make ffmpeg/jpeg/png conditional, fixes bug #237178 and should fix bug #232423

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc5 i686

4 files changed, 27 insertions, 6 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 705033d20908..69473b781d7e 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.150 2008/09/08 16:40:29 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.151 2008/09/10 20:04:26 maekke Exp $
+
+  10 Sep 2008; Markus Meier <maekke@gentoo.org> blender-2.47.ebuild,
+  blender-2.47-r1.ebuild:
+  make ffmpeg/jpeg/png conditional, fixes bug #237178 and should fix bug
+  #232423
 
   08 Sep 2008; Luca Barbato <lu_zero@gentoo.org> blender-2.47.ebuild,
   blender-2.47-r1.ebuild:
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 7ccc926dfd24..77407ce9a412 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX blender-2.37-dirs.patch 725 RMD160 3496386616f3066e1a237921f8ecc695a21b142e SHA1 905181caae8193d212a783e4c4c938e87e136752 SHA256 18ed351fd88c1bf952c86425dc769143cda6c5cd25e948ec1e1c0a1b911d44f7
 AUX blender-2.44-scriptsdir.patch 2586 RMD160 8e80859edf1fae2f401b326be4cb939108879999 SHA1 50143946828d3f2b2568e71fae5ed28f6adf7449 SHA256 a7afac10ce2431cd94d10dc3f4cae33423b5a59d0c6918199006f623cd6d68e4
 AUX blender-2.44-swscale.patch 4054 RMD160 8e0f31402682e01763ccd8ad529fb57db064c423 SHA1 2e8a322644d4cfafc59f6fa33b34e46851a03836 SHA256 c74007ad24989a215b04dd275c8dee33960a05297901daf3c457e4c42de51c35
@@ -21,7 +24,14 @@ EBUILD blender-2.45-r3.ebuild 3630 RMD160 227ddf68702a6da91e53f51696264882e4922e
 EBUILD blender-2.45-r4.ebuild 3615 RMD160 ac1f9b3019b4df0b096bad978c28ab5f548b1185 SHA1 0e035f0a53a24cb3df933baab85b8fbb2799a744 SHA256 6a4ef47a1744e4af6b479d24e10dbf1686cafaebc8bb97734e8d034208a0b5a9
 EBUILD blender-2.46-r1.ebuild 3630 RMD160 f2a4f3bbdfbc0b30f4284694e6ec263b6e7e66c2 SHA1 54c7eabaf40b17820115d615b21742a5b3e2351c SHA256 bc482c0874bbf57dbfb9770a80041401f7a27c53f65a11260c1785c19e762701
 EBUILD blender-2.46.ebuild 3602 RMD160 86e8526c456b78f44bcd8cc05c1df320d76903f0 SHA1 5c1ab9951e4256ce75f47c9623755cd90e52f2e8 SHA256 d36260c6399766db15b38c79a01216be23dd982113a34e3e83927ed6ecfac52a
-EBUILD blender-2.47-r1.ebuild 3862 RMD160 146fad2192dedada03389139e79f244b89060b3d SHA1 d8c270b95ff11917c6a53d5ece714ecaa1e758db SHA256 7f508ac3d607e68bf1fe4b6d4d3fadfda3a7053d6a6b2cab3beb49d7303739a0
-EBUILD blender-2.47.ebuild 3833 RMD160 98273f8bd34d11cc6b06c7dae9decbd2b5ce861f SHA1 4ec9ad5bb956616b359c9ac214e2a83dd63dbaeb SHA256 880890fa0e64bf0edf223848f28eccfcb6da2356249e50143c889cac11452fe6
-MISC ChangeLog 22116 RMD160 153f36acaaf516c27c8295556504de5c245348b7 SHA1 ad0b0204cc981587d22bbf299003f36cd7ce3d17 SHA256 2a7f50b770f4f7ea9a3f0ed4390c4a4745b1b6a1335506d344612b3d18d19a21
+EBUILD blender-2.47-r1.ebuild 3898 RMD160 720bb4010b011282cdd83294abc28528ec738bac SHA1 04c6ae4ab6e7173c39e4b71ca1530d814c6f4835 SHA256 e671f2121b13001acc4b4f3261515df61f58621425d1a7d281cb1ecb34142fc0
+EBUILD blender-2.47.ebuild 3869 RMD160 257e24844e835bd63b47a6c3ce6115ad61c77c5a SHA1 2fa64735a9c6a5180d9d90062abbe3baf21da740 SHA256 cd68ab5a6991222a7268fbf0a1244be660768dbab165f2488b0bf85c4c93a723
+MISC ChangeLog 22294 RMD160 bfe12e55a811d177c1b3e2adda9fbac5c3d9a21c SHA1 ae58ee11c9db4dbba7cc24a1e2716f4a59c3a5a2 SHA256 08c3ea2fe0c1e44538d8f03b33066d131414e86777ae47d3c2573f0ee02a8ee2
 MISC metadata.xml 867 RMD160 a630f92b5061faea6e66057dc3a51dc3b8c161cb SHA1 4be79b0bc68377bd5ab9e83207fd734c5617fd44 SHA256 cec2cb5acea5ea8d18bd76edf58ba037a87302f69e3b6a30a9ca9c20fdd0534b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjIKKEACgkQkKaRLQcq0GLk9QCeO3qxAJODEQLEU0ZRTS6CZbNu
+GMsAnRmWpCQVm1KuSEW/qY8VcpH27JBy
+=DN4I
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.47-r1.ebuild b/media-gfx/blender/blender-2.47-r1.ebuild
index 6d613f81e9c6..e081c425e6cb 100644
--- a/media-gfx/blender/blender-2.47-r1.ebuild
+++ b/media-gfx/blender/blender-2.47-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.47-r1.ebuild,v 1.3 2008/09/08 16:40:29 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.47-r1.ebuild,v 1.4 2008/09/10 20:04:26 maekke Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -90,9 +90,12 @@ src_unpack() {
 src_compile() {
 	for arg in \
 			'blender-game gameengine' \
+			'ffmpeg' \
+			'jpeg' \
 			'nls international' \
 			'openal' \
 			'openexr' \
+			'png' \
 			'player' \
 			'verse' ; do
 		blend_with ${arg}
diff --git a/media-gfx/blender/blender-2.47.ebuild b/media-gfx/blender/blender-2.47.ebuild
index f2f367d4b23c..4e111947cb28 100644
--- a/media-gfx/blender/blender-2.47.ebuild
+++ b/media-gfx/blender/blender-2.47.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.47.ebuild,v 1.3 2008/09/08 16:40:29 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.47.ebuild,v 1.4 2008/09/10 20:04:26 maekke Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -90,10 +90,13 @@ src_unpack() {
 src_compile() {
 	for arg in \
 			'blender-game gameengine' \
+			'ffmpeg' \
+			'jpeg' \
 			'nls international' \
 			'openal' \
 			'openexr' \
 			'player' \
+			'png' \
 			'verse' ; do
 		blend_with ${arg}
 	done