2.27 bumped to stable, 2.28c minor fixes

5 files changed, 69 insertions, 34 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 23f314bf98ba..083451551639 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # 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.19 2003/10/10 22:41:14 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.20 2003/10/11 17:28:26 lu_zero Exp $
+
+  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
 
   11 Oct 2003; Bart Lauwers <blauwers@gentoo.org> blender-2.28c.ebuild :
   Version bump.
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 5ff554dd61b7..877fc29db862 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,14 +1,15 @@
-MD5 2147de0c3403d352d411029cf43adef3 ChangeLog 2425
-MD5 b85001a84dca16ebd1b349e4bd715e06 blender-2.23-r1.ebuild 1098
+MD5 c9539345c6708097e324bd4fbc5cc461 ChangeLog 2582
+MD5 810e10f61ea2084db695b59e5563e533 blender-2.28c.ebuild 2185
+MD5 55deca9446401facc4703eceef64b33b blender-2.28a.ebuild 1997
 MD5 ecab9de91cc4b34b45b458106b829968 blender-2.26.ebuild 648
-MD5 ed130114bbcba0dbc4dbe9e36dc31e97 blender-2.27.ebuild 648
+MD5 24f0b24bddb729ccebaedc0374d7bb1c blender-2.27.ebuild 690
 MD5 6a812bacb0726fbad7f0c35b02ed58b1 blender-2.28.ebuild 1996
-MD5 55deca9446401facc4703eceef64b33b blender-2.28a.ebuild 1997
-MD5 ca3f94393b3ea6dd5e7c808b75537d59 blender-2.28c.ebuild 1996
+MD5 b85001a84dca16ebd1b349e4bd715e06 blender-2.23-r1.ebuild 1098
 MD5 a855ab3ef355897d6896804f54ce21bd files/blender-2.12 36
+MD5 21158d7f37f745ab78dcb437e3f5fac7 files/digest-blender-2.28 66
 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 6534f3035e2370d87c8c3cb943c5a119 files/digest-blender-2.26 66
 MD5 f22dcdbc692118213454a8c31bc459ff files/digest-blender-2.28a 67
 MD5 aacb0f08e5496b93ec12751242c0a9ab files/digest-blender-2.28c 67
+MD5 b5356307d35d0bfe73149428cafe23ff files/configure-fix.patch 754
diff --git a/media-gfx/blender/blender-2.27.ebuild b/media-gfx/blender/blender-2.27.ebuild
index 2d3912136150..6816c9a0c856 100644
--- a/media-gfx/blender/blender-2.27.ebuild
+++ b/media-gfx/blender/blender-2.27.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.27.ebuild,v 1.2 2003/05/27 12:49:27 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.27.ebuild,v 1.3 2003/10/11 17:28:26 lu_zero Exp $
 
 inherit flag-o-matic
 replace-flags -march=pentium4 -march=pentium3
@@ -14,13 +14,13 @@ 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
-	>=openal-20020127
-	>=libsdl-1.2
-	>=libvorbis-1.0
-	>=openssl-0.9.6"
+	>=media-libs/openal-20020127
+	>=media-libs/libsdl-1.2
+	>=media-libs/libvorbis-1.0
+	>=dev-libs/openssl-0.9.6"
 
 
 src_install() {
diff --git a/media-gfx/blender/blender-2.28c.ebuild b/media-gfx/blender/blender-2.28c.ebuild
index db4fabc6a4b9..9597c3d5c444 100644
--- a/media-gfx/blender/blender-2.28c.ebuild
+++ b/media-gfx/blender/blender-2.28c.ebuild
@@ -1,11 +1,12 @@
 # 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.1 2003/10/10 22:41:14 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.28c.ebuild,v 1.2 2003/10/11 17:28:26 lu_zero Exp $
 
 inherit flag-o-matic
 replace-flags -march=pentium4 -march=pentium3
 
-IUSE=""
+IUSE="sdl jpeg png mozilla truetype static"
+#IUSE="${IUSE} blender-game blender-static blender-plugin"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="3D Creation/Animation/Publishing System"
@@ -24,10 +25,16 @@ DEPEND="virtual/x11
 	mozilla? ( net-www/mozilla )
 	truetype? ( >=freetype-2.0 )
 	fmod? ( media-libs/fmod )
-	>=openal-20020127
-	>=libsdl-1.2
-	>=libvorbis-1.0
-	>=openssl-0.9.6"
+	>=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.patch
+}
+
 
 src_compile() {
 	local myconf=""
@@ -52,10 +59,10 @@ src_compile() {
 
 	# ./configure points at the wrong mozilla directories and will fail
 	# with this enabled. (A simple patch should take care of this)
-	#if [ -n "`use mozilla`" ]
-	#then
-	#	myconf="${myconf} --with-mozilla=/usr"
-	#fi
+	if [ -n "`use mozilla`" ]
+	then
+		myconf="${myconf} --with-mozilla=/usr"
+	fi
 
 	# TrueType support (For text objects)
 	if [ -n "`use truetype`" ]
@@ -64,22 +71,22 @@ src_compile() {
 	fi
 
 	# Build Staticly
-	if [ -n "`use blender-static`" ]
+	if [ -n "`use static`" ]
 	then
 		myconf="${myconf} --enable-blenderstatic"
 	fi
 
 	# Build the game engine (Fails in 2.28)
-	if [ -n "`use blender-game`" ]
-	then
-		myconf="${myconf} --enable-gameblender"
-	fi
+	#if [ -n "`use blender-game`" ]
+	#then
+	#	myconf="${myconf} --enable-gameblender"
+	#fi
 
-	# Build the plugin (Will probably fail, especially without mozilla)
-	if [ -n "`use blender-plugin`" ]
-	then
-		myconf="${myconf} --enable-blenderplugin"
-	fi
+	# Build the plugin (Will fail, requires gameblender)
+	#if [ -n "`use blender-plugin`" ]
+	#then
+	#	myconf="${myconf} --enable-blenderplugin"
+	#fi
 
 	econf ${myconf} || die
 	emake || die
diff --git a/media-gfx/blender/files/configure-fix.patch b/media-gfx/blender/files/configure-fix.patch
new file mode 100644
index 000000000000..5f8ea6ef1f40
--- /dev/null
+++ b/media-gfx/blender/files/configure-fix.patch
@@ -0,0 +1,23 @@
+diff -ruN blender-2.28c.orig/configure blender-2.28c/configure
+--- blender-2.28c.orig/configure	2003-10-11 18:55:18.000000000 +0200
++++ blender-2.28c/configure	2003-10-11 17:51:30.000000000 +0200
+@@ -21144,8 +21144,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;
+@@ -22030,8 +22030,6 @@
+   fi
+ 
+ 
+-  rm -f conf.sdltest
+- (1.0)
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+ CPP_FLAGS="$CFLAGS $SDL_CFLAGS"
+ LIBS="$SDL_LIBS"