revision bumps for security bug #219008

Package-Manager: portage-2.1.5_rc6

6 files changed, 446 insertions, 2 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index aead6fd7b716..28350aa4adb4 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.132 2008/04/12 10:22:13 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.133 2008/04/27 12:19:52 maekke Exp $
+
+*blender-2.45-r3 (27 Apr 2008)
+*blender-2.45-r2 (27 Apr 2008)
+*blender-2.43-r1 (27 Apr 2008)
+
+  27 Apr 2008; Markus Meier <maekke@gentoo.org>
+  +files/blender-2.45-cve-2008-1102.patch, +blender-2.43-r1.ebuild,
+  +blender-2.45-r2.ebuild, +blender-2.45-r3.ebuild:
+  revision bumps for security bug #219008
 
   12 Apr 2008; Tiziano Müller <dev-zero@gentoo.org>
   +files/blender-2.45-missing_includes.patch, blender-2.45.ebuild,
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b3b533e33e1a..35efba42a0bf 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,6 +1,10 @@
+-----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
+AUX blender-2.45-cve-2008-1102.patch 737 RMD160 7f55e8850638d343197ef1a7e3987fd48d35617f SHA1 bd57987f0fdfa97b2649f82b7e944a9817ce4414 SHA256 7546a4133cc682b9ed35dc6350637e535cf032ffbaa668746fb2549bcedd7c84
 AUX blender-2.45-ffmpeg.patch 2807 RMD160 748fec0b51ee35b0524d678facecfaf91204ddb1 SHA1 2cd955967adc1bea42472a3bee8beff997cb53e5 SHA256 fe5ebbabf26544072dd44a4e952decb6e72dbc663e5cc7241527baf3b3a4ab82
 AUX blender-2.45-missing_includes.patch 2314 RMD160 7f9b7205569dccb357fc82754cbe1100ca946574 SHA1 4bfdde220c3e3508e6987f0bdff654a8ed54c8e3 SHA256 f3deb71358d7b5163a5d0ea52b7891a622d0419d06fa7c33d4c3d256d512ad7d
 AUX blender.desktop 194 RMD160 5b154d86d52f46a3f1fcd29da90322e1727f1107 SHA1 a1b70789388f72f2a292939588365a0b845b83b7 SHA256 9d21fe8823f249f0720895107817854dd8ce64afe6586317af08805b94fe0fab
@@ -8,8 +12,18 @@ AUX blender.png 2119 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 SHA1 9a0d71
 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 ffmpeg-0.4.9-p20070330.tar.bz2 2192476 RMD160 e52bf6abbf7c630aa3e76243987fb7dd6d9b84a1 SHA1 bcc18c88c64f6f941eb1ac94357e0d6dcbf99045 SHA256 58a7e7d909e02fda07856ea044ae0f5f9c174791f63a449f2f23f37a78b34f95
+EBUILD blender-2.43-r1.ebuild 3708 RMD160 a4ec055dbbceee3dcaf94b337257e172f083c55f SHA1 56afdfa0a9e8d7a8698c6ea8d4f871095b808218 SHA256 017984c6615a1039c50e8858e99c3d3796fb7d92663238497da58ff8a0d30c5d
 EBUILD blender-2.43.ebuild 3648 RMD160 64e054248ef6f3d53fb56cc3cc388e521fd894a5 SHA1 3fd7aed4ddddc7a40ae4452d462436cedbf5b893 SHA256 4843593f2d3107a7e0e4ed97e5e8efd61d2ee4458ecbec1d2308990122ad728b
 EBUILD blender-2.45-r1.ebuild 3447 RMD160 648a1fcca74e2fa67c3944f6f8099932302a3703 SHA1 ffcebd9696bfb9af60405d30f526a5371f2b8fca SHA256 2e4a1e756ef2e6c0b4353dc9a9d0c4f6ead76edff664adc4dd33d89e26994a54
+EBUILD blender-2.45-r2.ebuild 3514 RMD160 409ad1234c0966da88ad39fdf99edd33cb0846c5 SHA1 29018ea58fcd2a5c4d18e61f00224c069bfec40c SHA256 85b7697714d911d2dad4318171d4ba536b75fbcd2b1b1d8d0fb82ce6c3872bc4
+EBUILD blender-2.45-r3.ebuild 3492 RMD160 b73ea242c0aae4476c032b5e2c19208aba0e5bdb SHA1 7d2df6feb514a1d78aa7e0bcf984f2f82e0e91da SHA256 e211f3763be7c4a842d839d1e335a44ad1172c0a553e5d7998b68389b896b6c6
 EBUILD blender-2.45.ebuild 3466 RMD160 6ba1735307172bc0ec4ebe9934b302a53371d625 SHA1 a5fecd52147a6c0d914c563250efd0f9e957168b SHA256 53a8c3c7774a3dea92e74a823ff7e79c32e5f9709c9496a9c70b6d5f4e05648e
-MISC ChangeLog 19201 RMD160 21d4f84556186988bc1bbd89a5502cb82cb3701e SHA1 d090d9042832b4d25b36b24693683f20f1da9c30 SHA256 b17e7dd4ebc4a6d0579d07af1195dd8bb00f9b7f72921516f8da83647d407491
+MISC ChangeLog 19504 RMD160 29b30a468c693e4d926b934b6b8049d302b723eb SHA1 7fe225f7059a6aa029ab31a24a0fb6f4a39cf892 SHA256 781255a29ee058c43dea7dbc2d487bb88621ad3745a04c7a3e102abefacf64b5
 MISC metadata.xml 492 RMD160 c477917476fbde6356586768276eda1ea31ae3ea SHA1 4a109fbded83a3f6c403ab5f3ec20e7113c1a26c SHA256 0ef00c095e68d12b312f8558b8909b4ae633717cf12932d7a4e479faf7fb9e18
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgUb5sACgkQkKaRLQcq0GKvFwCgo/lWe9hwMrYbGgrIu4ToGeaO
+l5gAn36hUJdDdHp02tPbES0nLfWvpFfq
+=3FOb
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.43-r1.ebuild b/media-gfx/blender/blender-2.43-r1.ebuild
new file mode 100644
index 000000000000..77be9978b1fd
--- /dev/null
+++ b/media-gfx/blender/blender-2.43-r1.ebuild
@@ -0,0 +1,133 @@
+# 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-r1.ebuild,v 1.1 2008/04/27 12:19:52 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-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
+
+	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.45-r2.ebuild b/media-gfx/blender/blender-2.45-r2.ebuild
new file mode 100644
index 000000000000..c8b3b71e44c4
--- /dev/null
+++ b/media-gfx/blender/blender-2.45-r2.ebuild
@@ -0,0 +1,138 @@
+# 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.45-r2.ebuild,v 1.1 2008/04/27 12:19:52 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 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 )
+	>=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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"/release/plugins
+	chmod 755 bmake
+	cp -pPR "${S}"/source/blender/blenpluginapi include
+
+	cd "${S}"
+	epatch "${FILESDIR}"/blender-2.37-dirs.patch
+	epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
+	epatch "${FILESDIR}"/blender-2.44-swscale.patch
+	epatch "${FILESDIR}"/${P}-missing_includes.patch
+	epatch "${FILESDIR}"/${P}-cve-2008-1102.patch
+
+	if use ffmpeg ; then
+		cd "${S}"/extern
+		rm -rf ffmpeg
+	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
+
+}
+
+src_compile() {
+	for arg in 'openal' \
+			'openexr' \
+			'jpeg' \
+			'ffmpeg' \
+			'png' \
+			'verse' \
+			'nls international' \
+			'blender-game gameengine'; do
+		blend_with ${arg}
+	done
+
+	# 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.45-r3.ebuild b/media-gfx/blender/blender-2.45-r3.ebuild
new file mode 100644
index 000000000000..564b28b48638
--- /dev/null
+++ b/media-gfx/blender/blender-2.45-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.45-r3.ebuild,v 1.1 2008/04/27 12:19:52 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 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 )
+	>=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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"/release/plugins
+	chmod 755 bmake
+	cp -pPR "${S}"/source/blender/blenpluginapi include
+
+	cd "${S}"
+	epatch "${FILESDIR}"/blender-2.37-dirs.patch
+	epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
+	epatch "${FILESDIR}"/blender-2.44-swscale.patch
+	epatch "${FILESDIR}"/${P}-missing_includes.patch
+	epatch "${FILESDIR}"/${P}-cve-2008-1102.patch
+
+	if use ffmpeg ; then
+		cd "${S}"/extern
+		rm -rf ffmpeg
+	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
+
+}
+
+src_compile() {
+	for arg in 'openal' \
+			'openexr' \
+			'jpeg' \
+			'ffmpeg' \
+			'png' \
+			'verse' \
+			'nls international' \
+			'blender-game gameengine'; do
+		blend_with ${arg}
+	done
+
+	# 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/files/blender-2.45-cve-2008-1102.patch b/media-gfx/blender/files/blender-2.45-cve-2008-1102.patch
new file mode 100644
index 000000000000..43015b3c052b
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.45-cve-2008-1102.patch
@@ -0,0 +1,13 @@
+diff -up blender-2.45/source/blender/imbuf/intern/radiance_hdr.c.csv blender-2.45/source/blender/imbuf/intern/radiance_hdr.c
+--- blender-2.45/source/blender/imbuf/intern/radiance_hdr.c.csv	2008-04-24 16:22:36.000000000 +0200
++++ blender-2.45/source/blender/imbuf/intern/radiance_hdr.c	2008-04-24 16:25:59.000000000 +0200
+@@ -191,7 +191,8 @@ struct ImBuf *imb_loadhdr(unsigned char 
+ 			}
+ 		}
+ 		if (found) {
+-			sscanf((char*)&mem[x+1], "%s %d %s %d", (char*)&oriY, &height, (char*)&oriX, &width);
++			if (sscanf((char *)&mem[x+1], "%79s %d %79s %d", (char*)&oriY, &height, 
++				(char*)&oriX, &width) != 4) return NULL;
+ 
+ 			/* find end of this line, data right behind it */
+ 			ptr = (unsigned char *)strchr((char*)&mem[x+1], '\n');