[gentoo-commits] gentoo-x86 commit in www-client/midori: midori-0.2.4.ebuild ChangeLog midori-9999.ebuild midori-0.2.2.ebuild

[gentoo-commits] gentoo-x86 commit in www-client/midori: midori-0.2.4.ebuild ChangeLog midori-9999.ebuild midori-0.2.2.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    10/03/31 15:03:48

  Modified:             midori-0.2.4.ebuild ChangeLog midori-9999.ebuild
  Removed:              midori-0.2.2.ebuild
  Log:
  Use Python 2.x instead of Python 3.x for ./waf wrt #302555.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  www-client/midori/midori-0.2.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/midori-0.2.4.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/midori-0.2.4.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/midori-0.2.4.ebuild?r1=1.2&r2=1.3

Index: midori-0.2.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- midori-0.2.4.ebuild	10 Mar 2010 15:51:16 -0000	1.2
+++ midori-0.2.4.ebuild	31 Mar 2010 15:03:48 -0000	1.3
@@ -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 @@
 	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



1.28                 www-client/midori/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/ChangeLog?r1=1.27&r2=1.28

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog	10 Mar 2010 15:51:16 -0000	1.27
+++ ChangeLog	31 Mar 2010 15:03:48 -0000	1.28
@@ -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:



1.15                 www-client/midori/midori-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/midori-9999.ebuild?r1=1.14&r2=1.15

Index: midori-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- midori-9999.ebuild	10 Mar 2010 15:51:16 -0000	1.14
+++ midori-9999.ebuild	31 Mar 2010 15:03:48 -0000	1.15
@@ -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 @@
 	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