version bump, minor ebuild cleanups, metadata

6 files changed, 142 insertions, 11 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 083451551639..a71975dd7729 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,16 @@
 # 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.20 2003/10/11 17:28:26 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.21 2003/11/07 14:43:25 malverian Exp $
+
+*blender-2.30 (07 Nov 2003)
+
+  07 Nov 2003; Philip Walls <malverian@gentoo.org> blender-2.30.ebuild 
+  files/configure-fix-2.30.patch metadata.xml:
+  Version bump, changed to "use foo && ..." instead of ifs. Thanks to 
+  Dan Bryant <dan@omega.blackdaemon.net> in bug #32585 for configure 
+  patch. Cleaned up ChangeLog.
+
+*blender-2.28c (11 Oct 2003)
 
   11 Oct 2003; Luca Barbato <lu_zero@gentoo.org> blender-2.28c.ebuild, 
   blender-2.27.ebuild :
@@ -9,6 +19,8 @@
   11 Oct 2003; Bart Lauwers <blauwers@gentoo.org> blender-2.28c.ebuild :
   Version bump.
 
+*blender-2.28a (26 Jul 2003)
+
   30 Sep 2003; Michael Sterrett <mr_bones_@gentoo.org> blender-2.28.ebuild,
   blender-2.28a.ebuild:
   Massive whitespace cleanup
@@ -19,16 +31,17 @@
   26 Jul 2003; Luca Barbato <lu_zero@gentoo.org> blender-2.28.ebuild :
   Version bump.
 
-  27 May 2003; Hanno Boeck <hanno@gentoo.org> blender-2.26.ebuild,
-  blender-2.27.ebuild:
-  Changed license, it must be GPL-2 or BL, not both.
-
 *blender-2.27 (25 May 2003)
+
   25 May 2003; Thomas Raschbacher <lordvan@gentoo.org> blender-2.27.ebuild:
   Version bump
 	
 *blender-2.26 (12 Feb 2003)
 
+  27 May 2003; Hanno Boeck <hanno@gentoo.org> blender-2.26.ebuild,
+  blender-2.27.ebuild:
+  Changed license, it must be GPL-2 or BL, not both.
+
   18 Apr 2003; Philip Walls <malverian@gentoo.org> blender-2.26.ebuild :
   Strip Pentium4 -march flag. Fixes bug #19526
 
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 877fc29db862..8994f8737514 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,15 +1,17 @@
 MD5 c9539345c6708097e324bd4fbc5cc461 ChangeLog 2582
-MD5 810e10f61ea2084db695b59e5563e533 blender-2.28c.ebuild 2185
-MD5 55deca9446401facc4703eceef64b33b blender-2.28a.ebuild 1997
+MD5 b85001a84dca16ebd1b349e4bd715e06 blender-2.23-r1.ebuild 1098
 MD5 ecab9de91cc4b34b45b458106b829968 blender-2.26.ebuild 648
 MD5 24f0b24bddb729ccebaedc0374d7bb1c blender-2.27.ebuild 690
 MD5 6a812bacb0726fbad7f0c35b02ed58b1 blender-2.28.ebuild 1996
-MD5 b85001a84dca16ebd1b349e4bd715e06 blender-2.23-r1.ebuild 1098
+MD5 55deca9446401facc4703eceef64b33b blender-2.28a.ebuild 1997
+MD5 810e10f61ea2084db695b59e5563e533 blender-2.28c.ebuild 2185
+MD5 810e10f61ea2084db695b59e5563e533 blender-2.30.ebuild 2185
 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 723758c1783633a74f493588a2913b46 files/digest-blender-2.27 66
 MD5 6534f3035e2370d87c8c3cb943c5a119 files/digest-blender-2.26 66
+MD5 723758c1783633a74f493588a2913b46 files/digest-blender-2.27 66
+MD5 0a3c7feca1dacd93c177f383e9d741b8 files/configure-fix.patch 750
+MD5 21158d7f37f745ab78dcb437e3f5fac7 files/digest-blender-2.28 66
 MD5 f22dcdbc692118213454a8c31bc459ff files/digest-blender-2.28a 67
 MD5 aacb0f08e5496b93ec12751242c0a9ab files/digest-blender-2.28c 67
-MD5 b5356307d35d0bfe73149428cafe23ff files/configure-fix.patch 754
+MD5 edbe7fddec312f94a65155ba4303398a files/digest-blender-2.30 66
diff --git a/media-gfx/blender/blender-2.30.ebuild b/media-gfx/blender/blender-2.30.ebuild
new file mode 100644
index 000000000000..0b6163211f62
--- /dev/null
+++ b/media-gfx/blender/blender-2.30.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.30.ebuild,v 1.1 2003/11/07 14:43:25 malverian 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"
+
+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.30.patch b/media-gfx/blender/files/configure-fix-2.30.patch
new file mode 100644
index 000000000000..881ccd311a91
--- /dev/null
+++ b/media-gfx/blender/files/configure-fix-2.30.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.30 b/media-gfx/blender/files/digest-blender-2.30
new file mode 100644
index 000000000000..d42c9c7625e0
--- /dev/null
+++ b/media-gfx/blender/files/digest-blender-2.30
@@ -0,0 +1 @@
+MD5 6e413db3bdd6208ad47c35b66ce1fe58 blender-2.30.tar.bz2 4925781
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
new file mode 100644
index 000000000000..df1e956a3be3
--- /dev/null
+++ b/media-gfx/blender/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+
+	<herd>gfx-3d</herd>
+
+	<maintainer>
+		<email>malverian@gentoo.org</email>
+		<name>Philip Walls</name>
+	</maintainer>
+
+	<maintainer>
+		<email>lu_zero@gentoo.org</email>
+		<name>Luca Barbato</name>
+	</maintainer>
+
+	<longdescription>Blender, the open source software for 3D modeling, animation, rendering, post-production, interactive creation and playback. Available for Windows, Linux, Irix, Sun Solaris, FreeBSD or Mac OS X.</longdescription>
+
+</pkgmetadata>