Restore libltdl.la and add a comment noting its requirement to prevent future screw-ups #383929 by Francesco Riosa.

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

4 files changed, 24 insertions, 11 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 904bad7b97cb..2cb939a9c56f 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.192 2011/09/23 04:17:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.193 2011/09/24 06:39:35 vapier Exp $
+
+*libtool-2.4-r3 (24 Sep 2011)
+
+  24 Sep 2011; Mike Frysinger <vapier@gentoo.org> -libtool-2.4-r2.ebuild,
+  +libtool-2.4-r3.ebuild, libtool-9999.ebuild:
+  Restore libltdl.la and add a comment noting its requirement to prevent future
+  screw-ups #383929 by Francesco Riosa.
 
 *libtool-2.4-r2 (23 Sep 2011)
 
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index c792fac2d137..d2d81ca9714d 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -16,14 +16,14 @@ EBUILD libtool-1.5.26-r1.ebuild 759 RMD160 59eaf949c33f58e014cb2a167309ab8d2f036
 EBUILD libtool-1.5.26.ebuild 2837 RMD160 01e8a0bd7256d2aeda34e2f7791baba3fb979b02 SHA1 f9ec3c2ffb6d85610db75ffbb95e611e45a7576e SHA256 faf95db0c3e14440410e543a28a1d824c176e72a7f6091bd93f72bf9e74e707a
 EBUILD libtool-2.2.10.ebuild 1822 RMD160 38024b97a085f966d620f3a44ccd642e58af90ac SHA1 bc74836cd7f257811b88510d8a4eb0c82dcd4077 SHA256 338ae2f58f5c86338c3af4bc452d583a1ec4fed22707392a82b974a573395171
 EBUILD libtool-2.4-r1.ebuild 1856 RMD160 2f06fbaecce32fe38bd7c7d4af27e0d627df7670 SHA1 8b124eca396b9d14d7417b759eaec123056c89f6 SHA256 82e228a1979e516e2e7e3f08b0ecaff3a63f3a13bc1837d803bfa8c75f810c88
-EBUILD libtool-2.4-r2.ebuild 2312 RMD160 dc6257875c1fc9d111d266b6e491a4ca385d0249 SHA1 f3b16fad638390d1db222e550a87b540626a22d8 SHA256 90db8ad9b8ecceca1babcad5b1a941303e3497bf185d4062cfbfc6ef746133ca
-EBUILD libtool-9999.ebuild 2224 RMD160 3aa24d34418f852c7e61c19b65a49d121bd41a96 SHA1 41f8256e8df4db0bb1a6a93f6a68f4ee8c1580ac SHA256 80f5ed4341ef40857ee66eb62b9ed534f705dd00a61c1775abc71a0287ddb4e8
-MISC ChangeLog 28553 RMD160 765fb3942502f9c2a3abced117f13b4e6d21dbf5 SHA1 1c730ea2ae8cfb26d10a3c86e989b89b6fa45107 SHA256 90433c7fd72344996e7ef9cd270b9954d4a1c51ee2132c8191cec02bff17ed30
+EBUILD libtool-2.4-r3.ebuild 2453 RMD160 4e20e531e49a629a6d676ca4625b89c5147b01c8 SHA1 aabc276aca78f84ca1f41d67826908d5608bfe82 SHA256 4034cb3a6291cf91e5a7e327429a4ea251159dc247c57ed5701fa1f11302885f
+EBUILD libtool-9999.ebuild 2365 RMD160 a4e92631105bee99385c5d2d104572bcf4d66084 SHA1 dc75f71ec65315b31f113cbd47379bfb4f0844f4 SHA256 b70c9da74dd41e930854b67844d0b8a2bc5aeaead18b3ec8d4aef8e1d005cd38
+MISC ChangeLog 28826 RMD160 7a51a6cc393c8dfb44a77009d49f62645e16e8c4 SHA1 2dd004f88d56e932fb63a60273fa78bf6cffdf1a SHA256 9aeb0294c1242932e6ca5a9790f77230681bebdc9d953890a785b3bdd7aa149d
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk58CGkACgkQaC/OocHi7JaMHAD/U1TwJZBh9pG+K2IWELP14XGe
-qds0hbp/iucYlVkyTs4A/1WX0/20auRgpZTcFmQud3NLHC/vN6n9U33YHHWPHA+k
-=fx0B
+iF4EAREIAAYFAk59exEACgkQaC/OocHi7JazGwD8CHijvce53Uup1YojY8ASHo0U
+L8bRYeNfQTsyhhhpm68A/04d64WeSxKcuY9oHtXewwg5CEIn+nQQ4YN2NSF5gqKk
+=V3+p
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/libtool-2.4-r2.ebuild b/sys-devel/libtool/libtool-2.4-r3.ebuild
index 60593f52db0f..155795939c6a 100644
--- a/sys-devel/libtool/libtool-2.4-r2.ebuild
+++ b/sys-devel/libtool/libtool-2.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4-r2.ebuild,v 1.1 2011/09/23 04:17:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4-r3.ebuild,v 1.1 2011/09/24 06:39:35 vapier Exp $
 
 EAPI="2" #356089
 
@@ -70,9 +70,12 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	use static-libs || find "${D}" -name libltdl.la -delete
 	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
 
+	# While the libltdl.la file is not used directly, the m4 ltdl logic
+	# keys off of its existence when searching for ltdl support. #293921
+	#use static-libs || find "${D}" -name libltdl.la -delete
+
 	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
 		rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
 	done
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index 855e413d72ad..7f1555b04a7c 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.7 2011/09/23 04:17:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.8 2011/09/24 06:39:35 vapier Exp $
 
 EAPI="2" #356089
 
@@ -67,9 +67,12 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	use static-libs || find "${D}" -name libltdl.la -delete
 	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
 
+	# While the libltdl.la file is not used directly, the m4 ltdl logic
+	# keys off of its existence when searching for ltdl support. #293921
+	#use static-libs || find "${D}" -name libltdl.la -delete
+
 	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
 		rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
 	done