Fix ax_lib_expat.m4 macro to not use LDFLAGS for passing libraries wrt #305547 by Kacper Kowalik.

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

4 files changed, 67 insertions, 4 deletions

diff --git a/sci-biology/mira/ChangeLog b/sci-biology/mira/ChangeLog
index 60bd38326de7..e3d10b3a5912 100644
--- a/sci-biology/mira/ChangeLog
+++ b/sci-biology/mira/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-biology/mira
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mira/ChangeLog,v 1.3 2010/02/03 15:57:25 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mira/ChangeLog,v 1.4 2010/02/25 19:00:05 ssuominen Exp $
+
+  25 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> mira-3.0.0.ebuild,
+  +files/mira-3.0.0-asneeded.patch:
+  Fix ax_lib_expat.m4 macro to not use LDFLAGS for passing libraries wrt
+  #305547 by Kacper Kowalik.
 
   03 Feb 2010; Andrey Kislyuk <weaver@gentoo.org> mira-3.0.0.ebuild:
   add eautoreconf
diff --git a/sci-biology/mira/Manifest b/sci-biology/mira/Manifest
index 0838896b6722..3a18ea31b1e4 100644
--- a/sci-biology/mira/Manifest
+++ b/sci-biology/mira/Manifest
@@ -1,5 +1,6 @@
+AUX mira-3.0.0-asneeded.patch 1469 RMD160 08c3278e5ac3bc8403e53ef63859fd612004960a SHA1 c23929ea0f5c1f2e092494bdf55ddb236baf70a9 SHA256 b024e149d9c3f5a17e39bbcc3ef33c291bd452546c75f76a70557b355d223d3e
 DIST mira-3.0.0.tar.bz2 7323621 RMD160 ab95d728a74b101ff49bea80bc5648fa9ebb69b8 SHA1 d736b324115d24270602cdc7066feb928869a916 SHA256 564177fb9777ecdf657640f8e7ea5d7aa0e76b35cebb882ccf77e1714d2fe21d
 DIST mira_3rdparty_31-01-2010.tar.bz2 23314 RMD160 d1edd2281693db1f7c472390128551c7f45775ab SHA1 0add918747b1d7ff50b81df767e4839463b06f06 SHA256 8b042447e7f6f7de15166c9b667477358a9f78a6c98347bb8eddf278c8a8c50b
-EBUILD mira-3.0.0.ebuild 1239 RMD160 71a852200f0eb882555429f574e0e753fb97ed11 SHA1 f415ae7865ca9a2cf540aad8553cb9f039e8c850 SHA256 2dc170d6647a7d5120b53527467f4d6a2fa0b2de6232c2bf2c4b7b7a87cd3fe2
-MISC ChangeLog 540 RMD160 302df975cbf3fa71d60dc8df9ba50d1f15a903a9 SHA1 e15f6a9617cb56f955b91eb7eba15b40dc9b6e22 SHA256 58f79611c7a98238a52946097ef7e2086471e6731dc57b0cea40ed6a3d40967d
+EBUILD mira-3.0.0.ebuild 1284 RMD160 8f42b6262f349a6e7062021f4ec8cf0af3986308 SHA1 c68947cb1b84e8ea5433f218f77280767f6c9fa6 SHA256 3effc7c86c50ca88ea2471e93283ed41fdc52ab407a3344026adc2fb15cb0a0b
+MISC ChangeLog 755 RMD160 9d65f30fb85b0ebaa3960e7ec61d31dedb5e4e6f SHA1 8745bab2a504943948729fd931b91af93fbb3334 SHA256 1b03cb2b9e25bbe0a85f5f4045fa2b65d0a6c3b9da68a80788abb76cbbd48677
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
diff --git a/sci-biology/mira/files/mira-3.0.0-asneeded.patch b/sci-biology/mira/files/mira-3.0.0-asneeded.patch
new file mode 100644
index 000000000000..d1b797006051
--- /dev/null
+++ b/sci-biology/mira/files/mira-3.0.0-asneeded.patch
@@ -0,0 +1,56 @@
+http://bugs.gentoo.org/show_bug.cgi?id=305547
+
+--- config/m4/ax_lib_expat.m4
++++ config/m4/ax_lib_expat.m4
+@@ -96,6 +99,7 @@
+ 
+     EXPAT_CFLAGS=""
+     EXPAT_LDFLAGS=""
++    EXPAT_LIBS=""
+     EXPAT_VERSION=""
+ 
+     dnl
+@@ -105,7 +109,8 @@
+ 
+     if test -n "$expat_prefix"; then
+         expat_include_dir="$expat_prefix/include"
+-        expat_lib_flags="-L$expat_prefix/lib -lexpat"
++        expat_lib_flags="-L$expat_prefix/lib"
++        expat_libs="-lexpat"
+         run_expat_test="yes"
+     elif test "$expat_requested" = "yes"; then
+         if test -n "$expat_include_dir" -a -n "$expat_lib_flags"; then
+@@ -126,6 +131,8 @@
+         saved_LDFLAGS="$LDFLAGS"
+         LDFLAGS="$LDFLAGS $expat_lib_flags"
+ 
++        saved_LIBS="$LIBSS"
++        LIBS="$LIBS $expat_libs"
+         dnl
+         dnl Check Expat headers
+         dnl
+@@ -171,7 +178,8 @@
+                     ]]
+                 )],
+                 [
+                 EXPAT_LDFLAGS="$expat_lib_flags"
++                EXPAT_LIBS="$expat_libs"
+                 expat_lib_found="yes"
+                 AC_MSG_RESULT([found])
+                 ],
+@@ -185,6 +193,7 @@
+ 
+         CPPFLAGS="$saved_CPPFLAGS"
+         LDFLAGS="$saved_LDFLAGS"
++        LIBS="$saved_LIBS"
+     fi
+ 
+     AC_MSG_CHECKING([for Expat XML Parser])
+@@ -194,6 +203,7 @@
+ 
+             AC_SUBST([EXPAT_CFLAGS])
+             AC_SUBST([EXPAT_LDFLAGS])
++            AC_SUBST([EXPAT_LIBS])
+ 
+             HAVE_EXPAT="yes"
+         else
diff --git a/sci-biology/mira/mira-3.0.0.ebuild b/sci-biology/mira/mira-3.0.0.ebuild
index 538ef1eab18a..d112bee41571 100644
--- a/sci-biology/mira/mira-3.0.0.ebuild
+++ b/sci-biology/mira/mira-3.0.0.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/sci-biology/mira/mira-3.0.0.ebuild,v 1.3 2010/02/03 15:57:25 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mira/mira-3.0.0.ebuild,v 1.4 2010/02/25 19:00:05 ssuominen Exp $
 
 EAPI="2"
 
@@ -26,6 +26,7 @@ RDEPEND="${CDEPEND}"
 
 src_prepare() {
 	find -name 'configure*' -or -name 'Makefile*' | xargs sed -i 's/flex++/flex -+/' || die
+	epatch "${FILESDIR}"/${P}-asneeded.patch
 	AT_M4DIR="config/m4" eautoreconf
 }