New revision and some cleanups
authorLuca Barbato <lu_zero@gentoo.org>
Mon, 3 Jan 2005 12:41:13 +0000 (12:41 +0000)
committerLuca Barbato <lu_zero@gentoo.org>
Mon, 3 Jan 2005 12:41:13 +0000 (12:41 +0000)
23 files changed:
media-gfx/blender/ChangeLog
media-gfx/blender/Manifest
media-gfx/blender/blender-2.30.ebuild [deleted file]
media-gfx/blender/blender-2.31.ebuild [deleted file]
media-gfx/blender/blender-2.31a.ebuild [deleted file]
media-gfx/blender/blender-2.32.ebuild [deleted file]
media-gfx/blender/blender-2.34-r1.ebuild
media-gfx/blender/blender-2.34.ebuild
media-gfx/blender/blender-2.35.ebuild
media-gfx/blender/blender-2.36-r1.ebuild [moved from media-gfx/blender/blender-2.33a.ebuild with 54% similarity]
media-gfx/blender/blender-2.36.ebuild
media-gfx/blender/files/blender-2.12 [deleted file]
media-gfx/blender/files/blender-2.31a-plugins.patch [deleted file]
media-gfx/blender/files/blender-2.36-dirs.patch [new file with mode: 0644]
media-gfx/blender/files/configure-fix-2.30.patch [deleted file]
media-gfx/blender/files/configure-fix-2.31.patch [deleted file]
media-gfx/blender/files/configure-fix-2.31a.patch [deleted file]
media-gfx/blender/files/digest-blender-2.30 [deleted file]
media-gfx/blender/files/digest-blender-2.31 [deleted file]
media-gfx/blender/files/digest-blender-2.31a [deleted file]
media-gfx/blender/files/digest-blender-2.32 [deleted file]
media-gfx/blender/files/digest-blender-2.33a [deleted file]
media-gfx/blender/files/digest-blender-2.36-r1 [new file with mode: 0644]

index 9961047137d1b5cf1ebc9bc72e15e8232c6f2911..2e38683090e8cd1ab694194f840a624847dbdf4b 100644 (file)
@@ -1,6 +1,19 @@
 # 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.47 2004/12/25 02:26:49 lu_zero Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.48 2005/01/03 12:41:13 lu_zero Exp $
+
+*blender-2.36-r1 (03 Jan 2005)
+
+  03 Jan 2005; Luca Barbato <lu_zero@gentoo.org> +blender-2.36-r1.ebuild,
+  +files/blender-2.36-dirs.patch:
+  Make it use saner paths, added back plugins, scripts and internationalization
+
+  03 Jan 2005; Luca Barbato <lu_zero@gentoo.org> -files/blender-2.12,
+  -files/blender-2.31a-plugins.patch, -blender-2.33a.ebuild.
+  -files/configure-fix-2.30.patch, -files/configure-fix-2.31.patch,
+  -files/configure-fix-2.31a.patch, -blender-2.30.ebuild,
+  -blender-2.31.ebuild, -blender-2.31a.ebuild, -blender-2.32.ebuild:
+  Cleanups
 
 *blender-2.36 (25 Dec 2004)
 
   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>
+  and Tarmo TÃ\83Â\83Ã\82¤nav <sn4ip3r@estprog.ee>
 
   08 Nov 2003; Brad House <brad_mssw@gentoo.org> blender-2.30.ebuild:
   add ~amd64 flag
index ce7a3c73d37a51468a3cac053179f6262eeb580a..a84fa194e50d53630c28c95d97e5d9bbacfaca42 100644 (file)
@@ -1,29 +1,17 @@
-MD5 1532b5123e28aa86bc7794a9646b7e13 blender-2.31.ebuild 1950
-MD5 9cc53289421f3427b57ea78ccf7cbedc blender-2.31a.ebuild 2390
-MD5 2f2c600fbaa56c41b66dbb60c36187ec blender-2.34.ebuild 2819
-MD5 d4ae08b4ca947312c5bc841d9e1e155c blender-2.34-r1.ebuild 2931
-MD5 ef0b5f2396978611136337853c984f13 blender-2.36.ebuild 2929
-MD5 d524a53548cc17dfbfd5e7ae1ade0ab3 ChangeLog 6792
-MD5 3267c7d556d51e0294d693ab301d2442 blender-2.32.ebuild 2393
+MD5 66a5b30c7230910dfe5d35c16ee19763 blender-2.34.ebuild 2819
+MD5 d319a736c17f64760fe7cfcfaf4d9ba5 blender-2.34-r1.ebuild 2931
+MD5 99ad2f8fe7c190a54f498946071a613b blender-2.36.ebuild 2929
+MD5 0915c4943ae18931321bd8665bafa45e ChangeLog 7355
 MD5 d3eba695aaee4c4ce9eac27c6a7c5ad3 metadata.xml 588
-MD5 2f0e082749931dbda3aae3fe1364e05d blender-2.33a.ebuild 2875
-MD5 abb651c159fd8c1f8d2626dd3a4f1db4 blender-2.35.ebuild 2802
-MD5 c321fd097c3e92a21b2fe87d76d1ae1f blender-2.30.ebuild 1950
-MD5 a13520b8046c792869ea5cae8374f6f3 files/configure-fix-2.31a.patch 658
+MD5 b024660fd2067edc9a0415547d5f5406 blender-2.35.ebuild 2802
+MD5 3d77235defa1e5496d11db5ec99908ec blender-2.36-r1.ebuild 3191
 MD5 ef66b38c216b9ab1d78968353025116f files/digest-blender-2.34-r1 66
 MD5 705b95605426ad9d562457fdbbff5460 files/blender-2.32.patch 2562
-MD5 fc5a649e2b6bfd7b436d1db41cd1e8f4 files/digest-blender-2.31a 67
 MD5 f65e9e32429f06fd611b9902f9d7852b files/digest-blender-2.36 65
-MD5 f9d20818255d723bce691f341a34dc38 files/configure-fix-2.30.patch 655
 MD5 2fbf0a94ba625bce0c2af487d90cf7f5 files/digest-blender-2.35 66
-MD5 504960c3dfcf520f65e3d9e59c81a598 files/digest-blender-2.32 66
 MD5 b8e304980dc2bfd9a7157037d6ead44b files/blender.desktop 197
-MD5 a855ab3ef355897d6896804f54ce21bd files/blender-2.12 36
-MD5 d49beb1d5a2182b3b1f1a4c123145c96 files/configure-fix-2.31.patch 655
 MD5 ef66b38c216b9ab1d78968353025116f files/digest-blender-2.34 66
-MD5 6057638080d3c5c999219113ecf0ee6b files/blender-2.31a-plugins.patch 641
-MD5 edbe7fddec312f94a65155ba4303398a files/digest-blender-2.30 66
+MD5 ee3557021be75082093de0d643b32260 files/blender-2.36-dirs.patch 1970
+MD5 f65e9e32429f06fd611b9902f9d7852b files/digest-blender-2.36-r1 65
 MD5 d95ef10fee53b71576c6da6c8163e748 files/blender.png 2119
-MD5 64c3289608ad29370759d1c278d02a0c files/digest-blender-2.31 66
 MD5 b5356307d35d0bfe73149428cafe23ff files/configure-fix.patch 754
-MD5 63d6139e35a43b13e243f918f33b3319 files/digest-blender-2.33a 139
diff --git a/media-gfx/blender/blender-2.30.ebuild b/media-gfx/blender/blender-2.30.ebuild
deleted file mode 100644 (file)
index 2aa5e48..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.7 2004/10/28 06:50:26 lu_zero Exp $
-
-inherit flag-o-matic eutils
-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? ( >=media-libs/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/blender-2.31.ebuild b/media-gfx/blender/blender-2.31.ebuild
deleted file mode 100644 (file)
index 5441d8d..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.6 2004/10/28 06:50:26 lu_zero Exp $
-
-inherit flag-o-matic eutils
-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? ( >=media-libs/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/blender-2.31a.ebuild b/media-gfx/blender/blender-2.31a.ebuild
deleted file mode 100644 (file)
index bb40c54..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.31a.ebuild,v 1.8 2004/10/28 06:50:26 lu_zero Exp $
-
-inherit flag-o-matic eutils
-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? ( >=media-libs/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
-       epatch ${FILESDIR}/${P}-plugins.patch
-       cd ${S}/release/plugins
-       chmod 755 bmake
-}
-
-
-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
-       cd ${S}/release/plugins
-       emake || die
-
-}
-
-src_install() {
-       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.32.ebuild b/media-gfx/blender/blender-2.32.ebuild
deleted file mode 100644 (file)
index f265416..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.32.ebuild,v 1.8 2004/10/28 06:50:26 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="~x86 ~ppc ~amd64"
-
-DEPEND="virtual/x11
-       !amd64? ( blender-game? ( dev-games/ode ) )
-       sdl? ( media-libs/libsdl )
-       jpeg? ( media-libs/jpeg )
-       png? ( media-libs/libpng )
-       mozilla? ( net-www/mozilla )
-       truetype? ( >=media-libs/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
-       >=media-gfx/yafray-0.0.6"
-
-src_unpack() {
-       unpack ${A}
-       epatch ${FILESDIR}/blender-2.32.patch
-       cd ${S}/release/plugins
-       chmod 755 bmake
-}
-
-
-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
-       cd ${S}/release/plugins
-       emake || die
-
-}
-
-src_install() {
-       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*
-
-}
index b43846ae4ba7060f47f5bc7011406f1ed8dd1ed4..f2fddd8239ccafe77e8dc0ef059e2b5927c07c14 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.1 2004/12/24 14:45:31 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.34-r1.ebuild,v 1.2 2005/01/03 12:41:13 lu_zero Exp $
 
 inherit flag-o-matic eutils
 
index 63f355ca729de9121df0e1f78392bafdbb1b3046..7e650c4c68d456c25080999c9af68a181c6fdbf4 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.3 2004/10/28 06:50:26 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.34.ebuild,v 1.4 2005/01/03 12:41:13 lu_zero Exp $
 
 inherit flag-o-matic eutils
 
index dad4d1edb3803d6ddc8f931854d7640685b7e089..b96c0b538df41a1408ed7abd44228d94b81127d1 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2 2004/11/16 10:40:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.35.ebuild,v 1.3 2005/01/03 12:41:13 lu_zero Exp $
 
 inherit flag-o-matic eutils
 
similarity index 54%
rename from media-gfx/blender/blender-2.33a.ebuild
rename to media-gfx/blender/blender-2.36-r1.ebuild
index b3fd25a8017fe665da455bb8f740cda3ad9b7bbe..60fdf7d1b8454f438339b93828f43d82a0edad69 100644 (file)
@@ -1,21 +1,19 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.33a.ebuild,v 1.6 2004/10/28 06:50:26 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.36-r1.ebuild,v 1.1 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"
+IUSE="nls"  #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
-                http://download.blender.org/source/${P}-gcc34.patch.bz2"
+SRC_URI="http://download.blender.org/source/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="||(GPL-2 BL)"
-KEYWORDS="~ppc ~x86 ~amd64"
+LICENSE="|| (GPL-2 BL)"
+KEYWORDS="~ppc ~x86"
 
 RDEPEND="virtual/x11
        media-libs/libsdl
@@ -26,18 +24,22 @@ RDEPEND="virtual/x11
        >=media-libs/libsdl-1.2
        >=media-libs/libvorbis-1.0
        >=dev-libs/openssl-0.9.6
-       >=media-gfx/yafray-0.0.6"
+       >=media-gfx/yafray-0.0.6
+       nls? ( >=media-libs/ftgl-2.1 )"
 
 DEPEND="dev-util/scons
        ${RDEPEND}"
 
-
+S=${WORKDIR}/${PN}
 
 src_unpack() {
        unpack ${A}
-       epatch ${DISTDIR}/${P}-gcc34.patch.bz2
        cd ${S}/release/plugins
        chmod 755 bmake
+       rm -fR include
+       cp -a ${S}/source/blender/blenpluginapi include
+       cd ${S}
+       epatch ${FILESDIR}/${P}-dirs.patch
 }
 
 
@@ -68,50 +70,56 @@ src_compile() {
        #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 )
+#      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 = 'false':PLUGIN = 'true':" \
+#      sed -i -e "s:BUILD_BLENDER_PLUGIN.*$: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
+       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
 
+       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_2*
+       dodoc COPYING INSTALL README
 
 }
index bea63d7b113186f8e2e3fb1e7f6567b7dcbaebf5..fdd5f2d3a5a35382ddc84f1f1c06be1375c7b682 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.1 2004/12/25 02:26:49 lu_zero Exp $
+# $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
 
diff --git a/media-gfx/blender/files/blender-2.12 b/media-gfx/blender/files/blender-2.12
deleted file mode 100644 (file)
index 8f57758..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/opt/blender-2.12/blender
diff --git a/media-gfx/blender/files/blender-2.31a-plugins.patch b/media-gfx/blender/files/blender-2.31a-plugins.patch
deleted file mode 100644 (file)
index c6212e6..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- blender-2.31a.orig/release/plugins/bmake   2003-12-04 21:12:20.000000000 +1300
-+++ blender-2.31a/release/plugins/bmake        2003-12-04 21:13:12.000000000 +1300
-@@ -60,7 +60,7 @@
-       LDFLAGS="-Bshareable";
- elif ( test $UNAME = "Linux" ) then
-       CC="gcc";
--      CFLAGS="-fPIC -funsigned-char -O2";
-+#     CFLAGS="-fPIC -funsigned-char -O2";
- 
-       LD="ld";
-       LDFLAGS="-Bshareable";
-@@ -112,6 +112,8 @@
-       INCLUDES=-I..;
- elif ( test -f "../include/plugin.h" ) then
-       INCLUDES=-I../include
-+elif ( test -f "../../../source/blender/blenpluginapi/plugin.h" ) then
-+      INCLUDES=-I../../../source/blender/blenpluginapi
- else 
-       echo "Couldn't find plugin.h";
-       exit;
diff --git a/media-gfx/blender/files/blender-2.36-dirs.patch b/media-gfx/blender/files/blender-2.36-dirs.patch
new file mode 100644 (file)
index 0000000..875b0ca
--- /dev/null
@@ -0,0 +1,62 @@
+--- ./source.orig/blender/python/BPY_interface.c       2004-11-27 19:32:25.000000000 +0100
++++ ./source/blender/python/BPY_interface.c    2004-12-29 17:35:50.000000000 +0100
+@@ -1373,14 +1373,8 @@
+       if( BLI_exists( homedir ) )
+               return homedir;
+ 
+-      /* otherwise, use argv[0] (bprogname) to get .blender/ in
+-       * Blender's installation dir */
+-      s = BLI_last_slash( bprogname );
+-
+-      i = s - bprogname + 1;
+-
+-      PyOS_snprintf( bprogdir, i, bprogname );
+-      BLI_make_file_string( "/", homedir, bprogdir, ".blender/" );
++      /* otherwise, use /usr/lib/blender */
++      BLI_make_file_string( "/", homedir, "/usr/lib", "blender/" );
+ 
+       return homedir;
+ }
+--- source.orig/blender/src/language.c 2004-11-08 16:46:57.000000000 +0100
++++ source/blender/src/language.c      2005-01-02 21:25:53.302585856 +0100
+@@ -317,23 +317,30 @@
+               strcpy(name, bundlePath);
+               strcat(name, "/Contents/Resources/.Blanguages");
+ #else
+-              /* Check the CWD. Takes care of the case where users
+-               * unpack blender tarball; cd blender-dir; ./blender */
+-              strcpy(name, ".blender/.Blanguages");
+-#endif
++              /* Check the standar location. Takes care of the case 
++               * in which the distribution installs blender */
++              strcpy(name, "/usr/lib/blender/.Blanguages");
++              
+               lines= BLI_read_file_as_lines(name);
+-
++              
+               if(lines == NULL) {
+-                      /* If not found in .blender, try current dir */
+-                      strcpy(name, ".Blanguages");
++                      /* Check the CWD. Takes care of the case where users
++                       * unpack blender tarball; cd blender-dir; ./blender */
++                      strcpy(name, ".blender/.Blanguages");
++#endif
+                       lines= BLI_read_file_as_lines(name);
++
+                       if(lines == NULL) {
+-                                      error("File \".Blanguages\" not found");
+-                                      return 0;
++                              /* If not found in .blender, try current dir */
++                              strcpy(name, ".Blanguages");
++                              lines= BLI_read_file_as_lines(name);
++                              if(lines == NULL) {
++                                              error("File \".Blanguages\" not found");
++                                              return 0;
++                              }
+                       }
+               }
+       }
+-
+       for (l= lines; l; l= l->next) {
+               char *line= l->link;
+                       
diff --git a/media-gfx/blender/files/configure-fix-2.30.patch b/media-gfx/blender/files/configure-fix-2.30.patch
deleted file mode 100644 (file)
index 881ccd3..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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/configure-fix-2.31.patch b/media-gfx/blender/files/configure-fix-2.31.patch
deleted file mode 100644 (file)
index 25a2ea0..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
---- blender-2.31/configure.old 2003-11-06 01:59:54.000000000 -0500
-+++ blender-2.31/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/configure-fix-2.31a.patch b/media-gfx/blender/files/configure-fix-2.31a.patch
deleted file mode 100644 (file)
index 1ec9190..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
---- blender-2.31a.orig/configure       2003-12-04 23:47:25.000000000 +1300
-+++ blender-2.31a/configure    2003-12-04 23:49:54.000000000 +1300
-@@ -22221,8 +22221,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;
-@@ -26002,7 +26002,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
deleted file mode 100644 (file)
index d42c9c7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e413db3bdd6208ad47c35b66ce1fe58 blender-2.30.tar.bz2 4925781
diff --git a/media-gfx/blender/files/digest-blender-2.31 b/media-gfx/blender/files/digest-blender-2.31
deleted file mode 100644 (file)
index 7d2670e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 179dea9a56c520582bf56c9a9c4d3bf9 blender-2.31.tar.bz2 4546274
diff --git a/media-gfx/blender/files/digest-blender-2.31a b/media-gfx/blender/files/digest-blender-2.31a
deleted file mode 100644 (file)
index e9edd6a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 834d9236b233951d854b02f7cd3721fb blender-2.31a.tar.bz2 4540160
diff --git a/media-gfx/blender/files/digest-blender-2.32 b/media-gfx/blender/files/digest-blender-2.32
deleted file mode 100644 (file)
index d2cc057..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ebde5f573e19b7b8b64401d293c989e7 blender-2.32.tar.bz2 5661028
diff --git a/media-gfx/blender/files/digest-blender-2.33a b/media-gfx/blender/files/digest-blender-2.33a
deleted file mode 100644 (file)
index f5f9639..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 987aafbbca4c13a648516fbd35caac08 blender-2.33a.tar.bz2 5129415
-MD5 2816aeb104788bec8d7844f95bbd2269 blender-2.33a-gcc34.patch.bz2 1842
diff --git a/media-gfx/blender/files/digest-blender-2.36-r1 b/media-gfx/blender/files/digest-blender-2.36-r1
new file mode 100644 (file)
index 0000000..bd39cfb
--- /dev/null
@@ -0,0 +1 @@
+MD5 8e2237c86b12e6061935632495aec875 blender-2.36.tar.gz 6912828