Cleanup

(Portage version: 2.2_rc14/cvs/Linux 2.6.26-gentoo-r1 x86_64)

14 files changed, 10 insertions, 1719 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 61b94b82909c..3dd7228d273c 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.161 2008/11/15 17:48:50 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.162 2008/11/16 22:01:43 lu_zero Exp $
+
+  16 Nov 2008; Luca Barbato <lu_zero@gentoo.org>
+  -files/blender-2.44-swscale.patch,
+  -files/blender-2.46-select_charmap.patch, -blender-2.43-r2.ebuild,
+  -blender-2.45-r3.ebuild, -blender-2.45-r4.ebuild, -blender-2.46.ebuild,
+  -blender-2.46-r1.ebuild, -blender-2.47.ebuild, -blender-2.47-r1.ebuild,
+  -blender-2.48.ebuild, -blender-2.48-r1.ebuild, -blender-2.48a.ebuild,
+  -blender-2.48a-r1.ebuild:
+  Cleanup
 
   15 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   blender-2.43-r3.ebuild:
diff --git a/media-gfx/blender/blender-2.43-r2.ebuild b/media-gfx/blender/blender-2.43-r2.ebuild
deleted file mode 100644
index 65e627f8a0e7..000000000000
--- a/media-gfx/blender/blender-2.43-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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-r2.ebuild,v 1.5 2008/06/25 21:09:08 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
-
-	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-r3.ebuild b/media-gfx/blender/blender-2.45-r3.ebuild
deleted file mode 100644
index bc132de08982..000000000000
--- a/media-gfx/blender/blender-2.45-r3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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.3 2008/05/07 21:07:25 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}-ffmpeg.patch
-	epatch "${FILESDIR}"/${P}-cve-2008-1102.patch
-	epatch "${FILESDIR}"/${P}-cve-2008-1103-1.patch
-	epatch "${FILESDIR}"/${P}-cve-2008-1103-2.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-r4.ebuild b/media-gfx/blender/blender-2.45-r4.ebuild
deleted file mode 100644
index 44adf66468d0..000000000000
--- a/media-gfx/blender/blender-2.45-r4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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-r4.ebuild,v 1.2 2008/07/17 08:02:24 aballier 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-r20
-			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
-	epatch "${FILESDIR}"/${P}-cve-2008-1103-1.patch
-	epatch "${FILESDIR}"/${P}-cve-2008-1103-2.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.46-r1.ebuild b/media-gfx/blender/blender-2.46-r1.ebuild
deleted file mode 100644
index 3e55f3c71224..000000000000
--- a/media-gfx/blender/blender-2.46-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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.46-r1.ebuild,v 1.3 2008/08/17 20:12:29 lu_zero 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-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-ffmpeg.patch
-	epatch "${FILESDIR}"/blender-2.46-cve-2008-1103-1.patch
-	epatch "${FILESDIR}"/blender-2.46-select_charmap.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
-
-}
-
-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]} || 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.46.ebuild b/media-gfx/blender/blender-2.46.ebuild
deleted file mode 100644
index f3cf51f8b891..000000000000
--- a/media-gfx/blender/blender-2.46.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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.46.ebuild,v 1.4 2008/08/17 20:12:29 lu_zero 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-r20
-			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-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
-	epatch "${FILESDIR}"/blender-2.46-select_charmap.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
-
-}
-
-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]} || 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.47-r1.ebuild b/media-gfx/blender/blender-2.47-r1.ebuild
deleted file mode 100644
index e081c425e6cb..000000000000
--- a/media-gfx/blender/blender-2.47-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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.47-r1.ebuild,v 1.4 2008/09/10 20:04:26 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}"/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
-
-	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' \
-			'png' \
-			'player' \
-			'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/blender-2.47.ebuild b/media-gfx/blender/blender-2.47.ebuild
deleted file mode 100644
index 4e111947cb28..000000000000
--- a/media-gfx/blender/blender-2.47.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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.47.ebuild,v 1.4 2008/09/10 20:04:26 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/blender-2.48-r1.ebuild b/media-gfx/blender/blender-2.48-r1.ebuild
deleted file mode 100644
index 7cd0eaf15ed7..000000000000
--- a/media-gfx/blender/blender-2.48-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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.4 2008/10/19 21:32:27 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}"/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
-
-	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.48.ebuild b/media-gfx/blender/blender-2.48.ebuild
deleted file mode 100644
index adcbf3a68f36..000000000000
--- a/media-gfx/blender/blender-2.48.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# 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.2 2008/10/19 14:15:04 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
-	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-r1.ebuild b/media-gfx/blender/blender-2.48a-r1.ebuild
deleted file mode 100644
index 8bad7a45e542..000000000000
--- a/media-gfx/blender/blender-2.48a-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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
deleted file mode 100644
index 72cc95c618ad..000000000000
--- a/media-gfx/blender/blender-2.48a.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# 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.44-swscale.patch b/media-gfx/blender/files/blender-2.44-swscale.patch
deleted file mode 100644
index 1982d73b2cfa..000000000000
--- a/media-gfx/blender/files/blender-2.44-swscale.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/trunk/blender/config/linux2-config.py b/trunk/blender/config/linux2-config.py
-index edc7f26..bd323e4 100644
---- a/trunk/blender/config/linux2-config.py
-+++ b/trunk/blender/config/linux2-config.py
-@@ -119,7 +119,7 @@ WITH_BF_FFMPEG = 'false'  # -DWITH_FFMPEG
- BF_FFMPEG = '/usr'
- BF_FFMPEG_INC = '${BF_FFMPEG}/include'
- BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
--BF_FFMPEG_LIB = 'avformat avcodec avutil'
-+BF_FFMPEG_LIB = 'avformat avcodec avutil swscale'
- 
- # Mesa Libs should go here if your using them as well....
- WITH_BF_STATICOPENGL = 'false'
-diff --git a/trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c b/trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
-index 703f280..8576f59 100644
---- a/trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
-+++ b/trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
-@@ -32,6 +32,7 @@
- #include <ffmpeg/avformat.h>
- #include <ffmpeg/avcodec.h>
- #include <ffmpeg/rational.h>
-+#include <ffmpeg/swscale.h>
- 
- #if LIBAVFORMAT_VERSION_INT < (49 << 16)
- #define FFMPEG_OLD_FRAME_RATE 1
-@@ -258,6 +259,7 @@ static void write_video_frame(AVFrame* frame)
- static AVFrame* generate_video_frame(uint8_t* pixels) 
- {
- 	uint8_t* rendered_frame;
-+	static struct SwsContext *img_convert_ctx;
- 
- 	AVCodecContext* c = get_codec_from_stream(video_stream);
- 	int width = c->width;
-@@ -317,8 +319,18 @@ static AVFrame* generate_video_frame(uint8_t* pixels)
- 	}
- 
- 	if (c->pix_fmt != PIX_FMT_RGBA32) {
--		img_convert((AVPicture*)current_frame, c->pix_fmt, 
--			(AVPicture*)rgb_frame, PIX_FMT_RGBA32, width, height);
-+		if (img_convert_ctx == NULL)
-+			img_convert_ctx = sws_getContext(c->width, c->height,
-+							 PIX_FMT_RGBA32,
-+							 c->width, c->height,
-+							 c->pix_fmt,
-+							 SWS_BICUBIC,
-+							 NULL, NULL, NULL);
-+		sws_scale(img_convert_ctx, rgb_frame->data,
-+			  rgb_frame->linesize, 0, c->height, 
-+			  current_frame->data, current_frame->linesize);
-+//		img_convert((AVPicture*)current_frame, c->pix_fmt, 
-+//			(AVPicture*)rgb_frame, PIX_FMT_RGBA32, width, height);
- 		delete_picture(rgb_frame);
- 	}
- 	return current_frame;
-diff --git a/trunk/blender/source/blender/imbuf/intern/anim.c b/trunk/blender/source/blender/imbuf/intern/anim.c
-index 5b185a4..5cdb651 100644
---- a/trunk/blender/source/blender/imbuf/intern/anim.c
-+++ b/trunk/blender/source/blender/imbuf/intern/anim.c
-@@ -89,6 +89,7 @@
- #include <ffmpeg/avformat.h>
- #include <ffmpeg/avcodec.h>
- #include <ffmpeg/rational.h>
-+#include <ffmpeg/swscale.h>
- 
- #if LIBAVFORMAT_VERSION_INT < (49 << 16)
- #define FFMPEG_OLD_FRAME_RATE 1
-@@ -619,6 +620,7 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) {
- 	AVPacket packet;
- 	int64_t pts_to_search = 0;
- 	int pos_found = 1;
-+	static struct SwsContext *img_convert_ctx;
- 
- 	if (anim == 0) return (0);
- 
-@@ -706,12 +708,32 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) {
- 				unsigned char * p =(unsigned char*) ibuf->rect;
- 				unsigned char * e = p + anim->x * anim->y * 4;
- 
--				img_convert((AVPicture *)anim->pFrameRGB, 
--					    PIX_FMT_RGBA32, 
--					    (AVPicture*)anim->pFrame, 
--					    anim->pCodecCtx->pix_fmt, 
--					    anim->pCodecCtx->width, 
--					    anim->pCodecCtx->height);
-+//				img_convert((AVPicture *)anim->pFrameRGB, 
-+//					    PIX_FMT_RGBA32, 
-+//					    (AVPicture*)anim->pFrame, 
-+//					    anim->pCodecCtx->pix_fmt, 
-+//					    anim->pCodecCtx->width, 
-+//					    anim->pCodecCtx->height);
-+				if (img_convert_ctx == NULL) {
-+					img_convert_ctx = sws_getContext(
-+						anim->pCodecCtx->width,
-+						anim->pCodecCtx->height,
-+						anim->pCodecCtx->pix_fmt,
-+						anim->pCodecCtx->width,
-+						anim->pCodecCtx->height,
-+						PIX_FMT_RGBA32,
-+						SWS_BICUBIC,
-+						NULL, NULL, NULL);
-+				}
-+				sws_scale(img_convert_ctx,
-+					anim->pFrame->data,
-+					anim->pFrame->linesize,
-+					0,
-+					anim->pCodecCtx->height,
-+					anim->pFrameRGB->data,
-+					anim->pFrameRGB->linesize);
-+
-+
- 				IMB_flipy(ibuf);
- 				if (G.order == L_ENDIAN) {
- 					/* BGRA -> RGBA */
diff --git a/media-gfx/blender/files/blender-2.46-select_charmap.patch b/media-gfx/blender/files/blender-2.46-select_charmap.patch
deleted file mode 100644
index 6e440434cdcf..000000000000
--- a/media-gfx/blender/files/blender-2.46-select_charmap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/blender/blenlib/intern/freetypefont.c
-+++ b/source/blender/blenlib/intern/freetypefont.c
-@@ -405,7 +405,7 @@ static VFontData *objfnt_to_ftvfontdata(PackedFile * pf)
- 		lcode = charcode;
- 	}
- 	
--	err = FT_Set_Charmap( face, (FT_CharMap) FT_ENCODING_UNICODE );
-+	err = FT_Select_Charmap( face, FT_ENCODING_UNICODE );
- 
- 	return vfd;	
- }