bump to blender-2.48a (bugfix release); fix files/blender-2.37-dirs.patch reported in bug #242904

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27.3 i686

5 files changed, 320 insertions, 7 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 097177ff5e44..3120fc7fed41 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,15 @@
 # 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.156 2008/10/19 21:32:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.157 2008/10/25 11:36:56 maekke Exp $
+
+*blender-2.48a-r1 (25 Oct 2008)
+*blender-2.48a (25 Oct 2008)
+
+  25 Oct 2008; Markus Meier <maekke@gentoo.org>
+  files/blender-2.37-dirs.patch, +blender-2.48a.ebuild,
+  +blender-2.48a-r1.ebuild:
+  bump to blender-2.48a (bugfix release); fix files/blender-2.37-dirs.patch
+  reported in bug #242904
 
   19 Oct 2008; Markus Meier <maekke@gentoo.org> blender-2.48-r1.ebuild:
   downgrade EAPI to 0 as this seems to cause troubles to some users (bug
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 8e96e8e03553..94d2d2bb0d80 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX blender-2.37-dirs.patch 725 RMD160 3496386616f3066e1a237921f8ecc695a21b142e SHA1 905181caae8193d212a783e4c4c938e87e136752 SHA256 18ed351fd88c1bf952c86425dc769143cda6c5cd25e948ec1e1c0a1b911d44f7
+AUX blender-2.37-dirs.patch 727 RMD160 ddf5c951182f809374c43f1a1cce47f4397a868c SHA1 9b3cb06a8bd23b1a5041bd3193018c2e5e28dcfd SHA256 beb5e5835cde71a00712ddf600278ca0bbdb6020123faeb6ea7a53e8f6812e5e
 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
 AUX blender-2.45-cve-2008-1102.patch 737 RMD160 7f55e8850638d343197ef1a7e3987fd48d35617f SHA1 bd57987f0fdfa97b2649f82b7e944a9817ce4414 SHA256 7546a4133cc682b9ed35dc6350637e535cf032ffbaa668746fb2549bcedd7c84
@@ -20,6 +20,7 @@ DIST blender-2.45.tar.gz 14226829 RMD160 fd39b59de0f4d770fe26ce39d51356e98b1ec8e
 DIST blender-2.46.tar.gz 20948850 RMD160 e269d6dc3e0c2fecd2f9a8f6ff6a8917c0ee6538 SHA1 c5f17700a18d44409a5920e852a97a87ff37d06e SHA256 399f3a0f565b2b07df94582c22981b9ae2daa7bdd810bed4dfd5ea7233a325d1
 DIST blender-2.47.tar.gz 21222013 RMD160 b3abdbff6744708ce9322fb54a2a0e1f0b10f9f1 SHA1 9061ef792da1671ce5e2faa51804577560c65b2d SHA256 7b4dca628a8fee6e19a39d413cd611d7de22c3636b12947868b868c598cb541f
 DIST blender-2.48.tar.gz 21625409 RMD160 becd1a744b4eff7a18489bd931178337edccd334 SHA1 0e3bc8a0f82d2e5c047a498b1e64c61204be905c SHA256 b82564324d38f1975e5ca5b9abe03cda8409a3336f50568722a5fb642de023fa
+DIST blender-2.48a.tar.gz 21502247 RMD160 5ef94d6019302bfea86d5657af738d1d86a8bcd5 SHA1 9fb2dbf5d6cfcba8ae2d6d9b93ca9e3e66aae6c7 SHA256 781d4d9e2332f4f3887af1d66fb70c4c6dd0b89166391403ee4853108abf4e46
 DIST ffmpeg-0.4.9-p20070330.tar.bz2 2192476 RMD160 e52bf6abbf7c630aa3e76243987fb7dd6d9b84a1 SHA1 bcc18c88c64f6f941eb1ac94357e0d6dcbf99045 SHA256 58a7e7d909e02fda07856ea044ae0f5f9c174791f63a449f2f23f37a78b34f95
 EBUILD blender-2.43-r2.ebuild 3842 RMD160 d8f01d4265173a61388c66c62bb7e882469a26e8 SHA1 d80a1d14bebc4742ffee4ff5d03ba59fbba0e0b1 SHA256 a7350b4b9790f0f3cbe7850c2ad35d0e8ea492c4fac64ed14295814d91276811
 EBUILD blender-2.45-r3.ebuild 3630 RMD160 227ddf68702a6da91e53f51696264882e4922e37 SHA1 fd6566b569a3dcee49a69f40dc46b84ea3c336ce SHA256 fce484f3d84b1faf87d1af33cca1c3df1247a859d3b7501cf0e8b029528135fa
@@ -30,12 +31,14 @@ EBUILD blender-2.47-r1.ebuild 3898 RMD160 720bb4010b011282cdd83294abc28528ec738b
 EBUILD blender-2.47.ebuild 3869 RMD160 257e24844e835bd63b47a6c3ce6115ad61c77c5a SHA1 2fa64735a9c6a5180d9d90062abbe3baf21da740 SHA256 cd68ab5a6991222a7268fbf0a1244be660768dbab165f2488b0bf85c4c93a723
 EBUILD blender-2.48-r1.ebuild 4011 RMD160 23a93a7aab32058ca8c319174c97c032768a8b9f SHA1 c21ff69548cb71bf81ca7d709a61161784d59675 SHA256 1f9227e9f4cf396e2287017f29d7f1fa5b5db287e228944931bdc7761c90968e
 EBUILD blender-2.48.ebuild 3933 RMD160 47e7e71e1b39b3ea34caeeae4b81d72c9e7a028b SHA1 046a29b139570a149ce3ced40383640af68782ee SHA256 68849d83d27cea5695cbe348ddc7aa9fc37c6f5234024b59db6abaaf07271575
-MISC ChangeLog 23284 RMD160 5016f6beee4fbf5d614987277596c8e337aecb3b SHA1 45a7061d0e340f31892a025b2f28fa7fe4ff4621 SHA256 e308c5fe31b32086ddfc729214a57fec9386eb083f0ae65737709e6b86250293
+EBUILD blender-2.48a-r1.ebuild 4010 RMD160 05ab84cd8d1cfd5b3bfed95faa52fdd55d718c5f SHA1 f3dd627f7f519b961e2b4c8646522a25aec3bb2d SHA256 48bbf508a797ff32188abb3d8f6b9c9c7141ce4d3f26b11c7264c9aac230b24d
+EBUILD blender-2.48a.ebuild 3928 RMD160 d279d68c3f74d9bf839840def19f86012f27300f SHA1 2554d5aa4184dbca40e467035d1e3b2fa5d654eb SHA256 217bf808e0b28ba366574653b9c996a525eeddde2fae8ef03cf4fef7ed8c53cd
+MISC ChangeLog 23581 RMD160 c28e0a5e2268d9e656ca5eaac13d679c6804c1f0 SHA1 ca5cdf86ebe66f75d6235e84b4b456c72c75ff65 SHA256 ed1ae869a943cde2d623e933348e6b6a76f765ae32e48b620c50168206d33ad7
 MISC metadata.xml 719 RMD160 132dfe4fc49228b922ed39f556c403347e992ef9 SHA1 7896fb17bd0dd87d8a072b0f6f6072876c1eed94 SHA256 6409856f1883ed49aae365c885d5512a38784a5a48a2bbf7dd583b8054d32510
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj7p8sACgkQkKaRLQcq0GKPtACdFKARffaODZEbeko+ohSrT4Ai
-uYQAmQGTt5BEosb9OZR6mwJcTtgVAzsd
-=Kcmq
+iEYEARECAAYFAkkDBU0ACgkQkKaRLQcq0GJjWQCeIzc+4O0RITuby9SmllfcUyzo
+aJoAoJoIVArWJhviwmvEGtJpUrPlduTd
+=D03U
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.48a-r1.ebuild b/media-gfx/blender/blender-2.48a-r1.ebuild
new file mode 100644
index 000000000000..8bad7a45e542
--- /dev/null
+++ b/media-gfx/blender/blender-2.48a-r1.ebuild
@@ -0,0 +1,151 @@
+# 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.48a-r1.ebuild,v 1.1 2008/10/25 11:36:56 maekke Exp $
+
+inherit multilib flag-o-matic eutils python
+
+#IUSE="jpeg mozilla png sdl static truetype"
+IUSE="blender-game ffmpeg jpeg nls openal openexr openmp
+	player png quicktime verse"
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org/"
+SRC_URI="http://download.blender.org/source/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-libs/openssl-0.9.6
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
+	jpeg? ( media-libs/jpeg )
+	media-libs/tiff
+	>=dev-lang/python-2.4
+	nls? ( >=media-libs/freetype-2.0
+			virtual/libintl
+			>=media-libs/ftgl-2.1 )
+	openal? ( media-libs/openal
+			media-libs/freealut )
+	openexr? ( media-libs/openexr )
+	png? ( media-libs/libpng )
+	quicktime? ( media-libs/libquicktime )
+	>=media-libs/libsdl-1.2
+	virtual/opengl"
+
+DEPEND=">=dev-util/scons-0.98
+	x11-libs/libXt
+	x11-proto/inputproto
+	${RDEPEND}"
+
+blend_with() {
+	local UWORD="$2"
+	if [ -z "${UWORD}" ]; then
+		UWORD="$1"
+	fi
+	if useq $1; then
+		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
+			>> "${S}"/user-config.py
+	else
+		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
+			>> "${S}"/user-config.py
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.37-dirs.patch
+	epatch "${FILESDIR}"/${PN}-2.44-scriptsdir.patch
+	epatch "${FILESDIR}"/${PN}-2.46-ffmpeg.patch
+	epatch "${FILESDIR}"/${PN}-2.46-cve-2008-1103-1.patch
+	epatch "${FILESDIR}"/${PN}-2.48-ffmpeg-20081014.patch
+
+	if use ffmpeg ; then
+#		cd "${S}"/extern
+#		rm -rf ffmpeg libmp3lame x264
+		cat <<- EOF >> "${S}"/user-config.py
+		BF_FFMPEG="/usr"
+		BF_FFMPEG_LIB="avformat avcodec swscale avutil"
+		EOF
+	fi
+	# pass compiler flags to the scons build system
+	# and set python version to current version in use
+	python_version
+	cat <<- EOF >> "${S}"/user-config.py
+		CFLAGS += '${CFLAGS}'
+		BF_PYTHON_VERSION="${PYVER}"
+		BF_PYTHON_INC="/usr/include/python${PYVER}"
+		BF_PYTHON_BINARY="/usr/bin/python${PYVER}"
+		BF_PYTHON_LIB="python${PYVER}"
+	EOF
+
+	if use openmp && built_with_use --missing false sys-devel/gcc openmp ; then
+		echo "WITH_BF_OPENMP=1" >> "${S}"/user-config.py
+		elog "enabling openmp"
+	else
+		echo "WITH_BF_OPENMP=0" >> "${S}"/user-config.py
+		elog "disabling openmp"
+	fi
+}
+
+src_compile() {
+	for arg in \
+			'blender-game gameengine' \
+			'ffmpeg' \
+			'jpeg' \
+			'nls international' \
+			'openal' \
+			'openexr' \
+			'player' \
+			'png' \
+			'verse' ; do
+		blend_with ${arg}
+	done
+
+	# scons uses -l differently -> remove it
+	scons ${MAKEOPTS/-l[0-9]} || die \
+	"!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org"
+
+	cd "${WORKDIR}"/install/linux2/plugins
+	chmod 755 bmake
+	emake || die
+}
+
+src_install() {
+	exeinto /usr/bin/
+	doexe "${WORKDIR}"/install/linux2/blender
+	use player && doexe "${WORKDIR}"/install/linux2/blenderplayer
+
+	dodir /usr/share/${PN}
+
+	exeinto /usr/$(get_libdir)/${PN}/textures
+	doexe "${WORKDIR}"/install/linux2/plugins/texture/*.so
+	exeinto /usr/$(get_libdir)/${PN}/sequences
+	doexe "${WORKDIR}"/install/linux2/plugins/sequence/*.so
+	insinto /usr/include/${PN}
+	doins "${WORKDIR}"/install/linux2/plugins/include/*.h
+
+	if use nls ; then
+		mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
+			"${D}"/usr/share/${PN}
+		mv "${WORKDIR}"/install/linux2/.blender/locale \
+			"${D}"/usr/share/locale
+	fi
+
+	mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN}
+
+	insinto /usr/share/pixmaps
+	doins "${FILESDIR}"/${PN}.png
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/${PN}.desktop
+
+	dodoc INSTALL README
+	dodoc "${WORKDIR}"/install/linux2/BlenderQuickStart.pdf
+}
+
+pkg_preinst(){
+	if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
+	then
+		rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
+	fi
+}
diff --git a/media-gfx/blender/blender-2.48a.ebuild b/media-gfx/blender/blender-2.48a.ebuild
new file mode 100644
index 000000000000..72cc95c618ad
--- /dev/null
+++ b/media-gfx/blender/blender-2.48a.ebuild
@@ -0,0 +1,150 @@
+# 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.48a.ebuild,v 1.1 2008/10/25 11:36:56 maekke Exp $
+
+inherit multilib flag-o-matic eutils python
+
+#IUSE="jpeg mozilla png sdl static truetype"
+IUSE="blender-game ffmpeg jpeg nls openal openexr openmp
+	player png quicktime verse"
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org/"
+SRC_URI="http://download.blender.org/source/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-libs/openssl-0.9.6
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r1
+			media-libs/x264 )
+	jpeg? ( media-libs/jpeg )
+	media-libs/tiff
+	>=dev-lang/python-2.4
+	nls? ( >=media-libs/freetype-2.0
+			virtual/libintl
+			>=media-libs/ftgl-2.1 )
+	openal? ( media-libs/openal
+			media-libs/freealut )
+	openexr? ( media-libs/openexr )
+	png? ( media-libs/libpng )
+	quicktime? ( media-libs/libquicktime )
+	>=media-libs/libsdl-1.2
+	virtual/opengl"
+
+DEPEND=">=dev-util/scons-0.98
+	x11-libs/libXt
+	x11-proto/inputproto
+	${RDEPEND}"
+
+blend_with() {
+	local UWORD="$2"
+	if [ -z "${UWORD}" ]; then
+		UWORD="$1"
+	fi
+	if useq $1; then
+		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
+			>> "${S}"/user-config.py
+	else
+		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
+			>> "${S}"/user-config.py
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.37-dirs.patch
+	epatch "${FILESDIR}"/${PN}-2.44-scriptsdir.patch
+	epatch "${FILESDIR}"/${PN}-2.46-cve-2008-1103-1.patch
+
+	if use ffmpeg ; then
+#		cd "${S}"/extern
+#		rm -rf ffmpeg libmp3lame x264
+		cat <<- EOF >> "${S}"/user-config.py
+		BF_FFMPEG="/usr"
+		BF_FFMPEG_LIB="avformat avcodec swscale avutil"
+		EOF
+	fi
+	# pass compiler flags to the scons build system
+	# and set python version to current version in use
+	python_version
+	cat <<- EOF >> "${S}"/user-config.py
+		CFLAGS += '${CFLAGS}'
+		BF_PYTHON_VERSION="${PYVER}"
+		BF_PYTHON_INC="/usr/include/python${PYVER}"
+		BF_PYTHON_BINARY="/usr/bin/python${PYVER}"
+		BF_PYTHON_LIB="python${PYVER}"
+	EOF
+
+	if use openmp && built_with_use --missing false sys-devel/gcc openmp ; then
+		echo "WITH_BF_OPENMP=1" >> "${S}"/user-config.py
+		elog "enabling openmp"
+	else
+		echo "WITH_BF_OPENMP=0" >> "${S}"/user-config.py
+		elog "disabling openmp"
+	fi
+}
+
+src_compile() {
+	for arg in \
+			'blender-game gameengine' \
+			'ffmpeg' \
+			'jpeg' \
+			'nls international' \
+			'openal' \
+			'openexr' \
+			'player' \
+			'png' \
+			'verse' ; do
+		blend_with ${arg}
+	done
+
+	# scons uses -l differently -> remove it
+	scons ${MAKEOPTS/-l[0-9]} || die \
+	"!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org"
+
+	cd "${WORKDIR}"/install/linux2/plugins
+	chmod 755 bmake
+	emake || die
+}
+
+src_install() {
+	exeinto /usr/bin/
+	doexe "${WORKDIR}"/install/linux2/blender
+	use player && doexe "${WORKDIR}"/install/linux2/blenderplayer
+
+	dodir /usr/share/${PN}
+
+	exeinto /usr/$(get_libdir)/${PN}/textures
+	doexe "${WORKDIR}"/install/linux2/plugins/texture/*.so
+	exeinto /usr/$(get_libdir)/${PN}/sequences
+	doexe "${WORKDIR}"/install/linux2/plugins/sequence/*.so
+	insinto /usr/include/${PN}
+	doins "${WORKDIR}"/install/linux2/plugins/include/*.h
+
+	if use nls ; then
+		mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
+			"${D}"/usr/share/${PN}
+		mv "${WORKDIR}"/install/linux2/.blender/locale \
+			"${D}"/usr/share/locale
+	fi
+
+	mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN}
+
+	insinto /usr/share/pixmaps
+	doins "${FILESDIR}"/${PN}.png
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/${PN}.desktop
+
+	dodoc INSTALL README
+	dodoc "${WORKDIR}"/install/linux2/BlenderQuickStart.pdf
+}
+
+pkg_preinst(){
+	if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
+	then
+		rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
+	fi
+}
diff --git a/media-gfx/blender/files/blender-2.37-dirs.patch b/media-gfx/blender/files/blender-2.37-dirs.patch
index 3ac7b9242a7b..1b6837fa70e8 100644
--- a/media-gfx/blender/files/blender-2.37-dirs.patch
+++ b/media-gfx/blender/files/blender-2.37-dirs.patch
@@ -10,7 +10,7 @@ diff -ruN blender.orig/source/blender/src/language.c blender/source/blender/src/
 -		strcpy(name, ".blender/.Blanguages");
 +		/* Check the standar location. Takes care of the case 
 +		 * in which the distribution installs blender */
-+		strcpy(name, "/usr/lib/blender/.Blanguages");
++		strcpy(name, "/usr/share/blender/.Blanguages");
  #endif
  		lines= BLI_read_file_as_lines(name);