Do not delete headers installed by gnulib #527200 by Jorge Nerin.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 156 insertions, 15 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 63872204a6ad..c7cd60fbdebc 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.227 2014/10/28 01:01:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.228 2014/10/31 21:08:12 vapier Exp $
+
+*libtool-2.4.3-r1 (31 Oct 2014)
+
+  31 Oct 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/libtool-2.4.3-no-clean-gnulib.patch, +libtool-2.4.3-r1.ebuild:
+  Do not delete headers installed by gnulib #527200 by Jorge Nerin.
 
 *libtool-2.4.3 (28 Oct 2014)
 
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index f3efba84e58c..5372f05b9d12 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX 1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185 SHA256 6a17e149e3638c3c94679459e1201f5dd7abbe97e5c8ab3654c1a0d079f53326 SHA512 17faaf1d725d246b7fcd94a9be99c24b0600db0dea40218eb5a8b3ef382f8e90bd6e70e9b21733e80ccf448ed588b589fc4dca5b13a365e6b7821a730c65faec WHIRLPOOL dc6d7ff7a1c42d40931f90fe69d5cb6094ea67de5a1c9461e47336d4b5d4b36dd9db6a19a72df00e474a6e0aaab2cd0545270184ad795f32cc344ac3956d0821
 AUX libtool-2.4-openmp.patch 2289 SHA256 355bb3a6f92ae46dd723551b0f11e5e5f8a584e21880e756e815704e8f7b74da SHA512 403b4b78b480644f341ba89961313f7c872174ad04e2f8d580950290837f605aa776430335fae7a040a530a6f91e0aff1d5d32ca612a1bb81f4793b5a54c37bf WHIRLPOOL bdaae61a6f0424b5ed42054fbd997ef37ca75a132f65d7b103a14a7551bdd6817af732ce168e35d445bdf618593e8aa92548e75b31628f7f390c30b74e846850
+AUX libtool-2.4.3-no-clean-gnulib.patch 1937 SHA256 cd37c59390fe0c626e9de1e407865557489447e4c2e30b0b8c9e6d244ad3a74f SHA512 b4a63880350707fcf777430b70a139a4972966d97edbce40d27eb17e62f3bb2a80567a5a069991e960266a212c9c926d4b4b94258f266dc04c117def1aac8c5a WHIRLPOOL 72a9ec9aafb758d4d88fe741c66b2f2b3ba84ad477d9768d8353bba5bb07b7b11653ae2ed9f07f3497f65b3c7c10b667e98ccfe2ec146c41a9cdd066ae6746b9
 AUX libtool-2.4.3-use-linux-version-in-fbsd.patch 1124 SHA256 4f081f5515b28be8496883a413c4c3597312e3780b3ba2732e28a33e0a61dd94 SHA512 6134fb39cf0e115a91cf69de175c9a088d405684139f8ba3dcf77f2c039e5f4603e2b70652f27bb59773aacb562560c1bcdbf439de1564bd19095d524b0ee5c7 WHIRLPOOL 360aa2635e2f26e94558428ac8d0921ce3d88ba9ec7906a63431a2894627d98b78c69af66a295a7dc7a3e59c4670bdfff0bfe08bccd31baa261410c8ac963492
 DIST libtool-1.3.5.tar.gz 538884 SHA256 02e287ba621aa01ee581b0f88854deb222fa61e7e0fc55ed7685038354f0259f SHA512 e7e693da0e87bc3b178b270c1d5b0d46116d1624f6e3657ad75bc381bcbba8949ab0913fe3985c77e9dd0ee519df7da9c5ee3b4f6030ad1d4651de2e642c4bd6 WHIRLPOOL 038305555932f7554c5e50932a0bf8cd0f2a8007c26fdd21c81dc7c44ca9076d1086e3c05911f62719685bd7aa6b14463f3a1160bfbf6090bcdba6a162d95630
 DIST libtool-1.5.26.tar.gz 2961939 SHA256 1c35ae34fe85aa167bd7ab4bc9f477fe019138e1af62678d952fc43c0b7e2f09 SHA512 fcd39856c8cd457c97f176d5f6ce97fd93108808ce24315d179a7c9ca85bb90e799afaa83bc283ec627d73cfe0e0710d36a1ee8f39c9963cf2e806e64a0e0bcf WHIRLPOOL 0a56e666ee7ec79b74b500e761ebddc94fb3d322b1c29c3f9929071f71a339b3082faa486b75c7cfcf72182976a8d6152585ca92c08735a512c07eff80a24ec4
@@ -15,24 +16,25 @@ EBUILD libtool-2.4-r1.ebuild 1860 SHA256 134dc2a2dd2b71d8ac5dc6bd3f0e4535d031407
 EBUILD libtool-2.4-r4.ebuild 2753 SHA256 9070fd9cc352f4a1158dc5e019e68b5f36cc2dab67bf1f1a41f36c3e5241eeef SHA512 e31b8d7e91c3358a9e63293f348c0b5044ea8f4a404c10c9b6537abc9261f4bdf0fb0a3fb5eaac7752905b74d9eaf24acc8b65d6f3e3175d7ff85851ed9a18ea WHIRLPOOL 07f373e88b2e439ba6b7282b17b3da20a3115ba45ec180ada6473e63d4d473f98d93b3511abc57c79a7e87e552e8ccf2ae8d396b5f0ed44771831ae51607a8f6
 EBUILD libtool-2.4.2-r1.ebuild 2846 SHA256 d363a162685573430c2c4e0b50e5ebe5c8faa7584a6bdacf093803ef5837693b SHA512 927845575ebe67cf3db3cd21a3cd180d143b6d796dd0a7490c9770b2c4e78bf2c9893d1d5ca06b27f5090cc3916671320ba1a9ffce8aef68561798087298a92f WHIRLPOOL 65a363bbb770c1ab3c7d46e6d3b99a1b9499acd7b65f2a6cb407281aa49ca58976d99d8f08221a2c252d2a47eaaac1dbdaad38a690e45047ebba430ed33c6024
 EBUILD libtool-2.4.2.ebuild 2687 SHA256 8a389b8d5e1b00df338eb93188e916da67fe6f2c019d73a5bc5a49d98d88eae8 SHA512 6372b7e6141770146f0917c01e35a333f285717ea6275343f3184fa622d74624494961dde54c776ed2f895bdbca8637a3d605c4feab06a509cd7b6d4258bb001 WHIRLPOOL da3c1743617d4ca304b715a144bf411de13254b6c5e9d675ab8e0f1a2cdf7d2fb5b6e21af446c753aa7745638c39cab3b596310dee89f885a3a2e3e2ed80ca54
+EBUILD libtool-2.4.3-r1.ebuild 2928 SHA256 c1d4e620ddd27f1098aaaff19043375482d7330007c5b1d726848d7f40a83290 SHA512 bd25badd087cdbb7bf0f618d39ca65fcdb692bedee81d17166a45f24b01d05de6c1d7b5a783c6ab06c15afa83f7a2c71d0122718e3cb4e0dae37b6b9632be2a0 WHIRLPOOL e7a20013c4eedff01baf44776bf05f5be1a29a5588d25397d91eafcf8cc00b462e4711d8a13fe7400a17c573d7062fc0561eeab2f0cc5f12bc3830d1ee34ad73
 EBUILD libtool-2.4.3.ebuild 2861 SHA256 3afc81079fd4b410a53b3ed1626d4c5cd2d7b7b7605fbfe68b9f46e718c24040 SHA512 e886687c33d12767d39c1fe8d28aff93e8d57893b0ad35bb43a920c3de220b08b538afff6c3554aa58783f7527da3d3e2459918f8a572f392adbdec82024143d WHIRLPOOL 2d0e23655f6f66bee202d03e5c1df9d166e55043bb80c1e4f84e40b7979583fcb9f615e81eefbf12764269b711f57dc50d119204f712e3a2627ae32f82518300
 EBUILD libtool-9999.ebuild 2824 SHA256 bd892fc98245c589ee733cf8d6acda3c938555e830f7cbbcb103d596cb4b14de SHA512 92a961614856c5d40299183fa00966cf1872a13cbba5e676c4b08a1fb1835e540e96969c2a8ca9eb08bdc754f69eab87c9889ff960f6507f8cb7dbdfe0c46e0b WHIRLPOOL e56477ccb31ffe67aaf6a25f805e750a98c7915bb6fc1c84f35bc0084450e67ec8c660a66035389bcbac5822e14f6d4dcc46bfe7933b162347f9ca47c63043c5
-MISC ChangeLog 33317 SHA256 4289e4a8d2661ea87d4427129f3631cb0254d1bc1d91a80ef0853fe842aaeb46 SHA512 751713f5d3bd2279869edb4e3c0b312a67f8edc61b905deb787b6d4c487266de136ef691e228d35a939130315dcf398c92662a6af32dd8eecaf0ae919c7f0f27 WHIRLPOOL 1a987b065f052d4b38a851c57db27008cdc1a6b88d3bffd6ac4f1c46c7435c5539fb9cecdfdd3a4b3a01764e05c2b0bead4284cdf69feccd3649f4f5a4216844
+MISC ChangeLog 33541 SHA256 6158c01003c6d36e28811c96007dbcca3b7b94df4ebc17a4a04bb2263046b12e SHA512 cc78ef4b139008e4b11eed366ecba22cf78c410b8934adafa827658b546e613048fecee206254c88dcd054b13c169d47d6de8c88bd4f7ee432e53f0f5bce44a1 WHIRLPOOL ea5ae6c3dc7b6cef58d1fd85eb86fe1a34faaa785e96e003fd7dc590aa1fea8ae26161a35851a14f1c83209e289b017982a9bf67fcf99eb3a2388a2f00c22b4c
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUTurOAAoJEPGu1DbS6WIAd2IP/RfJn/syTpHY1dJHPS4Ul62B
-+IX/e46zukXq1kaEST+ZCvz86dLwZcmNWD5S9HTkH2pnhel90zpGGyDLshVnV3qM
-Z9/Xp9Uh+C6BlIeJuqI3f7UE2zorocvBStSew51cAcjOwhi/y11VOFVYEVZliM9J
-fbTHDTx+YzwNSuafs/fm+/XSmHKHqp6D1EMeOdCS7JrXDkYmrBBN7T4mYbUdpIDo
-CZPsYZbYCmNGBic1U7Cx2fQ4HsB2Ih+fPYf7Rj0iBJ1Tja+LPVAo9ZdM6YKpuABO
-zYih8NPjYe0mcsFFn6aXD88FDaILCs7rZgVWQsYTZNWBTlR8QB9Y/IPWYqTnTUpr
-hpJwYqY/VUCRLzZJbMOLrMWobGSOKJSlpOanWRaq1t/OGAC2u7SIBI/jYmh5bNBr
-JZ/NIc4shU/oCCoLnhOmHr4brkdd3GmvSbJlfPTIyJ/UHOJh0fvN9HXShpkKep0d
-8fDeGHdfRKdYyB1ILNGX/KkI7obWbvy8LbB+GBZBkAnVAp8//z4cHmUTVTj4sTbL
-pflGKUN5MxllqPjkBOSE+Ar/FgxP/KTLaslspn4Io5D6hSsHFG8atFakfb0BPgsg
-VZd388LSWUKoFV/ZqRIcDDkqgwLO81JynZMNSN7MWQvN2DHzNpxZ7rmspNbfB333
-QASdK7soSvlyE5NXhKr4
-=7Ja/
+iQIcBAEBCAAGBQJUU/o+AAoJEPGu1DbS6WIA0Q4P/1KAOO2vekhC3WTLYH4B0tQk
+fjw0kQM76KiWQWj08jhOY4nYmNulJ9jLNjXZ/pUne1Fa53kwYpNybtuEtTIUTd2L
+d4rDB0chBqFN3BZ71wfaJ5FoIwf0VmNPTbupQE5rjRmPAh9gIw8LLrJQjvMATTLI
+Z8rgYq4YHknlm60oiYu/qwLak+Bc8NHgaukZktz3WsHzD28BKFX+QL3lEVQq0r+t
+1GLU/OLtRv/SOQBUhNXVsri93hNa/bB8S1PinxgwCnb0j94R7ad9qkxWVXFh0Rxs
+Kepl3gkWrpI2KHn9VlmTcD0TY7O1uzhvtGHOB/+YOsb1A4Gof+pgexXJ9Zp3U0vb
+1d4GxxfHiWSVwV1kcSGhnZS+LrbIWp9zWhcB3oKnL2wrk9KVr5kRtW/PURlrgg0c
+T3O/61SVmKk9MiR9KMypqc9wly5T6VbqtunTyAfU6zv7AJXAlRpYlAG/C+/OALKz
+aaR5QzNUPAZ8RZg+4BMF2hZo53qPV6+ekwkM4qhPJmgcDe004LR0iiu4M/ThWEtS
+X4SyjALUIZeSHE2PPpH6wkE7utDhzUXdintCA0RggfnuhMDQC7XRa5YlFvaj+yaG
+ZdKRxl/6URMZnINUDrDm502BtTR5c4wiQNVlDfGwCz90qQsPbDAi+1jySqQV+d/0
+iRs6/GexnViFtdkehYpC
+=6oQ4
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/files/libtool-2.4.3-no-clean-gnulib.patch b/sys-devel/libtool/files/libtool-2.4.3-no-clean-gnulib.patch
new file mode 100644
index 000000000000..31c30e4f5737
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.4.3-no-clean-gnulib.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/527200
+
+From 4e675f73a02714103fc74937f69e4159d5fbcfe7 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 31 Oct 2014 17:04:11 -0400
+Subject: [PATCH] libtoolize: do not delete gnulib headers
+
+These snippet/ headers are installed by gnulib, not libtool.  There's no
+reason libtool should be trying to delete these for us (and will break
+projects), so drop that logic.
+
+People who are using gnulib can use gnulib to update/manage these.
+
+* libtoolize.in (func_require_seen_libtool): Delete snippet/ header files
+from $all_pkgaux_files.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ libtoolize.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libtoolize.in b/libtoolize.in
+index d819470..d0cbfb0 100644
+--- a/libtoolize.in
++++ b/libtoolize.in
+@@ -1897,7 +1897,7 @@ func_require_seen_libtool ()
+   # Do not remove config.guess, config.sub or install-sh, we don't
+   # install them without --install, and the project may not be using
+   # Automake.
+-  all_pkgaux_files="compile depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
++  all_pkgaux_files="compile depcomp missing ltmain.sh"
+   all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
+   all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h ltdl.mk slist.c"
+ 
+-- 
+2.1.2
+
diff --git a/sys-devel/libtool/libtool-2.4.3-r1.ebuild b/sys-devel/libtool/libtool-2.4.3-r1.ebuild
new file mode 100644
index 000000000000..e7727f5b52ab
--- /dev/null
+++ b/sys-devel/libtool/libtool-2.4.3-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r1.ebuild,v 1.1 2014/10/31 21:08:12 vapier Exp $
+
+EAPI="4"
+
+LIBTOOLIZE="true" #225559
+WANT_LIBTOOL="none"
+inherit eutils autotools multilib unpacker multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
+		http://git.savannah.gnu.org/r/${PN}.git"
+	inherit git-2
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="http://www.gnu.org/software/libtool/"
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="static-libs test vanilla"
+
+RDEPEND="sys-devel/gnuconfig
+	!<sys-devel/autoconf-2.62:2.5
+	!<sys-devel/automake-1.11.1:1.11
+	!=sys-devel/libtool-2*:1.5
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	test? ( !<sys-devel/binutils-2.20 )
+	app-arch/xz-utils"
+[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
+		cd "${S}"
+		./bootstrap || die
+	else
+		unpacker_src_unpack
+	fi
+}
+
+src_prepare() {
+	use vanilla && return 0
+
+	epatch "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
+	epatch "${FILESDIR}"/${PN}-2.4.3-no-clean-gnulib.patch #527200
+	pushd libltdl >/dev/null
+	AT_NOELIBTOOLIZE=yes eautoreconf
+	popd >/dev/null
+	AT_NOELIBTOOLIZE=yes eautoreconf
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	# the libtool script uses bash code in it and at configure time, tries
+	# to find a bash shell.  if /bin/sh is bash, it uses that.  this can
+	# cause problems for people who switch /bin/sh on the fly to other
+	# shells, so just force libtool to use /bin/bash all the time.
+	export CONFIG_SHELL=/bin/bash
+	ECONF_SOURCE="${S}" \
+	econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	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
+
+	# Building libtool with --disable-static will cause the installed
+	# helper to not build static objects by default.  This is undesirable
+	# for crappy packages that utilize the system libtool, so undo that.
+	sed -i -e '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' "${D}"/usr/bin/libtool || die
+
+	local x
+	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
+		ln -sf /usr/share/gnuconfig/${x##*/} "${x}" || die
+	done
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libltdl.so.3
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libltdl.so.3
+}