Fix deps to match the change, revert commit to 2.48

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

6 files changed, 18 insertions, 18 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 6a9b9c765975..6daaaf6272b1 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,10 +1,9 @@
 # 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.222 2012/04/02 13:28:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.223 2012/04/02 13:34:47 ssuominen Exp $
 
-  02 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> blender-2.48a-r3.ebuild,
-  blender-2.49a.ebuild, blender-2.49b-r2.ebuild, blender-2.57-r1.ebuild,
-  blender-2.60a.ebuild:
+  02 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> blender-2.49a.ebuild,
+  blender-2.49b-r2.ebuild, blender-2.57-r1.ebuild, blender-2.60a.ebuild:
   Fix building with media-libs/openjpeg >= 1.5.0 wrt #409283. Every version has
   source/blender/imbuf/intern/jp2.c with parameters->tile_size_on set to false.
 
diff --git a/media-gfx/blender/blender-2.48a-r3.ebuild b/media-gfx/blender/blender-2.48a-r3.ebuild
index 21a8f1510fb1..a0db8c7de668 100644
--- a/media-gfx/blender/blender-2.48a-r3.ebuild
+++ b/media-gfx/blender/blender-2.48a-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.18 2012/04/02 13:28:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.19 2012/04/02 13:34:47 ssuominen Exp $
 
 EAPI=2
 
@@ -60,11 +60,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.46-cve-2008-1103-1.patch
 	epatch "${FILESDIR}"/${PN}-2.48-ffmpeg-20081014.patch
 	epatch "${FILESDIR}"/${P}-CVE-2008-4863.patch
-
-	# Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
-	sed -i \
-		-e '/parameters.*tile_size_on/s:false:FALSE:' \
-		source/blender/imbuf/intern/jp2.c || die
 }
 
 src_configure() {
diff --git a/media-gfx/blender/blender-2.49a.ebuild b/media-gfx/blender/blender-2.49a.ebuild
index ffaa63f22b10..5e0ff72d499d 100644
--- a/media-gfx/blender/blender-2.49a.ebuild
+++ b/media-gfx/blender/blender-2.49a.ebuild
@@ -1,6 +1,6 @@
 # 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.18 2012/04/02 13:28:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.19 2012/04/02 13:34:47 ssuominen Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ LICENSE="|| ( GPL-2 BL BSD )"
 KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="ffmpeg? ( virtual/ffmpeg[encode,theora] )
-	media-libs/openjpeg
+	>=media-libs/openjpeg-1.5.0
 	media-libs/tiff
 	>=dev-lang/python-2.5
 	nls? ( >=media-libs/freetype-2.0
diff --git a/media-gfx/blender/blender-2.49b-r2.ebuild b/media-gfx/blender/blender-2.49b-r2.ebuild
index fbe2b9e4a7e3..5249d14980d2 100644
--- a/media-gfx/blender/blender-2.49b-r2.ebuild
+++ b/media-gfx/blender/blender-2.49b-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.13 2012/04/02 13:28:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.14 2012/04/02 13:34:47 ssuominen Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ LICENSE="|| ( GPL-2 BL BSD )"
 KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="ffmpeg? ( virtual/ffmpeg[encode,theora] )
-	media-libs/openjpeg
+	>=media-libs/openjpeg-1.5.0
 	media-libs/tiff
 	>=dev-lang/python-2.5
 	nls? ( >=media-libs/freetype-2.0
diff --git a/media-gfx/blender/blender-2.57-r1.ebuild b/media-gfx/blender/blender-2.57-r1.ebuild
index 9c78b0dfae8c..64eeaac5edc9 100644
--- a/media-gfx/blender/blender-2.57-r1.ebuild
+++ b/media-gfx/blender/blender-2.57-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.57-r1.ebuild,v 1.12 2012/04/02 13:28:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.13 2012/04/02 13:34:47 ssuominen Exp $
 
 PYTHON_DEPEND="3:3.2"
 
@@ -58,7 +58,10 @@ RDEPEND="virtual/jpeg
 	openexr? ( media-libs/openexr )
 	ffmpeg? (
 		virtual/ffmpeg[x264,mp3,encode,theora]
-		jpeg2k? ( virtual/ffmpeg[x264,mp3,encode,theora,jpeg2k] )
+		jpeg2k? (
+			!<media-libs/openjpeg-1.5.0
+			virtual/ffmpeg[x264,mp3,encode,theora,jpeg2k]
+		)
 	)
 	openal? ( >=media-libs/openal-1.6.372 )
 	fftw? ( sci-libs/fftw:3.0 )
diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild
index daa9ef8565fa..d614d099160c 100644
--- a/media-gfx/blender/blender-2.60a.ebuild
+++ b/media-gfx/blender/blender-2.60a.ebuild
@@ -1,6 +1,6 @@
 # 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.60a.ebuild,v 1.10 2012/04/02 13:28:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.11 2012/04/02 13:34:47 ssuominen Exp $
 
 PYTHON_DEPEND="3:3.2"
 EAPI=4
@@ -54,7 +54,10 @@ RDEPEND="virtual/jpeg
 	openexr? ( media-libs/openexr )
 	ffmpeg? (
 		>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
-		jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
+		jpeg2k? (
+			!<media-libs/openjpeg-1.5.0
+			>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k]
+		)
 	)
 	openal? ( >=media-libs/openal-1.6.372 )
 	fftw? ( sci-libs/fftw:3.0 )