readded ~amd64 keyword. Disabled serpent/rc6 for amd64. bug #94288

(Portage version: 2.0.51.22-r1)

3 files changed, 23 insertions, 17 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 9baa99113202..f9c6583460ce 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/bestcrypt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.31 2005/06/19 00:57:23 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.32 2005/06/20 13:37:37 dragonheart Exp $
+
+  20 Jun 2005; Daniel Black <dragonheart@gentoo.org>
+  bestcrypt-1.6_p1.ebuild:
+  Disabled serpent/rc6 for amd64. readded ~amd64 keyword. Submitted bug report
+  upstream for amd64 serpent compile fault fault
 
   19 Jun 2005; Daniel Black <dragonheart@gentoo.org>
   bestcrypt-1.5_p10.ebuild, bestcrypt-1.6_p1.ebuild:
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index e446e74baff4..a859637df9fc 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 bd28be85b34d9b7abd102d9f52f9f378 ChangeLog 6202
 MD5 68121ad348d78c8efdebce17ab7bbb81 bestcrypt-1.5_p10.ebuild 2942
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
-MD5 e370b036cab2432071c93457a419310e bestcrypt-1.6_p1.ebuild 2962
+MD5 22f995552aabc023b89e9bc8e4923beb bestcrypt-1.6_p1.ebuild 3285
 MD5 e4fb0265d55a570daf750fa7c0b8414c files/bestcrypt-1.6_p1-makefile_fix.patch 1367
 MD5 063ae0f67213da39ed4dd75a594b3b07 files/bcrypt3 3246
 MD5 dee6aa8c71224187da9fbc2b2a6fc167 files/digest-bestcrypt-1.6_p1 136
 MD5 c9fdd7c76eb3731a6166cc9ff17bf722 files/digest-bestcrypt-1.5_p10 137
 MD5 e9585e8f08138f46bdda7b88ddd81cd8 files/bestcrypt-1.5_p10-makefile_fix.patch 1136
 MD5 01225cc87eee84cf54232c86b04e8c93 files/bestcrypt.devfs 1673
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCtMMCmdTrptrqvGERAkxbAJ9Zh+HM68vQcUU8uBNTjD7NGYS8NwCfZLbn
-tqhfc0iigaDesZXiysn9i0c=
-=nMOE
------END PGP SIGNATURE-----
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p1.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p1.ebuild
index 3b6fd0409e05..82eb99e6913f 100644
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p1.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-1.6_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p1.ebuild,v 1.2 2005/06/19 00:57:23 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p1.ebuild,v 1.3 2005/06/20 13:37:37 dragonheart Exp $
 
 inherit flag-o-matic eutils linux-mod toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.jetico.com/linux/BestCrypt-${PV/_p/-}.tar.gz
 LICENSE="bestcrypt"
 SLOT="0"
 IUSE=""
-KEYWORDS="-amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="virtual/linux-sources"
 
@@ -30,8 +30,6 @@ MODULE_NAMES="bc(block:${S}/mod)
 		bc_gost(block:${S}/mod/gost)
 		bc_idea(block:${S}/mod/idea)
 		bc_rijn(block:${S}/mod/rijn)
-		bc_serpent(block:${S}/mod/serpent)
-		bc_rc6(block:${S}/mod/rc6)
 		bc_twofish(block:${S}/mod/twofish)"
 
 src_unpack() {
@@ -39,10 +37,18 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-makefile_fix.patch
 	cd ${S}
 
-	epatch ${DISTDIR}/bcrypt-rc6-serpent.diff.gz
+	if ! use amd64;
+	then
+		epatch ${DISTDIR}/bcrypt-rc6-serpent.diff.gz
+		export MODULE_NAMES="${MODULE_NAMES} bc_serpent(block:${S}/mod/serpent) bc_rc6(block:${S}/mod/rc6)"
+	fi
 }
 
 src_compile() {
+	if ! use amd64;
+	then
+		export MODULE_NAMES="${MODULE_NAMES} bc_serpent(block:${S}/mod/serpent) bc_rc6(block:${S}/mod/rc6)"
+	fi
 
 	filter-flags -fforce-addr
 
@@ -62,6 +68,11 @@ src_compile() {
 }
 
 src_install() {
+	if ! use amd64;
+	then
+		export MODULE_NAMES="${MODULE_NAMES} bc_serpent(block:${S}/mod/serpent) bc_rc6(block:${S}/mod/rc6)"
+	fi
+
 	linux-mod_src_install
 
 	cd ${S}