Fix vala dependency and vala logic in the 9999 ebuild

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

6 files changed, 26 insertions, 26 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index b6eeb5182357..d55bb361f140 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.62 2011/06/08 22:17:29 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.63 2011/06/17 09:37:29 angelos Exp $
+
+  17 Jun 2011; Christoph Mende <angelos@gentoo.org> midori-0.3.3.ebuild,
+  midori-0.3.5.ebuild, midori-0.3.6.ebuild, midori-9999.ebuild:
+  Fix vala dependency and vala logic in the 9999 ebuild
 
   08 Jun 2011; Christoph Mende <angelos@gentoo.org> midori-9999.ebuild:
   Update live ebuild
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index f06df5fa8201..f84c3263d26a 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -4,16 +4,16 @@ Hash: SHA256
 DIST midori-0.3.3.tar.bz2 848720 RMD160 f2380250f3246a3a7c32edb3eba884d3c8ed946f SHA1 01baf6243f7b00af5e5b4eb6ac5d3233e60bc993 SHA256 236770d134e2eb9c44776e233903fc0afa760cd3b8b87d12316e1b25afe2d3fe
 DIST midori-0.3.5.tar.bz2 871235 RMD160 9dfe53448789540867aca7d81145c6e5c49573a0 SHA1 69940049ea98c06b2a6444e9a837e2bf472ba949 SHA256 748059b90d48cd5897d776d88f55d154081ea38eac8735ca393ed1c4317383ac
 DIST midori-0.3.6.tar.bz2 904370 RMD160 b74e1d2d99538ea6a54d28537d41b20987a5e8f4 SHA1 b790f33b72520e6910061a933f879b74482f801c SHA256 5fb290ffde81e5e6b39a54d286f5732496bfda10ff65019189cc6bf8408f2410
-EBUILD midori-0.3.3.ebuild 1839 RMD160 fd922af7dc90a138bca4541e385c2b13ab078127 SHA1 0bee7c73243741df2df12c4e15d9ae3c191a8064 SHA256 3eb3c3a70a1b18efa0e9036f23429bb109f9c3bed169db32eb32d0e3d81ce642
-EBUILD midori-0.3.5.ebuild 1860 RMD160 2a2547dde22803534b9e232ee9dc3cde4db7b6c2 SHA1 2c288644a0521dde2b1f3c6afae6353e66101d1e SHA256 a31f6ef3542fa40597c7b088707aae136348a4f77d9fa1a21d15db82eaba7c2d
-EBUILD midori-0.3.6.ebuild 1860 RMD160 b9f7476d8927f5e646cf63987fdc3e80120af37e SHA1 4c2800986d487c88e0dfbab1cbdfc782d08acc20 SHA256 3fb4c0037717b14b3a1f72242bd5758cd21ce8093f35cf3c28da1866a7d388c0
-EBUILD midori-9999.ebuild 1787 RMD160 252f5731a75dca63d5ccad7ed456e7d8c8721020 SHA1 8f109593be4347b4b005db501ead01f596547c44 SHA256 70471373a0a4d2ed46b511d3dc788eebaf15580227e0c1dab8555b41ea84247d
-MISC ChangeLog 9434 RMD160 9a6a7870983442e81fea0521864c755aedfbf6bc SHA1 5559442e1c066144b9ffd1e756e223548e82fdcb SHA256 d2a0e905ddcd7d387e457a140c92144da03e0055d43f4be89f76a375387d00fc
+EBUILD midori-0.3.3.ebuild 1836 RMD160 027cee01a298247e513d8cf661c7a0b4dfb386f5 SHA1 a40ecd519a8be8866f062dbae8aa7704aade1366 SHA256 ce7885c2d573089333c4e5b69e8c069b03bf3f6e7d80295b51e54493710d98a3
+EBUILD midori-0.3.5.ebuild 1860 RMD160 e1093429e46648e0163870da7776508e869b9295 SHA1 4a46803daef273acff1bd3456774eefb9694498b SHA256 cc253832fbe7296c7d6f3e2808620d6965c409061ebe6ea1a8ffcef22b57ad48
+EBUILD midori-0.3.6.ebuild 1860 RMD160 a8301c5411fba484c71ea353e29f81c4b7bb2281 SHA1 b9d315c2e71a18a0b097a904e6ac992d9ea9b465 SHA256 be80c7c00c3c0e2cd50c734cdd2dc529c4b1c0e986d1e8da0a6893aaa2ecbcb7
+EBUILD midori-9999.ebuild 1673 RMD160 9edc0e009607aaf1f829d5d3aa65944e938c0afd SHA1 d774d89a62bd31b52db0320c6fb4f8e1f932fba4 SHA256 31140b99496fde5194b4499c9c9ebd4314832ce748d23cc4e6eadd64acba4972
+MISC ChangeLog 9628 RMD160 2c187e3de3e3e86951cdf2a4f65427c4c68ed671 SHA1 2aca48c073c6331c8a46070501b44c113f6b29fd SHA256 58269b7d146721701a99248db00eb3128e5fa4f63b65fb69ecc0286569245c5e
 MISC metadata.xml 324 RMD160 462191a93a3148df91b0ae430af36bb5e7d9a50e SHA1 d2d179fa5da9712cf8c5e6f64cf78b60a9af7b71 SHA256 4f530b1076e8a7c8e52019288be2af64d0f787e564a9f1a9f61188f059ed5dda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3v9P4ACgkQmWq1bYTyC0PLMwD+Kv2+UhjQWX3gphFfow9Ds05A
-Dg2vAMOIglFfvSsdGhcA/3FjRjaflSjFEygngTsbKrRqUaM2L45Kzk0CEgtPdLc1
-=x3X0
+iF4EAREIAAYFAk37IF8ACgkQmWq1bYTyC0MuXQEAlDNnx4UBrBi59VPJnFG2NZto
+sEXHMxP8ZWoSMEQdDjQBAMlAJp2WiRcoV6kzV1Hkofy5Sze+vukvb1anPgZS4zIX
+=wqLa
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/midori-0.3.3.ebuild b/www-client/midori/midori-0.3.3.ebuild
index 3154b6d2b1b7..5ee07a7dd0e5 100644
--- a/www-client/midori/midori-0.3.3.ebuild
+++ b/www-client/midori/midori-0.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.3.3.ebuild,v 1.5 2011/04/28 10:29:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.3.3.ebuild,v 1.6 2011/06/17 09:37:29 angelos Exp $
 
 EAPI=3
 inherit eutils fdo-mime gnome2-utils python waf-utils
@@ -22,10 +22,10 @@ RDEPEND="dev-libs/libxml2:2
 	gnome? ( net-libs/libsoup-gnome:2.4 )
 	idn? ( net-dns/libidn )
 	libnotify? ( x11-libs/libnotify )
-	unique? ( dev-libs/libunique:1 )
-	vala? ( dev-lang/vala:0.10 )"
+	unique? ( dev-libs/libunique:1 )"
 DEPEND="${RDEPEND}
 	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	vala? ( dev-lang/vala:0.10 )
 	dev-util/intltool
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )"
diff --git a/www-client/midori/midori-0.3.5.ebuild b/www-client/midori/midori-0.3.5.ebuild
index f4134e94f297..5976cb217dfa 100644
--- a/www-client/midori/midori-0.3.5.ebuild
+++ b/www-client/midori/midori-0.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.3.5.ebuild,v 1.1 2011/05/02 08:01:01 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.3.5.ebuild,v 1.2 2011/06/17 09:37:29 angelos Exp $
 
 EAPI=3
 inherit eutils fdo-mime gnome2-utils python waf-utils
@@ -22,10 +22,10 @@ RDEPEND="dev-libs/libxml2:2
 	gnome? ( net-libs/libsoup-gnome:2.4 )
 	idn? ( net-dns/libidn )
 	libnotify? ( x11-libs/libnotify )
-	unique? ( dev-libs/libunique:1 )
-	vala? ( dev-lang/vala:0.10 )"
+	unique? ( dev-libs/libunique:1 )"
 DEPEND="${RDEPEND}
 	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	vala? ( dev-lang/vala:0.10 )
 	dev-util/intltool
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )"
diff --git a/www-client/midori/midori-0.3.6.ebuild b/www-client/midori/midori-0.3.6.ebuild
index 64fda0f418ab..7d5791a97931 100644
--- a/www-client/midori/midori-0.3.6.ebuild
+++ b/www-client/midori/midori-0.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.3.6.ebuild,v 1.1 2011/05/16 08:40:49 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.3.6.ebuild,v 1.2 2011/06/17 09:37:29 angelos Exp $
 
 EAPI=3
 inherit eutils fdo-mime gnome2-utils python waf-utils
@@ -22,10 +22,10 @@ RDEPEND="dev-libs/libxml2:2
 	gnome? ( net-libs/libsoup-gnome:2.4 )
 	idn? ( net-dns/libidn )
 	libnotify? ( x11-libs/libnotify )
-	unique? ( dev-libs/libunique:1 )
-	vala? ( dev-lang/vala:0.10 )"
+	unique? ( dev-libs/libunique:1 )"
 DEPEND="${RDEPEND}
 	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	vala? ( dev-lang/vala:0.10 )
 	dev-util/intltool
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )"
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index 256659182c6e..f502d78db7c2 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.34 2011/06/08 22:17:29 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.35 2011/06/17 09:37:29 angelos Exp $
 
 EAPI=3
 inherit eutils fdo-mime gnome2-utils python waf-utils git-2
@@ -22,10 +22,10 @@ RDEPEND="dev-libs/libxml2:2
 	gnome? ( net-libs/libsoup-gnome:2.4 )
 	idn? ( net-dns/libidn )
 	libnotify? ( x11-libs/libnotify )
-	unique? ( dev-libs/libunique:1 )
-	dev-lang/vala:0.10"
+	unique? ( dev-libs/libunique:1 )"
 DEPEND="${RDEPEND}
 	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	dev-lang/vala:0.10
 	dev-util/intltool
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )"
@@ -38,14 +38,10 @@ pkg_setup() {
 	HTML_DOCS=( data/faq.html data/faq.css )
 }
 
-src_prepare() {
-	# Make it work with slotted vala versions
-	sed -i -e "s/conf.env, 'valac'/conf.env, 'valac-0.10', var='VALAC'/" wscript || die
-}
-
 src_configure() {
 	strip-linguas -i po
 
+	VALAC="$(type -p valac-0.10)" \
 	waf-utils_src_configure \
 		--disable-docs \
 		--enable-addons \