New version

4 files changed, 150 insertions, 25 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 785cbafbcc7d..fc420e8ca965 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.34 2004/06/24 22:33:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.35 2004/07/12 16:45:25 lu_zero Exp $
+
+*blender-2.33a (12 Jul 2004)
+
+  12 Jul 2004; Luca Barbato <lu_zero@gentoo.org> +blender-2.33a.ebuild:
+  Version bumped and marked -* since it has a feature regression
 
   07 Jun 2004; Aron Griffis <agriffis@gentoo.org> blender-2.28.ebuild,
   blender-2.28a.ebuild, blender-2.28c.ebuild:
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 30b7ac7b25a6..1bb1d7310465 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,31 +1,33 @@
-MD5 719178f2d5ac4967d1817a57b57fb7d0 ChangeLog 4899
-MD5 620913418c5dab3a7e43ad13210a3ec0 blender-2.23-r1.ebuild 1100
-MD5 0d02e888f28974bd8cfbfa10ad3e9563 blender-2.26.ebuild 692
-MD5 9c58557e9d9ea41a45c57ba055ccf7f0 blender-2.27.ebuild 691
-MD5 acd266d5bf7138d7ac72b0a51194af5d blender-2.28.ebuild 2047
-MD5 b776b992e207503b4eeb24e17676c659 blender-2.28a.ebuild 2048
-MD5 7ba1cc11a98fe356eeeb1f19c4b32565 blender-2.28c.ebuild 2202
-MD5 a4bb97bc6885c78dbcc4b945f647c6d8 blender-2.30.ebuild 1957
+MD5 6f1cc66fbc72651ba60ce97618f3f7fc blender-2.31.ebuild 1948
+MD5 56c30f9922ba1747c6243643019ee3fc blender-2.31a.ebuild 2388
+MD5 bb993be87026c719402a9d0bc0228c8c blender-2.28c.ebuild 2105
+MD5 63735b9e55a221b7309ba7c49d3c20d5 ChangeLog 5197
+MD5 81f7b81ccaedfe5748b4806e42c82667 blender-2.32.ebuild 2391
+MD5 e78b6ca617be4e1ce8bb8ea41be4b578 blender-2.27.ebuild 682
 MD5 d3eba695aaee4c4ce9eac27c6a7c5ad3 metadata.xml 588
-MD5 45f01a8ef4d88c8cebf57c6ed73abf3a blender-2.31.ebuild 1957
-MD5 54dbdd619b86d2df54ab81b9016118e4 blender-2.31a.ebuild 2397
-MD5 2f9af78a7e362725afb7e2ba6b3b2f5b blender-2.32.ebuild 2400
+MD5 067228e24e7c9b0c2b3ac8cd4c83246d blender-2.33a.ebuild 2847
+MD5 49d14eec171c843ef94e3d4b61c5abc9 blender-2.28a.ebuild 1952
+MD5 6314874742d3616492d4746a7740a420 blender-2.28.ebuild 1951
+MD5 26c1a0b44674ee4b780daaf9472aff20 blender-2.30.ebuild 1948
+MD5 e238db0df5ba73278fe158c1187c2a32 blender-2.23-r1.ebuild 1091
+MD5 7782b7107ba81f892a458d600ae86590 blender-2.26.ebuild 684
+MD5 a13520b8046c792869ea5cae8374f6f3 files/configure-fix-2.31a.patch 658
+MD5 705b95605426ad9d562457fdbbff5460 files/blender-2.32.patch 2562
+MD5 21158d7f37f745ab78dcb437e3f5fac7 files/digest-blender-2.28 66
+MD5 fc5a649e2b6bfd7b436d1db41cd1e8f4 files/digest-blender-2.31a 67
+MD5 f9d20818255d723bce691f341a34dc38 files/configure-fix-2.30.patch 655
+MD5 504960c3dfcf520f65e3d9e59c81a598 files/digest-blender-2.32 66
+MD5 b8e304980dc2bfd9a7157037d6ead44b files/blender.desktop 197
 MD5 a855ab3ef355897d6896804f54ce21bd files/blender-2.12 36
-MD5 da440d4ab4dddbda368a23ea4d62f97e files/digest-blender-2.23-r1 154
 MD5 6534f3035e2370d87c8c3cb943c5a119 files/digest-blender-2.26 66
-MD5 723758c1783633a74f493588a2913b46 files/digest-blender-2.27 66
-MD5 21158d7f37f745ab78dcb437e3f5fac7 files/digest-blender-2.28 66
-MD5 f22dcdbc692118213454a8c31bc459ff files/digest-blender-2.28a 67
-MD5 b5356307d35d0bfe73149428cafe23ff files/configure-fix.patch 754
+MD5 d49beb1d5a2182b3b1f1a4c123145c96 files/configure-fix-2.31.patch 655
+MD5 6057638080d3c5c999219113ecf0ee6b files/blender-2.31a-plugins.patch 641
 MD5 aacb0f08e5496b93ec12751242c0a9ab files/digest-blender-2.28c 67
-MD5 f9d20818255d723bce691f341a34dc38 files/configure-fix-2.30.patch 655
 MD5 edbe7fddec312f94a65155ba4303398a files/digest-blender-2.30 66
-MD5 6057638080d3c5c999219113ecf0ee6b files/blender-2.31a-plugins.patch 641
-MD5 b8e304980dc2bfd9a7157037d6ead44b files/blender.desktop 197
+MD5 da440d4ab4dddbda368a23ea4d62f97e files/digest-blender-2.23-r1 154
 MD5 d95ef10fee53b71576c6da6c8163e748 files/blender.png 2119
-MD5 d49beb1d5a2182b3b1f1a4c123145c96 files/configure-fix-2.31.patch 655
-MD5 a13520b8046c792869ea5cae8374f6f3 files/configure-fix-2.31a.patch 658
 MD5 64c3289608ad29370759d1c278d02a0c files/digest-blender-2.31 66
-MD5 fc5a649e2b6bfd7b436d1db41cd1e8f4 files/digest-blender-2.31a 67
-MD5 705b95605426ad9d562457fdbbff5460 files/blender-2.32.patch 2562
-MD5 504960c3dfcf520f65e3d9e59c81a598 files/digest-blender-2.32 66
+MD5 f22dcdbc692118213454a8c31bc459ff files/digest-blender-2.28a 67
+MD5 723758c1783633a74f493588a2913b46 files/digest-blender-2.27 66
+MD5 b5356307d35d0bfe73149428cafe23ff files/configure-fix.patch 754
+MD5 9cf14e9d9537c8ee865a9d276d0cd4b6 files/digest-blender-2.33a 67
diff --git a/media-gfx/blender/blender-2.33a.ebuild b/media-gfx/blender/blender-2.33a.ebuild
new file mode 100644
index 000000000000..e9938d7adf83
--- /dev/null
+++ b/media-gfx/blender/blender-2.33a.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.33a.ebuild,v 1.1 2004/07/12 16:45:25 lu_zero Exp $
+
+inherit flag-o-matic eutils
+replace-flags -march=pentium4 -march=pentium3
+
+IUSE="sdl jpeg png mozilla truetype static fmod"
+IUSE="${IUSE} blender-game" #blender-plugin"
+
+S=${WORKDIR}/${P}
+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="-*"
+
+RDEPEND="virtual/x11
+	!amd64? ( dev-games/ode )
+	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}
+	epatch ${DISTDIR}/${P}-gcc34.patch.bz2
+	cd ${S}/release/plugins
+	chmod 755 bmake
+}
+
+
+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 = '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':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
+
+#	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/files/digest-blender-2.33a b/media-gfx/blender/files/digest-blender-2.33a
new file mode 100644
index 000000000000..d359377b8f07
--- /dev/null
+++ b/media-gfx/blender/files/digest-blender-2.33a
@@ -0,0 +1 @@
+MD5 987aafbbca4c13a648516fbd35caac08 blender-2.33a.tar.bz2 5129415