security bumps for 2.43 (for stable) and 2.48a, bug #245310

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

7 files changed, 490 insertions, 5 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 3120fc7fed41..f120967a49a4 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,16 @@
 # 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.157 2008/10/25 11:36:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.158 2008/11/03 22:22:24 maekke Exp $
+
+*blender-2.48a-r3 (03 Nov 2008)
+*blender-2.48a-r2 (03 Nov 2008)
+*blender-2.43-r3 (03 Nov 2008)
+
+  03 Nov 2008; Markus Meier <maekke@gentoo.org>
+  +files/blender-2.43-CVE-2008-4863.patch,
+  +files/blender-2.48a-CVE-2008-4863.patch, +blender-2.43-r3.ebuild,
+  +blender-2.48a-r2.ebuild, +blender-2.48a-r3.ebuild:
+  security bumps for 2.43 (for stable) and 2.48a, bug #245310
 
 *blender-2.48a-r1 (25 Oct 2008)
 *blender-2.48a (25 Oct 2008)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 94d2d2bb0d80..36becc0711b4 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX blender-2.37-dirs.patch 727 RMD160 ddf5c951182f809374c43f1a1cce47f4397a868c SHA1 9b3cb06a8bd23b1a5041bd3193018c2e5e28dcfd SHA256 beb5e5835cde71a00712ddf600278ca0bbdb6020123faeb6ea7a53e8f6812e5e
+AUX blender-2.43-CVE-2008-4863.patch 623 RMD160 98ddc3171c2b486c43b4c26c4241cf5aa9daaa71 SHA1 b179983b3e9e731426f58fce1325a675d2e3a401 SHA256 e412f99010b022b9235969b54c0fc1d44a4243e3a1e6b0cbb0a59f04f98f8798
 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
@@ -13,6 +14,7 @@ AUX blender-2.46-cve-2008-1103-1.patch 636 RMD160 11d0b7dbff6e186334a80b7f6932ac
 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-2.48a-CVE-2008-4863.patch 696 RMD160 b61dc085d0154be3850fa4b53985f670cd177adf SHA1 805f18290965c2e74778628c4e2a1888ea77d8ab SHA256 fee1896c791a623181ebf681f4ad67c610677e82575a95a46e896b747f980418
 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
@@ -23,6 +25,7 @@ DIST blender-2.48.tar.gz 21625409 RMD160 becd1a744b4eff7a18489bd931178337edccd33
 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.43-r3.ebuild 3892 RMD160 0379ab941fc328385355361e3dc38df5e3a04d69 SHA1 eb088c26076cd7604e383cc351351ff30e1af6cd SHA256 228b4ffed14ce86f2e7e4b4e4a7f5c6b7970191d302b36a1b9bc746527f297d0
 EBUILD blender-2.45-r3.ebuild 3630 RMD160 227ddf68702a6da91e53f51696264882e4922e37 SHA1 fd6566b569a3dcee49a69f40dc46b84ea3c336ce SHA256 fce484f3d84b1faf87d1af33cca1c3df1247a859d3b7501cf0e8b029528135fa
 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
@@ -32,13 +35,15 @@ EBUILD blender-2.47.ebuild 3869 RMD160 257e24844e835bd63b47a6c3ce6115ad61c77c5a
 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
 EBUILD blender-2.48a-r1.ebuild 4010 RMD160 05ab84cd8d1cfd5b3bfed95faa52fdd55d718c5f SHA1 f3dd627f7f519b961e2b4c8646522a25aec3bb2d SHA256 48bbf508a797ff32188abb3d8f6b9c9c7141ce4d3f26b11c7264c9aac230b24d
+EBUILD blender-2.48a-r2.ebuild 3978 RMD160 ffba9e2d36a8e3e88ec33ad2baba8b460ec5d43f SHA1 5115bb15f19402d1c7b478c32bf218f51f8fdcec SHA256 10456813654f39c32fc72658c9e25bbc0764507cf5c1562ed9038e2519b5def2
+EBUILD blender-2.48a-r3.ebuild 4057 RMD160 ed05b7794290a0a701a817e9c608761dfeaf7423 SHA1 a900f082c1450cd38815c1446317a7247f0f8334 SHA256 fb3644716c2b555e4ec6ab5d8fb21207fa41dcc8fabc131bfb5061cab7fa50b5
 EBUILD blender-2.48a.ebuild 3928 RMD160 d279d68c3f74d9bf839840def19f86012f27300f SHA1 2554d5aa4184dbca40e467035d1e3b2fa5d654eb SHA256 217bf808e0b28ba366574653b9c996a525eeddde2fae8ef03cf4fef7ed8c53cd
-MISC ChangeLog 23581 RMD160 c28e0a5e2268d9e656ca5eaac13d679c6804c1f0 SHA1 ca5cdf86ebe66f75d6235e84b4b456c72c75ff65 SHA256 ed1ae869a943cde2d623e933348e6b6a76f765ae32e48b620c50168206d33ad7
+MISC ChangeLog 23954 RMD160 40955a6e4ef3ce15d528b8a6b2bba0477b575be1 SHA1 df0844061c416ef4e86896c8954df15a62f86573 SHA256 e45d24243eabb6252c4bfeea8d2f24c00360c8f7571969c5c710ca952e04a9ae
 MISC metadata.xml 719 RMD160 132dfe4fc49228b922ed39f556c403347e992ef9 SHA1 7896fb17bd0dd87d8a072b0f6f6072876c1eed94 SHA256 6409856f1883ed49aae365c885d5512a38784a5a48a2bbf7dd583b8054d32510
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkDBU0ACgkQkKaRLQcq0GJjWQCeIzc+4O0RITuby9SmllfcUyzo
-aJoAoJoIVArWJhviwmvEGtJpUrPlduTd
-=D03U
+iEYEARECAAYFAkkPedkACgkQkKaRLQcq0GJu0gCfc2Mn2eORiOduZHKhSOQRPLyn
+zU0An0JDDtWwMHPtjqtMt/Uclw+uHg3p
+=0slh
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.43-r3.ebuild b/media-gfx/blender/blender-2.43-r3.ebuild
new file mode 100644
index 000000000000..2208137f5fd9
--- /dev/null
+++ b/media-gfx/blender/blender-2.43-r3.ebuild
@@ -0,0 +1,137 @@
+# 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.43-r3.ebuild,v 1.1 2008/11/03 22:22:24 maekke Exp $
+
+inherit multilib flag-o-matic eutils python
+
+#IUSE="jpeg mozilla png sdl static truetype"
+IUSE="blender-game ffmpeg jpeg nls openal openexr png"
+FFMPEG_SNAP="0.4.9-p20070330"
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org/"
+SRC_URI="http://download.blender.org/source/${P}.tar.gz
+		 ffmpeg? ( mirror://gentoo/ffmpeg-${FFMPEG_SNAP}.tar.bz2 )"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="=dev-lang/python-2.4*
+	>=dev-libs/openssl-0.9.6
+	ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_SNAP/-/_}
+			media-libs/x264 )
+	jpeg? ( media-libs/jpeg )
+	media-libs/tiff
+	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 )
+	>=media-libs/libsdl-1.2
+	virtual/opengl"
+
+DEPEND="dev-util/scons
+	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
+	return 0
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"/release/plugins
+	chmod 755 bmake
+	rmdir include
+	cp -pPR "${S}"/source/blender/blenpluginapi include
+
+	cd "${S}"
+	epatch "${FILESDIR}"/blender-2.37-dirs.patch
+	epatch "${FILESDIR}"/blender-2.45-cve-2008-1102.patch
+	epatch "${FILESDIR}"/blender-2.45-cve-2008-1103-1.patch
+	epatch "${FILESDIR}"/blender-2.45-cve-2008-1103-2.patch
+	epatch "${FILESDIR}"/${P}-CVE-2008-4863.patch
+
+	if use ffmpeg ; then
+		cd "${S}"/extern
+		mv ffmpeg/Makefile ffmpeg/common.mak "${T}"
+		unpack ffmpeg-${FFMPEG_SNAP}.tar.bz2
+		mv "${T}"/Makefile "${T}"/common.mak ffmpeg
+	fi
+	# pass compiler flags to the scons build system
+	echo "CFLAGS += '${CFLAGS}'" >> "${S}"/user-config.py
+	echo "CCFLAGS += ['${CXXFLAGS//' '/','}','-DYESIAMSTUPID']" \
+								 >> "${S}"/user-config.py
+	# disable blender-player and iconv
+	# echo "WITH_BF_PLAYER=0" >> ${S}/user-config.py
+	# echo "WITH_BF_ICONV=0" >> ${S}/user-config.py
+}
+
+src_compile() {
+	myconf="${myconf} $(blend_with openal)"
+	myconf="${myconf} $(blend_with openexr)"
+	myconf="${myconf} $(blend_with jpeg)"
+	myconf="${myconf} $(blend_with ffmpeg)"
+	myconf="${myconf} $(blend_with png)"
+	myconf="${myconf} $(blend_with nls international)"
+	myconf="${myconf} $(blend_with blender-game gameengine)"
+
+	# scons uses -l differently -> remove it
+	scons ${MAKEOPTS/-l[0-9]} -h > scons.config
+	scons ${MAKEOPTS/-l[0-9]} || die \
+	"!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org"
+
+	cd "${S}"/release/plugins
+	emake || die
+}
+
+src_install() {
+	exeinto /usr/bin/
+	doexe "${WORKDIR}"/install/linux2/blender
+
+	dodir /usr/share/${PN}
+
+	exeinto /usr/$(get_libdir)/${PN}/textures
+	doexe "${S}"/release/plugins/texture/*.so
+	exeinto /usr/$(get_libdir)/${PN}/sequences
+	doexe "${S}"/release/plugins/sequence/*.so
+	insinto /usr/include/${PN}
+	doins "${S}"/release/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
+}
+
+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-r2.ebuild b/media-gfx/blender/blender-2.48a-r2.ebuild
new file mode 100644
index 000000000000..7d32ce9fdf41
--- /dev/null
+++ b/media-gfx/blender/blender-2.48a-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.48a-r2.ebuild,v 1.1 2008/11/03 22:22:24 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
+	epatch "${FILESDIR}"/${P}-CVE-2008-4863.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-r3.ebuild b/media-gfx/blender/blender-2.48a-r3.ebuild
new file mode 100644
index 000000000000..94ec67e960e8
--- /dev/null
+++ b/media-gfx/blender/blender-2.48a-r3.ebuild
@@ -0,0 +1,152 @@
+# 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-r3.ebuild,v 1.1 2008/11/03 22:22:24 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
+	epatch "${FILESDIR}"/${P}-CVE-2008-4863.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.43-CVE-2008-4863.patch b/media-gfx/blender/files/blender-2.43-CVE-2008-4863.patch
new file mode 100644
index 000000000000..be19cc55fc91
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.43-CVE-2008-4863.patch
@@ -0,0 +1,15 @@
+diff -ru blender-2.43.orig/source/blender/python/BPY_interface.c blender-2.43/source/blender/python/BPY_interface.c
+--- blender-2.43.orig/source/blender/python/BPY_interface.c	2008-11-03 21:39:45.000000000 +0100
++++ blender-2.43/source/blender/python/BPY_interface.c	2008-11-03 21:41:29.000000000 +0100
+@@ -178,6 +178,11 @@
+ 	
+ 	//Start the interpreter
+ 	Py_Initialize(  );
++
++	/* Sanitize sys.path to prevent relative imports loading modules in
++		the current working directory */
++	PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
++
+ 	PySys_SetArgv( argc_copy, argv_copy );
+ 
+ 	//Overrides __import__
diff --git a/media-gfx/blender/files/blender-2.48a-CVE-2008-4863.patch b/media-gfx/blender/files/blender-2.48a-CVE-2008-4863.patch
new file mode 100644
index 000000000000..3162a0d8a840
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.48a-CVE-2008-4863.patch
@@ -0,0 +1,15 @@
+diff -up blender-2.48a/source/blender/python/BPY_interface.c.cve blender-2.48a/source/blender/python/BPY_interface.c
+--- blender-2.48a/source/blender/python/BPY_interface.c.cve	2008-11-03 17:31:19.000000000 +0100
++++ blender-2.48a/source/blender/python/BPY_interface.c	2008-11-03 17:35:01.000000000 +0100
+@@ -225,6 +225,11 @@ void BPY_start_python( int argc, char **
+ 	Py_Initialize(  );
+ 	
+ 	PySys_SetArgv( argc_copy, argv_copy );
++	
++	/* Sanitize sys.path to prevent relative imports loading modules in
++	   the current working directory */
++	PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
++
+ 	/* Initialize thread support (also acquires lock) */
+ 	PyEval_InitThreads();
+