Use dev-lang/python 2.x wrt #421089 by "lynx"

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

4 files changed, 35 insertions, 13 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 23e55dab0047..95f8a4a81507 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.224 2012/04/13 19:28:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.225 2012/06/14 15:18:44 ssuominen Exp $
+
+  14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> blender-2.48a-r3.ebuild,
+  blender-2.49a.ebuild, blender-2.49b-r2.ebuild:
+  Use dev-lang/python 2.x wrt #421089 by "lynx"
 
   13 Apr 2012; Ulrich Müller <ulm@gentoo.org> blender-2.57-r1.ebuild,
   blender-2.60a.ebuild:
diff --git a/media-gfx/blender/blender-2.48a-r3.ebuild b/media-gfx/blender/blender-2.48a-r3.ebuild
index a0db8c7de668..37708a79f4d6 100644
--- a/media-gfx/blender/blender-2.48a-r3.ebuild
+++ b/media-gfx/blender/blender-2.48a-r3.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.19 2012/04/02 13:34:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.20 2012/06/14 15:18:44 ssuominen Exp $
 
 EAPI=2
 
+PYTHON_DEPEND="2:2.6"
+
 inherit scons-utils multilib flag-o-matic eutils python
 
 #IUSE="jpeg mozilla png sdl static truetype"
@@ -20,15 +22,14 @@ KEYWORDS="amd64 ppc ppc64 x86"
 RDEPEND=">=dev-libs/openssl-0.9.6
 	ffmpeg? ( virtual/ffmpeg )
 	jpeg? ( virtual/jpeg )
-	media-libs/tiff
-	>=dev-lang/python-2.4
+	media-libs/tiff:0
 	nls? ( >=media-libs/freetype-2.0
 			virtual/libintl
 			>=media-libs/ftgl-2.1 )
 	openal? ( >=media-libs/openal-1.6.372
 		>=media-libs/freealut-1.1.0-r1 )
 	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng )
+	png? ( media-libs/libpng:0 )
 	quicktime? ( media-libs/libquicktime )
 	>=media-libs/libsdl-1.2
 	blender-game? ( >=media-libs/libsdl-1.2[joystick] )
@@ -53,6 +54,11 @@ blend_with() {
 	fi
 }
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.37-dirs.patch
 	epatch "${FILESDIR}"/${PN}-2.44-scriptsdir.patch
diff --git a/media-gfx/blender/blender-2.49a.ebuild b/media-gfx/blender/blender-2.49a.ebuild
index 5e0ff72d499d..974bd5233acc 100644
--- a/media-gfx/blender/blender-2.49a.ebuild
+++ b/media-gfx/blender/blender-2.49a.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.19 2012/04/02 13:34:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.20 2012/06/14 15:18:44 ssuominen Exp $
 
 EAPI=2
 
+PYTHON_DEPEND="2:2.6"
+
 inherit scons-utils multilib eutils python
 
 IUSE="blender-game ffmpeg nls ogg openmp verse openal"
@@ -18,15 +20,14 @@ KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="ffmpeg? ( virtual/ffmpeg[encode,theora] )
 	>=media-libs/openjpeg-1.5.0
-	media-libs/tiff
-	>=dev-lang/python-2.5
+	media-libs/tiff:0
 	nls? ( >=media-libs/freetype-2.0
 		virtual/libintl
 		>=media-libs/ftgl-2.1 )
 	openal? ( >=media-libs/openal-1.6.372
 		>=media-libs/freealut-1.1.0-r1 )
 	media-libs/openexr
-	media-libs/libpng
+	media-libs/libpng:0
 	blender-game? ( >=media-libs/libsdl-1.2[joystick] )
 	>=media-libs/libsdl-1.2
 	ogg? ( media-libs/libogg )
@@ -51,6 +52,11 @@ blend_with() {
 	fi
 }
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/blender-2.48a-CVE-2008-4863.patch
 	epatch "${FILESDIR}"/${PN}-2.37-dirs.patch
diff --git a/media-gfx/blender/blender-2.49b-r2.ebuild b/media-gfx/blender/blender-2.49b-r2.ebuild
index 5249d14980d2..7e43c29065c0 100644
--- a/media-gfx/blender/blender-2.49b-r2.ebuild
+++ b/media-gfx/blender/blender-2.49b-r2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.14 2012/04/02 13:34:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.15 2012/06/14 15:18:44 ssuominen Exp $
 
 EAPI=2
 
+PYTHON_DEPEND="2:2.6"
+
 inherit scons-utils multilib eutils python
 
 IUSE="blender-game ffmpeg nls ogg openmp verse openal"
@@ -18,15 +20,14 @@ KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="ffmpeg? ( virtual/ffmpeg[encode,theora] )
 	>=media-libs/openjpeg-1.5.0
-	media-libs/tiff
-	>=dev-lang/python-2.5
+	media-libs/tiff:0
 	nls? ( >=media-libs/freetype-2.0
 		virtual/libintl
 		>=media-libs/ftgl-2.1 )
 	openal? ( >=media-libs/openal-1.6.372
 		>=media-libs/freealut-1.1.0-r1 )
 	media-libs/openexr
-	media-libs/libpng
+	media-libs/libpng:0
 	blender-game? ( >=media-libs/libsdl-1.2[joystick] )
 	>=media-libs/libsdl-1.2
 	ogg? ( media-libs/libogg )
@@ -51,6 +52,11 @@ blend_with() {
 	fi
 }
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/blender-2.48a-CVE-2008-4863.patch
 	epatch "${FILESDIR}"/${PN}-2.37-dirs.patch