Stable on amd64 and x86 wrt bug #136784.

Package-Manager: portage-2.1.1_pre1-r2

4 files changed, 37 insertions, 21 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index d522dc4bb0cd..230704e3f782 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.81 2006/06/30 10:11:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.82 2006/06/30 17:04:01 wolf31o2 Exp $
+
+  30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> blender-2.41.ebuild,
+  blender-2.41-r1.ebuild:
+  Stable on amd64 and x86 wrt bug #136784.
 
   30 Jun 2006; Luca Barbato <lu_zero@gentoo.org> blender-2.41-r1.ebuild:
   Marked ppc
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index e9c046819d92..76a85d98f396 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
 MD5 bcc3b86202d4c6bb85ef9cef08bfcf9e files/blender-2.37-dirs.patch 725
 RMD160 3496386616f3066e1a237921f8ecc695a21b142e files/blender-2.37-dirs.patch 725
@@ -16,18 +19,18 @@ EBUILD blender-2.40.ebuild 3476 RMD160 5bc4396d473ff41d37a97cfaca7dfe91b0d5ef79
 MD5 b5a58d9d575fd848b622a33952550d3a blender-2.40.ebuild 3476
 RMD160 5bc4396d473ff41d37a97cfaca7dfe91b0d5ef79 blender-2.40.ebuild 3476
 SHA256 7df4ecb59c15dcce4fa2a0c042853fda8594ee03839cde4a63bddb933598fd44 blender-2.40.ebuild 3476
-EBUILD blender-2.41-r1.ebuild 3540 RMD160 219e6aa1af3bb7bc233f987654cd29605acca0f2 SHA1 bf11fff21ea133b1c13b4f64c3ff98ba109371df SHA256 8e02c989995737954a76a80386b92df76c925b58227157b418b4c91ee12919fb
-MD5 4dc4c3f6806218a46d1eaf0cc9076dce blender-2.41-r1.ebuild 3540
-RMD160 219e6aa1af3bb7bc233f987654cd29605acca0f2 blender-2.41-r1.ebuild 3540
-SHA256 8e02c989995737954a76a80386b92df76c925b58227157b418b4c91ee12919fb blender-2.41-r1.ebuild 3540
-EBUILD blender-2.41.ebuild 3496 RMD160 4f625ef74b1ea3efa9c81b881564b43ba766517e SHA1 8e82ca35774fed7bac2a95478b4290d8e262b323 SHA256 ab2428dd971682d2eb2e6dd357f457f47bbbe9fb610e8a6dae68e3d37493aa7f
-MD5 20db7db1f5b20cf77ab877dce9d2ffa6 blender-2.41.ebuild 3496
-RMD160 4f625ef74b1ea3efa9c81b881564b43ba766517e blender-2.41.ebuild 3496
-SHA256 ab2428dd971682d2eb2e6dd357f457f47bbbe9fb610e8a6dae68e3d37493aa7f blender-2.41.ebuild 3496
-MISC ChangeLog 11778 RMD160 f26705982142b627fa558d37d11875cb089f7a2b SHA1 ef8d2c388f745b42afcb2bb2cd1b2ee4c84ebfb7 SHA256 1cd16d0e17016e7b100b78553b52ffaf8a53d7402e7c198f22653ce245a97207
-MD5 6176a8969407abb6ba8f78b638217299 ChangeLog 11778
-RMD160 f26705982142b627fa558d37d11875cb089f7a2b ChangeLog 11778
-SHA256 1cd16d0e17016e7b100b78553b52ffaf8a53d7402e7c198f22653ce245a97207 ChangeLog 11778
+EBUILD blender-2.41-r1.ebuild 3539 RMD160 753d77f68be694f50cdd658a965c97cdf2e535f5 SHA1 5447a5118ebeccf38e379ba5574a6facb5067e21 SHA256 2b384390a114f198df61eeb40de32f1e2d05d5a75f45b90a4c5124a9f8a46443
+MD5 d6d2115f56bfe61aa67baefd097ab739 blender-2.41-r1.ebuild 3539
+RMD160 753d77f68be694f50cdd658a965c97cdf2e535f5 blender-2.41-r1.ebuild 3539
+SHA256 2b384390a114f198df61eeb40de32f1e2d05d5a75f45b90a4c5124a9f8a46443 blender-2.41-r1.ebuild 3539
+EBUILD blender-2.41.ebuild 3519 RMD160 ce4972a7ee1775a4a928c45b31d219c3ecefb943 SHA1 ec860f924a7f85ca9eb9dc858475289e3e2d4570 SHA256 aca5420793aec6ce645f04c5299c99abc184f708242e09f4e5be7566d9a561d8
+MD5 68172c0ca1ed4923c2675c57d4c1e13c blender-2.41.ebuild 3519
+RMD160 ce4972a7ee1775a4a928c45b31d219c3ecefb943 blender-2.41.ebuild 3519
+SHA256 aca5420793aec6ce645f04c5299c99abc184f708242e09f4e5be7566d9a561d8 blender-2.41.ebuild 3519
+MISC ChangeLog 11924 RMD160 41fd96ae5ab31bbf280096596ca7b61e3f692227 SHA1 bbf5fe2dd6865729146c7e39fc42a0a705d03e5b SHA256 7ca29edc485c93754093e5f8e922e44a5c4272a52e3b62b49df1115128f34116
+MD5 37de552b2773f76a88bb13d33d5f64ec ChangeLog 11924
+RMD160 41fd96ae5ab31bbf280096596ca7b61e3f692227 ChangeLog 11924
+SHA256 7ca29edc485c93754093e5f8e922e44a5c4272a52e3b62b49df1115128f34116 ChangeLog 11924
 MISC metadata.xml 587 RMD160 925b5c3bcf2d4f21fc82f760aad723541088bca4 SHA1 9060e32f277a506f2bbdfb7b0a9ed89ae13612b7 SHA256 4a2974916837cada500d7a764a285fa29a0471b242dff4717d60c4a7113dd45e
 MD5 493f38fb63d60a1ce275fdd2ea43d6e9 metadata.xml 587
 RMD160 925b5c3bcf2d4f21fc82f760aad723541088bca4 metadata.xml 587
@@ -41,3 +44,10 @@ SHA256 64d11d6125385ca32c8f8ae4de0c196a9567729a26d971f49199329a14ca4bee files/di
 MD5 2a86080873a0cb2b7cbb6c6f91b64401 files/digest-blender-2.41-r1 241
 RMD160 bd03e47f6dd9aef4c06f89e03d015495cdabf6dc files/digest-blender-2.41-r1 241
 SHA256 64d11d6125385ca32c8f8ae4de0c196a9567729a26d971f49199329a14ca4bee files/digest-blender-2.41-r1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEpVmskT4lNIS36YERApRRAJ9CR85PbsfQ0/7ODl34dDKvA0V19wCdHjOq
+NLOII2KLe7BNmBiAesWYUPs=
+=Ac1R
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.41-r1.ebuild b/media-gfx/blender/blender-2.41-r1.ebuild
index 69d29af18f35..87840d83384a 100644
--- a/media-gfx/blender/blender-2.41-r1.ebuild
+++ b/media-gfx/blender/blender-2.41-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.41-r1.ebuild,v 1.4 2006/06/30 10:11:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.41-r1.ebuild,v 1.5 2006/06/30 17:04:01 wolf31o2 Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.blender.org/source/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
 RDEPEND="media-libs/libsdl
 	media-libs/jpeg
diff --git a/media-gfx/blender/blender-2.41.ebuild b/media-gfx/blender/blender-2.41.ebuild
index c10d3ff0ae65..29401edc3733 100644
--- a/media-gfx/blender/blender-2.41.ebuild
+++ b/media-gfx/blender/blender-2.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.41.ebuild,v 1.2 2006/01/27 19:23:51 reb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.41.ebuild,v 1.3 2006/06/30 17:04:01 wolf31o2 Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.blender.org/source/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
 RDEPEND="media-libs/libsdl
 	media-libs/jpeg
@@ -85,6 +85,10 @@ src_compile() {
 		config.opts
 	fi
 
+	sed -i \
+		-e "s:'openal':'openal','alut':" \
+		config.opts
+
 #	use blender-game || \
 #	( einfo "disabling game engine"
 #	sed -i -e "s:BUILD_GAMEENGINE = 'true':BUILD_GAMEENGINE = 'false':" \
@@ -106,14 +110,12 @@ src_compile() {
 src_install() {
 	exeinto /usr/bin/
 	doexe ${S}/blender
-	doexe ${S}/blenderplayer
-
 
 	exeinto /usr/$(get_libdir)/${PN}/textures
 	doexe ${S}/release/plugins/texture/*.so
 	exeinto /usr/$(get_libdir)/${PN}/sequences
 	doexe ${S}/release/plugins/sequence/*.so
-	cp -pPR ${S}/release/{datafile,plugins,scripts} \
+	cp -pPR ${S}/release/{datafiles,plugins,scripts} \
 		${D}/usr/$(get_libdir)/${PN}
 	use nls && \
 	cp -pPR ${S}/bin/.blender/{.Blanguages,.bfont.ttf,locale} \
@@ -123,7 +125,7 @@ src_install() {
 	insinto /usr/share/applications
 	doins ${FILESDIR}/${PN}.desktop
 
-	dodoc COPYING INSTALL README release_*.txt
+	dodoc COPYING INSTALL README
 
 }