Marked x86 and ppc

13 files changed, 21 insertions, 381 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 7e1d3b018b83..372448972060 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,13 @@
 # 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.41 2004/08/08 23:39:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.42 2004/10/28 06:50:26 lu_zero Exp $
+
+  28 Oct 2004; Luca Barbato <lu_zero@gentoo.org> -blender-2.23-r1.ebuild,
+  -blender-2.26.ebuild, -blender-2.27.ebuild, -blender-2.28.ebuild,
+  -blender-2.28a.ebuild, -blender-2.28c.ebuild, blender-2.30.ebuild,
+  blender-2.31.ebuild, blender-2.31a.ebuild, blender-2.32.ebuild,
+  blender-2.33a.ebuild, blender-2.34.ebuild:
+  Marked x86 and ppc, global cleanup
 
   09 Aug 2004; Luca Barbato <lu_zero@gentoo.org> blender-2.34.ebuild:
   Forcing blender-game, otherwise blender won't build
diff --git a/media-gfx/blender/blender-2.23-r1.ebuild b/media-gfx/blender/blender-2.23-r1.ebuild
deleted file mode 100644
index d6638a04a3df..000000000000
--- a/media-gfx/blender/blender-2.23-r1.ebuild
+++ /dev/null
@@ -1,34 +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.23-r1.ebuild,v 1.6 2004/06/24 22:33:42 agriffis Exp $
-
-S=${WORKDIR}/blender-creator-${PV}-linux-glibc2.1.2-i386
-DESCRIPTION="Extremely fast and versatile 3D rendering package"
-SRC_URI="http://www.download.blender.pl/mirror/blender-creator-${PV}-linux-glibc2.1.2-i386.tar.gz http://www.download.blender.pl/mirror/manual_1.5.zip"
-HOMEPAGE="http://www.blender.org"
-
-SLOT="0"
-LICENSE="blender"
-KEYWORDS="x86 -ppc -sparc "
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/x11
-		sys-libs/lib-compat"
-
-src_install () {
-	dodir /opt
-	cd ${D}/opt
-	tar xzf ${DISTDIR}/blender-creator-${PV}-linux-glibc2.1.2-i386.tar.gz
-	mv blender-creator-${PV}-linux-glibc2.1.2-i386 blender-${PV}
-	dodir /usr/share/doc/${P}
-	cd ${D}/usr/share/doc/${P}
-	unzip ${DISTDIR}/manual_1.5.zip
-	mv manual_1.5 html
-	insinto /usr/bin
-	insopts -m755
-	newins ${FILESDIR}/${P} blender
-	dodir /usr/bin
-	dosym /opt/blender-${PV}/blender /usr/bin/blender
-
-	dodoc README
-}
diff --git a/media-gfx/blender/blender-2.26.ebuild b/media-gfx/blender/blender-2.26.ebuild
deleted file mode 100644
index dc30c4ac4da4..000000000000
--- a/media-gfx/blender/blender-2.26.ebuild
+++ /dev/null
@@ -1,28 +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.26.ebuild,v 1.7 2004/06/24 22:33:42 agriffis Exp $
-
-inherit flag-o-matic
-replace-flags -march=pentium4 -march=pentium3
-
-IUSE=""
-
-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
-	>=media-libs/openal-20020127
-	>=media-libs/libsdl-1.2
-	>=media-libs/libvorbis-1.0
-	>=dev-libs/openssl-0.9.6"
-
-
-src_install() {
-	einstall || die
-}
diff --git a/media-gfx/blender/blender-2.27.ebuild b/media-gfx/blender/blender-2.27.ebuild
deleted file mode 100644
index 142224d5d191..000000000000
--- a/media-gfx/blender/blender-2.27.ebuild
+++ /dev/null
@@ -1,28 +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.27.ebuild,v 1.5 2004/06/24 22:33:42 agriffis Exp $
-
-inherit flag-o-matic
-replace-flags -march=pentium4 -march=pentium3
-
-IUSE=""
-
-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
-	>=media-libs/openal-20020127
-	>=media-libs/libsdl-1.2
-	>=media-libs/libvorbis-1.0
-	>=dev-libs/openssl-0.9.6"
-
-
-src_install() {
-	einstall || die
-}
diff --git a/media-gfx/blender/blender-2.28.ebuild b/media-gfx/blender/blender-2.28.ebuild
deleted file mode 100644
index 77c70dff0f95..000000000000
--- a/media-gfx/blender/blender-2.28.ebuild
+++ /dev/null
@@ -1,90 +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.28.ebuild,v 1.6 2004/06/24 22:33:42 agriffis Exp $
-
-inherit flag-o-matic
-replace-flags -march=pentium4 -march=pentium3
-
-IUSE=""
-
-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_compile() {
-	local myconf=""
-
-	# SDL Support
-	if use sdl
-	then
-		myconf="${myconf} --with-sdl=/usr"
-	fi
-
-	# JPG Support (Should be there by default, but I'll put it in anyways)
-	if use jpeg
-	then
-		myconf="${myconf} --with-libjpeg=/usr"
-	fi
-
-	# PNG Support (Same as above)
-	if use png
-	then
-		myconf="${myconf} --with-libpng=/usr"
-	fi
-
-	# ./configure points at the wrong mozilla directories and will fail
-	# with this enabled. (A simple patch should take care of this)
-	#if use mozilla
-	#then
-	#	myconf="${myconf} --with-mozilla=/usr"
-	#fi
-
-	# TrueType support (For text objects)
-	if use truetype
-	then
-		myconf="${myconf} --with-freetype2=/usr"
-	fi
-
-	# Build Staticly
-	if use blender-static
-	then
-		myconf="${myconf} --enable-blenderstatic"
-	fi
-
-	# Build the game engine (Fails in 2.28)
-	if use blender-game
-	then
-		myconf="${myconf} --enable-gameblender"
-	fi
-
-	# Build the plugin (Will probably fail, especially without mozilla)
-	if use blender-plugin
-	then
-		myconf="${myconf} --enable-blenderplugin"
-	fi
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-}
diff --git a/media-gfx/blender/blender-2.28a.ebuild b/media-gfx/blender/blender-2.28a.ebuild
deleted file mode 100644
index b1d5b74313b4..000000000000
--- a/media-gfx/blender/blender-2.28a.ebuild
+++ /dev/null
@@ -1,90 +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.28a.ebuild,v 1.5 2004/06/24 22:33:42 agriffis Exp $
-
-inherit flag-o-matic
-replace-flags -march=pentium4 -march=pentium3
-
-IUSE=""
-
-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_compile() {
-	local myconf=""
-
-	# SDL Support
-	if use sdl
-	then
-		myconf="${myconf} --with-sdl=/usr"
-	fi
-
-	# JPG Support (Should be there by default, but I'll put it in anyways)
-	if use jpeg
-	then
-		myconf="${myconf} --with-libjpeg=/usr"
-	fi
-
-	# PNG Support (Same as above)
-	if use png
-	then
-		myconf="${myconf} --with-libpng=/usr"
-	fi
-
-	# ./configure points at the wrong mozilla directories and will fail
-	# with this enabled. (A simple patch should take care of this)
-	#if use mozilla
-	#then
-	#	myconf="${myconf} --with-mozilla=/usr"
-	#fi
-
-	# TrueType support (For text objects)
-	if use truetype
-	then
-		myconf="${myconf} --with-freetype2=/usr"
-	fi
-
-	# Build Staticly
-	if use blender-static
-	then
-		myconf="${myconf} --enable-blenderstatic"
-	fi
-
-	# Build the game engine (Fails in 2.28)
-	if use blender-game
-	then
-		myconf="${myconf} --enable-gameblender"
-	fi
-
-	# Build the plugin (Will probably fail, especially without mozilla)
-	if use blender-plugin
-	then
-		myconf="${myconf} --enable-blenderplugin"
-	fi
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-}
diff --git a/media-gfx/blender/blender-2.28c.ebuild b/media-gfx/blender/blender-2.28c.ebuild
deleted file mode 100644
index 5e00828ca896..000000000000
--- a/media-gfx/blender/blender-2.28c.ebuild
+++ /dev/null
@@ -1,97 +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.28c.ebuild,v 1.8 2004/07/19 21:57:28 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-static 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.patch
-}
-
-
-src_compile() {
-	local myconf=""
-
-	# SDL Support
-	if use sdl
-	then
-		myconf="${myconf} --with-sdl=/usr"
-	fi
-
-	# JPG Support (Should be there by default, but I'll put it in anyways)
-	if use jpeg
-	then
-		myconf="${myconf} --with-libjpeg=/usr"
-	fi
-
-	# PNG Support (Same as above)
-	if use png
-	then
-		myconf="${myconf} --with-libpng=/usr"
-	fi
-
-	# ./configure points at the wrong mozilla directories and will fail
-	# with this enabled. (A simple patch should take care of this)
-	if use mozilla
-	then
-		myconf="${myconf} --with-mozilla=/usr"
-	fi
-
-	# TrueType support (For text objects)
-	if use truetype
-	then
-		myconf="${myconf} --with-freetype2=/usr"
-	fi
-
-	# Build Staticly
-	if use static
-	then
-		myconf="${myconf} --enable-blenderstatic"
-	fi
-
-	# Build the game engine (Fails in 2.28)
-	#if use blender-game
-	#then
-	#	myconf="${myconf} --enable-gameblender"
-	#fi
-
-	# Build the plugin (Will fail, requires gameblender)
-	#if use blender-plugin
-	#then
-	#	myconf="${myconf} --enable-blenderplugin"
-	#fi
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-}
diff --git a/media-gfx/blender/blender-2.30.ebuild b/media-gfx/blender/blender-2.30.ebuild
index fabb1930ca8c..2aa5e48c6222 100644
--- a/media-gfx/blender/blender-2.30.ebuild
+++ b/media-gfx/blender/blender-2.30.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2004/06/24 22:33:42 agriffis Exp $
+# $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
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.blender.org/"
 SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
 
 SLOT="0"
-LICENSE="GPL-2 | BL"
+LICENSE="|| (GPL-2 BL)"
 KEYWORDS="~x86 ~ppc"
 
 DEPEND="virtual/x11
diff --git a/media-gfx/blender/blender-2.31.ebuild b/media-gfx/blender/blender-2.31.ebuild
index 9d94214b3eba..5441d8dd2eca 100644
--- a/media-gfx/blender/blender-2.31.ebuild
+++ b/media-gfx/blender/blender-2.31.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2004/06/24 22:33:42 agriffis Exp $
+# $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
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.blender.org/"
 SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
 
 SLOT="0"
-LICENSE="GPL-2 | BL"
+LICENSE="|| (GPL-2 BL)"
 KEYWORDS="~x86 ~ppc"
 
 DEPEND="virtual/x11
diff --git a/media-gfx/blender/blender-2.31a.ebuild b/media-gfx/blender/blender-2.31a.ebuild
index c809bc089da9..bb40c54fcd92 100644
--- a/media-gfx/blender/blender-2.31a.ebuild
+++ b/media-gfx/blender/blender-2.31a.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2004/06/24 22:33:42 agriffis Exp $
+# $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
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.blender.org/"
 SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
 
 SLOT="0"
-LICENSE="GPL-2 | BL"
+LICENSE="|| (GPL-2 BL)"
 KEYWORDS="~x86 ~ppc"
 
 DEPEND="virtual/x11
diff --git a/media-gfx/blender/blender-2.32.ebuild b/media-gfx/blender/blender-2.32.ebuild
index fe3c15056362..f265416fad22 100644
--- a/media-gfx/blender/blender-2.32.ebuild
+++ b/media-gfx/blender/blender-2.32.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2004/06/24 22:33:42 agriffis Exp $
+# $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
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.blender.org/"
 SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
 
 SLOT="0"
-LICENSE="GPL-2 | BL"
+LICENSE="|| (GPL-2 BL)"
 KEYWORDS="~x86 ~ppc ~amd64"
 
 DEPEND="virtual/x11
diff --git a/media-gfx/blender/blender-2.33a.ebuild b/media-gfx/blender/blender-2.33a.ebuild
index 583cb0bffe5c..b3fd25a8017f 100644
--- a/media-gfx/blender/blender-2.33a.ebuild
+++ b/media-gfx/blender/blender-2.33a.ebuild
@@ -1,6 +1,6 @@
 # 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.33a.ebuild,v 1.5 2004/08/08 15:20:57 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.33a.ebuild,v 1.6 2004/10/28 06:50:26 lu_zero Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.blender.org/source/${P}.tar.bz2
 		 http://download.blender.org/source/${P}-gcc34.patch.bz2"
 
 SLOT="0"
-LICENSE="GPL-2 | BL"
+LICENSE="||(GPL-2 BL)"
 KEYWORDS="~ppc ~x86 ~amd64"
 
 RDEPEND="virtual/x11
diff --git a/media-gfx/blender/blender-2.34.ebuild b/media-gfx/blender/blender-2.34.ebuild
index 8250c98cd442..63f355ca729d 100644
--- a/media-gfx/blender/blender-2.34.ebuild
+++ b/media-gfx/blender/blender-2.34.ebuild
@@ -1,6 +1,6 @@
 # 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.34.ebuild,v 1.2 2004/08/08 23:39:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.34.ebuild,v 1.3 2004/10/28 06:50:26 lu_zero Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,8 +13,8 @@ HOMEPAGE="http://www.blender.org/"
 SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
 
 SLOT="0"
-LICENSE="GPL-2 | BL"
-KEYWORDS="~ppc ~x86 ~amd64"
+LICENSE="|| (GPL-2 BL)"
+KEYWORDS="ppc x86 ~amd64"
 
 RDEPEND="virtual/x11
 	media-libs/libsdl