Cleanup+security bump

Package-Manager: portage-2.1_pre3-r1

16 files changed, 21 insertions, 748 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 0f4cf6d6f48d..33e6d1f62f32 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/blender
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.70 2005/12/28 02:26:45 lu_zero Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.71 2006/01/07 16:09:31 lu_zero Exp $
+
+  07 Jan 2006; Luca Barbato <lu_zero@gentoo.org> -blender-2.34.ebuild,
+  -blender-2.34-r1.ebuild, -blender-2.35.ebuild, -blender-2.36.ebuild,
+  blender-2.36-r1.ebuild, -blender-2.37.ebuild, -blender-2.37a.ebuild,
+  blender-2.40.ebuild:
+  Cleanup part I
+
+  07 Jan 2006; Luca Barbato <lu_zero@gentoo.org> blender-2.40.ebuild:
+  Marked ppc, see bug 118163
 
   28 Dec 2005; Luca Barbato <lu_zero@gentoo.org> blender-2.40.ebuild:
   Workaround for missing tiff header, as pointed by Maciej Pawlik
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 9e8e50a3fc71..09c09b1f5df0 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,12 +1,6 @@
-MD5 c6b84c87c5043762c4c2cd4559d634fc ChangeLog 10238
-MD5 748a22317a9c9448af9e97a5a2900155 blender-2.34-r1.ebuild 2912
-MD5 c2f4a5861dcc36216ddc1e7592141dd1 blender-2.34.ebuild 2800
-MD5 36142769a0a67d234b09973eb7117367 blender-2.35.ebuild 2801
-MD5 8a390c3a50c2abbcfa3fbbb7b87a8c54 blender-2.36-r1.ebuild 3309
-MD5 99ad2f8fe7c190a54f498946071a613b blender-2.36.ebuild 2929
-MD5 1642695ed007cd3b2ea25e09b276c690 blender-2.37.ebuild 3349
-MD5 a1cc145d9fb0161bb84c7cd4b3e841dd blender-2.37a.ebuild 3492
-MD5 9e449c2622261789732fc491971b0e1f blender-2.40.ebuild 3469
+MD5 a0255744d5a2109305ffc6de5f9b0df5 ChangeLog 10592
+MD5 f36308ba7cbae244f796a734dda27867 blender-2.36-r1.ebuild 3314
+MD5 9efe058d54ad3d5365e64e82150ec298 blender-2.40.ebuild 3470
 MD5 705b95605426ad9d562457fdbbff5460 files/blender-2.32.patch 2562
 MD5 ee3557021be75082093de0d643b32260 files/blender-2.36-dirs.patch 1970
 MD5 bcc3b86202d4c6bb85ef9cef08bfcf9e files/blender-2.37-dirs.patch 725
@@ -16,12 +10,6 @@ MD5 3cab957d0ff2afbbbd4f47b95aec94c8 files/blender-2.37a-x86_64.patch 5059
 MD5 b8e304980dc2bfd9a7157037d6ead44b files/blender.desktop 197
 MD5 d95ef10fee53b71576c6da6c8163e748 files/blender.png 2119
 MD5 b5356307d35d0bfe73149428cafe23ff files/configure-fix.patch 754
-MD5 ef66b38c216b9ab1d78968353025116f files/digest-blender-2.34 66
-MD5 ef66b38c216b9ab1d78968353025116f files/digest-blender-2.34-r1 66
-MD5 2fbf0a94ba625bce0c2af487d90cf7f5 files/digest-blender-2.35 66
-MD5 f65e9e32429f06fd611b9902f9d7852b files/digest-blender-2.36 65
 MD5 f65e9e32429f06fd611b9902f9d7852b files/digest-blender-2.36-r1 65
-MD5 2ba439f544d1a154d6ab27d68cd059fc files/digest-blender-2.37 65
-MD5 052c6c1c8bb6f7abaef2c5a615d6995e files/digest-blender-2.37a 66
 MD5 8637d60394b1e58d4f4c0fe4b71865fa files/digest-blender-2.40 65
 MD5 493f38fb63d60a1ce275fdd2ea43d6e9 metadata.xml 587
diff --git a/media-gfx/blender/blender-2.34-r1.ebuild b/media-gfx/blender/blender-2.34-r1.ebuild
deleted file mode 100644
index d313a10f20d6..000000000000
--- a/media-gfx/blender/blender-2.34-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.34-r1.ebuild,v 1.3 2005/07/10 00:50:38 swegener Exp $
-
-inherit flag-o-matic eutils
-
-#IUSE="sdl jpeg png mozilla truetype static fmod"
-IUSE=""  #blender-game" # blender-plugin"
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org/"
-SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="|| (GPL-2 BL)"
-KEYWORDS="ppc x86 ~amd64"
-
-RDEPEND="virtual/x11
-	media-libs/libsdl
-	media-libs/jpeg
-	media-libs/libpng
-	>=media-libs/freetype-2.0
-	>=media-libs/openal-20020127
-	>=media-libs/libsdl-1.2
-	>=media-libs/libvorbis-1.0
-	>=dev-libs/openssl-0.9.6
-	>=media-gfx/yafray-0.0.6"
-
-DEPEND="dev-util/scons
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/release/plugins
-	chmod 755 bmake
-	rm -fR include
-	ln -s ${S}/source/blender/blenpluginapi include
-}
-
-
-src_compile() {
-	local myconf=""
-
-	replace-flags -march=pentium4 -march=pentium3
-	scons -q
-
-	# SDL Support
-	#use sdl && myconf="${myconf} --with-sdl=/usr"
-	#	|| myconf="${myconf} --without-sdl"
-
-	# Jpeg support
-	#use jpeg && myconf="${myconf} --with-libjpeg=/usr"
-
-	# PNG Support
-	#use png && myconf="${myconf} --with-libpng=/usr"
-
-	# ./configure points at the wrong mozilla directories and will fail
-	# with this enabled. (A simple patch should take care of this)
-	#use mozilla && myconf="${myconf} --with-mozilla=/usr"
-
-	# TrueType support (For text objects)
-	#use truetype && myconf="${myconf} --with-freetype2=/usr"
-
-	# Build Staticly
-	#use static && myconf="${myconf} --enable-blenderstatic"
-
-	# Build the game engine
-#	use blender-game && \
-	einfo "enabling game engine"
-	sed -i -e "s:BUILD_GAMEENGINE = 'false':BUILD_GAMEENGINE = 'true':" \
-	config.opts
-
-#	use blender-game || \
-#	( einfo "disabling game engine"
-#	sed -i -e "s:BUILD_GAMEENGINE = 'true':BUILD_GAMEENGINE = 'false':" \
-#	${S}/config.opts )
-
-	# Build the plugin
-#	use blender-plugin && \
-#	( einfo "enabling mozilla plugin"
-#	sed -i -e "s:BUILD_BLENDER_PLUGIN = 'false':BUILD_BLENDER_PLUGIN = 'true':" \
-#	config.opts )
-
-	#Solid desn't work with gcc-3.4, ode does, but the physics bridge
-	#doesn't work yet
-#	use amd64 && sed -i -e "s:solid:ode:" SConstruct
-
-	sed -i -e "s/-O2/${CFLAGS// /\' ,\'}/g" ${S}/SConstruct
-	scons ${MAKEOPTS} || die
-	cd ${S}/release/plugins
-	emake || die
-
-}
-
-src_install() {
-	exeinto /usr/bin/
-	doexe ${S}/blender
-	doexe ${S}/blenderplayer
-#	einstall || die
-
-	exeinto /usr/lib/${PN}/textures
-	doexe ${S}/release/plugins/texture/*.so
-	exeinto /usr/lib/${PN}/sequences
-	doexe ${S}/release/plugins/sequence/*.so
-	cp -aR	${S}/release/{bpydata,plugins,scripts} ${D}/usr/lib/${PN}
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/${PN}.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
-
-	dodoc COPYING INSTALL README release_2*
-
-}
diff --git a/media-gfx/blender/blender-2.34.ebuild b/media-gfx/blender/blender-2.34.ebuild
deleted file mode 100644
index 7cf79f420e6d..000000000000
--- a/media-gfx/blender/blender-2.34.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.34.ebuild,v 1.5 2005/07/10 00:50:38 swegener Exp $
-
-inherit flag-o-matic eutils
-
-#IUSE="sdl jpeg png mozilla truetype static fmod"
-IUSE=""  #blender-game" # blender-plugin"
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org/"
-SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="|| (GPL-2 BL)"
-KEYWORDS="ppc x86 ~amd64"
-
-RDEPEND="virtual/x11
-	media-libs/libsdl
-	media-libs/jpeg
-	media-libs/libpng
-	>=media-libs/freetype-2.0
-	>=media-libs/openal-20020127
-	>=media-libs/libsdl-1.2
-	>=media-libs/libvorbis-1.0
-	>=dev-libs/openssl-0.9.6
-	>=media-gfx/yafray-0.0.6"
-
-DEPEND="dev-util/scons
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/release/plugins
-	chmod 755 bmake
-}
-
-
-src_compile() {
-	local myconf=""
-
-	replace-flags -march=pentium4 -march=pentium3
-	scons -q
-
-	# SDL Support
-	#use sdl && myconf="${myconf} --with-sdl=/usr"
-	#	|| myconf="${myconf} --without-sdl"
-
-	# Jpeg support
-	#use jpeg && myconf="${myconf} --with-libjpeg=/usr"
-
-	# PNG Support
-	#use png && myconf="${myconf} --with-libpng=/usr"
-
-	# ./configure points at the wrong mozilla directories and will fail
-	# with this enabled. (A simple patch should take care of this)
-	#use mozilla && myconf="${myconf} --with-mozilla=/usr"
-
-	# TrueType support (For text objects)
-	#use truetype && myconf="${myconf} --with-freetype2=/usr"
-
-	# Build Staticly
-	#use static && myconf="${myconf} --enable-blenderstatic"
-
-	# Build the game engine
-#	use blender-game && \
-	einfo "enabling game engine"
-	sed -i -e "s:BUILD_GAMEENGINE = 'false':BUILD_GAMEENGINE = 'true':" \
-	config.opts
-
-#	use blender-game || \
-#	( einfo "disabling game engine"
-#	sed -i -e "s:BUILD_GAMEENGINE = 'true':BUILD_GAMEENGINE = 'false':" \
-#	${S}/config.opts )
-
-	# Build the plugin
-#	use blender-plugin && \
-#	( einfo "enabling mozilla plugin"
-#	sed -i -e "s:BUILD_BLENDER_PLUGIN = 'false':BUILD_BLENDER_PLUGIN = 'true':" \
-#	config.opts )
-
-	#Solid desn't work with gcc-3.4, ode does, but the physics bridge
-	#doesn't work yet
-#	use amd64 && sed -i -e "s:solid:ode:" SConstruct
-
-	sed -i -e "s/-O2/${CFLAGS// /\' ,\'}/g" ${S}/SConstruct
-	scons ${MAKEOPTS} || die
-#	emake || die
-#	cd ${S}/release/plugins
-#	emake || die
-
-}
-
-src_install() {
-	exeinto /usr/bin/
-	doexe ${S}/blender
-	doexe ${S}/blenderplayer
-#	einstall || die
-
-#	exeinto /usr/lib/${PN}/textures
-#	doexe ${S}/release/plugins/texture/*.so
-#	exeinto /usr/lib/${PN}/sequences
-#	doexe ${S}/release/plugins/sequence/*.so
-
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/${PN}.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
-
-	dodoc COPYING INSTALL README release_2*
-
-}
diff --git a/media-gfx/blender/blender-2.35.ebuild b/media-gfx/blender/blender-2.35.ebuild
deleted file mode 100644
index 19c69aa1529e..000000000000
--- a/media-gfx/blender/blender-2.35.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.35.ebuild,v 1.4 2005/07/10 00:50:38 swegener Exp $
-
-inherit flag-o-matic eutils
-
-#IUSE="sdl jpeg png mozilla truetype static fmod"
-IUSE="" #blender-game" # blender-plugin"
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org/"
-SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="|| (GPL-2 BL)"
-KEYWORDS="~ppc ~x86 ~amd64"
-
-RDEPEND="virtual/x11
-	media-libs/libsdl
-	media-libs/jpeg
-	media-libs/libpng
-	>=media-libs/freetype-2.0
-	>=media-libs/openal-20020127
-	>=media-libs/libsdl-1.2
-	>=media-libs/libvorbis-1.0
-	>=dev-libs/openssl-0.9.6
-	>=media-gfx/yafray-0.0.6"
-
-DEPEND="dev-util/scons
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/release/plugins
-	chmod 755 bmake
-}
-
-
-src_compile() {
-	local myconf=""
-
-	replace-flags -march=pentium4 -march=pentium3
-	scons -q
-
-	# SDL Support
-	#use sdl && myconf="${myconf} --with-sdl=/usr"
-	#	|| myconf="${myconf} --without-sdl"
-
-	# Jpeg support
-	#use jpeg && myconf="${myconf} --with-libjpeg=/usr"
-
-	# PNG Support
-	#use png && myconf="${myconf} --with-libpng=/usr"
-
-	# ./configure points at the wrong mozilla directories and will fail
-	# with this enabled. (A simple patch should take care of this)
-	#use mozilla && myconf="${myconf} --with-mozilla=/usr"
-
-	# TrueType support (For text objects)
-	#use truetype && myconf="${myconf} --with-freetype2=/usr"
-
-	# Build Staticly
-	#use static && myconf="${myconf} --enable-blenderstatic"
-
-	# Build the game engine
-#	use blender-game && \
-	einfo "enabling game engine"
-	sed -i -e "s:BUILD_GAMEENGINE = 'false':BUILD_GAMEENGINE = 'true':" \
-	config.opts
-
-#	use blender-game || \
-#	( einfo "disabling game engine"
-#	sed -i -e "s:BUILD_GAMEENGINE = 'true':BUILD_GAMEENGINE = 'false':" \
-#	${S}/config.opts )
-
-	# Build the plugin
-#	use blender-plugin && \
-#	( einfo "enabling mozilla plugin"
-#	sed -i -e "s:BUILD_BLENDER_PLUGIN = 'false':BUILD_BLENDER_PLUGIN = 'true':" \
-#	config.opts )
-
-	#Solid desn't work with gcc-3.4, ode does, but the physics bridge
-	#doesn't work yet
-#	use amd64 && sed -i -e "s:solid:ode:" SConstruct
-
-	sed -i -e "s/-O2/${CFLAGS// /\' ,\'}/g" ${S}/SConstruct
-	scons ${MAKEOPTS} || die
-#	emake || die
-#	cd ${S}/release/plugins
-#	emake || die
-
-}
-
-src_install() {
-	exeinto /usr/bin/
-	doexe ${S}/blender
-	doexe ${S}/blenderplayer
-#	einstall || die
-
-#	exeinto /usr/lib/${PN}/textures
-#	doexe ${S}/release/plugins/texture/*.so
-#	exeinto /usr/lib/${PN}/sequences
-#	doexe ${S}/release/plugins/sequence/*.so
-
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/${PN}.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
-
-	dodoc COPYING INSTALL README release_2*
-
-}
diff --git a/media-gfx/blender/blender-2.36-r1.ebuild b/media-gfx/blender/blender-2.36-r1.ebuild
index 6045cc0753ec..f7dbdeede362 100644
--- a/media-gfx/blender/blender-2.36-r1.ebuild
+++ b/media-gfx/blender/blender-2.36-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.36-r1.ebuild,v 1.9 2005/06/12 21:50:13 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.36-r1.ebuild,v 1.10 2006/01/07 16:09:31 lu_zero Exp $
 
 inherit flag-o-matic eutils python
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.blender.org/"
 SRC_URI="http://download.blender.org/source/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="|| (GPL-2 BL)"
+LICENSE="|| ( GPL-2 BL )"
 KEYWORDS="amd64 ppc x86"
 
 RDEPEND="virtual/x11
diff --git a/media-gfx/blender/blender-2.36.ebuild b/media-gfx/blender/blender-2.36.ebuild
deleted file mode 100644
index fdd5f2d3a5a3..000000000000
--- a/media-gfx/blender/blender-2.36.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.36.ebuild,v 1.2 2005/01/03 12:41:13 lu_zero Exp $
-
-inherit flag-o-matic eutils
-
-#IUSE="sdl jpeg png mozilla truetype static fmod"
-IUSE=""  #blender-game" # blender-plugin"
-
-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="~ppc ~x86 ~amd64"
-
-RDEPEND="virtual/x11
-	media-libs/libsdl
-	media-libs/jpeg
-	media-libs/libpng
-	>=media-libs/freetype-2.0
-	>=media-libs/openal-20020127
-	>=media-libs/libsdl-1.2
-	>=media-libs/libvorbis-1.0
-	>=dev-libs/openssl-0.9.6
-	>=media-gfx/yafray-0.0.6"
-
-DEPEND="dev-util/scons
-	${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/release/plugins
-	chmod 755 bmake
-	rm -fR include
-	ln -s ${S}/source/blender/blenpluginapi include
-}
-
-
-src_compile() {
-	local myconf=""
-
-	replace-flags -march=pentium4 -march=pentium3
-	scons -q
-
-	# SDL Support
-	#use sdl && myconf="${myconf} --with-sdl=/usr"
-	#	|| myconf="${myconf} --without-sdl"
-
-	# Jpeg support
-	#use jpeg && myconf="${myconf} --with-libjpeg=/usr"
-
-	# PNG Support
-	#use png && myconf="${myconf} --with-libpng=/usr"
-
-	# ./configure points at the wrong mozilla directories and will fail
-	# with this enabled. (A simple patch should take care of this)
-	#use mozilla && myconf="${myconf} --with-mozilla=/usr"
-
-	# TrueType support (For text objects)
-	#use truetype && myconf="${myconf} --with-freetype2=/usr"
-
-	# Build Staticly
-	#use static && myconf="${myconf} --enable-blenderstatic"
-
-	# Build the game engine
-#	use blender-game && \
-	einfo "enabling game engine"
-	sed -i -e "s:BUILD_GAMEENGINE = 'false':BUILD_GAMEENGINE = 'true':" \
-	config.opts
-
-#	use blender-game || \
-#	( einfo "disabling game engine"
-#	sed -i -e "s:BUILD_GAMEENGINE = 'true':BUILD_GAMEENGINE = 'false':" \
-#	${S}/config.opts )
-
-	# Build the plugin
-#	use blender-plugin && \
-#	( einfo "enabling mozilla plugin"
-#	sed -i -e "s:BUILD_BLENDER_PLUGIN = 'false':BUILD_BLENDER_PLUGIN = 'true':" \
-#	config.opts )
-
-	#Solid desn't work with gcc-3.4, ode does, but the physics bridge
-	#doesn't work yet
-#	use amd64 && sed -i -e "s:solid:ode:" SConstruct
-
-	sed -i -e "s/-O2/${CFLAGS// /\' ,\'}/g" ${S}/SConstruct
-	scons ${MAKEOPTS} || die
-	cd ${S}/release/plugins
-	emake || die
-
-}
-
-src_install() {
-	exeinto /usr/bin/
-	doexe ${S}/blender
-	doexe ${S}/blenderplayer
-#	einstall || die
-
-	exeinto /usr/lib/${PN}/textures
-	doexe ${S}/release/plugins/texture/*.so
-	exeinto /usr/lib/${PN}/sequences
-	doexe ${S}/release/plugins/sequence/*.so
-	cp -aR	${S}/release/{bpydata,plugins,scripts} ${D}/usr/lib/${PN}
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/${PN}.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
-
-	dodoc COPYING INSTALL README release_2*
-
-}
diff --git a/media-gfx/blender/blender-2.37.ebuild b/media-gfx/blender/blender-2.37.ebuild
deleted file mode 100644
index ad725d1cd50e..000000000000
--- a/media-gfx/blender/blender-2.37.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.37.ebuild,v 1.5 2005/12/10 21:33:10 tgall Exp $
-
-inherit flag-o-matic eutils python
-
-#IUSE="sdl jpeg png mozilla truetype static fmod"
-IUSE="nls"  #blender-game" # blender-plugin"
-
-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="virtual/x11
-	media-libs/libsdl
-	media-libs/jpeg
-	media-libs/libpng
-	>=media-libs/freetype-2.0
-	>=media-libs/openal-20020127
-	>=media-libs/libsdl-1.2
-	>=media-libs/libvorbis-1.0
-	>=dev-libs/openssl-0.9.6
-	>=media-gfx/yafray-0.0.7
-	nls? ( >=media-libs/ftgl-2.1 )"
-
-DEPEND="dev-util/scons
-	${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/release/plugins
-	chmod 755 bmake
-	rm -fR include
-	cp -a ${S}/source/blender/blenpluginapi include
-	cd ${S}
-	epatch ${FILESDIR}/${P}-dirs.patch
-	mkdir -p ${WORKDIR}/build/linux2/{extern,intern,source}
-}
-
-
-src_compile() {
-	local myconf=""
-
-	scons -q
-
-	# SDL Support
-	#use sdl && myconf="${myconf} --with-sdl=/usr"
-	#	|| myconf="${myconf} --without-sdl"
-
-	# Jpeg support
-	#use jpeg && myconf="${myconf} --with-libjpeg=/usr"
-
-	# PNG Support
-	#use png && myconf="${myconf} --with-libpng=/usr"
-
-	# ./configure points at the wrong mozilla directories and will fail
-	# with this enabled. (A simple patch should take care of this)
-	#use mozilla && myconf="${myconf} --with-mozilla=/usr"
-
-	# TrueType support (For text objects)
-	#use truetype && myconf="${myconf} --with-freetype2=/usr"
-
-	# Build Staticly
-	#use static && myconf="${myconf} --enable-blenderstatic"
-
-	# Build the game engine
-#	use blender-game && \
-	einfo "enabling game engine"
-	sed -i -e "s:BUILD_GAMEENGINE.*$:BUILD_GAMEENGINE = 'true':" \
-	config.opts
-
-	if use nls ;
-	then
-		einfo "enabling internationalization"
-		sed -i -e "s:USE_INTERNATIONAL.*$:USE_INTERNATIONAL = 'true':" \
-		-e "s:FTGL_INCLUDE.*$:FTGL_INCLUDE = ['/usr/include/FTGL']:"	\
-		-e "s:FTGL_LIBPATH.*$:FTGL_LIBPATH = ['/usr/lib']:"				\
-		config.opts
-	fi
-
-#	use blender-game || \
-#	( einfo "disabling game engine"
-#	sed -i -e "s:BUILD_GAMEENGINE = 'true':BUILD_GAMEENGINE = 'false':" \
-#	${S}/config.opts )
-
-	# Build the plugin
-#	use blender-plugin && \
-#	( einfo "enabling mozilla plugin"
-#	sed -i -e "s:BUILD_BLENDER_PLUGIN.*$:BUILD_BLENDER_PLUGIN = 'true':" \
-#	config.opts )
-
-	sed -i -e "s/-O2/${CFLAGS// /\' ,\'}/g" ${S}/SConstruct
-	scons ${MAKEOPTS} || die
-	cd ${S}/release/plugins
-	emake || die
-
-}
-
-src_install() {
-	exeinto /usr/bin/
-	doexe ${S}/blender
-	doexe ${S}/blenderplayer
-
-
-	exeinto /usr/lib/${PN}/textures
-	doexe ${S}/release/plugins/texture/*.so
-	exeinto /usr/lib/${PN}/sequences
-	doexe ${S}/release/plugins/sequence/*.so
-	cp -a ${S}/release/{bpydata,plugins,scripts} ${D}/usr/lib/${PN}
-	use nls && \
-	cp -a ${S}/bin/.blender/{.Blanguages,.bfont.ttf,locale} ${D}/usr/lib/${PN}
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/${PN}.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
-
-	dodoc COPYING INSTALL README release_237.txt
-
-}
-
-pkg_preinst(){
-	if [ -h "/usr/lib/blender/plugins/include" ];
-	then
-		rm -f /usr/lib/blender/plugins/include
-	fi
-}
diff --git a/media-gfx/blender/blender-2.37a.ebuild b/media-gfx/blender/blender-2.37a.ebuild
deleted file mode 100644
index fd0b0f6485f1..000000000000
--- a/media-gfx/blender/blender-2.37a.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.37a.ebuild,v 1.6 2005/12/15 04:59:59 spyderous Exp $
-
-inherit flag-o-matic eutils python
-
-#IUSE="sdl jpeg png mozilla truetype static fmod"
-IUSE="nls"  #blender-game" # blender-plugin"
-
-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 ~sparc ~x86"
-
-RDEPEND="media-libs/libsdl
-	media-libs/jpeg
-	media-libs/libpng
-	>=media-libs/freetype-2.0
-	>=media-libs/openal-20020127
-	>=media-libs/libsdl-1.2
-	>=media-libs/libvorbis-1.0
-	>=dev-libs/openssl-0.9.6
-	>=media-gfx/yafray-0.0.7
-	nls? ( >=media-libs/ftgl-2.1 )"
-
-DEPEND="=dev-util/scons-0.96.1
-	|| ( x11-libs/libXt virtual/x11 )
-	${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/release/plugins
-	chmod 755 bmake
-	rm -fR include
-	cp -pPR ${S}/source/blender/blenpluginapi include
-	cd ${S}
-	epatch ${FILESDIR}/${P}-dirs.patch
-	epatch ${FILESDIR}/${P}-x86_64.patch
-	mkdir -p ${WORKDIR}/build/linux2/{extern,intern,source}
-}
-
-
-src_compile() {
-	local myconf=""
-
-	scons -q
-
-	# SDL Support
-	#use sdl && myconf="${myconf} --with-sdl=/usr"
-	#	|| myconf="${myconf} --without-sdl"
-
-	# Jpeg support
-	#use jpeg && myconf="${myconf} --with-libjpeg=/usr"
-
-	# PNG Support
-	#use png && myconf="${myconf} --with-libpng=/usr"
-
-	# ./configure points at the wrong mozilla directories and will fail
-	# with this enabled. (A simple patch should take care of this)
-	#use mozilla && myconf="${myconf} --with-mozilla=/usr"
-
-	# TrueType support (For text objects)
-	#use truetype && myconf="${myconf} --with-freetype2=/usr"
-
-	# Build Staticly
-	#use static && myconf="${myconf} --enable-blenderstatic"
-
-	# Build the game engine
-#	use blender-game && \
-	einfo "enabling game engine"
-	sed -i -e "s:BUILD_GAMEENGINE.*$:BUILD_GAMEENGINE = 'true':" \
-	config.opts
-
-	if use nls ;
-	then
-		einfo "enabling internationalization"
-		sed -i -e "s:USE_INTERNATIONAL.*$:USE_INTERNATIONAL = 'true':" \
-		-e "s:FTGL_INCLUDE.*$:FTGL_INCLUDE = ['/usr/include/FTGL']:"	\
-		-e "s:FTGL_LIBPATH.*$:FTGL_LIBPATH = ['/usr/$(get_libdir)']:"				\
-		config.opts
-	fi
-
-#	use blender-game || \
-#	( einfo "disabling game engine"
-#	sed -i -e "s:BUILD_GAMEENGINE = 'true':BUILD_GAMEENGINE = 'false':" \
-#	${S}/config.opts )
-
-	# Build the plugin
-#	use blender-plugin && \
-#	( einfo "enabling mozilla plugin"
-#	sed -i -e "s:BUILD_BLENDER_PLUGIN.*$:BUILD_BLENDER_PLUGIN = 'true':" \
-#	config.opts )
-
-	sed -i -e "s/-O2/${CFLAGS// /\' ,\'}/g" ${S}/SConstruct
-	scons ${MAKEOPTS} || die
-	cd ${S}/release/plugins
-	emake || die
-
-}
-
-src_install() {
-	exeinto /usr/bin/
-	doexe ${S}/blender
-	doexe ${S}/blenderplayer
-
-
-	exeinto /usr/$(get_libdir)/${PN}/textures
-	doexe ${S}/release/plugins/texture/*.so
-	exeinto /usr/$(get_libdir)/${PN}/sequences
-	doexe ${S}/release/plugins/sequence/*.so
-	cp -pPR ${S}/release/{bpydata,plugins,scripts} ${D}/usr/$(get_libdir)/${PN}
-	use nls && \
-	cp -pPR ${S}/bin/.blender/{.Blanguages,.bfont.ttf,locale}
-	${D}/usr/$(get_libdir)/${PN}
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/${PN}.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
-
-	dodoc COPYING INSTALL README release_237.txt
-
-}
-
-pkg_preinst(){
-	if [ -h "/usr/$(get_libdir)/blender/plugins/include" ];
-	then
-		rm -f /usr/$(get_libdir)/blender/plugins/include
-	fi
-}
diff --git a/media-gfx/blender/blender-2.40.ebuild b/media-gfx/blender/blender-2.40.ebuild
index 178ea438cb25..255204532a09 100644
--- a/media-gfx/blender/blender-2.40.ebuild
+++ b/media-gfx/blender/blender-2.40.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.40.ebuild,v 1.3 2005/12/28 02:26:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.40.ebuild,v 1.4 2006/01/07 16:09:31 lu_zero Exp $
 
 inherit flag-o-matic eutils python
 
@@ -12,8 +12,8 @@ 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"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="media-libs/libsdl
 	media-libs/jpeg
diff --git a/media-gfx/blender/files/digest-blender-2.34 b/media-gfx/blender/files/digest-blender-2.34
deleted file mode 100644
index c62a06dc9038..000000000000
--- a/media-gfx/blender/files/digest-blender-2.34
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dad5ac3d415abefad9c52f7b814339d8 blender-2.34.tar.bz2 5499297
diff --git a/media-gfx/blender/files/digest-blender-2.34-r1 b/media-gfx/blender/files/digest-blender-2.34-r1
deleted file mode 100644
index c62a06dc9038..000000000000
--- a/media-gfx/blender/files/digest-blender-2.34-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dad5ac3d415abefad9c52f7b814339d8 blender-2.34.tar.bz2 5499297
diff --git a/media-gfx/blender/files/digest-blender-2.35 b/media-gfx/blender/files/digest-blender-2.35
deleted file mode 100644
index 43fa56d2c771..000000000000
--- a/media-gfx/blender/files/digest-blender-2.35
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d451bb3047a9c2fe785c0b91f9769717 blender-2.35.tar.bz2 5658791
diff --git a/media-gfx/blender/files/digest-blender-2.36 b/media-gfx/blender/files/digest-blender-2.36
deleted file mode 100644
index bd39cfb8ea55..000000000000
--- a/media-gfx/blender/files/digest-blender-2.36
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8e2237c86b12e6061935632495aec875 blender-2.36.tar.gz 6912828
diff --git a/media-gfx/blender/files/digest-blender-2.37 b/media-gfx/blender/files/digest-blender-2.37
deleted file mode 100644
index b50c85e3fef6..000000000000
--- a/media-gfx/blender/files/digest-blender-2.37
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a233a77abcc5561fbe2c5fe307654b41 blender-2.37.tar.gz 7953131
diff --git a/media-gfx/blender/files/digest-blender-2.37a b/media-gfx/blender/files/digest-blender-2.37a
deleted file mode 100644
index 45179efde268..000000000000
--- a/media-gfx/blender/files/digest-blender-2.37a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dd0002c09ecd68b3cb3e3d8f4ce31e83 blender-2.37a.tar.gz 7990789