Convert to vala.eclass

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x84F20B43

6 files changed, 37 insertions, 39 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 0dedfada89bf..9ef022b34863 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.106 2013/03/12 10:19:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.107 2013/03/29 21:37:00 angelos Exp $
+
+  29 Mar 2013; Christoph Mende <angelos@gentoo.org> midori-0.4.6-r1.ebuild,
+  midori-0.4.8.ebuild, midori-0.4.9.ebuild, midori-9999.ebuild:
+  Convert to vala.eclass
 
 *midori-0.4.9 (12 Mar 2013)
 
@@ -446,4 +450,3 @@
 
   27 Mar 2008; Markus Ullmann <jokey@gentoo.org> +metadata.xml:
   Add ebuild for bug #215036
-
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 4a404738c0d6..8f93c52e467f 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -6,20 +6,16 @@ AUX midori-0.4.8-desktop_file_validation.patch 870 SHA256 615f3f5de1de29f2704e9d
 DIST midori-0.4.6.tar.bz2 978570 SHA256 910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea SHA512 8c46f2eed6dd0af237b6aa021f8fc2150bd4387f7de14c9265cf5b8c1a1a558ecf908c98389415100ca0eac9037d7df89c5a348ef9dcd397bb1d3421104a8e7a WHIRLPOOL 36a498e2fd22039816da7072c1a7d59c84548fc187480b33b7a12ddf2ecd41626bb5a80d28298f336148ff74e3ec6fd2dd6da7a19f466ea899849b2d0919c0b2
 DIST midori-0.4.8.tar.bz2 1047789 SHA256 40bf23f84a3537f54d7eb45df1da40ebef54c321b1b34d0d0c8e45bb0cce5e9f SHA512 ec10fb836f824928cee2df4ca13d65b8436efd8f34af911884fb225b521d1f67dd44bdb5588cd36e0f2db802ed9d1d3c6852563f563b18e20416fcdf3dc3d349 WHIRLPOOL 607c49dd4269a588bd4c33445b3342aa7c785da458aea3abd10deb7c0ffb55a22024e7f1d293e9237b3cd54fc023a0afb70931ed5bdf99df7bd46d67bf889f42
 DIST midori-0.4.9.tar.bz2 1079713 SHA256 f01e5dc45e94f909e48f0dd62cc4afedd80710769fdf98bc4e0b38d4ef0abc11 SHA512 02a1f6523c8912c916cbff930712ba87d42487f5f513e59c3adbaeaed533406874074635e96db87f3c4132e4221e60b126002785634d194bb5cbf2f602d3c321 WHIRLPOOL 9aa814b69cfbcb36f0dcb1ddff47c0fda38411cfd788f1c6b0bfd758f10db7ba8598144ef066b677404b85fca3bae408b0e8bb708a33cd1be11d4877644610b2
-EBUILD midori-0.4.6-r1.ebuild 2246 SHA256 02f9afa0790834dded6e7153ed1307fc1537497223c3066fa557fb5d4b765699 SHA512 f5a6dfd6e85a76cacdbf4d73957047cf37bb6c19174e14e586874a94abfa91f6973ccd45c128a4ca373f355aec05779e48f0587b22c3a2fc277e2d916636ca76 WHIRLPOOL 283c97500a5862f3f06e1f8b7ae279a5654c63a7d46598a41d1e7767198e8f05e32a0385a4281c9d887b6f14156d3e3fa4aaf48bc4cfbf893a197bc82efc93b8
-EBUILD midori-0.4.8.ebuild 2528 SHA256 0bc40661d6ab5f72c85fcfa89438444e05598a9d230b74f0d35ca561dd5b262b SHA512 7fcf44615a488a983555f5ae93313d24028bca3338fa1008efdf73b8ebef66dec3666fbf95eef0212765bcd4db3e041d784e51cacc238708637943d4d303fe93 WHIRLPOOL 30a26fb115136aaa10d00ac1e87c576b8855805fbf2a0774cd80b865946e8a474ded6e37f36cde9b763b0428398c71f43eea5e265a759e88b3de05ebf0cc8d5e
-EBUILD midori-0.4.9.ebuild 2508 SHA256 682ea9628fb169cb780b4b8372ab1bd4d0af60cf868681140acebdeac3711c12 SHA512 e8b4513bba3831a1738b9cdace908784a6690881d2cf600a00ced243d627bcad8f2091a34315c026a39624791bc71977b4736bbe1d60cdb2e28c7efbe91e22bb WHIRLPOOL fcefb86065314d8f8ff74bc919a7211e46dc3aad76ab0927245abc6dee2f1e59010bfdd20407e0b7a371e0952d9543a979eb2bc01b902b8158b69b719b09e88c
-EBUILD midori-9999.ebuild 2508 SHA256 50a114795520b10aded28dee74ab0f5408bb0bc88a258253a7a89cfb2393819c SHA512 e6233745ce8a694a181d765e3d7bf7a21117f548318ffbb10791feb4340f88d10739e807b7851d14bd95e3f73f99f4cf25adc9a392f9df0eaaccca0ba39896a3 WHIRLPOOL 544c1b8668da44f25b3a3ea2e88f84e3a57fc0012892355bf4d6de3709dda1d62ec8d734d07bbcea4781f5a3e6bb1cd794ff8836463bec2d91e30a7a23e3d286
-MISC ChangeLog 15549 SHA256 01b02fae097125f5c3c15c4569e15317d1f8a5eaba2687ad26dac53319e6b6ad SHA512 78ae8e5efc90f61e428dd65803ec5293dd398254962cbbc54a81574d69cbabcd4b8697161e5969391714b62daf67f041b8d86f20883fce00edfd2e99acc2c25d WHIRLPOOL 5b624bc3b91640c7dbddf64a1905b7929942dea7eeccb6d869dd81b7c441c835b6b75cf18edee39e077c7f1606f095ddc5354a6eab02132c1f888d936bc51fad
+EBUILD midori-0.4.6-r1.ebuild 2211 SHA256 48e90bc460897c622ae0632c15dc3c033645489e70744670da3b21886d551b69 SHA512 a1414ab2c4976f577f86a9108ad9806cb4f8eebe834b6360e02911ce3d9c34dbca06ab3e4dea5c61eed2a3dbe00cad85276812dbbf55c22c04a7160d89a3a074 WHIRLPOOL a401d18386e3b3556733962b1cc414fc463df4894db459b546b84e6e2c9eb7c7bdd0f916f99e4207c25cfcaaae176fa89acb79501f88a26dfc43e333707a6a25
+EBUILD midori-0.4.8.ebuild 2498 SHA256 e2911ebbbee983bf90264f2a36baaa7962fa35049e3fe38a45b5219f36193ee9 SHA512 033ac41fa5e736e3fb5007c7de7aabf6702792840a367609c091325fa9f624fb836a67912402a51e3555e638ed5f71ab8ec0dc354aeeba800be3cd968c69f4f0 WHIRLPOOL 212769f248a15a7c34058af7943b7288a224910cb2832c83583d6249e9f68f2c9bfabbc789042382503876844675e72ddcb36d957ad638cb3087df1beddbac8a
+EBUILD midori-0.4.9.ebuild 2478 SHA256 57783803a713e1265f421a9e20e961a8d8e4f418c3f6f645e5bf7f3e5e2103c5 SHA512 9e38fd7f4e173b29ddc670e7b2dd43e66060e24960a8d167782e1ec0d86a92c3b9a8fb5cd217a0e493a37bbdf8fdbc4d6f64e453d39ff44af720f45fe1d62a8f WHIRLPOOL 671219b9295f4461c9439ef71d27fbea7663f178f86246b3e7466e21b50d7306780c384cf446a468a1ecaed3218c48c127274155c13ce1c7b599a83ba03c0536
+EBUILD midori-9999.ebuild 2478 SHA256 730d14d9b836572d65c2bd8b631fc9eca3d90c926a25370de5beda8dccf7fc19 SHA512 025679aa441524509b864fe7c92e9a4c0fbad5f299ac5c365a7ad0733e0f7a5543f620a55de4434f1658969af94c779f0fd4f1250b68967c7fa71427daab79c4 WHIRLPOOL 2f4788eeac12f43836be27b188b1434a418b62daed4fa3223e477464293cd4a75a067bad612a8410e2901f9c797635e3a36bc68579ec17bdffb349e11841b6dc
+MISC ChangeLog 15712 SHA256 3ac076325ecca8c72ae6236b872784c151afa36b3d9012a4e462ff2e850b98ba SHA512 9d7a603c64f8bf25a2a7140f8bf3bec1399724b0418bf83edfc629183d59ea119a3d61209d950cf5f8c45fd9942494010e83a99e8edb23e80f232027d24293ad WHIRLPOOL b3c675cc9f06503523954811c5aafcac32115d6560891d8127179c6f5142ce743a61a4015901f3140c0561d803e039991b40e303a653d3deef427e0ccd00f483
 MISC metadata.xml 596 SHA256 0fa7bd1140a2b36810b7766e6586d34fed003c56817eb86e9559e03ec03793d7 SHA512 d166a4438ae11dc4efa5fc8834d347e4f29f9ee4fd88c7f09e83ed210b221beb1a9806cd8aac05e1bda22e54ead051e731842b7f2220fae7b7a1cc83e53de263 WHIRLPOOL 3374d47859174c05954af05548a7d2338be0d85b021ccd5345b1ac00ec39aa936360954a09621221534adcbad2662408de5a5b53dadebe352fc9a5891232ab5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRPwGuAAoJEEdUh39IaPFNtIUH/Rktf5TFTVwr7bxSNEaHqI2A
-XKRchcKUzixDDBJ0bQWCFZiSswyQl2312Nh1gy49FM8/K+0v786WCTGrtkHc2Z6i
-5IACKR2HiH9A+W3T4GQ3TtpC8jwEo/u/99+Pmx6pZ7UMeiqIjU6N0rOl/R3Ya/X/
-maHXSvqrRjE7GpnLOM3Y+3Z84iDEf/XLtccqRtR4Me4GhU0A3irTOPW6GSUscet0
-vfWm9QAN5jBMYePFwYsU7pRI2f/ipYBeeg5Zm5KWCbYx9sGexYdWUyVh1wtxvzyM
-0jMohI74ktqbC94DOxDBXRVHnmVn+a2td+HXHsc4wty3VDuwBZfzVJbMFwZM+rk=
-=reiW
+iF4EAREIAAYFAlFWCX4ACgkQmWq1bYTyC0P84wEAqv66hFFjlbRQQHNVahk0sTk5
+uzAy7UdC46hgdT/t1fYA/RWwhlmjVR1Bcd4uPGYy+g3kWe2JFCTdmsGwKQF0w1Un
+=K8sh
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/midori-0.4.6-r1.ebuild b/www-client/midori/midori-0.4.6-r1.ebuild
index 7f1465c179a4..997e96c7903e 100644
--- a/www-client/midori/midori-0.4.6-r1.ebuild
+++ b/www-client/midori/midori-0.4.6-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.6-r1.ebuild,v 1.4 2012/08/18 13:27:25 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.6-r1.ebuild,v 1.5 2013/03/29 21:37:00 angelos Exp $
 
 EAPI=4
+VALA_MIN_API_VERSION=0.14
 
 unset _live_inherits
 
@@ -14,9 +15,7 @@ else
 	SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 fi
 
-inherit eutils fdo-mime gnome2-utils python waf-utils ${_live_inherits}
-
-PV_vala_version=0.16
+inherit eutils fdo-mime gnome2-utils python waf-utils vala ${_live_inherits}
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -44,7 +43,7 @@ RDEPEND="dev-db/sqlite:3
 	libnotify? ( >=x11-libs/libnotify-0.7 )"
 DEPEND="${RDEPEND}
 	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	dev-lang/vala:${PV_vala_version}
+	$(vala_depend)
 	dev-util/intltool
 	gnome-base/librsvg
 	doc? ( dev-util/gtk-doc )
@@ -68,12 +67,12 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-dl.patch
+	vala_src_prepare
 }
 
 src_configure() {
 	strip-linguas -i po
 
-	VALAC="$(type -P valac-${PV_vala_version})" \
 	waf-utils_src_configure \
 		--disable-docs \
 		 $(use_enable doc apidocs) \
diff --git a/www-client/midori/midori-0.4.8.ebuild b/www-client/midori/midori-0.4.8.ebuild
index 388dbb9ef7bf..39e1167c271d 100644
--- a/www-client/midori/midori-0.4.8.ebuild
+++ b/www-client/midori/midori-0.4.8.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.8.ebuild,v 1.3 2013/02/06 18:18:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.8.ebuild,v 1.4 2013/03/29 21:37:00 angelos Exp $
 
 EAPI=5
+VALA_MIN_API_VERSION=0.14
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -16,9 +17,7 @@ else
 	SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 fi
 
-inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils ${_live_inherits}
-
-VALA_VERSION=0.18
+inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils vala ${_live_inherits}
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
 HOMEPAGE="http://twotoasts.de/index.php/midori/"
@@ -48,7 +47,7 @@ RDEPEND=">=dev-db/sqlite-3.6.19:3
 	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-lang/vala:${VALA_VERSION}
+	$(vala_depend)
 	dev-util/intltool
 	gnome-base/librsvg
 	doc? ( dev-util/gtk-doc )
@@ -75,12 +74,13 @@ src_prepare() {
 
 # FIXME: The code is not compatible with X- in the names
 #	epatch "${FILESDIR}"/${P}-desktop_file_validation.patch
+
+	vala_src_prepare
 }
 
 src_configure() {
 	strip-linguas -i po
 
-	VALAC="$(type -P valac-${VALA_VERSION})" \
 	waf-utils_src_configure \
 		--disable-docs \
 		$(use_enable doc apidocs) \
diff --git a/www-client/midori/midori-0.4.9.ebuild b/www-client/midori/midori-0.4.9.ebuild
index b905fc882d8d..ea4f453c1faa 100644
--- a/www-client/midori/midori-0.4.9.ebuild
+++ b/www-client/midori/midori-0.4.9.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.9.ebuild,v 1.1 2013/03/12 10:19:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.9.ebuild,v 1.2 2013/03/29 21:37:00 angelos Exp $
 
 EAPI=5
+VALA_MIN_API_VERSION=0.14
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -16,9 +17,7 @@ else
 	SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 fi
 
-inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils ${_live_inherits}
-
-VALA_VERSION=0.18
+inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils vala ${_live_inherits}
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
 HOMEPAGE="http://twotoasts.de/index.php/midori/"
@@ -48,7 +47,7 @@ RDEPEND=">=dev-db/sqlite-3.6.19:3
 	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-lang/vala:${VALA_VERSION}
+	$(vala_depend)
 	dev-util/intltool
 	gnome-base/librsvg
 	doc? ( dev-util/gtk-doc )
@@ -72,6 +71,8 @@ src_unpack() {
 src_prepare() {
 	# Force disabled because we don't have this custom renamed in Portage
 	sed -i -e 's:gcr-3-gtk2:&dIsAbLe:' wscript || die
+
+	vala_src_prepare
 }
 
 src_configure() {
@@ -80,7 +81,6 @@ src_configure() {
 	local myconf
 	use deprecated || myconf="$(use_enable webkit2)"
 
-	VALAC="$(type -P valac-${VALA_VERSION})" \
 	waf-utils_src_configure \
 		--disable-docs \
 		$(use_enable doc apidocs) \
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index 9b5fcad5c038..d32807201873 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.46 2013/03/12 10:19:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.47 2013/03/29 21:37:00 angelos Exp $
 
 EAPI=5
+VALA_MIN_API_VERSION=0.14
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -16,9 +17,7 @@ else
 	SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 fi
 
-inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils ${_live_inherits}
-
-VALA_VERSION=0.18
+inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils vala ${_live_inherits}
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
 HOMEPAGE="http://twotoasts.de/index.php/midori/"
@@ -48,7 +47,7 @@ RDEPEND=">=dev-db/sqlite-3.6.19:3
 	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-lang/vala:${VALA_VERSION}
+	$(vala_depend)
 	dev-util/intltool
 	gnome-base/librsvg
 	doc? ( dev-util/gtk-doc )
@@ -72,6 +71,8 @@ src_unpack() {
 src_prepare() {
 	# Force disabled because we don't have this custom renamed in Portage
 	sed -i -e 's:gcr-3-gtk2:&dIsAbLe:' wscript || die
+
+	vala_src_prepare
 }
 
 src_configure() {
@@ -80,7 +81,6 @@ src_configure() {
 	local myconf
 	use deprecated || myconf="$(use_enable webkit2)"
 
-	VALAC="$(type -P valac-${VALA_VERSION})" \
 	waf-utils_src_configure \
 		--disable-docs \
 		$(use_enable doc apidocs) \