Unify live/release ebuilds again. Add patch from upstream for openmp when linking #349078 by Justin Lecher. Add USE=static-libs support #379047 by Agostino Sarubbo.

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

5 files changed, 202 insertions, 26 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 2b864ca6bfd7..904bad7b97cb 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,14 @@
 # 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.191 2011/09/21 08:35:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.192 2011/09/23 04:17:36 vapier Exp $
+
+*libtool-2.4-r2 (23 Sep 2011)
+
+  23 Sep 2011; Mike Frysinger <vapier@gentoo.org> +libtool-2.4-r2.ebuild,
+  +files/libtool-2.4-openmp.patch, libtool-9999.ebuild:
+  Unify live/release ebuilds again. Add patch from upstream for openmp when
+  linking #349078 by Justin Lecher. Add USE=static-libs support #379047 by
+  Agostino Sarubbo.
 
   21 Sep 2011; Michał Górny <mgorny@gentoo.org> libtool-9999.ebuild:
   Migrate to git-2.
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 193befd955fa..c792fac2d137 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -6,6 +6,7 @@ AUX 1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch 637 RMD160 f46d46cdd9e5
 AUX 1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185 RMD160 ed02facdc5fd1ea9ffd403f5641f620791d833db SHA1 8d5784695682e3e8a271a9ed635d9d1566c4e99b SHA256 6a17e149e3638c3c94679459e1201f5dd7abbe97e5c8ab3654c1a0d079f53326
 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 libtool-2.4-openmp.patch 2289 RMD160 8b513d7a20cd56976aa27b91191da22f0a146bce SHA1 bd0102afb3f534164f3edd363a2d9e1b7ab08009 SHA256 355bb3a6f92ae46dd723551b0f11e5e5f8a584e21880e756e815704e8f7b74da
 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.10.tar.lzma 788637 RMD160 d383b48a110f27dea370e1a060503ff1484deac5 SHA1 f494f82e9f73c0679a76d077b9b54aef2a7bb610 SHA256 6ae978f9674bd1e77bbc9d6309944429d8024c53ce19db24bbed21ad5e70d490
@@ -15,15 +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-9999.ebuild 1369 RMD160 dfaa758fc28d0f65a39363632c34ad1de7f9b322 SHA1 ff98b7cb41a626b18fc82442028c6b8a915f3756 SHA256 84a33ee09d25edd906bab74a4daf60ad8b8f0f37202f49d2dc1d503ca3cde852
-MISC ChangeLog 28220 RMD160 ddc45049ede5536db399adac5ff8fabe75fb7738 SHA1 ad6facc107a3d33ea323489cac8867c6b727cec1 SHA256 a4b83e7af1ce0d50b11471b73d8ec878c0169f973fce0b55fc48792fe28ca573
+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
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk55onQACgkQfXuS5UK5QB1KrQQAnhXocR5wrkRqx/CXukdpZlz2
-yofhiIiLt+uXmA4N+C79+P0rRs92TFdfT/2MyMOmS9cuDj6zz7rji8gEljrAmfp9
-aoICIk6lnC2dbAiL5yjL/QnkEa3gQmdK6xKI/a9x4dE+X4xOiRzNEsdXJm1ahUUd
-VNGcz/hCFoze/SXKpEs=
-=uz9/
+iF4EAREIAAYFAk58CGkACgkQaC/OocHi7JaMHAD/U1TwJZBh9pG+K2IWELP14XGe
+qds0hbp/iucYlVkyTs4A/1WX0/20auRgpZTcFmQud3NLHC/vN6n9U33YHHWPHA+k
+=fx0B
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/files/libtool-2.4-openmp.patch b/sys-devel/libtool/files/libtool-2.4-openmp.patch
new file mode 100644
index 000000000000..94e0bcee564e
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.4-openmp.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/349078
+
+From 1b76054f4763a28ae1b01fbeee86ba0c524d1923 Mon Sep 17 00:00:00 2001
+From: Justin Lecher <jlec@gentoo.org>
+Date: Mon, 14 Mar 2011 08:40:50 +0100
+Subject: [PATCH] Don't filter OPENMP flags (-openmp & -fopenmp) from linker lines.
+
+If -fopenmp if passed to gcc during linking, it will take care to add all
+necessary libs to link correctly for openmp support. Currently libtool filters
+those flags, similar as it was the case with the threading flags. This change
+handles the situation for the openmp support similar as before the thread
+support was fixed.
+
+http://lists.gnu.org/archive/html/bug-libtool/2010-12/msg00009.html
+http://lists.gnu.org/archive/html/bug-libtool/2011-03/msg00014.html
+
+* libltdl/config/ltmain.m4sh (func_mode_link): Treat OpenMP
+flags like pthreads flags.
+
+Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+---
+ ChangeLog                  |    7 +++++++
+ libltdl/config/ltmain.m4sh |    6 ++++--
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+2011-03-22  Justin Lecher  <jlec@gentoo.org>  (tiny change)
+	    Rhys Ulerich  <rhys.ulerich@gmail.com>  (tiny change)
+
+	Don't filter OPENMP flags (-openmp & -fopenmp) from linker lines.
+	* libltdl/config/ltmain.m4sh (func_mode_link): Treat OpenMP
+	flags like pthreads flags.
+
+diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
+index 766777f..9358ec5 100644
+--- a/libltdl/config/ltmain.m4sh
++++ b/libltdl/config/ltmain.m4sh
+@@ -4865,7 +4865,8 @@ func_mode_link ()
+ 	continue
+ 	;;
+ 
+-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
++      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ 	func_append compiler_flags " $arg"
+ 	func_append compile_command " $arg"
+ 	func_append finalize_command " $arg"
+@@ -5369,7 +5370,8 @@ func_mode_link ()
+ 	lib=
+ 	found=no
+ 	case $deplib in
+-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
++        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"
+ 	    finalize_deplibs="$deplib $finalize_deplibs"
+-- 
+1.7.6.1
+
diff --git a/sys-devel/libtool/libtool-2.4-r2.ebuild b/sys-devel/libtool/libtool-2.4-r2.ebuild
new file mode 100644
index 000000000000..60593f52db0f
--- /dev/null
+++ b/sys-devel/libtool/libtool-2.4-r2.ebuild
@@ -0,0 +1,87 @@
+# 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 $
+
+EAPI="2" #356089
+
+LIBTOOLIZE="true" #225559
+WANT_LIBTOOL="none"
+inherit eutils autotools multilib
+
+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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 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"
+DEPEND="${RDEPEND}
+	>=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
+		xz -dc "${DISTDIR}"/${A} > ${P}.tar #356089
+		unpack ./${P}.tar
+	fi
+}
+
+src_prepare() {
+	use vanilla && return 0
+
+	epatch "${FILESDIR}"/${P}-openmp.patch #349078
+
+	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
+}
+
+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 $(use_enable static-libs static)
+}
+
+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
+
+	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
+}
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index 290364d6388a..855e413d72ad 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,33 +1,36 @@
 # 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.6 2011/09/21 08:35:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.7 2011/09/23 04:17:36 vapier Exp $
 
-inherit eutils
+EAPI="2" #356089
+
+LIBTOOLIZE="true" #225559
+WANT_LIBTOOL="none"
+inherit eutils autotools multilib
 
 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.bz2"
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="A shared library tool for developers"
 HOMEPAGE="http://www.gnu.org/software/libtool/"
 
 LICENSE="GPL-2"
-SLOT="1.5"
-KEYWORDS=""
-IUSE="vanilla"
+SLOT="2"
+IUSE="static-libs vanilla"
 
 RDEPEND="sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.65
 	>=sys-devel/automake-1.11.1"
 DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-S=${WORKDIR}/${ECVS_MODULE}
+	>=sys-devel/binutils-2.20
+	app-arch/xz-utils"
+[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
@@ -35,28 +38,47 @@ src_unpack() {
 		cd "${S}"
 		./bootstrap || die
 	else
-		unpack ${A}
-		cd "${S}"
+		xz -dc "${DISTDIR}"/${A} > ${P}.tar #356089
+		unpack ./${P}.tar
 	fi
+}
 
+src_prepare() {
 	use vanilla && return 0
 
 	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
+}
+
+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 $(use_enable static-libs static)
 }
 
 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
 
-	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
 }
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libltdl.so.3
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libltdl.so.3
+}