Use Python 2 (bug #313499).

Package-Manager: portage-HEAD/cvs/Linux x86_64

4 files changed, 24 insertions, 12 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 769d2df63a00..d03884e728a9 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.310 2010/06/05 17:26:00 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.311 2010/06/06 14:19:33 arfrever Exp $
+
+  06 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  gimp-2.6.8.ebuild, gimp-9999.ebuild:
+  Use Python 2 (bug #313499).
 
   05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> gimp-2.6.8.ebuild,
   gimp-9999.ebuild:
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 9b0a68248009..6096f2f43416 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,6 +1,6 @@
 AUX gimp-2.6.8-libpng-1.4.patch 1346 RMD160 8e6272af4bb869daeb348600e296412a7a11149d SHA1 0f9271676429a6a868ca2d104328f12d3eacb863 SHA256 521bd1f7d0afb9d8e86d99cbcdbcabeb9a1ecfff6e91ab002012f01f501d2ee3
 DIST gimp-2.6.8.tar.bz2 16342377 RMD160 da02fedcc00ebaac04bfd21c153a7130d3ff5e08 SHA1 a550943f086abc9bf6b96d576741337b7186a4f4 SHA256 d5d4218b742390157fca23a9d2cce436904546a2ea419ffeb44a5f43c99a3332
-EBUILD gimp-2.6.8.ebuild 2592 RMD160 c66cf21c6639ef9ceac504ba5e827cfdd21bb654 SHA1 17862df885f907c417737858d64d09f5ee0838c8 SHA256 fd724d0d6edadc9e9441b3caf99634646a6276788e22a218cb64296cc1709b58
-EBUILD gimp-9999.ebuild 2638 RMD160 e2d7aa692b654e824a2ac125b2ac6ef73b1607db SHA1 68e3d7b830952d93823a499d2e228a84171e31b1 SHA256 0e68263addf6fc5d55db6f71744e721df43ec8f68520e6ac9e2fcde572624288
-MISC ChangeLog 41994 RMD160 92d5ff3d94401292049076256e63f274eb998ac8 SHA1 ac0102fa123924e4bf8537d074241d51aa383ffa SHA256 6bb61a04ce8b69484ba82a6160134038401954e0b6bb60cfeadc82de6806fff8
+EBUILD gimp-2.6.8.ebuild 2666 RMD160 ffd512553ee5805ff5e520371583d11dc1114b7e SHA1 1389a518745e115de1bba428c67d6ad1d597f312 SHA256 cadb59f02378f12e4c09a40307ab57bab8766134e3e7e5940049ad129d993a94
+EBUILD gimp-9999.ebuild 2712 RMD160 c629331c3f3e011b5a79e0439669e4ad4e9fea92 SHA1 e9a6f476e77aba95359d4e9d3cecbef242406e99 SHA256 e68e35619bd82b00d2eebe2ac2dbf0ef16751788d32909507f95359d87a16a0e
+MISC ChangeLog 42137 RMD160 94dd8532939011d9785ff5b4845e2bf1416f181d SHA1 d7467fb63937d20cbe2473a0ff90732298879c58 SHA256 4a138c1fc4a99bda0221dcc2fb6f6bd2b02855f66bc39cbce493d79b80d9a1bd
 MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce399814102ba9802439497439e2e00ecc3b82e SHA256 380bccccb72b527f81e02fd37b41b584316fcd7c802b959b8eae27fcef0c0db5
diff --git a/media-gfx/gimp/gimp-2.6.8.ebuild b/media-gfx/gimp/gimp-2.6.8.ebuild
index be628d5d1304..a669de5bb979 100644
--- a/media-gfx/gimp/gimp-2.6.8.ebuild
+++ b/media-gfx/gimp/gimp-2.6.8.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.8.ebuild,v 1.11 2010/06/05 17:26:00 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.8.ebuild,v 1.12 2010/06/06 14:19:33 arfrever Exp $
 
 EAPI=2
+PYTHON_DEPEND="python? 2:2.5"
 
 inherit eutils gnome2 fdo-mime multilib python
 
@@ -40,8 +41,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
 	mng? ( media-libs/libmng )
 	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
 	png? ( >=media-libs/libpng-1.2.2 )
-	python?	( >=dev-lang/python-2.5.0
-		>=dev-python/pygtk-2.10.4 )
+	python?	( >=dev-python/pygtk-2.10.4 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	svg? ( >=gnome-base/librsvg-2.8.0 )
 	wmf? ( >=media-libs/libwmf-0.2.8 )"
@@ -82,6 +82,10 @@ pkg_setup() {
 		$(use_with svg librsvg) \
 		$(use_with tiff libtiff) \
 		$(use_with wmf)"
+
+	if use python; then
+		python_set_active_version 2
+	fi
 }
 
 pkg_postinst() {
@@ -94,6 +98,6 @@ pkg_postinst() {
 pkg_postrm() {
 	gnome2_pkg_postrm
 
-	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
+	use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
 		/usr/$(get_libdir)/gimp/2.0/plug-ins
 }
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 826a719ac184..77b8313c6dfb 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.25 2010/06/05 17:26:00 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.26 2010/06/06 14:19:33 arfrever Exp $
 
 EAPI=2
+PYTHON_DEPEND="python? 2:2.5"
 
 inherit git eutils gnome2 fdo-mime multilib python
 
@@ -42,8 +43,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
 	mng? ( media-libs/libmng )
 	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
 	png? ( >=media-libs/libpng-1.2.2 )
-	python?	( >=dev-lang/python-2.5.0
-		>=dev-python/pygtk-2.10.4 )
+	python?	( >=dev-python/pygtk-2.10.4 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	svg? ( >=gnome-base/librsvg-2.8.0 )
 	wmf? ( >=media-libs/libwmf-0.2.8 )"
@@ -90,6 +90,10 @@ pkg_setup() {
 		$(use_with svg librsvg) \
 		$(use_with tiff libtiff) \
 		$(use_with wmf)"
+
+	if use python; then
+		python_set_active_version 2
+	fi
 }
 
 pkg_postinst() {
@@ -102,6 +106,6 @@ pkg_postinst() {
 pkg_postrm() {
 	gnome2_pkg_postrm
 
-	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
+	use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
 		/usr/$(get_libdir)/gimp/2.0/plug-ins
 }