fix alpha handling

Package-Manager: portage-2.0.51.21-r1

5 files changed, 49 insertions, 44 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index a23418f42e1e..4d1e55770b5b 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,9 +1,6 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.117 2005/05/12 08:29:05 kloeri Exp $
-
-  12 May 2005; Bryan Østergaard <kloeri@gentoo.org> openssl-0.9.7g.ebuild:
-  -alpha as configure is broken.
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.118 2005/05/14 17:37:46 vapier Exp $
 
   11 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> openssl-0.9.7g.ebuild:
   Back to ~sparc wrt #92075
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index f65b9d4cb687..5dc2d1b61fc1 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,43 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8a6bfea1784fd62ac3a143586b24fd59 openssl-0.9.7e.ebuild 7844
-MD5 e59c3cc3221269d3ae08609d821b6b21 openssl-0.9.7c-r1.ebuild 7019
-MD5 9cb8d8cba8c65d3b422a780141041867 openssl-0.9.7d-r2.ebuild 8960
-MD5 539e48b7488d1cc7f4e15e55dd392046 ChangeLog 18834
-MD5 a217f5a3406e3fd1cf335c3c11760657 openssl-0.9.7e-r1.ebuild 8518
+MD5 afcff73908378a32aaaf342ef605dc77 ChangeLog 18724
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 efbaa7dc6fd0f4e71ae8b5ad71a9eb13 openssl-0.9.7g.ebuild 5151
 MD5 685c33f8a3f1980105944ab3c23a346c openssl-0.9.6m.ebuild 3074
+MD5 e59c3cc3221269d3ae08609d821b6b21 openssl-0.9.7c-r1.ebuild 7019
+MD5 a217f5a3406e3fd1cf335c3c11760657 openssl-0.9.7e-r1.ebuild 8518
+MD5 2e9aaa6888d653ee8bffb2849a006fcd openssl-0.9.7g.ebuild 5205
+MD5 5f32bf277f8520c8054e95c6a8d73f4b openssl-0.9.7d-r2.ebuild 8972
+MD5 8a6bfea1784fd62ac3a143586b24fd59 openssl-0.9.7e.ebuild 7844
+MD5 744b358cd3b68b2ca6561c214c541fc0 files/addppc64support.diff 1327
 MD5 2e6ed24d513a8f2b1b6f03709ab5ba18 files/digest-openssl-0.9.6m 67
-MD5 bef2724dccc11edf27916526d9c08576 files/openssl-0.9.7-arm-big-endian.patch 1074
-MD5 f8b9ae9e3ed08f964620aa832aec4d0c files/digest-openssl-0.9.7c-r1 134
-MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6m-gentoo.diff 1591
-MD5 86106e28e408bdd53dd64ad0ecab7f1d files/openssl-0.9.7e-x86_64-bn-asm.patch 3881
-MD5 f886f4a6a62eb4ec7bc718952d76900d files/openssl-0.9.7e-gentoo.patch 460
-MD5 257fcbed4f939cd3e0113af18df66a92 files/openssl-0.9.7g-ABI-compat.patch 1880
-MD5 91854bcd6c83f040927d490b104bb5a0 files/openssl-0.9.7d-smime.patch 641
 MD5 1a7aabb860415c7be612863579d67b4d files/digest-openssl-0.9.7g 67
-MD5 cde67bc688a59d0178f1a6e1bb1db7cf files/openssl-0.9.7g-ptr-casting.patch 714
+MD5 f8b9ae9e3ed08f964620aa832aec4d0c files/digest-openssl-0.9.7c-r1 134
+MD5 4e6c2cbbc1ff9e36ff6d83b6c5356b7c files/openssl-0.9.7-hppa-fix-detection.patch 1718
 MD5 897d293325315cdeeb390745ed5cdd1b files/digest-openssl-0.9.7d-r2 134
+MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e 134
+MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6m-gentoo.diff 1591
+MD5 f8ff492f66404c732e4661cc4443a2e8 files/openssl-0.9.7-alpha-default-gcc.patch 533
+MD5 bef2724dccc11edf27916526d9c08576 files/openssl-0.9.7-arm-big-endian.patch 1074
 MD5 ef2c8d5afa47da8a58e464f43e6ecc67 files/openssl-0.9.7g-mem-clr-ptr-cast.patch 637
 MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7d-gentoo.diff 936
-MD5 4e6c2cbbc1ff9e36ff6d83b6c5356b7c files/openssl-0.9.7-hppa-fix-detection.patch 1718
 MD5 f804ea4df3b388d22451cde6e9458f2b files/openssl-0.9.7c-tempfile.patch 2178
-MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e 134
-MD5 cccc21f217f5222053228e88605a1869 files/gentoo.config-0.9.7g 1415
-MD5 f8ff492f66404c732e4661cc4443a2e8 files/openssl-0.9.7-alpha-default-gcc.patch 533
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7d-gentoo.diff 936
+MD5 91854bcd6c83f040927d490b104bb5a0 files/openssl-0.9.7d-smime.patch 641
+MD5 f886f4a6a62eb4ec7bc718952d76900d files/openssl-0.9.7e-gentoo.patch 460
 MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e-r1 134
+MD5 53599279769faf50e5247b68d2907b10 files/openssl-0.9.7e-no-fips.patch 1344
 MD5 90fac5947e771433132723442dc90ab0 files/openssl-0.9.7g-no-fips.patch 333
+MD5 517bf0eabf8990cf6297985b2e2c814e files/gentoo.config-0.9.7g 1939
+MD5 cde67bc688a59d0178f1a6e1bb1db7cf files/openssl-0.9.7g-ptr-casting.patch 714
+MD5 86106e28e408bdd53dd64ad0ecab7f1d files/openssl-0.9.7e-x86_64-bn-asm.patch 3881
 MD5 82e3908837b5066c7ec907812de8da25 files/openssl-0.9.7e-ptr-casting.patch 440
-MD5 744b358cd3b68b2ca6561c214c541fc0 files/addppc64support.diff 1327
-MD5 53599279769faf50e5247b68d2907b10 files/openssl-0.9.7e-no-fips.patch 1344
-MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCgxPuKf2g/qXtneoRArOPAJ9ZiVJwin0v1KyJgoXbssjUIWyonACbBaEP
-LzXGiIHU420pZdpFbPHmYM4=
-=uDEA
------END PGP SIGNATURE-----
+MD5 257fcbed4f939cd3e0113af18df66a92 files/openssl-0.9.7g-ABI-compat.patch 1880
diff --git a/dev-libs/openssl/files/gentoo.config-0.9.7g b/dev-libs/openssl/files/gentoo.config-0.9.7g
index 3d6f75bc1e30..abb743551f48 100755
--- a/dev-libs/openssl/files/gentoo.config-0.9.7g
+++ b/dev-libs/openssl/files/gentoo.config-0.9.7g
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-0.9.7g,v 1.1 2005/05/09 06:38:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-0.9.7g,v 1.2 2005/05/14 17:37:46 vapier Exp $
 
 # Openssl doesn't play along nicely with cross-compiling 
 # like autotools based projects, so let's teach it new tricks.
@@ -16,11 +16,28 @@ system="linux"
 #	gnu*)     system="linux"
 #esac
 
+compiler="gcc"
+if [[ ${CC} == "ccc" ]] ; then
+	compiler=${CC}
+fi
+
 machine=""
 case ${CHOST%%-*} in
-	alphaev56*)   machine=alpha+bwx;;
-	alphaev[67]*) machine=alpha+bwx;;
-	alpha*)       machine=alpha;;
+	alphaev56*)   machine=alpha+bwx-${compiler};;
+	alphaev[67]*) machine=alpha+bwx-${compiler};;
+	alpha*)
+		# this pretty hack is because we have to make sure we
+		# maintain ABI on the system or things like ssh break
+		currmachine=""
+		if [[ ${ROOT} == "/" ]] && [[ -e /usr/lib/libcrypto.so ]] ; then
+			currmachine=$(strings /usr/lib/libcrypto.so | grep ^linux-alpha | sed -e s:linux-::)
+		fi
+		machine=${currmachine:-alpha-${compiler}}
+
+		# NOTE: drop this crap next time SSL changes ABI #'s
+		[[ ${PV:0:5} != "0.9.7" ]] && machine="plzupdatemekthxbye"
+		;;
+
 	arm*eb*)      machine="elf-arm -DB_ENDIAN";;
 	arm*)         machine="elf-arm -DL_ENDIAN";;
 #	hppa64*)      machine=parisc64;;
diff --git a/dev-libs/openssl/openssl-0.9.7d-r2.ebuild b/dev-libs/openssl/openssl-0.9.7d-r2.ebuild
index ff7b6c326e92..d4c26664cd1d 100644
--- a/dev-libs/openssl/openssl-0.9.7d-r2.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7d-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7d-r2.ebuild,v 1.15 2005/05/09 06:37:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7d-r2.ebuild,v 1.16 2005/05/14 17:37:46 vapier Exp $
 
-inherit eutils flag-o-matic gcc
+inherit eutils flag-o-matic toolchain-funcs
 
 OLD_096_P="${PN}-0.9.6m"
 
diff --git a/dev-libs/openssl/openssl-0.9.7g.ebuild b/dev-libs/openssl/openssl-0.9.7g.ebuild
index ac1c3fbf5475..d4d6841894f0 100644
--- a/dev-libs/openssl/openssl-0.9.7g.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7g.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/dev-libs/openssl/openssl-0.9.7g.ebuild,v 1.7 2005/05/12 08:29:05 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7g.ebuild,v 1.8 2005/05/14 17:37:46 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -10,7 +10,8 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm ~hppa -ia64 ~m68k -mips ~ppc -ppc64 ~s390 ~sh ~sparc ~x86"
+# ia64 is ABI incompat atm, do not change the KEYWORD
+KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~m68k -mips ~ppc -ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="emacs test bindist"
 
 RDEPEND=""