Fix vala dependency and vala logic in the 9999 ebuild

(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

5 files changed, 18 insertions, 18 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/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 \