Apply patch from Olivier Huber <oli.huber@gmail.com> to respect LDFLAGS. Bug #331591

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 37 insertions, 14 deletions

diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog
index 336e7335f5fe..d962d7304f8d 100644
--- a/net-mail/mailman/ChangeLog
+++ b/net-mail/mailman/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/mailman
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.120 2010/01/16 17:20:13 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.121 2010/08/12 21:37:57 hwoarang Exp $
+
+  12 Aug 2010; Markos Chandras <hwoarang@gentoo.org> mailman-2.1.13.ebuild,
+  +files/mailman-2.1.13-ldflags.patch:
+  Apply patch from Olivier Huber <oli.huber@gmail.com> to respect LDFLAGS.
+  Bug #331591
 
 *mailman-2.1.13 (16 Jan 2010)
 
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 085962346191..d5c401d2f4d3 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50_mailman.conf 429 RMD160 54104453464b725adc18e5fb66bee265089013f6 SHA1 7b002917ae358587fc121f8c06c54c76dd0d9934 SHA256 8a93c5f9b2012122c6e85445620d5eb388e1bc38cb2102158bb62681cb61d3ec
 AUX 50_mailman.conf-r1 592 RMD160 2f2be797205a63b728fe89a3367bbfb0e1f5d5dc SHA1 12a9d7276eb796c7512ece411a56f4b45f861a7d SHA256 4512a9dd6cba38a080654cbe172941a053fdc8b33afb65748d76716e9d00a029
 AUX README.gentoo-r2 5537 RMD160 8d753bb466666bac03ee4da4b7e35456d66dfec3 SHA1 f2702f1dbcab75397795b55883972a047b39463e SHA256 3809aa17e4e9a244cdf7c06af1605c3ce660329b0e279a93c4c3650b8d9ffa42
 AUX README.gentoo-r3 6804 RMD160 8885ce718cee4c1ff7fba103b6be314dfbf794c2 SHA1 343a4af9782136775fa3fe20d132d1e70b5468da SHA256 9db15d248be59d98f038718b50d5a02f08f5fc0870bf0f0ebec4c5d008c4e31b
 AUX mailman-2.1.12-add-destdir.patch 379 RMD160 f5cec806246df499d90174c907dce2562cd5c607 SHA1 919e3d7fab0e4d4fe176ce1f92bc9651c8d3cf91 SHA256 10a22b784eecfc86c78380be6c389b90bbcec3e4c31a04b70f6a09e96ef4afd8
 AUX mailman-2.1.12-directory-check.patch 1485 RMD160 1b2a12f332ca2c70d2cca4310d6f6d1ed37085aa SHA1 56abf3e8643a7140450a338b133b5f6e2e62d4a4 SHA256 4986cc5e7d37cec02b4f29dbf4838e81799fabdfb89bbc7f8e54c9210ae1de6d
+AUX mailman-2.1.13-ldflags.patch 1022 RMD160 24cb935e95056a55ce77de1c00c083d88dbf2a52 SHA1 ea60f2a9b567c7832525ad150f6a2399d8feb1e1 SHA256 75b9fe8ef757541776532f76b1262c1616d440178ad39c432fe2d529eecf5645
 AUX mailman-2.1.8_rc1-directory-check.patch 1287 RMD160 3bf6d1216a79a32d68340cb0df5db9b5f44a3931 SHA1 ad2b689ce7911b509f999cd849d0402c36ded97c SHA256 2d31eda834429a55edad1fea3c379ecb3e8f05c03fac82f172989caeab85314d
 AUX mailman-2.1.9-fix-XSS.patch 11287 RMD160 b4dff793463c976cef7bdfe2cded986a8f7820ab SHA1 d01f299044ddaf8c0c6df53cb7b8ec73f3f183a4 SHA256 cd2ffb0e19dd12205d375f3c83b7d6a3177c0f3389bf15db37bce1e63e459307
 AUX mailman-2.1.9-icons.patch 555 RMD160 d0beb080e0dd4c753ce5e075b3c7db424b5474ef SHA1 786edc8b3ed11920aaaa23a8f3c0e4f9ae190a87 SHA256 cd78a7447febcbe1901144a190ef14cf9075b8055cc275e0405fc748f9c855f0
@@ -18,14 +16,7 @@ DIST mailman-2.1.13.tgz 8166504 RMD160 3a62b04ea0f48c3ecbe815eb927d282f765e416c
 DIST mailman-2.1.9.tgz 7829201 RMD160 135f94eeecca1f562f98dfe98c1a367bed229372 SHA1 e9f6f55e2551c3e576460749383da20599412d42 SHA256 1b7a2c853c21bfd22205167dc3678c634a3f981721d95d1cd923ca84967cc986
 EBUILD mailman-2.1.11.ebuild 5799 RMD160 d2a98c07786101920267b3b5b04338c802f22b56 SHA1 0c143d4328e461519ea62a7f2647aab8b770b7ab SHA256 6b9841f293f9f0027b4bc6c47d9b23e8e659f67ccf18451307a85b700f822a19
 EBUILD mailman-2.1.12.ebuild 5955 RMD160 790d5192e1d4eae74b59f5637205a00c8761022d SHA1 0a3d7ac18a798f3fd4851e4137647c767c45b6e1 SHA256 214e41abcfa8b1ae4db3a9dee0d73a084024da9ef28727d29d2d219ab7552dbc
-EBUILD mailman-2.1.13.ebuild 5881 RMD160 f16a63263d96562fb594460097caf6af79dda921 SHA1 2fad37722627fec86a9afb03c4b6d18d176848ab SHA256 5e05fd95082a0d0ad06a3d80880e708cf8656fa2badb974b6355716cf963fe3f
+EBUILD mailman-2.1.13.ebuild 5925 RMD160 0e084b114243ec1c89ab8f5bf95e21e47ae11d89 SHA1 5090e7dc3097ea3e34978df98b2ccd5e3b610fd2 SHA256 290b704a118610db622ba15aa31d9b8a2a218e9e94826fa5cca1d6f8e5c793b6
 EBUILD mailman-2.1.9-r3.ebuild 5043 RMD160 af96466c4999637c7dbbe451bd9f356212d67e6e SHA1 da83aa902924804aee28b35ba65f4b378f943ae1 SHA256 b5d7277a1f8f87a6aac2977e58faeeaf337950bc0f030097f6bef6875584e973
-MISC ChangeLog 16003 RMD160 c19d6ad9a57940670a71738f8b834f0ba9174af3 SHA1 f12c6bf1a88822fc42b89bc595632a2de7741a05 SHA256 a99e6dc54e9e932efefbe7df7196278eefafcb4c2c7cbff3376ee335964ffe67
+MISC ChangeLog 16211 RMD160 a5ccc2a438c96e636973a5da668fa17abf84b805 SHA1 5eb037a12fa5eb41117cacd8e074fcd7083235d7 SHA256 aff7d10d2df75809304f147dac29b63d73d57ec5bd7a5c69a7405b129041453c
 MISC metadata.xml 218 RMD160 30759d93f0209fdd74f29393ae54999fe6b2bdff SHA1 486b307ff1dae10aef7d18472460a21bc2decdfb SHA256 09421ca1b9299683d07f68ddbbd3ed97251dac613121b420841a3251da7fcb89
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktR9VIACgkQr2QksT29OyC3WQCeM93wzzqvD6P4fIeQAY59HBAn
-/MMAn3w+LqhzCm5QwWa4Haik3IP1uESW
-=Xr+y
------END PGP SIGNATURE-----
diff --git a/net-mail/mailman/files/mailman-2.1.13-ldflags.patch b/net-mail/mailman/files/mailman-2.1.13-ldflags.patch
new file mode 100644
index 000000000000..1c278347a0ad
--- /dev/null
+++ b/net-mail/mailman/files/mailman-2.1.13-ldflags.patch
@@ -0,0 +1,26 @@
+--- src/Makefile.in~	2009-02-23 22:23:35.000000000 +0100
++++ src/Makefile.in	2010-08-08 02:03:16.000000000 +0200
+@@ -46,6 +46,7 @@
+ CGIDIR= 	$(exec_prefix)/cgi-bin
+ CGIEXT=		@CGIEXT@
+ MAILDIR=	$(exec_prefix)/mail
++LDFLAGS= @LDFLAGS@
+ 
+ SHELL=		/bin/sh
+ 
+@@ -91,13 +92,13 @@
+ all: $(PROGRAMS)
+ 
+ mailman: $(srcdir)/mail-wrapper.c $(COMMONOBJS)
+-	$(CC) -I. $(MAIL_FLAGS) $(CFLAGS) $(COMMONOBJS) -o $@ $(srcdir)/mail-wrapper.c
++	$(CC) $(LDFLAGS) -I. $(MAIL_FLAGS) $(CFLAGS) $(COMMONOBJS) -o $@ $(srcdir)/mail-wrapper.c
+ 
+ #addaliases: $(srcdir)/alias-wrapper.c $(COMMONOBJS)
+ #	$(CC) -I. $(ALIAS_FLAGS) $(CFLAGS) -o $@ $(srcdir)/alias-wrapper.c
+ 
+ $(CGI_PROGS): $(srcdir)/cgi-wrapper.c $(COMMONOBJS)
+-	$(CC) -DSCRIPT="\"$@\"" -I. $(CGI_FLAGS) $(CFLAGS) $(COMMONOBJS) -o $@ $(srcdir)/cgi-wrapper.c
++	$(CC) $(LDFLAGS) -DSCRIPT="\"$@\"" -I. $(CGI_FLAGS) $(CFLAGS) $(COMMONOBJS) -o $@ $(srcdir)/cgi-wrapper.c
+ 
+ common.o: $(srcdir)/common.c $(srcdir)/common.h Makefile
+ 	$(CC) -c -I. $(COMMON_FLAGS) $(CFLAGS) $(srcdir)/common.c
diff --git a/net-mail/mailman/mailman-2.1.13.ebuild b/net-mail/mailman/mailman-2.1.13.ebuild
index 677a56d08030..22712011d1bd 100644
--- a/net-mail/mailman/mailman-2.1.13.ebuild
+++ b/net-mail/mailman/mailman-2.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.13.ebuild,v 1.1 2010/01/16 17:20:13 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.13.ebuild,v 1.2 2010/08/12 21:37:57 hwoarang Exp $
 
 inherit eutils python multilib
 
@@ -41,6 +41,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-2.1.12-directory-check.patch" || die "patch failed."
 	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch" || die "patch failed."
+	epatch "${FILESDIR}/${P}-ldflags.patch"
 }
 
 src_compile() {