bump to 2.48 (bug #242202), with three revisions for different ffmpeg versions (-r2 is for media-video/ffmpeg-0.4.9_p20081014 with patch from bug #242058)

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

6 files changed, 496 insertions, 5 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 69473b781d7e..da76a2033db6 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,17 @@
 # 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.151 2008/09/10 20:04:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.152 2008/10/16 05:27:38 maekke Exp $
+
+*blender-2.48-r2 (16 Oct 2008)
+*blender-2.48-r1 (16 Oct 2008)
+*blender-2.48 (16 Oct 2008)
+
+  16 Oct 2008; Markus Meier <maekke@gentoo.org>
+  +files/blender-2.48-ffmpeg-20081014.patch, +blender-2.48.ebuild,
+  +blender-2.48-r1.ebuild, +blender-2.48-r2.ebuild:
+  bump to 2.48 (bug #242202), with three revisions for different ffmpeg
+  versions (-r2 is for media-video/ffmpeg-0.4.9_p20081014 with patch from
+  bug #242058)
 
   10 Sep 2008; Markus Meier <maekke@gentoo.org> blender-2.47.ebuild,
   blender-2.47-r1.ebuild:
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 77407ce9a412..a7b7e8748c34 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -12,12 +12,14 @@ AUX blender-2.45-missing_includes.patch 2314 RMD160 7f9b7205569dccb357fc82754cbe
 AUX blender-2.46-cve-2008-1103-1.patch 636 RMD160 11d0b7dbff6e186334a80b7f6932ace4a1bd6628 SHA1 979fa1c2f0836b46dfd26c197798625a72e0a28b SHA256 a0dd64fb749a9577d84e22896872dc2956a8530700308d0aadad588191356b96
 AUX blender-2.46-ffmpeg.patch 3823 RMD160 33f41651b1a6bc6d497ba01ab710ca3d7a1559c0 SHA1 82ce585db15a3c88625b0c04e649bd08b3c35b41 SHA256 ad75babcc08ae41f2a7c71bc457bd56a0ef39b5ae1e92ede2cdb0a34d7cbcc85
 AUX blender-2.46-select_charmap.patch 349 RMD160 a5387d5cf59d1e7c3aa6154faf6c83136338b5ea SHA1 bfeb5c0a126b6b83c0b52b40429e10670d90e8ac SHA256 6e858aef912d6fd2b41e2ef4a1b806ab080a76586ba3888d6bf84ee46667e9b5
+AUX blender-2.48-ffmpeg-20081014.patch 839 RMD160 b1fbad04a890dcc1698d02f5351d6d79cae42d91 SHA1 e931f1a85c5c01918b960936d4da5888eacfd64c SHA256 d6114d2647758e39608fcfdb05da00811f062ea3fc4c41cef3a6e2977bc5b0c4
 AUX blender.desktop 194 RMD160 5b154d86d52f46a3f1fcd29da90322e1727f1107 SHA1 a1b70789388f72f2a292939588365a0b845b83b7 SHA256 9d21fe8823f249f0720895107817854dd8ce64afe6586317af08805b94fe0fab
 AUX blender.png 2119 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 SHA1 9a0d713235ce99f8e4fde4f062209ab989e48c0f SHA256 bef633319c81323bb82db274004d89082ca05cab6650eb4c4bf43f830ccb5cad
 DIST blender-2.43.tar.gz 13806334 RMD160 a43babbc816194ba3e4cfed3bd250d20406e2479 SHA1 de9ba15fb40d962e56deebdea13a3a68b3ae6532 SHA256 a48213b61302d03eb8db0cf42712b142d280d16ad111f6411cd8e43403e5e61b
 DIST blender-2.45.tar.gz 14226829 RMD160 fd39b59de0f4d770fe26ce39d51356e98b1ec8ea SHA1 ff66ec5f0129fd04a2ba5c063627ef13033c0598 SHA256 921f72a15d4076f62e52674337f5d3a90cd7a82675b12bb549ebe6cd5c9027ae
 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 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
@@ -26,12 +28,15 @@ EBUILD blender-2.46-r1.ebuild 3630 RMD160 f2a4f3bbdfbc0b30f4284694e6ec263b6e7e66
 EBUILD blender-2.46.ebuild 3602 RMD160 86e8526c456b78f44bcd8cc05c1df320d76903f0 SHA1 5c1ab9951e4256ce75f47c9623755cd90e52f2e8 SHA256 d36260c6399766db15b38c79a01216be23dd982113a34e3e83927ed6ecfac52a
 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
+EBUILD blender-2.48-r1.ebuild 3905 RMD160 516c674cc3d09659f0fb373f661763bdbf294287 SHA1 24bfc6d03be273873891102b298fdfa53b796e94 SHA256 883fe38144d93c06b6a1d0ea2b08a6fb5439498a36281e3b8c15534c625395db
+EBUILD blender-2.48-r2.ebuild 3954 RMD160 e03a42148ca2a3dfd73013d483e0f7741ccfc035 SHA1 1e6b4ec213b03acb16785e1b3cebf9f8f22c1b37 SHA256 e02ddff12a90479c162ffda868e40d87bec909a3541fbadd70a134df27744e33
+EBUILD blender-2.48.ebuild 3870 RMD160 6586e7473dd036ef98aa70600727d2d901f927c4 SHA1 500d712e3b4a1882875aa783c2352f35fb747ecf SHA256 9a206bce680152058e693c3a44ebf566734de1f9ffd9c3a90db635dffc4f14a8
+MISC ChangeLog 22714 RMD160 b7922e25721ba212062c78502a028a1b2caf22cb SHA1 07f59ffe04677ffb5cf12536701d4d38faaa970d SHA256 64940983cb97c23279df7933bf4d5b1944a42d8199456c05a84730110f10e22b
 MISC metadata.xml 867 RMD160 a630f92b5061faea6e66057dc3a51dc3b8c161cb SHA1 4be79b0bc68377bd5ab9e83207fd734c5617fd44 SHA256 cec2cb5acea5ea8d18bd76edf58ba037a87302f69e3b6a30a9ca9c20fdd0534b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjIKKEACgkQkKaRLQcq0GLk9QCeO3qxAJODEQLEU0ZRTS6CZbNu
-GMsAnRmWpCQVm1KuSEW/qY8VcpH27JBy
-=DN4I
+iEYEARECAAYFAkj20SsACgkQkKaRLQcq0GLy3ACgqVxqTj1h0guBkEAVL8wBL37H
+23UAniKYBfOrAfbLpOpHs6BYV3l/lD5+
+=VJTx
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.48-r1.ebuild b/media-gfx/blender/blender-2.48-r1.ebuild
new file mode 100644
index 000000000000..a91c36e164fc
--- /dev/null
+++ b/media-gfx/blender/blender-2.48-r1.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.48-r1.ebuild,v 1.1 2008/10/16 05:27:38 maekke Exp $
+
+EAPI="2"
+
+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_prepare() {
+	epatch "${FILESDIR}"/blender-2.37-dirs.patch
+	epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
+	epatch "${FILESDIR}"/blender-2.46-ffmpeg.patch
+	epatch "${FILESDIR}"/blender-2.46-cve-2008-1103-1.patch
+}
+
+src_configure() {
+	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
+
+	for arg in \
+			'blender-game gameengine' \
+			'ffmpeg' \
+			'jpeg' \
+			'nls international' \
+			'openal' \
+			'openexr' \
+			'player' \
+			'png' \
+			'verse' ; do
+		blend_with ${arg}
+	done
+}
+
+src_compile() {
+	# 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
+
+	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.48-r2.ebuild b/media-gfx/blender/blender-2.48-r2.ebuild
new file mode 100644
index 000000000000..03649142a572
--- /dev/null
+++ b/media-gfx/blender/blender-2.48-r2.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.48-r2.ebuild,v 1.1 2008/10/16 05:27:38 maekke Exp $
+
+EAPI="2"
+
+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_p20081014 )
+	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_prepare() {
+	epatch "${FILESDIR}"/blender-2.37-dirs.patch
+	epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
+	epatch "${FILESDIR}"/blender-2.46-ffmpeg.patch
+	epatch "${FILESDIR}"/blender-2.46-cve-2008-1103-1.patch
+	epatch "${FILESDIR}"/${P}-ffmpeg-20081014.patch
+}
+
+src_configure() {
+	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
+
+	for arg in \
+			'blender-game gameengine' \
+			'ffmpeg' \
+			'jpeg' \
+			'nls international' \
+			'openal' \
+			'openexr' \
+			'player' \
+			'png' \
+			'verse' ; do
+		blend_with ${arg}
+	done
+}
+
+src_compile() {
+	# 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
+
+	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.48.ebuild b/media-gfx/blender/blender-2.48.ebuild
new file mode 100644
index 000000000000..c51acbae4652
--- /dev/null
+++ b/media-gfx/blender/blender-2.48.ebuild
@@ -0,0 +1,149 @@
+# 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.48.ebuild,v 1.1 2008/10/16 05:27:38 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}"/blender-2.37-dirs.patch
+	epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
+	epatch "${FILESDIR}"/blender-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
+
+	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.48-ffmpeg-20081014.patch b/media-gfx/blender/files/blender-2.48-ffmpeg-20081014.patch
new file mode 100644
index 000000000000..93ae633d7501
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.48-ffmpeg-20081014.patch
@@ -0,0 +1,25 @@
+Index: blender-2.47/source/blender/src/hddaudio.c
+===================================================================
+--- blender-2.47.orig/source/blender/src/hddaudio.c
++++ blender-2.47/source/blender/src/hddaudio.c
+@@ -302,7 +302,8 @@ static void sound_hdaudio_extract_small_
+ 				audio_pkt_size = packet.size;
+ 
+ 				while (audio_pkt_size > 0) {
+-					len = avcodec_decode_audio(
++					data_size= AVCODEC_MAX_AUDIO_FRAME_SIZE;
++					len = avcodec_decode_audio2(
+ 						hdaudio->pCodecCtx, 
+ 						hdaudio->decode_cache 
+ 						+ decode_pos, 
+@@ -469,7 +470,8 @@ static void sound_hdaudio_extract_small_
+ 			}
+ 
+ 			while (audio_pkt_size > 0) {
+-				len = avcodec_decode_audio(
++				data_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++				len = avcodec_decode_audio2(
+ 					hdaudio->pCodecCtx, 
+ 					hdaudio->decode_cache 
+ 					+ decode_pos, 
+