New version

6 files changed, 112 insertions, 6 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 28dfff7e9f94..8ceaa7500e83 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.22 2003/11/08 17:34:19 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.23 2003/12/04 04:55:30 lu_zero Exp $
+
+*blender-2.31 (04 Dec 2003)
+
+  04 Dec 2003; Luca Barbato <lu_zero@gentoo.org> blender-2.28c.ebuild,
+  blender-2.31.ebuild, files/configure-fix-2.31.patch:
+  new version, thanks to Bjarke Freund-Hansen <gentoo-bugzilla@rocekiller.dk>
+  and Tarmo Tänav <sn4ip3r@estprog.ee>
 
   08 Nov 2003; Brad House <brad_mssw@gentoo.org> blender-2.30.ebuild:
   add ~amd64 flag
@@ -15,6 +22,9 @@
 
 *blender-2.28c (11 Oct 2003)
 
+  30 Oct 2003; Luca Barbato <lu_zero@gentoo.org> blender-2.28c.ebuild:
+  Moved to stable
+
   11 Oct 2003; Luca Barbato <lu_zero@gentoo.org> blender-2.28c.ebuild, 
   blender-2.27.ebuild :
   Minor fixes, blender-2.27 bumped to stable for ppc and x86
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 6b3eefc1f9cc..78b1ee140a50 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,6 +1,6 @@
-MD5 9363b9852f9c01cd0b7b24c9c2ec0046 blender-2.31.ebuild 1948
-MD5 a4cc303b39b5fa429a9fcc3619ce0df6 blender-2.28c.ebuild 2183
-MD5 4eabab3edf1dfdb4addcde203ef462f5 ChangeLog 3145
+MD5 455348ecc7d508146b159478c045454c blender-2.31.ebuild 1945
+MD5 3a2e83e3f2f9b2f12a20973f0b4164eb blender-2.28c.ebuild 2183
+MD5 a9f2ad900d11d007d4af8506ebfbbe47 ChangeLog 3417
 MD5 24f0b24bddb729ccebaedc0374d7bb1c blender-2.27.ebuild 690
 MD5 bd3394aef9cdd2a2fa952218288fa4ea metadata.xml 585
 MD5 55deca9446401facc4703eceef64b33b blender-2.28a.ebuild 1997
diff --git a/media-gfx/blender/blender-2.28c.ebuild b/media-gfx/blender/blender-2.28c.ebuild
index 9597c3d5c444..ac8ead1f606c 100644
--- a/media-gfx/blender/blender-2.28c.ebuild
+++ b/media-gfx/blender/blender-2.28c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.28c.ebuild,v 1.2 2003/10/11 17:28:26 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.28c.ebuild,v 1.3 2003/12/04 04:55:30 lu_zero Exp $
 
 inherit flag-o-matic
 replace-flags -march=pentium4 -march=pentium3
@@ -15,7 +15,7 @@ SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2 | BL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND="virtual/x11
 	blender-game? ( dev-games/ode )
diff --git a/media-gfx/blender/blender-2.31.ebuild b/media-gfx/blender/blender-2.31.ebuild
new file mode 100644
index 000000000000..1e41b9f09969
--- /dev/null
+++ b/media-gfx/blender/blender-2.31.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.31.ebuild,v 1.1 2003/12/04 04:55:30 lu_zero Exp $
+
+inherit flag-o-matic
+replace-flags -march=pentium4 -march=pentium3
+
+IUSE="sdl jpeg png mozilla truetype static"
+#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="~x86 ~ppc ~amd64"
+
+DEPEND="virtual/x11
+	blender-game? ( dev-games/ode )
+	sdl? ( media-libs/libsdl )
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	mozilla? ( net-www/mozilla )
+	truetype? ( >=freetype-2.0 )
+	fmod? ( media-libs/fmod )
+	>=media-libs/openal-20020127
+	>=media-libs/libsdl-1.2
+	>=media-libs/libvorbis-1.0
+	>=dev-libs/openssl-0.9.6"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/configure-fix-${PV}.patch
+}
+
+
+src_compile() {
+	local myconf=""
+
+	# 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 && myconf="${myconf} --enable-gameblender"
+
+	# Build the plugin (Will fail, requires gameblender)
+	# use blender-plugin && myconf="${myconf} --enable-blenderplugin"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+}
diff --git a/media-gfx/blender/files/configure-fix-2.31.patch b/media-gfx/blender/files/configure-fix-2.31.patch
new file mode 100644
index 000000000000..881ccd311a91
--- /dev/null
+++ b/media-gfx/blender/files/configure-fix-2.31.patch
@@ -0,0 +1,21 @@
+--- blender-2.30/configure.old	2003-11-06 01:59:54.000000000 -0500
++++ blender-2.30/configure	2003-11-06 02:03:08.000000000 -0500
+@@ -21431,8 +21431,8 @@
+            with_mozilla =$withval
+         fi
+         if test x$with_mozilla != "yes"; then
+-           LDFLAGS="$LDFLAGS -L$withval/lib/mozilla-$MOZVER -lnspr"
+-           CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla-$MOZVER/nspr"
++           LDFLAGS="$LDFLAGS -L$withval/lib/mozilla -lnspr4"
++           CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla/nspr"
+         fi
+ 
+ fi;
+@@ -25015,7 +25015,6 @@
+   fi
+ 
+ 
+-  rm -f conf.sdltest
+ 
+ 
+ echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5
diff --git a/media-gfx/blender/files/digest-blender-2.31 b/media-gfx/blender/files/digest-blender-2.31
new file mode 100644
index 000000000000..7d2670e2e05c
--- /dev/null
+++ b/media-gfx/blender/files/digest-blender-2.31
@@ -0,0 +1 @@
+MD5 179dea9a56c520582bf56c9a9c4d3bf9 blender-2.31.tar.bz2 4546274