Add patch from upstream for as-needed test failures #321551 by Xake. Transition the SLOT (and EAPI) so we can install libtool-1.5.x libltdl ABI in parallel. Require newer binutils to avoid old as-needed test failures. Drop help2man cruft now that the upstream tarball includes the man pages.

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

4 files changed, 172 insertions, 8 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 10693df2c0ab..a42ed5dcbab2 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.168 2010/06/05 01:56:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.169 2010/06/08 21:52:05 vapier Exp $
+
+*libtool-2.2.8-r1 (08 Jun 2010)
+
+  08 Jun 2010; Mike Frysinger <vapier@gentoo.org> +libtool-2.2.8-r1.ebuild,
+  +files/libtool-2.2.8-versioning-as-needed-test.patch:
+  Add patch from upstream for as-needed test failures #321551 by Xake.
+  Transition the SLOT (and EAPI) so we can install libtool-1.5.x libltdl ABI
+  in parallel. Require newer binutils to avoid old as-needed test failures.
+  Drop help2man cruft now that the upstream tarball includes the man pages.
 
 *libtool-2.2.8 (05 Jun 2010)
 
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 01fae44f1ca2..515232560f83 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -7,24 +7,24 @@ AUX 1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185 RMD160 ed02facdc5
 AUX 1.5.20/libtool-1.5.20-version-checking.patch 1857 RMD160 25b981402a038a2c4c5ad64066c5f8a5b1416b36 SHA1 c5000fa6da0ffec1d7c48d871db94d8237c949ca SHA256 0d1af5e7024949dcf95bef0d5a47387d0b04b7905d0a55d3349576733783bb6d
 AUX 1.5.6/libtool-1.5-filter-host-tags.patch 1608 RMD160 af10d3d3459d07f77ccbdef6080e931e3387af38 SHA1 5d27c058f803cdc1953e82b71f747c2028b78ea0 SHA256 a50cba1c4b799717b21355cc908993c5cdf913b66881992b74b79001f8feb891
 AUX 2.2.6a/libtool-2.2.6a-tests-locale.patch 599 RMD160 be9e1d21e56a36c5d4d959135afa5928298a66b0 SHA1 a4ae6a4df7b0d43d4d09d07f4aed5edccddf6e55 SHA256 3832137bfb2e4cbf00467ec78ab7041bb7f0fc95d91cdee25717d19b8436c1a0
+AUX libtool-2.2.8-versioning-as-needed-test.patch 4015 RMD160 34fab1fdcd32ec0edf0c690ffacbf6f036655c8b SHA1 fb6458a703413117c86eabe082eca67fbf285c24 SHA256 cf316671cc1929c40d23db6d7a9990aba761cbb3890eb163d443805e2ecf2539
 DIST libtool-1.3.5.tar.gz 538884 RMD160 0bb20b6802bc790dcbdaecde4058ed06ec77b429 SHA1 0e0a57bcdd4942a872d6b24ff666cfa0dd721452 SHA256 02e287ba621aa01ee581b0f88854deb222fa61e7e0fc55ed7685038354f0259f
 DIST libtool-1.5.26.tar.gz 2961939 RMD160 4d1d7dd0308b98e8f590723ae5daddb8da49ac11 SHA1 4c1738351736562a951a345e24f233d00953ec0a SHA256 1c35ae34fe85aa167bd7ab4bc9f477fe019138e1af62678d952fc43c0b7e2f09
 DIST libtool-2.2.6b.tar.lzma 739089 RMD160 cb209df9819510928c17d36ce8b461bd8418a6a1 SHA1 18baaac89eed8be7bd2af2d2181598e176029cc6 SHA256 66ebad3c02e5cb6672bfbda1183fb6fc919d33d676eb8be4b7834aa7c3b8b7ae
-DIST libtool-2.2.7b.tar.lzma 779783 RMD160 925b2432d7b7ad092edd90df9824c977ec5bb09c SHA1 f6038e00be29557f34948731d33b5e779b0d92df SHA256 ddf66f2813a49e85f9dc4f02058272d693a2316cfa0af322a6da7c1642c8512e
 DIST libtool-2.2.8.tar.lzma 787141 RMD160 ab9fea99cc90a37b52bb0ced945e8f2f5483c2d2 SHA1 e160056cab3b0d31db6c929f12ddd4a77e2a024d SHA256 b94506f767d6f12ae05753c71d4f3e658be5aed080711b3d4d6caa5aacdd4afa
 EBUILD libtool-1.3.5.ebuild 800 RMD160 6c4fea1ab669d1a1926f176476fcba1f1fc84483 SHA1 a0fafa46ce16604a62bd56efdc65196730bb9397 SHA256 1d937d795219f49d8231ec0e11963043e4586da182603425f5b475d24600f49f
 EBUILD libtool-1.5.26-r1.ebuild 756 RMD160 dbde9e0664ef807199f86e44bf675afcebe8aa6e SHA1 f36b4e5c2994150f35899e708e405325910494eb SHA256 23ccee0df4d6cbf584b29c70c4c4c7a4a40d02798758977c68503c90ef265cb5
-EBUILD libtool-1.5.26.ebuild 2767 RMD160 4925000b25774e4e53dda375dc6fff7038f6944c SHA1 c6faa58ee70d0712f2c3179ee74dd7d9189422bc SHA256 9fc50159f1d7828a16d159c643ac2b012a92be181aa96656d799b2a450125e1d
+EBUILD libtool-1.5.26.ebuild 2834 RMD160 5e9bb806490ad16b957812882c26e3ebba012b4a SHA1 1252094365d012df74620809f0a98cc9015e632b SHA256 e13e5cff87864571fb2fc67b33645bf8da857fcb5f6a3cd1ba4e62c13316b2a5
 EBUILD libtool-2.2.6b.ebuild 2287 RMD160 5417197a72ffeed053537e1e1ad99561a4c63062 SHA1 e538863b0c5e32f15e49bc9d2890bb57d0d10630 SHA256 fcdd2c5c7bec1bdf9e84a583fb277716d7a2d94b1fa46a37ee38574dc9eb9dd9
-EBUILD libtool-2.2.7b.ebuild 2229 RMD160 1fd6f85b1ce1f5ae350ca70e1680c0ea0ef763a1 SHA1 b231a8e433e962e8695f3687a4be520e4f2a13a7 SHA256 65f20c887b894e2405f13f49119e59fc7a218863227d9d9d1ef5dc6c2d4fd7f5
+EBUILD libtool-2.2.8-r1.ebuild 1848 RMD160 17189f4f106c26f63c2e7ade5fae6991cfba55ce SHA1 e705bce041816f8ca4b5d5e101a986d4551251e4 SHA256 f7e6c67b063ce22fe8e91cc01fccad0c88c1b8ba3db80dad8352858e857a4ba7
 EBUILD libtool-2.2.8.ebuild 2228 RMD160 f476d818f312907ccc82aa4a54300da9f27b1156 SHA1 b79ccd10f20fe17edd968e9cb70cc8004e1ad47a SHA256 25719a7ef83aa60a62f707e6640b67804a7b10bd03905761ca04db95a37a54f4
 EBUILD libtool-9999.ebuild 1327 RMD160 f9a217315d38dfda00e8d8c6877040dac63dbb66 SHA1 38aeec4338c6d1e58c69ec6ab639f8ee55f34f7f SHA256 b7c9be504e756544411db0d163237834e146de5e9c7e8302b0a1d8b89d124f02
-MISC ChangeLog 25034 RMD160 4b4dd5b384aebe7b0b82d8a2887c82d056813f10 SHA1 f1aa9f354fd4c07050a774669f407e587f421d4e SHA256 d69f69e23201ca0df1577cc6d7a19d2a51106d0f62e79841ff7d2fead2ee9c59
+MISC ChangeLog 25500 RMD160 a93251cb211e72b22e4c2f402b6ac9d34b174240 SHA1 1dfd68773857bfa5dbc0564a866500f17ea7f4bc SHA256 0f092fffae350ace6bc3c4bcad9ac22fc4d1d76e29c53643de0ca23973b2e0be
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwJrsEACgkQTwhj9JtAlp4D1AD7BO9Iehhs5NGjKFbPncoIz4te
-x16psj7Wti8Zb5I0QzsBAMSL9zBLBlZR7ymxve7PV1m8adoKrpYI8LbHQExIavP6
-=XFly
+iF4EAREIAAYFAkwOu3gACgkQTwhj9JtAlp6tjAD/XTe8MraZtmdEV+RKb67IxLsb
+jrDXnjpc/Z4xBaQC2x8A/jwlP1V3yHcp38vmg2AgGtxscagMHGpLOvM/Q64mJjIZ
+=jbxx
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/files/libtool-2.2.8-versioning-as-needed-test.patch b/sys-devel/libtool/files/libtool-2.2.8-versioning-as-needed-test.patch
new file mode 100644
index 000000000000..cecaf1364986
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.2.8-versioning-as-needed-test.patch
@@ -0,0 +1,89 @@
+https://bugs.gentoo.org/321551
+
+From 9a801684f6e1a665dc7126091662b34d042adf68 Mon Sep 17 00:00:00 2001
+From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+Date: Mon, 7 Jun 2010 22:30:44 +0200
+Subject: [PATCH 1/2] Fix versioning test for LDFLAGS=-Wl,--as-needed.
+
+* tests/versioning.at (versioning): For the library update
+hypotheses, ensure the unchanged library libb isn't accidentally
+relinked against the new liba, by not reinstalling libb.
+Fixes testsuite failure for the incompatible update case with
+LDFLAGS=-Wl,--as-needed.
+* THANKS: Update.
+Report by Ryan Hill.
+
+Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+---
+ tests/versioning.at |   19 +++++++++----------
+ 1 files changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/tests/versioning.at b/tests/versioning.at
+index 136a549..31f294e 100644
+--- a/tests/versioning.at
++++ b/tests/versioning.at
+@@ -1,6 +1,6 @@
+ # versioning.at -- test libtool versioning           -*- Autotest -*-
+ #
+-#   Copyright (C) 2009 Free Software Foundation, Inc.
++#   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+ #
+ #   This file is part of GNU Libtool.
+ #
+@@ -190,18 +190,17 @@ AT_CHECK([$LIBTOOL --mode=uninstall rm -f $libdir/liba.la], [], [ignore], [ignor
+ 
+ 
+ # Hypothesis: library revision updates do not require (uninstalled
+-# nor installed) programs to be relinked.
++# nor installed) programs or libraries to be relinked.
+ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la liba2.lo ]dnl
+ 	 [-version-info 0:1:0 -rpath $libdir], [], [ignore], [ignore])
+ test_uninstalled
+-AT_CHECK([$LIBTOOL --mode=install cp liba.la libb.la $libdir],
+-	 [], [ignore], [ignore])
++AT_CHECK([$LIBTOOL --mode=install cp liba.la $libdir], [], [ignore], [ignore])
+ AT_CHECK([$LIBTOOL --mode=clean rm -f liba.la], [], [ignore], [ignore])
+ test_installed
+ # do not uninstall here: the library may be reused in the next test.
+ 
+ # Hypothesis: backward compatible library updates do not require
+-# (uninstalled nor installed) programs to be relinked.
++# (uninstalled nor installed) programs or libraries to be relinked.
+ # This can have one of several reasons:
+ # - the soname is the difference between $current and $age, thus
+ #   unchanged; in this case, the newly installed library will be used,
+@@ -212,26 +211,26 @@ test_installed
+ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la liba3.lo ]dnl
+ 	 [-version-info 1:0:1 -rpath $libdir], [], [ignore], [ignore])
+ # Do not test the uninstalled program, it may be broken (in the second case).
+-AT_CHECK([$LIBTOOL --mode=install cp liba.la libb.la $libdir],
+-	 [], [ignore], [ignore])
++AT_CHECK([$LIBTOOL --mode=install cp liba.la $libdir], [], [ignore], [ignore])
+ AT_CHECK([$LIBTOOL --mode=clean rm -f liba.la], [], [ignore], [ignore])
+ test_installed
+ # do not uninstall here: the library may be reused in the next test.
+ 
+ 
+ # Hypothesis: with shared libraries, incompatible library updates
+-# will not cause old installed programs (linked against the old
++# will not cause old installed programs or libraries (linked against the old
+ # library version) to break.
+ # This can have one of several reasons:
+ # - the soname has changed, so the old installed library will still be
+ #   available,
+ # - we are linking statically, so the old library code will still be used.
++# In order to be sure we are still linking against the old library version,
++# we must ensure that libb is not relinked, so we must not reinstall libb here.
+ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la liba4.lo ]dnl
+ 	 [-version-info 2:0:0 -rpath $libdir], [], [ignore], [ignore])
+ # We do not guarantee that old versions of an uninstalled library are still
+ # available, so test_uninstalled will not necessarily work here any more.
+-AT_CHECK([$LIBTOOL --mode=install cp liba.la libb.la $libdir],
+-	 [], [ignore], [ignore])
++AT_CHECK([$LIBTOOL --mode=install cp liba.la $libdir], [], [ignore], [ignore])
+ AT_CHECK([$LIBTOOL --mode=clean rm -f liba.la], [], [ignore], [ignore])
+ test_installed
+ 
+-- 
+1.7.1
+
diff --git a/sys-devel/libtool/libtool-2.2.8-r1.ebuild b/sys-devel/libtool/libtool-2.2.8-r1.ebuild
new file mode 100644
index 000000000000..3f68fa1fd289
--- /dev/null
+++ b/sys-devel/libtool/libtool-2.2.8-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.2.8-r1.ebuild,v 1.1 2010/06/08 21:52:05 vapier Exp $
+
+EAPI="3"
+
+LIBTOOLIZE="true" #225559
+inherit eutils autotools multilib
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="http://www.gnu.org/software/libtool/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.lzma"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="vanilla"
+
+RDEPEND="sys-devel/gnuconfig
+	>=sys-devel/autoconf-2.60
+	>=sys-devel/automake-1.10.1
+	!=sys-devel/libtool-2*:1.5"
+DEPEND="${RDEPEND}
+	>=sys-devel/binutils-2.20
+	|| ( app-arch/xz-utils app-arch/lzma-utils )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-versioning-as-needed-test.patch #321551
+
+	if ! use vanilla ; then
+		epunt_cxx
+		cd libltdl/m4
+		epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105
+		cd ..
+		AT_NOELIBTOOLIZE=yes eautoreconf
+		cd ..
+		AT_NOELIBTOOLIZE=yes eautoreconf
+	fi
+}
+
+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
+
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
+
+	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
+		rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
+	done
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libltdl.so.3
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libltdl.so.3
+}