preliminary ebuild and fixes

(Portage version: 2.1.1_pre2-r1)

5 files changed, 137 insertions, 4 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index ab8f2903c5a1..bc8e939ccd14 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.84 2006/07/03 13:56:39 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.85 2006/07/03 21:29:31 lu_zero Exp $
+
+*blender-2.42_pre20060703 (03 Jul 2006)
+
+  03 Jul 2006; Luca Barbato <lu_zero@gentoo.org> blender-2.41.ebuild,
+  +blender-2.42_pre20060703.ebuild:
+  pre ebuild, just to test and some fixes on the blender-2.41 ebuild
 
 *blender-2.41 (03 Jul 2006)
 
diff --git a/media-gfx/blender/blender-2.41-r1.ebuild b/media-gfx/blender/blender-2.41-r1.ebuild
index 87840d83384a..3e574b44b913 100644
--- a/media-gfx/blender/blender-2.41-r1.ebuild
+++ b/media-gfx/blender/blender-2.41-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.41-r1.ebuild,v 1.5 2006/06/30 17:04:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.41-r1.ebuild,v 1.6 2006/07/03 21:29:31 lu_zero Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.blender.org/source/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="~amd64 ppc ppc64 ~sparc x86"
 
 RDEPEND="media-libs/libsdl
 	media-libs/jpeg
diff --git a/media-gfx/blender/blender-2.41.ebuild b/media-gfx/blender/blender-2.41.ebuild
index 186d4e23de90..35d98f887d93 100644
--- a/media-gfx/blender/blender-2.41.ebuild
+++ b/media-gfx/blender/blender-2.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.41.ebuild,v 1.5 2006/07/03 13:56:39 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.41.ebuild,v 1.6 2006/07/03 21:29:31 lu_zero Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -21,6 +21,7 @@ RDEPEND="media-libs/libsdl
 	media-libs/tiff
 	>=media-libs/freetype-2.0
 	!=media-libs/openal-0.0.8
+	media-libs/openal
 	>=media-libs/libsdl-1.2
 	>=media-libs/libvorbis-1.0
 	>=dev-libs/openssl-0.9.6
diff --git a/media-gfx/blender/blender-2.42_pre20060703.ebuild b/media-gfx/blender/blender-2.42_pre20060703.ebuild
new file mode 100644
index 000000000000..d5b39c9b56f0
--- /dev/null
+++ b/media-gfx/blender/blender-2.42_pre20060703.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.42_pre20060703.ebuild,v 1.1 2006/07/03 21:29:31 lu_zero Exp $
+
+inherit multilib flag-o-matic eutils python
+
+#IUSE="sdl jpeg png mozilla truetype static fmod"
+IUSE="openal sdl openexr ffmpeg jpeg png nls iconv blender-game ode"
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org/"
+#SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+#KEYWORDS="~amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="-*"
+
+RDEPEND="
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	media-libs/tiff
+	nls? ( >=media-libs/freetype-2.0
+			 virtual/gettext )
+	iconv? ( virtual/libiconv )
+	openal? ( ~media-libs/openal-0.0.8
+			   media-libs/freealut )
+	sdl? ( >=media-libs/libsdl-1.2 )
+	ffmpeg? ( media-video/ffmpeg )
+	>=dev-libs/openssl-0.9.6
+	>=media-gfx/yafray-0.0.7
+	nls? ( >=media-libs/ftgl-2.1 )
+	openexr? ( media-libs/openexr )
+	ode? ( dev-games/ode )
+	virtual/opengl"
+
+DEPEND="=dev-util/scons-0.96.1
+	|| ( x11-libs/libXt virtual/x11 )
+	${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+
+blend_with() {
+local UWORD="$2"
+	if [ -z "${UWORD}" ]; then
+		UWORD="$1"
+	fi
+
+	if useq $1; then
+		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]'
+	else
+		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]'
+	fi
+
+return 0
+}
+
+src_unpack() {
+	unpack ${A}
+	mkdir ${WORKDIR}/install/linux2/plugins/
+	chmod 755 bmake
+#	rm -fR include
+	cp -pPR ${S}/source/blender/blenpluginapi include
+	cd ${S}
+	epatch ${FILESDIR}/blender-2.37-dirs.patch
+#	mkdir -p ${WORKDIR}/build/linux2/{extern,intern,source}
+}
+
+
+src_compile() {
+	local myconf=""
+
+	myconf="${myconf} $(blend_with openal)"
+	myconf="${myconf} $(blend_with sdl)"
+	myconf="${myconf} $(blend_with openexr)"
+	myconf="${myconf} $(blend_with ffmpeg)"
+	myconf="${myconf} $(blend_with jpeg)"
+	myconf="${myconf} $(blend_with png)"
+	myconf="${myconf} $(blend_with nls international)"
+	myconf="${myconf} $(blend_with iconv)"
+	myconf="${myconf} $(blend_with blender-game gameengine)"
+	myconf="${myconf} $(blend_with ode)"
+
+	scons ${MAKEOPTS} ${myconf} \
+			WITH_BF_PLAYER=0
+
+#	sed -i -e "s/-O2/${CFLAGS// /\' ,\'}/g" ${S}/SConstruct
+#	scons ${MAKEOPTS} || die
+#	cd ${S}/release/plugins
+#	emake || die
+
+}
+
+src_install() {
+	exeinto /usr/bin/
+	doexe ${WORKDIR}/install/linux2/blender
+
+	exeinto /usr/$(get_libdir)/${PN}/textures
+	doexe ${WORKDIR}/install/linux2/plugins/texture/*.so
+	exeinto /usr/$(get_libdir)/${PN}/sequences
+	doexe ${WORKDIR}/install/linux2/plugins/sequence/*.so
+	cp -pPR ${S}/install/linux2/plugins \
+		${D}/usr/$(get_libdir)/${PN}
+	use nls && \
+	cp -pPR ${WORKDIR}/install/linux2/.blender/* \
+		${D}/usr/$(get_libdir)/${PN}
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/${PN}.png
+	insinto /usr/share/applications
+	doins ${FILESDIR}/${PN}.desktop
+
+	dodoc COPYING INSTALL README
+
+}
+
+pkg_preinst(){
+	if [ -h "/usr/$(get_libdir)/blender/plugins/include" ];
+	then
+		rm -f /usr/$(get_libdir)/blender/plugins/include
+	fi
+}
diff --git a/media-gfx/blender/files/digest-blender-2.42_pre20060703 b/media-gfx/blender/files/digest-blender-2.42_pre20060703
new file mode 100644
index 000000000000..5c6c32f2abc2
--- /dev/null
+++ b/media-gfx/blender/files/digest-blender-2.42_pre20060703
@@ -0,0 +1,3 @@
+MD5 665e4c03ae07122986f370a3bd6fd0d2 blender-2.42_pre20060703.tar.bz2 10334584
+RMD160 14167584240e553f9d546071b280394766add8c5 blender-2.42_pre20060703.tar.bz2 10334584
+SHA256 90a5e714626b4bf9052a432bde591cb1af2a24f130c782f4ff48f479fdeb449f blender-2.42_pre20060703.tar.bz2 10334584