Don't override LDFLAGS, fixes bug 293573.

Package-Manager: portage-2.2_rc50/cvs/Linux i686

4 files changed, 37 insertions, 7 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 6224870d9ce5..c3eecff38561 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.223 2009/09/25 10:25:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.224 2009/11/18 19:12:20 ulm Exp $
+
+  18 Nov 2009; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.2.ebuild,
+  +files/openmotif-2.3.2-ldflags.patch:
+  Don't override LDFLAGS, fixes bug 293573.
 
   25 Sep 2009; Ulrich Mueller <ulm@gentoo.org> -openmotif-2.3.0-r3.ebuild,
   -files/openmotif-2.3.0-fix-nedit-segfaults.patch,
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 940856f398c0..36d706effd38 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -4,17 +4,18 @@ Hash: SHA1
 AUX Mwm.defaults 536 RMD160 99fc40c2e923b53a14b2911c37064f2c9cd3f63b SHA1 ddbe7ab7af3a8caf6ccb9d6ab2c721ce5940edd1 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250
 AUX openmotif-2.3.1-ac-editres.patch 358 RMD160 2bace990711052d7d26a405aa63d6696a33ca50c SHA1 a83e8567f5bc9998f9cbdfbfafce007ac44009a8 SHA256 6ef38a5a3532e3a8d6be85549026410340da0d98aa97dd683aeb70eb5b9c5d52
 AUX openmotif-2.3.1-multilist-stipple.patch 819 RMD160 756e0a20223b157f127197c74c5d71087a06c51f SHA1 c81c77fa9c47f463a851f3591ba9f370c4c7a347 SHA256 2ccc3b9292eb8a2f6eab49198ea54f51bc243d14b64b4bd07aea6712526dd828
+AUX openmotif-2.3.2-ldflags.patch 654 RMD160 8756d40e95f64a851838042f9cf2152a1b6e9f61 SHA1 f0f9958a259487b0ef6c9d0d9daf8ab2415faa1d SHA256 70236c905c93a50354d990fdb500ba32b94bb28b90ccf8b4ca5052d4ac23ca80
 DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb
 DIST openmotif-2.3.1-1.tar.gz 5937284 RMD160 e03422204b6077fa6556894f194236d40e92e42b SHA1 3245375f4bd8e2d2eb02c2636d5491e834d8bb1a SHA256 1f831a1a2feb63af3167e54eacc12856d8a38b9caf6342f30daf901a414a986e
 DIST openmotif-2.3.2.tar.gz 5941784 RMD160 2346a93fcec57b9c18b6657d1cc681b6001cba28 SHA1 c98ac1bf3640ce57da34a0704bdeb2b12011ae1f SHA256 f786f3724d33133e8c4b3c9b368c89d680e981ca1c0e8c3280f496976b390c7d
 EBUILD openmotif-2.3.1.1.ebuild 4186 RMD160 4676e5796c473d463d9a5628bb4b7c97e1e75777 SHA1 603ffd67e08d5d1c5ba1c93413786f7e0eea8d1e SHA256 9034efeb6edbd501703d8e598d4a543341a1bd69ee9b161963db1acec585844d
-EBUILD openmotif-2.3.2.ebuild 4041 RMD160 7f8bf9f3ccfff2d111108a0cca39cca6d00c81d0 SHA1 dc399111eb3d5c3f46ab14fa0fe96c8a2be680a5 SHA256 389a9d544591da6f7e7816638c7cdd9ca4068c800f8c097cab635060d786574c
-MISC ChangeLog 33538 RMD160 3e9cdfd47e016943ccdf3f2184ee0d30d41afdc5 SHA1 d6122a384f6f6cd08932088257f66a051d79a6b3 SHA256 f30d4c0a334fac68fc6fef59d8fe612465f8ee7d660bdc35a39861690d5eb7ec
+EBUILD openmotif-2.3.2.ebuild 4087 RMD160 e37ef97d8e8828a84cb49a8a99ac5f777ebee09d SHA1 babb80bc5c72ef9488295a289a7acaa2cc78453c SHA256 aff1f888483b9d4f2b60ec8448127de71e0732342a2c45c07cb26bdc6bce2dcf
+MISC ChangeLog 33694 RMD160 c2cc856730bc3db8ee547028c4d96949e2fdc990 SHA1 84feba7dffce27c747d927d4d9211e9fbe768326 SHA256 a4d39f305df800435012ad7f68cb1c668fb78b4d172d3190e708236a2519cb8b
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkq8my8ACgkQOeoy/oIi7uxf7ACg3wWSgU/m53MDdr5H27/RzdOq
-7rcAoMHctDVWRxxmRuBnxLeCXGJHE+il
-=6rje
+iEYEARECAAYFAksER64ACgkQOeoy/oIi7ux7+wCgt1+8+4hfN5162InVhP4M54c9
+ilQAn032x3LCeHiycRfSAJrSwLIFrBqy
+=TxeE
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/files/openmotif-2.3.2-ldflags.patch b/x11-libs/openmotif/files/openmotif-2.3.2-ldflags.patch
new file mode 100644
index 000000000000..7a84720ea0f5
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.3.2-ldflags.patch
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/293573
+
+--- openmotif-2.3.2-orig/lib/Mrm/Makefile.am
++++ openmotif-2.3.2/lib/Mrm/Makefile.am
+@@ -8,7 +8,7 @@
+ 
+ libMrm_la_LIBADD = ../Xm/libXm.la ${X_LIBS} -lXt ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS}
+ 
+-LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
++AM_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
+ 
+ lib_LTLIBRARIES = libMrm.la
+ 
+--- openmotif-2.3.2-orig/lib/Xm/Makefile.am
++++ openmotif-2.3.2/lib/Xm/Makefile.am
+@@ -11,7 +11,7 @@
+            ${X_CFLAGS}
+ xmdir = $(includedir)/Xm
+ 
+-LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
++AM_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
+ 
+ lib_LTLIBRARIES = libXm.la
+ 
diff --git a/x11-libs/openmotif/openmotif-2.3.2.ebuild b/x11-libs/openmotif/openmotif-2.3.2.ebuild
index 3d4c34a50d3f..757845c285ec 100644
--- a/x11-libs/openmotif/openmotif-2.3.2.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2.ebuild,v 1.10 2009/07/13 18:23:17 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2.ebuild,v 1.11 2009/11/18 19:12:20 ulm Exp $
 
 inherit autotools eutils flag-o-matic multilib
 
@@ -62,6 +62,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-2.3.1-multilist-stipple.patch" #215984
 	epatch "${FILESDIR}/${PN}-2.3.1-ac-editres.patch" #82081
+	epatch "${FILESDIR}/${P}-ldflags.patch" #293573
 
 	# disable compilation of demo binaries
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am