add back in cross compiling support

Package-Manager: portage-2.0.51.22-r2

2 files changed, 55 insertions, 29 deletions

diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 4436dec059ad..8ef86bacc8d5 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,39 +1,50 @@
-MD5 96e6cacb2e6bec77dac0a5740746fe86 ChangeLog 20641
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5a6f79dc9576fa04424a873b78889508 openssl-0.9.8.ebuild 5181
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 685c33f8a3f1980105944ab3c23a346c openssl-0.9.6m.ebuild 3074
 MD5 ee3873d64d138d4ac015bea7c8123a58 openssl-0.9.7c-r1.ebuild 7064
-MD5 6fbe613b51aae6d38f151388b4125695 openssl-0.9.7d-r2.ebuild 9016
 MD5 60c5e8df5d366b67c905c00a8aeb3c72 openssl-0.9.7e-r1.ebuild 8559
 MD5 68620bfc8489164f3cd05a42729cbd4b openssl-0.9.7e.ebuild 7888
-MD5 68a82df89536066dd792a03f6a68a3fb openssl-0.9.7g.ebuild 5220
-MD5 d7bc5ca5f569e987cf10c4410896df7b openssl-0.9.8.ebuild 4761
-MD5 744b358cd3b68b2ca6561c214c541fc0 files/addppc64support.diff 1327
-MD5 2e6ed24d513a8f2b1b6f03709ab5ba18 files/digest-openssl-0.9.6m 67
-MD5 f8b9ae9e3ed08f964620aa832aec4d0c files/digest-openssl-0.9.7c-r1 134
-MD5 897d293325315cdeeb390745ed5cdd1b files/digest-openssl-0.9.7d-r2 134
+MD5 6fbe613b51aae6d38f151388b4125695 openssl-0.9.7d-r2.ebuild 9016
+MD5 685c33f8a3f1980105944ab3c23a346c openssl-0.9.6m.ebuild 3074
+MD5 96e6cacb2e6bec77dac0a5740746fe86 ChangeLog 20641
+MD5 7dc090540ae89a9ce6a1ee3a4bc90f9e openssl-0.9.7g.ebuild 5267
+MD5 592d5a5b643b835123af4a44caffc75e files/digest-openssl-0.9.8 66
+MD5 53599279769faf50e5247b68d2907b10 files/openssl-0.9.7e-no-fips.patch 1344
+MD5 91854bcd6c83f040927d490b104bb5a0 files/openssl-0.9.7d-smime.patch 641
+MD5 4a170a962292bdd019fe303ba981e3ab files/openssl-0.9.8-ppc64.patch 1463
 MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e 134
 MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e-r1 134
-MD5 1a7aabb860415c7be612863579d67b4d files/digest-openssl-0.9.7g 67
-MD5 6fe82157d1370046682f9c3d39a55a18 files/gentoo.config-0.9.7g 3171
-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 4e6c2cbbc1ff9e36ff6d83b6c5356b7c files/openssl-0.9.7-hppa-fix-detection.patch 1718
 MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
-MD5 f804ea4df3b388d22451cde6e9458f2b files/openssl-0.9.7c-tempfile.patch 2178
-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 53599279769faf50e5247b68d2907b10 files/openssl-0.9.7e-no-fips.patch 1344
 MD5 82e3908837b5066c7ec907812de8da25 files/openssl-0.9.7e-ptr-casting.patch 440
+MD5 90fac5947e771433132723442dc90ab0 files/openssl-0.9.7g-no-fips.patch 333
+MD5 e476b45b7b15df41a0e3f06c187201ee files/openssl-0.9.8-parallel-build.patch 649
+MD5 f886f4a6a62eb4ec7bc718952d76900d files/openssl-0.9.7e-gentoo.patch 460
+MD5 f804ea4df3b388d22451cde6e9458f2b files/openssl-0.9.7c-tempfile.patch 2178
 MD5 86106e28e408bdd53dd64ad0ecab7f1d files/openssl-0.9.7e-x86_64-bn-asm.patch 3881
+MD5 744b358cd3b68b2ca6561c214c541fc0 files/addppc64support.diff 1327
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6m-gentoo.diff 1591
 MD5 257fcbed4f939cd3e0113af18df66a92 files/openssl-0.9.7g-ABI-compat.patch 1880
+MD5 1a7aabb860415c7be612863579d67b4d files/digest-openssl-0.9.7g 67
+MD5 2e6ed24d513a8f2b1b6f03709ab5ba18 files/digest-openssl-0.9.6m 67
 MD5 ef2c8d5afa47da8a58e464f43e6ecc67 files/openssl-0.9.7g-mem-clr-ptr-cast.patch 637
-MD5 90fac5947e771433132723442dc90ab0 files/openssl-0.9.7g-no-fips.patch 333
-MD5 be045f45d974ec215ec4986c6c7b6ffb files/openssl-0.9.7g-ppc64.patch 856
 MD5 cde67bc688a59d0178f1a6e1bb1db7cf files/openssl-0.9.7g-ptr-casting.patch 714
-MD5 592d5a5b643b835123af4a44caffc75e files/digest-openssl-0.9.8 66
+MD5 f8ff492f66404c732e4661cc4443a2e8 files/openssl-0.9.7-alpha-default-gcc.patch 533
 MD5 8c5ab963e60bc0744408eebf48596981 files/openssl-0.9.8-make-engines-dir.patch 461
-MD5 e476b45b7b15df41a0e3f06c187201ee files/openssl-0.9.8-parallel-build.patch 649
-MD5 4a170a962292bdd019fe303ba981e3ab files/openssl-0.9.8-ppc64.patch 1463
+MD5 bef2724dccc11edf27916526d9c08576 files/openssl-0.9.7-arm-big-endian.patch 1074
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7d-gentoo.diff 936
+MD5 f8b9ae9e3ed08f964620aa832aec4d0c files/digest-openssl-0.9.7c-r1 134
+MD5 897d293325315cdeeb390745ed5cdd1b files/digest-openssl-0.9.7d-r2 134
+MD5 4e6c2cbbc1ff9e36ff6d83b6c5356b7c files/openssl-0.9.7-hppa-fix-detection.patch 1718
+MD5 be045f45d974ec215ec4986c6c7b6ffb files/openssl-0.9.7g-ppc64.patch 856
+MD5 e8243335f7a119103ff9b0b12bc0d2f5 files/openssl-0.9.7g-superh.patch 517
+MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
+MD5 09fbcfcfc15f3a7326619ff83d4bdfd7 files/gentoo.config-0.9.7g 3227
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC7V0xgIKl8Uu19MoRAqyzAJ9M+sqTfLKhI3SsCmmIShpLTqHx9gCeIBSP
+nrEy5WInP0dznUli/kTHnBY=
+=kOti
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-0.9.8.ebuild b/dev-libs/openssl/openssl-0.9.8.ebuild
index 0caa1e46e809..6e513ad48fbe 100644
--- a/dev-libs/openssl/openssl-0.9.8.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8.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.8.ebuild,v 1.3 2005/07/06 02:40:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8.ebuild,v 1.4 2005/07/31 23:22:07 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -31,6 +31,10 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.9.8-parallel-build.patch
 	epatch "${FILESDIR}"/${PN}-0.9.8-make-engines-dir.patch
 
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-0.9.7g gentoo.config || die "cp cross-compile failed"
+	chmod a+rx gentoo.config
+
 	case $(gcc-version) in
 		3.2)
 			filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loop
@@ -78,7 +82,13 @@ src_compile() {
 	local confopts=""
 	use bindist && confopts="no-idea no-rc5 no-mdc2 -no-ec"
 
-	./config \
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout}"
+
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+	./${config} \
+		${sslout} \
 		${confopts} \
 		--prefix=/usr \
 		--openssldir=/etc/ssl \
@@ -130,6 +140,12 @@ src_install() {
 	fperms a+x /usr/$(get_libdir)/pkgconfig #34088
 }
 
+pkg_preinst() {
+	if [[ -e ${ROOT}/usr/$(get_libdir)/libcrypto.so.0.9.7 ]] ; then
+		cp -a "${ROOT}"/usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.7 "${IMAGE}"/usr/$(get_libdir)/
+	fi	
+}
+
 pkg_postinst() {
 	local BN_H="${ROOT}$(gcc-config -L)/include/openssl/bn.h"
 	# Breaks things one some boxen, bug #13795.  The problem is that
@@ -148,6 +164,5 @@ pkg_postinst() {
 		ewarn "# revdep-rebuild --soname libcrypto.so.0.9.7"
 		ewarn "After this, you can delete /usr/$(get_libdir)/libssl.so.0.9.7"
 		ewarn "and /usr/$(get_libdir)/libcrypto.so.0.9.7"
-		touch -c "${ROOT}"/usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.7
 	fi
 }