Reverted amd64 keywords for all versions prior to 2.32. Added !amd64() construct for dev-games/ode.

6 files changed, 32 insertions, 28 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 87c9900ee8f0..64be052c0a09 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.28 2004/02/18 09:30:29 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.29 2004/03/07 22:47:12 avenj Exp $
+
+  07 Mar 2004; Jon Portnoy <avenj@gentoo.org> :
+  Removed AMD64 keywords from all versions prior to 2.32. 
+  Added !amd64() contruct for dev-games/ode.
 
   18 Feb 2004; <augustus@gentoo.org> blender-2.32.ebuild:
   Made 2.32 testing ~amd64.
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 8bab70d011db..8dc98682d4e9 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,31 +1,31 @@
+MD5 5f43f168c252485de87e0f5b35e1be4d ChangeLog 4261
 MD5 b85001a84dca16ebd1b349e4bd715e06 blender-2.23-r1.ebuild 1098
-MD5 677ebfa2d4e274aad4330a516c2f1663 blender-2.30.ebuild 1947
 MD5 ecab9de91cc4b34b45b458106b829968 blender-2.26.ebuild 648
-MD5 f9d20818255d723bce691f341a34dc38 files/configure-fix-2.30.patch 655
+MD5 24f0b24bddb729ccebaedc0374d7bb1c blender-2.27.ebuild 690
+MD5 6a812bacb0726fbad7f0c35b02ed58b1 blender-2.28.ebuild 1996
+MD5 55deca9446401facc4703eceef64b33b blender-2.28a.ebuild 1997
+MD5 3a2e83e3f2f9b2f12a20973f0b4164eb blender-2.28c.ebuild 2183
+MD5 2a45bf34d6af66cddc109faad631d5f0 blender-2.30.ebuild 1936
+MD5 7556df679df7722b4b80ef8151f7c1df blender-2.31.ebuild 1936
+MD5 1184c9114156b5e501893d602d98f75b blender-2.31a.ebuild 2376
+MD5 d3eba695aaee4c4ce9eac27c6a7c5ad3 metadata.xml 588
+MD5 e179dbbb40c0e597585eec9593bd7d09 blender-2.32.ebuild 2374
+MD5 a855ab3ef355897d6896804f54ce21bd files/blender-2.12 36
+MD5 6057638080d3c5c999219113ecf0ee6b files/blender-2.31a-plugins.patch 641
+MD5 b8e304980dc2bfd9a7157037d6ead44b files/blender.desktop 197
 MD5 d95ef10fee53b71576c6da6c8163e748 files/blender.png 2119
-MD5 b5356307d35d0bfe73149428cafe23ff files/configure-fix.patch 754
+MD5 f9d20818255d723bce691f341a34dc38 files/configure-fix-2.30.patch 655
 MD5 d49beb1d5a2182b3b1f1a4c123145c96 files/configure-fix-2.31.patch 655
+MD5 a13520b8046c792869ea5cae8374f6f3 files/configure-fix-2.31a.patch 658
+MD5 b5356307d35d0bfe73149428cafe23ff files/configure-fix.patch 754
 MD5 da440d4ab4dddbda368a23ea4d62f97e files/digest-blender-2.23-r1 154
-MD5 6057638080d3c5c999219113ecf0ee6b files/blender-2.31a-plugins.patch 641
 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 edbe7fddec312f94a65155ba4303398a files/digest-blender-2.30 66
-MD5 64c3289608ad29370759d1c278d02a0c files/digest-blender-2.31 66
-MD5 504960c3dfcf520f65e3d9e59c81a598 files/digest-blender-2.32 66
-MD5 b8e304980dc2bfd9a7157037d6ead44b files/blender.desktop 197
 MD5 f22dcdbc692118213454a8c31bc459ff files/digest-blender-2.28a 67
 MD5 aacb0f08e5496b93ec12751242c0a9ab files/digest-blender-2.28c 67
+MD5 edbe7fddec312f94a65155ba4303398a files/digest-blender-2.30 66
+MD5 64c3289608ad29370759d1c278d02a0c files/digest-blender-2.31 66
 MD5 fc5a649e2b6bfd7b436d1db41cd1e8f4 files/digest-blender-2.31a 67
-MD5 a13520b8046c792869ea5cae8374f6f3 files/configure-fix-2.31a.patch 658
-MD5 a855ab3ef355897d6896804f54ce21bd files/blender-2.12 36
 MD5 705b95605426ad9d562457fdbbff5460 files/blender-2.32.patch 2562
-MD5 054c96d842237968163b5d70f031fc6e blender-2.32.ebuild 2365
-MD5 6a812bacb0726fbad7f0c35b02ed58b1 blender-2.28.ebuild 1996
-MD5 55deca9446401facc4703eceef64b33b blender-2.28a.ebuild 1997
-MD5 3a2e83e3f2f9b2f12a20973f0b4164eb blender-2.28c.ebuild 2183
-MD5 455348ecc7d508146b159478c045454c blender-2.31.ebuild 1945
-MD5 24f0b24bddb729ccebaedc0374d7bb1c blender-2.27.ebuild 690
-MD5 685ffc88ae77c0274ab5b714948b99ba blender-2.31a.ebuild 2386
-MD5 77feec6614c942270dda3c894ff666c3 ChangeLog 4111
-MD5 d3eba695aaee4c4ce9eac27c6a7c5ad3 metadata.xml 588
+MD5 504960c3dfcf520f65e3d9e59c81a598 files/digest-blender-2.32 66
diff --git a/media-gfx/blender/blender-2.30.ebuild b/media-gfx/blender/blender-2.30.ebuild
index afb350f5ff6b..4e8f7fdd753a 100644
--- a/media-gfx/blender/blender-2.30.ebuild
+++ b/media-gfx/blender/blender-2.30.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.30.ebuild,v 1.2 2003/11/08 17:34:19 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.30.ebuild,v 1.3 2004/03/07 22:47:12 avenj Exp $
 
 inherit flag-o-matic
 replace-flags -march=pentium4 -march=pentium3
@@ -15,7 +15,7 @@ SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2 | BL"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND="virtual/x11
 	blender-game? ( dev-games/ode )
diff --git a/media-gfx/blender/blender-2.31.ebuild b/media-gfx/blender/blender-2.31.ebuild
index 1e41b9f09969..7ac8495d4237 100644
--- a/media-gfx/blender/blender-2.31.ebuild
+++ b/media-gfx/blender/blender-2.31.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.31.ebuild,v 1.1 2003/12/04 04:55:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.31.ebuild,v 1.2 2004/03/07 22:47:12 avenj Exp $
 
 inherit flag-o-matic
 replace-flags -march=pentium4 -march=pentium3
@@ -15,7 +15,7 @@ SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2 | BL"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND="virtual/x11
 	blender-game? ( dev-games/ode )
diff --git a/media-gfx/blender/blender-2.31a.ebuild b/media-gfx/blender/blender-2.31a.ebuild
index 419745c59e04..7cda0697e9dc 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 Technologies, Inc.
 # 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.3 2004/02/18 09:30:29 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.31a.ebuild,v 1.4 2004/03/07 22:47:12 avenj Exp $
 
 inherit flag-o-matic
 replace-flags -march=pentium4 -march=pentium3
@@ -15,7 +15,7 @@ SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2 | BL"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND="virtual/x11
 	blender-game? ( dev-games/ode )
diff --git a/media-gfx/blender/blender-2.32.ebuild b/media-gfx/blender/blender-2.32.ebuild
index af15786491e6..3235cfcdf163 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 Technologies, Inc.
 # 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.2 2004/02/18 09:30:29 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.32.ebuild,v 1.3 2004/03/07 22:47:12 avenj Exp $
 
 inherit flag-o-matic
 replace-flags -march=pentium4 -march=pentium3
@@ -18,7 +18,7 @@ LICENSE="GPL-2 | BL"
 KEYWORDS="~x86 ~ppc ~amd64"
 
 DEPEND="virtual/x11
-	blender-game? ( dev-games/ode )
+	!amd64? ( blender-game? ( dev-games/ode ) )
 	sdl? ( media-libs/libsdl )
 	jpeg? ( media-libs/jpeg )
 	png? ( media-libs/libpng )