Use Python 2.x instead of Python 3.x for ./waf wrt #302555.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 27 insertions, 86 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 3ab79d999cb5..5918aedfd41e 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.27 2010/03/10 15:51:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.28 2010/03/31 15:03:48 ssuominen Exp $
+
+  31 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> midori-0.2.4.ebuild,
+  midori-9999.ebuild:
+  Use Python 2.x instead of Python 3.x for ./waf wrt #302555.
 
   10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> midori-0.2.4.ebuild,
   midori-9999.ebuild:
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index b8b1d7053aa8..b43d7236491b 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,7 +1,5 @@
-DIST midori-0.2.2.tar.bz2 613546 RMD160 37c84235d92cd458dfa1e05834bf531797384e4a SHA1 053718ef0c907d5fb905d3cd71b053460a9b1927 SHA256 bec38745947b79a80352374937cecb81fd21d30c35f11b11290fabdad1e4cb07
 DIST midori-0.2.4.tar.bz2 645554 RMD160 8291b66b23c80b1881c06a1f001789155a5fbf76 SHA1 41b11ff4a65256fc3fdcafb8151f60195d7f8845 SHA256 02a2b13e2ca51badae828b0a331af92f09ae3d6a9ab0a56e647544db64f7790f
-EBUILD midori-0.2.2.ebuild 2052 RMD160 b8cf0e214e2263f95caca8f2b3cf0f15c2dc195a SHA1 d4edc0b7a07629405dac7bdff8c94f4052db75cc SHA256 577985d01f5d88132fcedd156931c01689d415fac1f14de0c0603bc9c1f80238
-EBUILD midori-0.2.4.ebuild 2082 RMD160 6fd37be72496612124d4d83cf292281183ac6b64 SHA1 7b7c3f53f3dcd54c3c9970dc115c2b216d06c968 SHA256 e76b77f35041bfea18b182e9a9b931d96b033db871e963326653988553f7515f
-EBUILD midori-9999.ebuild 2005 RMD160 d576485ace5f060075553a8160bab631826da32e SHA1 40efc5474c7f100e79e1ec715aa2766cf5a5b079 SHA256 9fc51d8348c1eeab0535de8d13acc26e8f5a9f82cb4a09f189e7ca1868e55e22
-MISC ChangeLog 4299 RMD160 0b816220b7531b5da06ed59da3727777de1c4f9b SHA1 848c76b1a7bed83c6a9a8413e6e13eff33bedb1c SHA256 5ecbe0604098425e1967dc26517e81df399399c11497f20f5b21240e3b9f09df
+EBUILD midori-0.2.4.ebuild 2141 RMD160 0ebe102f6fade647c2780d563144768f08aa6db4 SHA1 66cec13bfe362285f8691673fa37e85dbc828cb5 SHA256 1ae02029bcbdfdcc1586e2a67b86382b82a958eb76d73389eee6a18f06b28d37
+EBUILD midori-9999.ebuild 2062 RMD160 d72c1e6dee68a854ee6b627514648fa882c36173 SHA1 06e9fbab9b566909bf9740d59b7fdef78465e734 SHA256 152ba0277d6761716f93e0bb88479492bd26f54c5479b4229e1919fdd48faa43
+MISC ChangeLog 4459 RMD160 81ecdd16142fcd49cf47704a2bba2c4d0e668c9a SHA1 bc28fb208777d5d54fc1ff401b3120d3dace81c3 SHA256 34fe9db7e0222344068fa24dd68d177127149d2d0e85498e59cdefac9df6bcb0
 MISC metadata.xml 290 RMD160 ca55fa90594e529d6c3e9958dbe996e4f30499c9 SHA1 7d2d10b55d003cfa795c5fa9a4371fb48fb5748f SHA256 4b570f38dc8612ef354f8ccede3fb440d35000605ad26eabf6ac441af749436a
diff --git a/www-client/midori/midori-0.2.2.ebuild b/www-client/midori/midori-0.2.2.ebuild
deleted file mode 100644
index 71698b620390..000000000000
--- a/www-client/midori/midori-0.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.2.ebuild,v 1.3 2010/01/20 17:56:04 darkside Exp $
-
-EAPI=2
-inherit xfconf multilib
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-IUSE="doc gnome html idn libnotify nls +sqlite +unique"
-
-RDEPEND="libnotify? ( x11-libs/libnotify )
-	>=net-libs/libsoup-2.25.2
-	>=net-libs/webkit-gtk-1.1.1
-	dev-libs/libxml2
-	>=x11-libs/gtk+-2.10:2
-	gnome? ( net-libs/libsoup[gnome] )
-	idn? ( net-dns/libidn )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	unique? ( dev-libs/libunique )"
-
-DEPEND="${RDEPEND}
-	dev-lang/python
-	dev-util/intltool
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	html? ( dev-python/docutils )
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	# moving docs to version-specific directory
-	sed -i -e "s:\${DOCDIR}/${PN}:\${DOCDIR}/${PF}/:g" wscript || die
-	sed -i -e "s:/${PN}/user/midori.html:/${PF}/user/midori.html:g" midori/midori-browser.c || die
-}
-
-src_configure() {
-	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf \
-		--prefix="/usr/" \
-		--libdir="/usr/$(get_libdir)" \
-		--disable-docs \
-		--enable-addons \
-		$(use_enable doc apidocs) \
-		$(use_enable html userdocs) \
-		$(use_enable idn libidn) \
-		$(use_enable libnotify) \
-		$(use_enable nls nls) \
-		$(use_enable sqlite) \
-		$(use_enable unique) \
-		configure || die "configure failed"
-}
-
-src_compile() {
-	NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS})
-	./waf build ${NUMJOBS} || die "build failed"
-}
-
-src_install() {
-	DESTDIR=${D} ./waf install || die "install failed"
-	dodoc AUTHORS ChangeLog INSTALL TODO || die "dodoc failed"
-}
-
-pkg_postinst() {
-	xfconf_pkg_postinst
-	ewarn "Midori tends to crash due to bugs in WebKit."
-	ewarn "Report bugs at http://www.twotoasts.de/bugs"
-}
diff --git a/www-client/midori/midori-0.2.4.ebuild b/www-client/midori/midori-0.2.4.ebuild
index d443c84fcd91..0dc409bd465a 100644
--- a/www-client/midori/midori-0.2.4.ebuild
+++ b/www-client/midori/midori-0.2.4.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.4.ebuild,v 1.2 2010/03/10 15:51:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.4.ebuild,v 1.3 2010/03/31 15:03:48 ssuominen Exp $
 
 EAPI=2
-inherit eutils xfconf multilib
+
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils multilib python xfconf
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -23,15 +26,17 @@ RDEPEND="libnotify? ( x11-libs/libnotify )
 	idn? ( net-dns/libidn )
 	sqlite? ( >=dev-db/sqlite-3.0 )
 	unique? ( dev-libs/libunique )"
-
 DEPEND="${RDEPEND}
-	dev-lang/python
 	dev-util/intltool
 	dev-util/pkgconfig
 	doc? ( dev-util/gtk-doc )
 	html? ( dev-python/docutils )
 	nls? ( sys-devel/gettext )"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	# moving docs to version-specific directory
 	sed -i -e "s:\${DOCDIR}/${PN}:\${DOCDIR}/${PF}/:g" wscript || die
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index 296f7cf580c1..80752e267669 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2010 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.14 2010/03/10 15:51:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.15 2010/03/31 15:03:48 ssuominen Exp $
 
-EAPI="2"
-inherit eutils xfconf multilib git
+EAPI=2
+
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils multilib python xfconf git
 
 DESCRIPTION="A lightweight web browser"
 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -25,14 +28,16 @@ RDEPEND="libnotify? ( x11-libs/libnotify )
 	idn? ( net-dns/libidn )
 	sqlite? ( >=dev-db/sqlite-3.0 )
 	unique? ( dev-libs/libunique )"
-
 DEPEND="${RDEPEND}
-	dev-lang/python
 	dev-util/pkgconfig
 	doc? ( dev-util/gtk-doc )
 	html? ( dev-python/docutils )
 	nls? ( sys-devel/gettext )"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	# moving docs to version-specific directory
 	sed -i -e "s:\${DOCDIR}/${PN}:\${DOCDIR}/${PF}/:g" wscript