From: Gustavo Zacarias <gustavoz@gentoo.org>
Date: Thu, 9 Dec 2004 14:16:52 +0000 (+0000)
Subject: Stable on sparc wrt #71760, fixed the whole sparc mess too
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cb56a94af719f8c02e250db0bfab49308bdc0a6c;p=gentoo.git

Stable on sparc wrt #71760, fixed the whole sparc mess too
---

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index f84465396c3a..3ec1bf417ffc 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/botan
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.3 2004/12/08 10:27:36 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.4 2004/12/09 14:16:52 gustavoz Exp $
+
+  09 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> botan-1.4.4.ebuild:
+  Stable on sparc wrt #71760, fixed the whole sparc mess too
 
   08 Dec 2004; Daniel Black <dragonheart@gentoo.org> botan-1.4.4.ebuild,
   +files/botan-1.4.4-gcc34.patch:
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index fd8594a8cc64..73dcf15e46a0 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 a6d4d146e44ebe17d57cb296c2f710e2 ChangeLog 1152
 MD5 dafb88a2409eb5d64eb1a86ede848b06 botan-1.4.3.ebuild 2221
 MD5 d769a7ef93cd04ed5de9f468af0979cd metadata.xml 463
-MD5 740dcbb78741c7738db5f39e16926f2e ChangeLog 1019
-MD5 64dbfc9a15e51f15b9b80d4bce73265c botan-1.4.4.ebuild 2515
+MD5 83ddf69b4b7d6703ef347d9a6eee6be3 botan-1.4.4.ebuild 2417
 MD5 c9748b2c6a670b1f0b8cbcb3ca74b8bb files/digest-botan-1.4.3 61
 MD5 010820c4ff5b87a3b62ea84bee465eed files/digest-botan-1.4.4 61
 MD5 2214700974b810ad0c871ae2110ff054 files/botan-1.4.4-gcc34.patch 479
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBttcemdTrptrqvGERAhWeAJ4zUNaBSCiGDkWdba9/64oro6a8qACeMMSf
-0dXKU/52b+GoK0v0kgMLGFQ=
-=M24a
+iD8DBQFBuF5SKRy60XGEcJIRAr09AJ497NSceWXc3p3CPU21/YgAW5sO0gCgmh3i
+3rmHQFdM9CNYvrEjBQSzCk4=
+=4Ggm
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/botan/botan-1.4.4.ebuild b/dev-libs/botan/botan-1.4.4.ebuild
index 3dd689d7443d..12b27f05a50d 100644
--- a/dev-libs/botan/botan-1.4.4.ebuild
+++ b/dev-libs/botan/botan-1.4.4.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/dev-libs/botan/botan-1.4.4.ebuild,v 1.2 2004/12/08 10:27:36 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.4.ebuild,v 1.3 2004/12/09 14:16:52 gustavoz Exp $
 
 # Comments/fixes to lloyd@randombit.net (author)
 
@@ -10,7 +10,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="http://botan.randombit.net/"
 SRC_URI="http://botan.randombit.net/files/Botan-${PV}.tgz"
 
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 ppc sparc"
 SLOT="0"
 LICENSE="BSD"
 IUSE="bzlib zlib gmp ssl debug"
@@ -45,22 +45,24 @@ src_compile() {
 	if useq ssl; then modules="$modules,eng_ossl"; fi
 
 
-	# This is also supported on i586+ and sparcv9 - hope this is correct.
+	# This is also supported on i586+ - hope this is correct.
 	if [ ${ARCH} = 'alpha' -o ${ARCH} = 'amd64' ] || \
-		[ ${ARCH} = 'x86' -a ${CHOST:0:4} != "i386" -a ${CHOST:0:4} != "i486" ] || \
-		[ ${CHOSTARCH} = 'sparc32-v9' -a ${PROFILE_ARCH} = 'sparc64' ]; then
+		[ ${ARCH} = 'x86' -a ${CHOST:0:4} != "i386" -a ${CHOST:0:4} != "i486" ]; then
 		modules="$modules,tm_hard"
 	fi
 
-	# Also works on mips64 and sparc64
+	# Also works on mips64
 	if [ "${ARCH}" = 'alpha' -o "${ARCH}" = 'amd64' -o \
-		"${ARCH}" = 'ia64' -o "${ARCH}" = 'ppc64' -o "${PROFILE_ARCH}" = 'mips64'  ] || \
-		[ "${CHOSTARCH}" = 'sparc32-v9' -a "${PROFILE_ARCH}" = 'sparc64' ]; then
+		"${ARCH}" = 'ia64' -o "${ARCH}" = 'ppc64' -o "${PROFILE_ARCH}" = 'mips64'  ]; then
 		modules="$modules,mp_asm64"
 	fi
 
-	# Are there any CHOSTs in use which break this?
-	CHOSTARCH=$(echo ${CHOST} | cut -d - -f 1)
+	# Enable v9 instructions for sparc64
+	if [ ${PROFILE_ARCH} = 'sparc64' ]; then
+		CHOSTARCH='sparc32-v9'
+	else
+		CHOSTARCH=$(echo ${CHOST} | cut -d - -f 1)
+	fi
 
 	cd ${S}
 	einfo "Enabling modules: " ${modules}