Mung the libgmp.la references in libgmpxx.la #397389 by David Leverton.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index 89d58d3095e95e77913c6423ca1c7566034a2770..4ae67ac62ad0298748dc3a7f0f56ab5c27491cf9 100644 (file)
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/gmp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.160 2012/01/01 18:37:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.161 2012/01/03 10:21:17 vapier Exp $
+
+  03 Jan 2012; Mike Frysinger <vapier@gentoo.org> gmp-5.0.2_p1.ebuild:
+  Mung the libgmp.la references in libgmpxx.la #397389 by David Leverton.
 
   01 Jan 2012; Raúl Porcel <armin76@gentoo.org> gmp-5.0.2_p1.ebuild:
   ia64/m68k/s390/sh/sparc/x86 stable wrt #395193

diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 3f8f91365099c1bc03c4beb308b36b065ceb430a..6f3ad0b7e0b74dd82a97abcfc2ae13928652e3f1 100644 (file)
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -18,13 +18,23 @@ EBUILD gmp-4.3.2-r1.ebuild 1686 RMD160 7192064f72a756e7f87a19bb6e04974869fe9322
 EBUILD gmp-4.3.2.ebuild 1995 RMD160 d4123b138aa96f8084dd652c886ae8a117551411 SHA1 cb4d3873679a4b0d5d073e4b89ef2d203798adc2 SHA256 b386354b1a93bbf9a20774aabb5f31e68fc3870e4eeba3d4931aa0c985608b10
 EBUILD gmp-5.0.1.ebuild 2458 RMD160 b60ffd9a8f150317c51e8ac7cc06d40a39e19201 SHA1 5e6bb32b4ba660fad1fa5ce0d9e33947426f591f SHA256 8a7b8f7fadb14fb6c92881e6f0e063422ea9c6ecf57e0c3f1ffe0b08dcf945d0
 EBUILD gmp-5.0.2.ebuild 2400 RMD160 749fdef4f722fde37ae46ff467de79b071f3eaea SHA1 0bf3e32d2429649dc5ac1e64a13c6743f434f2c5 SHA256 5373783ef40f60d5df4a4df92c345cb89d3abf0702706e4ee91a4f8e766eada8
-EBUILD gmp-5.0.2_p1.ebuild 2768 RMD160 965c806b1833114799f2921d27e748181159d700 SHA1 77402b6dc4c3721a70e2d73a46bae2b6a634b381 SHA256 ca8b6da3a130fc45178aeaa15936989927903aa83e51403713afcf6ca6f72e3b
-MISC ChangeLog 21376 RMD160 fc69f2811de57bd7e034ea02176f8ac6abedb39b SHA1 58f56947460f5e37373f022a207f9101c7e70211 SHA256 94a967221449cc56cf926f2d17eee13bd96c9cd877a7c3663fb2fab09ee289ff
+EBUILD gmp-5.0.2_p1.ebuild 2840 RMD160 7b863d91794b728d88595fb7800d1e93bd287fa1 SHA1 8593ba829911c52e8827e4d11d2b0ae2bc357fc7 SHA256 7c65ca482eab03068a0b9af3b943be65eb707101a0f6fb80b050f9374a223249
+MISC ChangeLog 21521 RMD160 93207424bbe1ebe0da78cb36485d84fd07e9d636 SHA1 1dac736ac7aa23f597b8c8f10e03b5bc77b3da76 SHA256 673177384e254d8f41ea1a0f4d51cc7f1ca69bd7ad918b44d91f4003b42e2171
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8Ap/IACgkQuQc30/atMkBBQwCffDs4XaWFm0PJTGU0AxQm9/7O
-JmEAoLOi3/l1cga5jjQFZMW3GgkIwDVf
-=lWTr
+iQIcBAEBAgAGBQJPAtauAAoJELEHsLL7fEFW6KAQALtNuZZEmtUNywCOR0Avzj0A
+JGJgp4g1zznfCq1daWaEhrCwVoLKRUBlZgmud0eTOLJ6Tu964RgAAHQu/YHy/Xe0
+Nj5WUJ9cI1y9D7y+uRVlZhLSFlVX2SzNylCJbbXCBfDdl0cCdPo5HeVKro4gIdX5
+8LyGUN/TrDEqyNiDKJWzfvmwZvipzKa2rzUj/UJCauOyy5j5S3qLoqA/XzqFgb0g
+eeJGRY/0YZ1pDkrMzm2v8RnqfsMc43GypbcBGXDPpXG8WO11wGejZmNjPZW/rr+n
+VqUcPkJ9W7UfX1MQoTxPGPX86dGoncD7AGikhneSA2EUSJnf+/RrBaZLZbO6ZLbF
+OgM0QL/5eC74LzqsTJFHrloNYFH4m1jvgAqQ5qEqUb09BCQrtooJoZsp2iq5ZGXv
+NXf1XiJByoNu//VUO4VYdSinQ50PmsuT9//NHWtHxi+v8MBZSiPM6EsVrk29C6u6
+JiLQekarB8c1xm61FwZVMux/xM2uCYVkx2hQzKZKrBcxj5Kc2z28mRAZdvXgczxa
+LEwyG8ORFJ8JPz8DBvz5qDdTyWzG+F2CBusrFts7kVY9fwZ1y4Lrgta18pFDrNIi
+rtoJWweFdE9YnKau17o5V5o17OIh1Axb5kUJV7yuBwYnxVhhJRsTWoSQsBsRjI09
+6V7RBKKn1OJzuoiI1o4m
+=VNLA
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/gmp/gmp-5.0.2_p1.ebuild b/dev-libs/gmp/gmp-5.0.2_p1.ebuild
index 56e59e84e9948c4ff9e71b80fb3dd7534aa73ff3..1b80ecace14a3db39f3646e86f25ad8b7529a145 100644 (file)
--- a/dev-libs/gmp/gmp-5.0.2_p1.ebuild
+++ b/dev-libs/gmp/gmp-5.0.2_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.2_p1.ebuild,v 1.9 2012/01/01 18:37:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.2_p1.ebuild,v 1.10 2012/01/03 10:21:17 vapier Exp $
 
 inherit flag-o-matic eutils libtool toolchain-funcs
 
@@ -81,7 +81,10 @@ src_install() {
        # should be a standalone lib
        rm -f "${D}"/usr/$(get_libdir)/libgmp.la
        # this requires libgmp
-       use static-libs || rm -f "${D}"/usr/$(get_libdir)/libgmpxx.la
+       local la="${D}/usr/$(get_libdir)/libgmpxx.la"
+       use static-libs \
+               && sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
+               || rm -f "${la}"
 
        dodoc AUTHORS ChangeLog NEWS README
        dodoc doc/configuration doc/isa_abi_headache