make Makefiles respect users LDFLAGS.

(Portage version: 2.1_pre6-r4)

5 files changed, 101 insertions, 15 deletions

diff --git a/net-libs/libwww/ChangeLog b/net-libs/libwww/ChangeLog
index 8160f13e85c2..166145295939 100644
--- a/net-libs/libwww/ChangeLog
+++ b/net-libs/libwww/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libwww
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.51 2006/01/08 12:46:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.52 2006/03/19 22:50:48 ehmsen Exp $
+
+  19 Mar 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  +files/libwww-5.4.0-respectflags.patch, libwww-5.4.0-r5.ebuild:
+  Added patch to make Makefiles respect users LDFLAGS,
+  thanks to flameeyes (bug #126863).
 
   08 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   files/libwww-5.4.0-asneeded.patch:
diff --git a/net-libs/libwww/Manifest b/net-libs/libwww/Manifest
index 0e63b18e0084..6db6af45d68b 100644
--- a/net-libs/libwww/Manifest
+++ b/net-libs/libwww/Manifest
@@ -1,27 +1,54 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 82a7e72c01be315ba436298380db165f ChangeLog 7479
+MD5 c25d21a2618c7f343ff76a9e0fea11a8 ChangeLog 7687
+RMD160 09340d556bdc4e4982a1544196e0defedcf49e5e ChangeLog 7687
+SHA256 63fc46ad3a5ea9e4aca8c3067a0c4130f3ebbd5532b78be39719dc72d36aa6e1 ChangeLog 7687
 MD5 078b6239f293e1cc65f3f977b3136317 files/digest-libwww-5.4.0-r3 151
+RMD160 50badc1ad798fd352a1c67885800d7d7d70a60ab files/digest-libwww-5.4.0-r3 151
+SHA256 ae5527ceca7a24dce1f2a2c1e632ac7a2626576a30ba165cba0948ab030d39b6 files/digest-libwww-5.4.0-r3 151
 MD5 4c3f7314020d5a1a6a01463a71b4944c files/digest-libwww-5.4.0-r4 151
-MD5 4c3f7314020d5a1a6a01463a71b4944c files/digest-libwww-5.4.0-r5 151
+RMD160 5c6c9b3addb8288e4e6a03685919069d1402596f files/digest-libwww-5.4.0-r4 151
+SHA256 06d2c3b351985690a741793ff4da3f7c4d9f799219ad35263a65a55d86c0e974 files/digest-libwww-5.4.0-r4 151
+MD5 c07f06c90922520867329bd3a262e0d2 files/digest-libwww-5.4.0-r5 545
+RMD160 4bc82afdba6774f1d3252af59666f05d01bf39ca files/digest-libwww-5.4.0-r5 545
+SHA256 d8df772d5553ab12bfb4b755dfcb80574536cd9091c326625493d10040934c78 files/digest-libwww-5.4.0-r5 545
 MD5 adb28c73b642bd088f1b48e2cad9bb59 files/libwww-5.4.0-asneeded.patch 2428
+RMD160 086f0e365a1b76588e28a075cc924cdb2f3efed6 files/libwww-5.4.0-asneeded.patch 2428
+SHA256 2174562847643ae8636ab385da1deb63d4a7a709961f92a45f3f21230ebe84de files/libwww-5.4.0-asneeded.patch 2428
 MD5 1866b237427a244b9923469b52f54473 files/libwww-5.4.0-autoconf-gentoo.diff 1089
+RMD160 aadddad4802da1f5b9f212073df90d171f422e52 files/libwww-5.4.0-autoconf-gentoo.diff 1089
+SHA256 630617c79601f664b5752f5331a2abb3eaae70ac3365ba84498475067f6dbcfa files/libwww-5.4.0-autoconf-gentoo.diff 1089
 MD5 ee0dd3b8a76bf8b9e6d051663119eb40 files/libwww-5.4.0-automake-gentoo.diff 346
+RMD160 16b6e244bd0d325d00c0ea6f4185552824cc6b60 files/libwww-5.4.0-automake-gentoo.diff 346
+SHA256 e9d7489f5ee2226cdd602939f82a559cefdd9a9cb4b3c98c316bae05c989c8d9 files/libwww-5.4.0-automake-gentoo.diff 346
 MD5 231e5cc6d075b3464a46858f8d2b65e3 files/libwww-5.4.0-automake-macos.patch 436
+RMD160 67b41c599f66813ab25047fdc07ef32e4afbfccf files/libwww-5.4.0-automake-macos.patch 436
+SHA256 c2df9e41390f12c8b454cc5cce2cec851ddfebb39a78125a0090da520fefcb10 files/libwww-5.4.0-automake-macos.patch 436
 MD5 0851f5aef9f0960efcdcabfdfa960341 files/libwww-5.4.0-disable-ndebug-gentoo.diff 370
+RMD160 8918de13a34d418cd55cb98930640265c48f6571 files/libwww-5.4.0-disable-ndebug-gentoo.diff 370
+SHA256 39bdcca0efc334c9a86a10090fcb2dbfaf9ca427bfd12ac2486b0533287c45f9 files/libwww-5.4.0-disable-ndebug-gentoo.diff 370
 MD5 6853cd848815d9446ef820e3a74878ca files/libwww-5.4.0-htbound.patch 13279
+RMD160 77fe8970180e7bcf79b994f78cb986b2f172d2db files/libwww-5.4.0-htbound.patch 13279
+SHA256 22d94546f706e263b28370b00207d6ad09739c98a6463d4341b94991ac981ad7 files/libwww-5.4.0-htbound.patch 13279
 MD5 b0a8e638d02da0d0284e8555866f1f38 files/libwww-5.4.0-mysql-4.1.patch 1674
+RMD160 39ca32835af65fa781d3c3465f33fc9743d38c34 files/libwww-5.4.0-mysql-4.1.patch 1674
+SHA256 b99508bf1cccb00ad55538a019d70ff165998701282e00faab2ec1b9df43ed01 files/libwww-5.4.0-mysql-4.1.patch 1674
 MD5 db10aa1f9442be23cfec06ad586d1afa files/libwww-5.4.0-noexport.patch 402
+RMD160 0074a161a985b08fa797dd91decea320a23f1dfd files/libwww-5.4.0-noexport.patch 402
+SHA256 f2fa63b1d94ebdec9b77dd6758222e2e6fb232b467b0c5f3f5efaa8ec2265c55 files/libwww-5.4.0-noexport.patch 402
+MD5 b297da007c2b37dbc72492c6a1b566a6 files/libwww-5.4.0-respectflags.patch 1673
+RMD160 751551e3d0c104e4b6a6f81fa815100d28200e37 files/libwww-5.4.0-respectflags.patch 1673
+SHA256 23e24af3d68ad8c33114440e25c6d0678aa4fec71988280c27a90d166b6f825f files/libwww-5.4.0-respectflags.patch 1673
 MD5 e99f48d15e0834666b84203b48805872 files/libwww-config-liborder.patch 776
+RMD160 c6b2f017f1c2ecb036aca3e6d497a1e2fc2e2d6f files/libwww-config-liborder.patch 776
+SHA256 01aa28bd0516ccfff053c07e02a0c323e0403a86be1845d6d5671e776a95d6d2 files/libwww-config-liborder.patch 776
 MD5 4c70dae7ce4964982b3ebe728633f9f0 libwww-5.4.0-r3.ebuild 1943
+RMD160 faebfbe9f76a08fc24b4c1718c999725466f8866 libwww-5.4.0-r3.ebuild 1943
+SHA256 e28a8afbe7a913a27f39ddddae525fcbc6627feb731cad67dc3bc45434e2cd67 libwww-5.4.0-r3.ebuild 1943
 MD5 469a45f9eb035116e1c88cfaee53eff7 libwww-5.4.0-r4.ebuild 2145
-MD5 f3c5fc29fd674e21a4f9bb95e0a57e94 libwww-5.4.0-r5.ebuild 2189
+RMD160 b69ae76583e872bbf9146455119a24cd1f354c99 libwww-5.4.0-r4.ebuild 2145
+SHA256 3c52a440dfdfbcc152a006ecf4c4a06a13c78a40b6d2d2b4fc253a6eceff160d libwww-5.4.0-r4.ebuild 2145
+MD5 031f96c170dddf86e7995553a02f5e54 libwww-5.4.0-r5.ebuild 2172
+RMD160 839a83de421462b27cde0ce8f329305abe1de04a libwww-5.4.0-r5.ebuild 2172
+SHA256 b8534088b857f31ecee94e33e65ad0519cc9a2cd2bce9b12e8c400f6a8a01240 libwww-5.4.0-r5.ebuild 2172
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDwQmkAiZjviIA2XgRAjTVAJ4wz3zf2wAEH3ghwpBdfbZhU8UaswCfY8zH
-nMbStcai9PUX3KC+eMcwoGQ=
-=T+zD
------END PGP SIGNATURE-----
+RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
+SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
diff --git a/net-libs/libwww/files/digest-libwww-5.4.0-r5 b/net-libs/libwww/files/digest-libwww-5.4.0-r5
index 5464fae96380..7a45b56e4053 100644
--- a/net-libs/libwww/files/digest-libwww-5.4.0-r5
+++ b/net-libs/libwww/files/digest-libwww-5.4.0-r5
@@ -1,2 +1,6 @@
 MD5 dcaddf44692252045090584a7d63082c libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
+RMD160 c15263ce045333f03a6f655ff3aaaf0dd14eac35 libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
+SHA256 a2e64a286c691075df952763de38bb5f5ad3611d089d3b8b9c8d7c2d2b7d1bbb libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
 MD5 c3734ca6caa405707e134cc8c6d7e422 w3c-libwww-5.4.0.tgz 1129121
+RMD160 12e55ecb2435f9048d627e56f8ae60d4c246648b w3c-libwww-5.4.0.tgz 1129121
+SHA256 64841cd99a41c84679cfbc777ebfbb78bdc2a499f7f6866ccf5cead391c867ef w3c-libwww-5.4.0.tgz 1129121
diff --git a/net-libs/libwww/files/libwww-5.4.0-respectflags.patch b/net-libs/libwww/files/libwww-5.4.0-respectflags.patch
new file mode 100644
index 000000000000..23e003e79917
--- /dev/null
+++ b/net-libs/libwww/files/libwww-5.4.0-respectflags.patch
@@ -0,0 +1,48 @@
+Index: w3c-libwww-5.4.0/Library/src/Makefile.am
+===================================================================
+--- w3c-libwww-5.4.0.orig/Library/src/Makefile.am
++++ w3c-libwww-5.4.0/Library/src/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with Automake to create Makefile.in.
+ 
+-LDFLAGS = -version-info "1:0:1"
++LDFLAGS := $(LDFLAGS) -version-info "1:0:1"
+ 
+ lib_LTLIBRARIES = \
+ 	libwwwutils.la \
+Index: w3c-libwww-5.4.0/Library/src/SSL/Makefile.am
+===================================================================
+--- w3c-libwww-5.4.0.orig/Library/src/SSL/Makefile.am
++++ w3c-libwww-5.4.0/Library/src/SSL/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with Automake to create Makefile.in.
+ 
+-LDFLAGS = -version-info "1:0:1"
++LDFLAGS := $(LDFLAGS) -version-info "1:0:1"
+
+ lib_LTLIBRARIES = @WWWSSL@
+ 
+Index: w3c-libwww-5.4.0/modules/expat/xmlparse/Makefile.am
+===================================================================
+--- w3c-libwww-5.4.0.orig/modules/expat/xmlparse/Makefile.am
++++ w3c-libwww-5.4.0/modules/expat/xmlparse/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with Automake to create Makefile.in.
+ 
+-LDFLAGS = -version-info "1:0:1"
++LDFLAGS := $(LDFLAGS) -version-info "1:0:1"
+ 
+ CFLAGS = @CFLAGS@ -DXML_NS
+ 
+Index: w3c-libwww-5.4.0/modules/expat/xmltok/Makefile.am
+===================================================================
+--- w3c-libwww-5.4.0.orig/modules/expat/xmltok/Makefile.am
++++ w3c-libwww-5.4.0/modules/expat/xmltok/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with Automake to create Makefile.in.
+ 
+-LDFLAGS = -version-info "1:0:1"
++LDFLAGS := $(LDFLAGS) -version-info "1:0:1"
+ 
+ CFLAGS = @CFLAGS@ -DXML_NS
+ 
diff --git a/net-libs/libwww/libwww-5.4.0-r5.ebuild b/net-libs/libwww/libwww-5.4.0-r5.ebuild
index 2cf525150265..706fec54ea46 100644
--- a/net-libs/libwww/libwww-5.4.0-r5.ebuild
+++ b/net-libs/libwww/libwww-5.4.0-r5.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/net-libs/libwww/libwww-5.4.0-r5.ebuild,v 1.1 2006/01/06 14:31:36 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r5.ebuild,v 1.2 2006/03/19 22:50:48 ehmsen Exp $
 
 inherit eutils multilib autotools
 
@@ -47,6 +47,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-noexport.patch"
 	# Mac OS X has no automake 1.4, only 1.6.3
 	epatch "${FILESDIR}/${P}-automake-macos.patch"
+	# Respect users LDFLAGS, bug #126863.
+	epatch "${FILESDIR}/${P}-respectflags.patch"
 
 	eautoreconf || die "autoreconf failed"
 }