Add some fixes from upstream.

Package-Manager: portage-2.2_pre5

6 files changed, 276 insertions, 5 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 3f4d87972e54..e009ce75ec4b 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.135 2008/04/02 03:08:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.136 2008/04/22 22:43:45 vapier Exp $
+
+*libtool-2.2.2-r1 (22 Apr 2008)
+
+  22 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/libtool-2.2.2-AC_ENABLE_SHARED.patch,
+  +files/libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch,
+  +files/libtool-2.2.2-flag-order.patch, +libtool-2.2.2-r1.ebuild:
+  Add some fixes from upstream.
 
 *libtool-2.2.2 (02 Apr 2008)
 
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index baffa4033389..03e75b902602 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -13,6 +13,9 @@ AUX 1.5.20/libtool-1.5.20-version-checking.patch 1857 RMD160 25b981402a038a2c4c5
 AUX 1.5.6/libtool-1.5-filter-host-tags.patch 1608 RMD160 af10d3d3459d07f77ccbdef6080e931e3387af38 SHA1 5d27c058f803cdc1953e82b71f747c2028b78ea0 SHA256 a50cba1c4b799717b21355cc908993c5cdf913b66881992b74b79001f8feb891
 AUX 1.5.6/libtool-1.5.6-ltmain-SED.patch 431 RMD160 0029b0911d92494115c1eb6bdc63b8196ec0cac5 SHA1 803d17d14083e302a6b8763c930188db4249db6e SHA256 a903c26b5e7d3fa1c22f9104648adac5e7065403b286bc1147a3b1ab77a8cf9d
 AUX libltdl-uclibc.patch 4590 RMD160 fea7fd22d6c2412041bea4f6dc992a73c3e7d453 SHA1 714d56807d5dbb2bd38d258fce20386d11c82b6a SHA256 07d027870c528f1514dbd8f07e7b8cb703b95166361d45b3ee0ce180ae790913
+AUX libtool-2.2.2-AC_ENABLE_SHARED.patch 1932 RMD160 4a16f7537fd65734ebcb222b6fa7380f57d925cc SHA1 9482577a2e88c72aa031da54d435abb782236a5e SHA256 4cfb7ead73b31d40f1fad5d1535a4a63579ff6e0660e750961048fe220f94983
+AUX libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch 2150 RMD160 7b9173d367a3a9168b0f0db368e85941a18ec82e SHA1 50c150e11b10c707a8c98293e795c95e3edf6f41 SHA256 19b614022a4aa6336879974c551bbd094b8412b095a372595de2c5c1b73f9a9a
+AUX libtool-2.2.2-flag-order.patch 2129 RMD160 72778ece0f72449a2ce0de556cc47019654dfe25 SHA1 fe765726f1a3f4e1b2ee7286e631ba359fb5225f SHA256 a6f4f896fdfd53ee08d27e3757b9a50884b48bbb7aa720be282c8c0e998ed554
 AUX ltconfig-uclibc.patch 1167 RMD160 67684826cd75f91660ad0d51ccf9fb0dc250dda9 SHA1 521950ed7e504a0c37b50da78672c2f296ada038 SHA256 67586fb81951ff86619387538c56e996412a7ad3afff9767c598792f0a31ad5d
 DIST libtool-1.3.5.tar.gz 538884 RMD160 0bb20b6802bc790dcbdaecde4058ed06ec77b429 SHA1 0e0a57bcdd4942a872d6b24ff666cfa0dd721452 SHA256 02e287ba621aa01ee581b0f88854deb222fa61e7e0fc55ed7685038354f0259f
 DIST libtool-1.5.24.tar.gz 2919557 RMD160 e682fe6570c71d93ad65e0c6c77cb6558846f27d SHA1 b4c994f1bf4a76d2b0c1d0a6f54d16598c15f3db SHA256 1e54016a76e9704f11eccf9bb73e2faa0699f002b00b6630df82b8882ff2e5b2
@@ -22,15 +25,16 @@ DIST libtool-2.2.tar.bz2 1446665 RMD160 b04729ea15f08786e42c1557b9c332793f245d38
 EBUILD libtool-1.3.5.ebuild 1157 RMD160 1655d7000af5869115b006ac1095195a140433d7 SHA1 4c93b4520b02380aa6ce153dbb6f5b6ee628073e SHA256 3479e6bf816003ff706850f6720a3f20f30a02b8db670624044970bae313944d
 EBUILD libtool-1.5.24.ebuild 2768 RMD160 e7c5d56039c019d45d73b8567fc955b49c03ceca SHA1 c059a3ecfbf61cfa5094afef324692d8a8071983 SHA256 162c21d6ebf7c138ef12718eef25f78c205efe5bfb4bb4ea26d3871e37a1d9ca
 EBUILD libtool-1.5.26.ebuild 2767 RMD160 4925000b25774e4e53dda375dc6fff7038f6944c SHA1 c6faa58ee70d0712f2c3179ee74dd7d9189422bc SHA256 9fc50159f1d7828a16d159c643ac2b012a92be181aa96656d799b2a450125e1d
+EBUILD libtool-2.2.2-r1.ebuild 1381 RMD160 68bd047789b568477ee4a958891ca692b7cfb1dc SHA1 f73a40254f8bdc6ac5589aa45959ab07b0532f45 SHA256 e83db3787f1597af126802b552bf40153c6c2ab5a27cabdf07351244b0ba129a
 EBUILD libtool-2.2.2.ebuild 1186 RMD160 5496e4abac055746fd7450b3a19b544b7a75f7a0 SHA1 3709e56d226f2f86d807bbb56f84054bd213712d SHA256 400a6ed5c08327560c4bc44b9ca60669dc5eedb0d50d47171b67cf5d37ada0d3
 EBUILD libtool-2.2.ebuild 1184 RMD160 7615b946064816072542716561103a426c16d931 SHA1 5d04b67ed32d403bccd21299276bfddc118b4f01 SHA256 32925e767a3ec309fa515470c327861a2a25f1bbdca3515523b52f82c1806679
 EBUILD libtool-9999.ebuild 1336 RMD160 3bc7d744987752c512ec6ad248905519574113a1 SHA1 48e00f0b8c9ddee8f660a4d0f06b4942565e1674 SHA256 0916b94107c4de2e6c54ac4ce4b3f7521d37fd3e988c0922840c591976aecc0c
-MISC ChangeLog 20563 RMD160 0a8970d46cada9a45b31027f04783a4e2f775120 SHA1 13af6ad0e5ff22f4af10aa41598c17cd0e4db8a0 SHA256 ab7df4f2faf20b8f5ec0e9beb48fc6dc20bfbb17bf3340cbdedacc00b72d6f31
+MISC ChangeLog 20846 RMD160 17f5ca60d97b5a1562eef0a953858c40fe8869df SHA1 d1cc64dac7421657ec94500e78a1a19e2636314c SHA256 32c01062924673c00a0446a1ff1386a1aee230274da31df6445254efcbde4955
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH8vmpj9hvisErhMIRAlzgAKC4py9W+uMaBIlF4QDEr8SHHiFvcACfZMjc
-hBx6D1rbbqRiC4lUWxkSfcE=
-=cx9T
+iD8DBQFIDmonj9hvisErhMIRApsIAJ9J8pJ0OnlF0/26RII/gAmb4vkHlgCfafgv
+xbD4Cjc4qKW/U2P23whnTcE=
+=HFC/
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/files/libtool-2.2.2-AC_ENABLE_SHARED.patch b/sys-devel/libtool/files/libtool-2.2.2-AC_ENABLE_SHARED.patch
new file mode 100644
index 000000000000..6b13eb94ae38
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.2.2-AC_ENABLE_SHARED.patch
@@ -0,0 +1,59 @@
+commit 1006ccc48c14d3715c569cca68dab54742207273
+Author: Andreas Schwab <schwab@suse.de>
+Date:   Fri Apr 18 23:43:19 2008 +0200
+
+    Properly emulate AC_ENABLE_SHARED([no]) and others.
+    
+    * libltdl/m4/ltoptions.m4 (AC_ENABLE_SHARED): Check optional
+    argument.
+    (AC_ENABLE_STATIC): Likewise.
+    (AC_ENABLE_FAST_INSTALL): Likewise.
+    
+    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+diff --git a/ChangeLog b/ChangeLog
+index 268e369..e593406 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,10 @@
++2008-04-18  Andreas Schwab  <schwab@suse.de>
++
++	* libltdl/m4/ltoptions.m4 (AC_ENABLE_SHARED): Check optional
++	argument.
++	(AC_ENABLE_STATIC): Likewise.
++	(AC_ENABLE_FAST_INSTALL): Likewise.
++
+ 2008-04-16  Eric Blake  <ebb9@byu.net>
+ 
+ 	Make ChangeLog merges easier.
+diff --git a/libltdl/m4/ltoptions.m4 b/libltdl/m4/ltoptions.m4
+index a1c3aba..339d6f5 100644
+--- a/libltdl/m4/ltoptions.m4
++++ b/libltdl/m4/ltoptions.m4
+@@ -192,7 +192,7 @@ LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+ 
+ # Old names:
+ AC_DEFUN([AC_ENABLE_SHARED],
+-[_LT_SET_OPTION([LT_INIT], [shared])
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+ ])
+ 
+ AC_DEFUN([AC_DISABLE_SHARED],
+@@ -246,7 +246,7 @@ LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+ 
+ # Old names:
+ AC_DEFUN([AC_ENABLE_STATIC],
+-[_LT_SET_OPTION([LT_INIT], [static])
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+ ])
+ 
+ AC_DEFUN([AC_DISABLE_STATIC],
+@@ -300,7 +300,7 @@ LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no
+ 
+ # Old names:
+ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+-[_LT_SET_OPTION([LT_INIT], [fast-install])
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+ AC_DIAGNOSE([obsolete],
+ [$0: Remove this warning and the call to _LT_SET_OPTION when you put
+ the `fast-install' option into LT_INIT's first parameter.])
diff --git a/sys-devel/libtool/files/libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch b/sys-devel/libtool/files/libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch
new file mode 100644
index 000000000000..119f6ed63778
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch
@@ -0,0 +1,73 @@
+commit 9b00a3a6e7d231440029d8be120dff7faa15320e
+Author: Andreas Schwab <schwab@suse.de>
+Date:   Tue Apr 22 21:32:32 2008 +0200
+
+    Fix default argument for AC_LIBLTDL_CONVENIENCE.
+    
+    * libltdl/m4/ltdl.m4 (AC_LIBLTDL_CONVENIENCE): Default argument
+    to libltdl.
+    (AC_LIBLTDL_INSTALLABLE): Likewise.
+    * tests/configure-iface.at (convenience libltdl): New test.
+    
+    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
+index bdecc9d..f6b1064 100644
+--- a/libltdl/m4/ltdl.m4
++++ b/libltdl/m4/ltdl.m4
+@@ -79,7 +79,7 @@ _$0()
+ # AC_LIBLTDL_CONVENIENCE accepted a directory argument in older libtools,
+ # now we have LT_CONFIG_LTDL_DIR:
+ AU_DEFUN([AC_LIBLTDL_CONVENIENCE],
+-[_LT_CONFIG_LTDL_DIR([$1])
++[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
+ _LTDL_CONVENIENCE])
+ 
+ dnl aclocal-1.4 backwards compatibility:
+@@ -135,7 +135,7 @@ _$0()
+ # AC_LIBLTDL_INSTALLABLE accepted a directory argument in older libtools,
+ # now we have LT_CONFIG_LTDL_DIR:
+ AU_DEFUN([AC_LIBLTDL_INSTALLABLE],
+-[_LT_CONFIG_LTDL_DIR([$1])
++[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
+ _LTDL_INSTALLABLE])
+ 
+ dnl aclocal-1.4 backwards compatibility:
+diff --git a/tests/configure-iface.at b/tests/configure-iface.at
+index 3fcb0da..9a311dc 100644
+--- a/tests/configure-iface.at
++++ b/tests/configure-iface.at
+@@ -275,5 +275,33 @@ AT_CHECK([$MAKE -q main$EXEEXT || exit 1], [1], [ignore], [ignore])
+ 
+ AT_CLEANUP
+ 
++
++## -------------------- ##
++## Convenience libltdl. ##
++## -------------------- ##
++
++AT_SETUP([convenience libltdl])
++
++AT_DATA([configure.ac],
++[[AC_INIT
++AC_CONFIG_AUX_DIR([libltdl/config])
++AC_LIBLTDL_CONVENIENCE
++AC_LIBTOOL_DLOPEN
++AC_PROG_LIBTOOL
++AC_CONFIG_FILES(Makefile)
++AC_OUTPUT
++]])
++AT_DATA([Makefile.in],
++[[LIBLTDL = @LIBLTDL@
++print-ltdl:
++	echo $(LIBLTDL)
++]])
++
++LT_AT_BOOTSTRAP([--ltdl], [-I libltdl/m4], [ignore], [ignore], [], [], [ignore])
++AT_CHECK([$MAKE print-ltdl], [], [stdout])
++AT_CHECK([grep libltdl/libltdlc.la stdout], [], [ignore])
++
++AT_CLEANUP
++
+ dnl Be careful not to let the definition leak into other tests
+ m4_popdef([_LT_AT_LTDL_SETUP])
diff --git a/sys-devel/libtool/files/libtool-2.2.2-flag-order.patch b/sys-devel/libtool/files/libtool-2.2.2-flag-order.patch
new file mode 100644
index 000000000000..074a41cd4d0e
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.2.2-flag-order.patch
@@ -0,0 +1,75 @@
+http://lists.gnu.org/archive/html/libtool/2008-04/msg00122.html
+
+commit 9c3ae35db6bbd9ce82bc5479354d99f53c46e888
+Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+Date:   Tue Apr 22 21:43:06 2008 +0200
+
+    Fix regression over 1.5.26 with ccache $CC -all-static.
+    
+    * libltdl/config/ltmain.m4sh (func_mode_link): Add
+    $link_static_flag to compile_command and link_command only
+    later, instead of right after a possible compiler wrapper.
+    * tests/static.at (ccache -all-static): New test.
+    * THANKS: Update.
+    Report by Richard Purdie.
+    
+    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
+index ff1e50d..ac334dc 100644
+--- a/libltdl/config/ltmain.m4sh
++++ b/libltdl/config/ltmain.m4sh
+@@ -3160,9 +3160,6 @@ func_mode_link ()
+ 	  fi
+ 	  if test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+-	    # See comment for -static flag below, for more details.
+-	    func_append compile_command " $link_static_flag"
+-	    func_append finalize_command " $link_static_flag"
+ 	  fi
+ 	  prefer_static_libs=yes
+ 	  ;;
+@@ -3450,7 +3447,11 @@ func_mode_link ()
+ 
+       case $arg in
+       -all-static)
+-	# The effects of -all-static are defined in a previous loop.
++	if test -n "$link_static_flag"; then
++	  # See comment for -static flag below, for more details.
++	  func_append compile_command " $link_static_flag"
++	  func_append finalize_command " $link_static_flag"
++	fi
+ 	continue
+ 	;;
+ 
+diff --git a/tests/static.at b/tests/static.at
+index 74b1c63..1a51d0d 100644
+--- a/tests/static.at
++++ b/tests/static.at
+@@ -352,3 +352,26 @@ for withdep in no yes; do
+ done
+ 
+ AT_CLEANUP
++
++
++AT_SETUP([ccache -all-static])
++
++AT_DATA([ccache],
++[[#! /bin/sh
++# poor man's ccache clone
++case $1 in
++-*) echo "bogus argument: $1" >&2; exit 1 ;;
++esac
++exec "$@"
++]])
++chmod +x ./ccache
++
++AT_DATA([a.c],
++[[int main(void) { return 0; }
++]])
++
++AT_CHECK([$CC $CPPFLAGS $CFLAGS -c a.c], [], [ignore])
++AT_CHECK([$LIBTOOL --mode=link --tag=CC ./ccache $CC $CFLAGS $LDFLAGS -all-static a.$OBJEXT -o a],
++	 [], [ignore])
++
++AT_CLEANUP
diff --git a/sys-devel/libtool/libtool-2.2.2-r1.ebuild b/sys-devel/libtool/libtool-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..a7e0b66e453b
--- /dev/null
+++ b/sys-devel/libtool/libtool-2.2.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.2.2-r1.ebuild,v 1.1 2008/04/22 22:43:45 vapier Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="http://www.gnu.org/software/libtool/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1.5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="vanilla"
+
+RDEPEND="sys-devel/gnuconfig
+	>=sys-devel/autoconf-2.60
+	>=sys-devel/automake-1.10"
+DEPEND="${RDEPEND}
+	sys-apps/help2man"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-flag-order.patch
+	epatch "${FILESDIR}"/${P}-AC_LIBLTDL_CONVENIENCE.patch
+	epatch "${FILESDIR}"/${P}-AC_ENABLE_SHARED.patch
+	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 "${S}"
+	fi
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
+
+	local x
+	for x in libtool libtoolize ; do
+		help2man ${x} > ${x}.1
+		doman ${x}.1 || die
+	done
+
+	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
+		rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
+	done
+}