Cleanup

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.26-gentoo-r1 x86_64

15 files changed, 11 insertions, 1737 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/Manifest b/media-gfx/blender/Manifest
index 8abdbff83b62..3f941e4d89d0 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,7 +1,6 @@
 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
 AUX blender-2.45-cve-2008-1103-1.patch 605 RMD160 e32bce6c420c537a8df0382660a77f2f00b15ebd SHA1 dcff3eda1905e4aea5943c26f16ce3291f465056 SHA256 28f4ae9c19a61f22f228810504afdb2fc7555a262eeae30d1ca87cc31da48d79
 AUX blender-2.45-cve-2008-1103-2.patch 771 RMD160 2f4b66432a54f2b017bed81fa4c07baa4b2279d0 SHA1 52cd1ad4955e208d238d110a5c7d17dc30ee0377 SHA256 3dbfb771cd7c4fe65e3ea788794933cdfd9f5e0318fddf609d9d5c63a3a2a637
@@ -9,31 +8,15 @@ AUX blender-2.45-ffmpeg.patch 2807 RMD160 748fec0b51ee35b0524d678facecfaf91204dd
 AUX blender-2.45-missing_includes.patch 2314 RMD160 7f9b7205569dccb357fc82754cbe1100ca946574 SHA1 4bfdde220c3e3508e6987f0bdff654a8ed54c8e3 SHA256 f3deb71358d7b5163a5d0ea52b7891a622d0419d06fa7c33d4c3d256d512ad7d
 AUX blender-2.46-cve-2008-1103-1.patch 636 RMD160 11d0b7dbff6e186334a80b7f6932ace4a1bd6628 SHA1 979fa1c2f0836b46dfd26c197798625a72e0a28b SHA256 a0dd64fb749a9577d84e22896872dc2956a8530700308d0aadad588191356b96
 AUX blender-2.46-ffmpeg.patch 3823 RMD160 33f41651b1a6bc6d497ba01ab710ca3d7a1559c0 SHA1 82ce585db15a3c88625b0c04e649bd08b3c35b41 SHA256 ad75babcc08ae41f2a7c71bc457bd56a0ef39b5ae1e92ede2cdb0a34d7cbcc85
-AUX blender-2.46-select_charmap.patch 349 RMD160 a5387d5cf59d1e7c3aa6154faf6c83136338b5ea SHA1 bfeb5c0a126b6b83c0b52b40429e10670d90e8ac SHA256 6e858aef912d6fd2b41e2ef4a1b806ab080a76586ba3888d6bf84ee46667e9b5
 AUX blender-2.48-ffmpeg-20081014.patch 839 RMD160 b1fbad04a890dcc1698d02f5351d6d79cae42d91 SHA1 e931f1a85c5c01918b960936d4da5888eacfd64c SHA256 d6114d2647758e39608fcfdb05da00811f062ea3fc4c41cef3a6e2977bc5b0c4
 AUX blender-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
-DIST blender-2.45.tar.gz 14226829 RMD160 fd39b59de0f4d770fe26ce39d51356e98b1ec8ea SHA1 ff66ec5f0129fd04a2ba5c063627ef13033c0598 SHA256 921f72a15d4076f62e52674337f5d3a90cd7a82675b12bb549ebe6cd5c9027ae
-DIST blender-2.46.tar.gz 20948850 RMD160 e269d6dc3e0c2fecd2f9a8f6ff6a8917c0ee6538 SHA1 c5f17700a18d44409a5920e852a97a87ff37d06e SHA256 399f3a0f565b2b07df94582c22981b9ae2daa7bdd810bed4dfd5ea7233a325d1
-DIST blender-2.47.tar.gz 21222013 RMD160 b3abdbff6744708ce9322fb54a2a0e1f0b10f9f1 SHA1 9061ef792da1671ce5e2faa51804577560c65b2d SHA256 7b4dca628a8fee6e19a39d413cd611d7de22c3636b12947868b868c598cb541f
-DIST blender-2.48.tar.gz 21625409 RMD160 becd1a744b4eff7a18489bd931178337edccd334 SHA1 0e3bc8a0f82d2e5c047a498b1e64c61204be905c SHA256 b82564324d38f1975e5ca5b9abe03cda8409a3336f50568722a5fb642de023fa
 DIST 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 3893 RMD160 325b2920f03bd356923b37019de8237a74ed20b6 SHA1 162ed1afb8936af593d57066d56bb9efd780a41e SHA256 0a3bb20aa6194287cb0bd11806bf06100ab61c11dd19c3d13d1fb65f86530477
-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
-EBUILD blender-2.46.ebuild 3602 RMD160 86e8526c456b78f44bcd8cc05c1df320d76903f0 SHA1 5c1ab9951e4256ce75f47c9623755cd90e52f2e8 SHA256 d36260c6399766db15b38c79a01216be23dd982113a34e3e83927ed6ecfac52a
-EBUILD blender-2.47-r1.ebuild 3898 RMD160 720bb4010b011282cdd83294abc28528ec738bac SHA1 04c6ae4ab6e7173c39e4b71ca1530d814c6f4835 SHA256 e671f2121b13001acc4b4f3261515df61f58621425d1a7d281cb1ecb34142fc0
-EBUILD blender-2.47.ebuild 3869 RMD160 257e24844e835bd63b47a6c3ce6115ad61c77c5a SHA1 2fa64735a9c6a5180d9d90062abbe3baf21da740 SHA256 cd68ab5a6991222a7268fbf0a1244be660768dbab165f2488b0bf85c4c93a723
-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 24271 RMD160 c4afdc149c144d8cd69a803736ae66fc1274b6fd SHA1 7b23fcbd0d910ec6c5a84d39f4a1b59e4ecae1f1 SHA256 4a0014adb9a7eeb57233a817538f5289a5129aed1c5a5ad2b18de576c7bde1d6
+MISC ChangeLog 24682 RMD160 2d2746b979e3a36208cf925816c1f2100a3ac9ee SHA1 80436399c019f03ab342690261a30a24337dfcec SHA256 93d005ddac8f450ffc3898291e44ca126a84bdd8aebd58df95ad109ad5fd96e1
 MISC metadata.xml 719 RMD160 132dfe4fc49228b922ed39f556c403347e992ef9 SHA1 7896fb17bd0dd87d8a072b0f6f6072876c1eed94 SHA256 6409856f1883ed49aae365c885d5512a38784a5a48a2bbf7dd583b8054d32510
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;	
- }