Respect LDFLAGS #149676 by Donnie Berkholz.

Package-Manager: portage-2.1.2_pre2

3 files changed, 26 insertions, 20 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 21520ad56783..93f4283c0994 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.203 2006/09/30 22:04:32 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.204 2006/10/01 20:16:17 vapier Exp $
+
+  01 Oct 2006; Mike Frysinger <vapier@gentoo.org> openssl-0.9.8d.ebuild:
+  Respect LDFLAGS #149676 by Donnie Berkholz.
 
   30 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> openssl-0.9.7l.ebuild,
   openssl-0.9.8d.ebuild:
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 955ca93dbd94..9b410be00839 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -87,10 +87,10 @@ EBUILD openssl-0.9.7k.ebuild 5402 RMD160 89fd43fb8bc64f345483c21b14690b5f7cbdcae
 MD5 1fdb5bbcd56f2780f574e907be69fb91 openssl-0.9.7k.ebuild 5402
 RMD160 89fd43fb8bc64f345483c21b14690b5f7cbdcae6 openssl-0.9.7k.ebuild 5402
 SHA256 9d19a2b0f8b3c1e7637639b77780abc7939c2fdae6c9ec0864e5ee8df8cd49bb openssl-0.9.7k.ebuild 5402
-EBUILD openssl-0.9.7l.ebuild 5427 RMD160 981d649db340221da735536223298f0f0ef16ee4 SHA1 b916fca153b5dcc79e6cdb81d52570447bc679c2 SHA256 16d15ab8c2a0c00473b184a1d70867f60bab46e8eed2ca72336987dddc1f79b6
-MD5 3ef90c999bd4c0243336eb99c05bc4d2 openssl-0.9.7l.ebuild 5427
-RMD160 981d649db340221da735536223298f0f0ef16ee4 openssl-0.9.7l.ebuild 5427
-SHA256 16d15ab8c2a0c00473b184a1d70867f60bab46e8eed2ca72336987dddc1f79b6 openssl-0.9.7l.ebuild 5427
+EBUILD openssl-0.9.7l.ebuild 5432 RMD160 b7378ab51d87839109ba608d1c420381a1d3dd14 SHA1 18791178db914c81b13ab411eb268a5737d7dcfb SHA256 031bc04b69c0d9e5ad0630f40f6fef48e5df94fc0102217edc14fc32dd58c631
+MD5 3bad16b1e275ee1f8319689c352a9cfd openssl-0.9.7l.ebuild 5432
+RMD160 b7378ab51d87839109ba608d1c420381a1d3dd14 openssl-0.9.7l.ebuild 5432
+SHA256 031bc04b69c0d9e5ad0630f40f6fef48e5df94fc0102217edc14fc32dd58c631 openssl-0.9.7l.ebuild 5432
 EBUILD openssl-0.9.8b.ebuild 4997 RMD160 6900925606a9c21f3ae136fd400e2cc6961be378 SHA1 b7fcdd25e5a7a46d0897771e0cef19689ebf229b SHA256 c6172cdb7c1ad3728ac08c2474004c824a635ba9151a71751cd36dae8c53c1fd
 MD5 4b67c1cdcfc7fe43341536e549eb8db9 openssl-0.9.8b.ebuild 4997
 RMD160 6900925606a9c21f3ae136fd400e2cc6961be378 openssl-0.9.8b.ebuild 4997
@@ -99,14 +99,14 @@ EBUILD openssl-0.9.8c-r2.ebuild 5516 RMD160 611d53a1ba338a78a10a56aeec0a046c16f8
 MD5 4d09331c22c10fbfa527a17b040a6e08 openssl-0.9.8c-r2.ebuild 5516
 RMD160 611d53a1ba338a78a10a56aeec0a046c16f839d4 openssl-0.9.8c-r2.ebuild 5516
 SHA256 69c69ec5ca42dfebb55ef24a9df610f4b2637a0c9a43036896e2f714fd944396 openssl-0.9.8c-r2.ebuild 5516
-EBUILD openssl-0.9.8d.ebuild 5537 RMD160 838508091935c07ca9320fcaa9c74be3c607ab1f SHA1 0f64f0ada66b00b7bc148a87f31081b543f39ca1 SHA256 8af5f35c2318e5a1162fa11ce2e25d2aeeb06add9771b6d09c43b4517351d5f1
-MD5 074f5a3a8f9bace77581ee60fa7dcb09 openssl-0.9.8d.ebuild 5537
-RMD160 838508091935c07ca9320fcaa9c74be3c607ab1f openssl-0.9.8d.ebuild 5537
-SHA256 8af5f35c2318e5a1162fa11ce2e25d2aeeb06add9771b6d09c43b4517351d5f1 openssl-0.9.8d.ebuild 5537
-MISC ChangeLog 31235 RMD160 f10ba11effa2869c1370fd4baa941898913cdfbf SHA1 198527093af27cd969f145961ba0bc3ebc6115e0 SHA256 004a9ef16d612dc19c167849acdf3f1fe48fa2b7439b853ad21434823c779e8b
-MD5 c9f2efb2454f8832c5663b645dcedd6f ChangeLog 31235
-RMD160 f10ba11effa2869c1370fd4baa941898913cdfbf ChangeLog 31235
-SHA256 004a9ef16d612dc19c167849acdf3f1fe48fa2b7439b853ad21434823c779e8b ChangeLog 31235
+EBUILD openssl-0.9.8d.ebuild 5591 RMD160 7c12cddeb9a951af301dd31ea0a54504ca57190f SHA1 bfd8c8464295bdc18c6bdf16c144f50182eeedfa SHA256 f2f6e9133d6132bab21665fe65c3f2a5783d5311316ef4cdfdd25e4f4801261a
+MD5 4f4dccea743f983fc97eca6e3bd913bb openssl-0.9.8d.ebuild 5591
+RMD160 7c12cddeb9a951af301dd31ea0a54504ca57190f openssl-0.9.8d.ebuild 5591
+SHA256 f2f6e9133d6132bab21665fe65c3f2a5783d5311316ef4cdfdd25e4f4801261a openssl-0.9.8d.ebuild 5591
+MISC ChangeLog 31356 RMD160 e622da873b05fc7a2edcccd2a2bc571946799e82 SHA1 446e41c5a504fa17905dc415ac4ea1e0dcd0a968 SHA256 a8d582df71ded05a8ead5a0c1dfbfd158be029c652351463b1e6b2ea8c267405
+MD5 756adeb4789b126857018e895e8e2b2b ChangeLog 31356
+RMD160 e622da873b05fc7a2edcccd2a2bc571946799e82 ChangeLog 31356
+SHA256 a8d582df71ded05a8ead5a0c1dfbfd158be029c652351463b1e6b2ea8c267405 ChangeLog 31356
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -130,9 +130,9 @@ MD5 c860eede8676360f4cd66b1fcb17345c files/digest-openssl-0.9.8d 247
 RMD160 fc03af9cd4ca71ec400924bfd866e09b0a8d59a7 files/digest-openssl-0.9.8d 247
 SHA256 f71ab1e8bddbc1f5dfcfafba984d0c2c95088b751768ff691f5fcc911be601a8 files/digest-openssl-0.9.8d 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFHun9ViELBEf1JB0RApuaAJ9b0fJxvotlhUBUJ0HfPsFNHGrB9QCfctTY
-x6IBoVNmC9u6CMwJiysd9gQ=
-=8Al4
+iD8DBQFFICI7amhnQswr0vIRAp6IAJ96mGdM9jKxOBqOwdPGKyZjkvmHWACfcTF5
+RaKIqipaEaFDD5gOJhqPr/0=
+=oanT
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-0.9.8d.ebuild b/dev-libs/openssl/openssl-0.9.8d.ebuild
index 9f341def7090..517091be590d 100644
--- a/dev-libs/openssl/openssl-0.9.8d.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8d.ebuild,v 1.9 2006/09/30 22:04:32 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8d.ebuild,v 1.10 2006/10/01 20:16:17 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -97,7 +97,10 @@ src_compile() {
 		-e 's:-mcpu=[-a-z0-9]* ::g' \
 		-e 's:-m[a-z0-9]* ::g' \
 	)
-	sed -i -e "/^CFLAG/s:=.*:=${CFLAG} ${CFLAGS}:" Makefile || die
+	sed -i \
+		-e "/^CFLAG/s:=.*:=${CFLAG} ${CFLAGS}:" \
+		-e "/^SHARED_LDFLAGS/s:$: ${LDFLAGS}:" \
+		Makefile || die
 
 	# depend is needed to use $confopts
 	# rehash is needed to prep the certs/ dir
@@ -118,7 +121,7 @@ src_test() {
 }
 
 src_install() {
-	make INSTALL_PREFIX="${D}" install || die
+	emake INSTALL_PREFIX="${D}" install || die
 	dodoc CHANGES* FAQ NEWS README doc/*.txt
 	dohtml doc/*