made openssl use $(get_libdir) to optionally install to lib64/lib32

3 files changed, 27 insertions, 25 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 6c08d3a89d46..b33d33a7971b 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.91 2004/07/19 19:08:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.92 2004/09/01 07:00:11 lv Exp $
+
+  01 Sep 2004; Travis Tilley <lv@gentoo.org> openssl-0.9.7d-r1.ebuild:
+  made openssl use $(get_libdir) to optionally install to lib64/lib32
 
   19 Jul 2004; Mike Frysinger <vapier@gentoo.org> openssl-0.9.7d-r1.ebuild:
   Move `make test` out of src_compile() and into src_test() where it should be.
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index c07881e00591..08283aac8cbe 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,28 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 da4a516dd35a38cd63ba204975fd161a ChangeLog 14866
+MD5 a5a3e6682c17e1ee6d679f67d162a15a openssl-0.9.7d.ebuild 7801
+MD5 f1b4a3440c93ff4165fc9235be9a1607 openssl-0.9.7d-r1.ebuild 8341
+MD5 9eb521df91b2ae08a45484d1986e44e4 openssl-0.9.7c.ebuild 4961
+MD5 8348f8cb6117f6228e58d01f3625c2e2 openssl-0.9.7c-r1.ebuild 7021
+MD5 159f4380fc25113dcd4faee000215af4 ChangeLog 15004
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 b2bb47be1c71efedd650243576212700 openssl-0.9.6m.ebuild 3088
-MD5 8348f8cb6117f6228e58d01f3625c2e2 openssl-0.9.7c-r1.ebuild 7021
-MD5 9eb521df91b2ae08a45484d1986e44e4 openssl-0.9.7c.ebuild 4961
-MD5 a5a3e6682c17e1ee6d679f67d162a15a openssl-0.9.7d.ebuild 7801
-MD5 13c366f865e26a720b000dee237b4b5e openssl-0.9.7d-r1.ebuild 7974
-MD5 2e6ed24d513a8f2b1b6f03709ab5ba18 files/digest-openssl-0.9.6m 67
-MD5 897d293325315cdeeb390745ed5cdd1b files/digest-openssl-0.9.7d 134
-MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6m-gentoo.diff 1591
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
 MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7d-gentoo.diff 936
+MD5 2e6ed24d513a8f2b1b6f03709ab5ba18 files/digest-openssl-0.9.6m 67
 MD5 8ad6215b1b4c9d53c435ceff6b537e35 files/digest-openssl-0.9.7c 134
+MD5 897d293325315cdeeb390745ed5cdd1b files/digest-openssl-0.9.7d 134
+MD5 91854bcd6c83f040927d490b104bb5a0 files/openssl-0.9.7d-smime.patch 641
 MD5 f8b9ae9e3ed08f964620aa832aec4d0c files/digest-openssl-0.9.7c-r1 134
-MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
-MD5 744b358cd3b68b2ca6561c214c541fc0 files/addppc64support.diff 1327
 MD5 897d293325315cdeeb390745ed5cdd1b files/digest-openssl-0.9.7d-r1 134
-MD5 91854bcd6c83f040927d490b104bb5a0 files/openssl-0.9.7d-smime.patch 641
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFBBYffHTu7gpaalycRAjGHAJ48Xfc0IPddyMttUY7t8g8tdQad7QCfXSiG
-IvCQFhcm9nN9ua2yineRm50=
-=LgG7
------END PGP SIGNATURE-----
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6m-gentoo.diff 1591
+MD5 744b358cd3b68b2ca6561c214c541fc0 files/addppc64support.diff 1327
+MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
diff --git a/dev-libs/openssl/openssl-0.9.7d-r1.ebuild b/dev-libs/openssl/openssl-0.9.7d-r1.ebuild
index 5e1616c9ae31..1fc5929be54c 100644
--- a/dev-libs/openssl/openssl-0.9.7d-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7d-r1.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/openssl/openssl-0.9.7d-r1.ebuild,v 1.9 2004/07/26 22:38:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7d-r1.ebuild,v 1.10 2004/09/01 07:00:11 lv Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -92,6 +92,15 @@ src_unpack() {
 	done
 	IFS=$OLDIFS
 
+	if [ "$(get_libdir)" != "lib" ] ; then
+		# using a library directory other than lib requires some magic
+		sed -e 	"s+\(\$(INSTALL_PREFIX)\$(INSTALLTOP)\)/lib+\1/$(get_libdir)+g" \
+		-e	"s+libdir=\$\${exec_prefix}/lib+libdir=\$\${exec_prefix}/$(get_libdir)+g" \
+		Makefile.org > Makefile.new
+		mv Makefile.new Makefile.org
+		./config --test-sanity || die
+	fi
+
 	# openssl-0.9.6
 	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
 		cd ${WORKDIR}/${OLD_096_P}
@@ -249,7 +258,7 @@ src_install() {
 		dolib.so ${WORKDIR}/${OLD_096_P}/libssl.so.0.9.6|| die "libssl.so.0.9.6 not found"
 	}
 
-	fperms a+x /usr/lib/pkgconfig #34088
+	fperms a+x /usr/$(get_libdir)/pkgconfig #34088
 }
 
 pkg_postinst() {