gentoo resync : 20.03.2022

3 files changed, 135 insertions, 9 deletions

diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index d400842a2543..a39c96e55e84 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -14,6 +14,8 @@ AUX libtool-2.4.6-pthread.patch 1496 BLAKE2B dc49604133c6c65a2290a8879c243b35b20
 AUX libtool-2.4.6-pthread_bootstrapped.patch 532 BLAKE2B aeb1592c07a9c5eeed81c483e348786fb1cede29b09fa8e74d0fcf7fdb6ad36fd980823d13b3e20cc7a54d5c518e0f557928b440ef9d0fd6723a8d5f8774c098 SHA512 05c1cee7a3d90bf4768cabaaba47290dc668db7c14173abf99ed8e64dae92191537f89c3304a4d42c01ecc2280d37104c47f621e44b3d19db481846bb225a2a1
 AUX libtool-2.4.6-sed-quote-speedup.patch 7619 BLAKE2B 14e0341bb5b5878dd9bab5996a63d849c5d8c257618a87792bf7c904481d07430553102da2917cb518c37790d2321ae6202572ab59614a8291e475fc8a043ee6 SHA512 f5658f87edc24e494fff1ad2b1932dcd4a8a1515e88a10f3d5bc076ac69570e11c4559a8a56d577dc24181de262c97d6c1cfb16b9cd8315264cf55bc1351bf71
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
+DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
 EBUILD libtool-2.4.6-r6.ebuild 3594 BLAKE2B 1af42af727a1aa0a7f7392ab253a34a93b76715b605291cd9ff136708c41ddede5e4cfbdec7b7059f6f40780ac8b6b17fa2a4d0ae17959565e29ed4dfe0846e3 SHA512 425c6a82232cdac39f598c7c8cff46a7594a5644ab30331d56ec92bbbad32fd099c89b7995be568f8ba60e489b3bb7c306fbf79ef40782ef4f2bc1552babcf40
-EBUILD libtool-9999.ebuild 3201 BLAKE2B 99bd172c1d5a5d1ee5355be9c03c174e0164391a795bc02744006b89db4095221f50ea1183599b3e3460a1f3ac261f8833af29a4124d0433178591d9494d782c SHA512 1ffdaa021c89fa420f2bd124a7fcb3a9db18b581b6e2c79168564b1244b65675662956207e00fa1355076dd11ec6e086e50c1e20e8b8db940d2e3bbb42ddf8ea
+EBUILD libtool-2.4.7.ebuild 3337 BLAKE2B 08edf323d23e0cc1406e96dfa3bce6863fe00689d2f6f22bc33e3fe0aca56d64a6c38f48af402dadac5c18b51af5e231c7c6fd43d22d641d9b804209a8480aa4 SHA512 e768c94a0c48b820442db50d44220262e489d42cfbb34b7aff0be0ac7a3f9afce6fd60d08944bb42749329d1f5cea606f484755ee67c3567f5c980d07c80dfe5
+EBUILD libtool-9999.ebuild 3328 BLAKE2B 24d35d2257f24fb566bb8b9e771544f59c9951fc8061398c742ca37d81007396fbc8fbb21c471d6dddd1c3601918fb28f20467a2c67d6f1c589fc99d82a477aa SHA512 ac200adb173a7dd60f296ab2623ca067d3e587e747ccc7fdcdd2eaad09d23ff0db44131eb5db58bb005b58581e63ca458be8b345842ea052117c8e92d29e10ad
 MISC metadata.xml 331 BLAKE2B 4a4cfaad20b2f1c22b0b5ab23b4557e1bef50dbc49d0b7d821d4099e06bf488fdc6c7cb4a29431910d0e1b8cfb7c8b565cd3296afb30925a08389e023c777150 SHA512 9ca8e937181de31beb06558475dc8c10e61765d5280a882576a2d1e4e87fb750bc1c2e99aafdfffe343343797e0565814c0a5f8c18c7fba5b7fe9275100f2609
diff --git a/sys-devel/libtool/libtool-2.4.7.ebuild b/sys-devel/libtool/libtool-2.4.7.ebuild
new file mode 100644
index 000000000000..2eb522d28d08
--- /dev/null
+++ b/sys-devel/libtool/libtool-2.4.7.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with dev-libs/libltdl.
+
+# bug #225559
+LIBTOOLIZE="true"
+WANT_LIBTOOL="none"
+inherit autotools prefix
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="https://www.gnu.org/software/libtool/"
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="vanilla"
+
+# Pull in libltdl directly until we convert packages to the new dep.
+RDEPEND="
+	sys-devel/gnuconfig
+	>=sys-devel/autoconf-2.69:*
+	>=sys-devel/automake-1.13:*
+	>=dev-libs/libltdl-2.4.7"
+DEPEND="${RDEPEND}"
+[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
+
+PATCHES=(
+	# bug #109105
+	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch
+	# bug #581314
+	"${FILESDIR}"/${PN}-2.4.6-ppc64le.patch
+
+	"${FILESDIR}"/${PN}-2.4.6-mint.patch
+	"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
+	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
+)
+
+src_prepare() {
+	if [[ ${PV} == *9999 ]] ; then
+		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch # bug #650876
+		./bootstrap || die
+	else
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch # bug #650876
+		)
+	fi
+
+	# WARNING: File build-aux/ltmain.sh is read-only; trying to patch anyway
+	chmod +w build-aux/ltmain.sh || die
+
+	if use vanilla ; then
+		eapply_user
+		return 0
+	else
+		default
+	fi
+
+	if use prefix ; then
+		# seems that libtool has to know about EPREFIX a little bit
+		# better, since it fails to find prefix paths to search libs
+		# from, resulting in some packages building static only, since
+		# libtool is fooled into thinking that libraries are unavailable
+		# (argh...). This could also be fixed by making the gcc wrapper
+		# return the correct result for -print-search-dirs (doesn't
+		# include prefix dirs ...).
+		eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
+		eprefixify m4/libtool.m4
+	fi
+
+	pushd libltdl >/dev/null || die
+	AT_NOELIBTOOLIZE=yes eautoreconf
+	popd >/dev/null || die
+	AT_NOELIBTOOLIZE=yes eautoreconf
+
+	# Make sure timestamps don't trigger a rebuild of man pages. #556512
+	if [[ ${PV} != *9999 ]] ; then
+		touch doc/*.1 || die
+		export HELP2MAN=false
+	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="$(type -P bash)"
+
+	# Do not bother hardcoding the full path to sed.
+	# Just rely on $PATH. bug #574550
+	export ac_cv_path_SED="$(basename "$(type -P sed)")"
+
+	[[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g"
+
+	ECONF_SOURCE="${S}" econf ${myconf} --disable-ltdl-install
+}
+
+src_install() {
+	default
+
+	local x
+	while read -d $'\0' -r x ; do
+		ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die
+	done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0)
+}
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index ea6a7173bed3..648487eec160 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,9 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-LIBTOOLIZE="true" #225559
+# Please bump with dev-libs/libltdl.
+
+# bug #225559
+LIBTOOLIZE="true"
 WANT_LIBTOOL="none"
 inherit autotools prefix
 
@@ -27,12 +30,16 @@ RDEPEND="
 	sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.69:*
 	>=sys-devel/automake-1.13:*
-	dev-libs/libltdl:0"
+	dev-libs/libltdl"
 DEPEND="${RDEPEND}"
 [[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
+	# bug #109105
+	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch
+	# bug #581314
+	"${FILESDIR}"/${PN}-2.4.6-ppc64le.patch
+
 	"${FILESDIR}"/${PN}-2.4.6-mint.patch
 	"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
 	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
@@ -40,11 +47,11 @@ PATCHES=(
 
 src_prepare() {
 	if [[ ${PV} == *9999 ]] ; then
-		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch #650876
+		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch # bug #650876
 		./bootstrap || die
 	else
 		PATCHES+=(
-			"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch #650876
+			"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch # bug #650876
 		)
 	fi
 
@@ -89,11 +96,13 @@ src_configure() {
 	# shells, so just force libtool to use /bin/bash all the time.
 	export CONFIG_SHELL="$(type -P bash)"
 
-	# Do not bother hardcoding the full path to sed.  Just rely on $PATH. #574550
+	# Do not bother hardcoding the full path to sed.
+	# Just rely on $PATH. bug #574550
 	export ac_cv_path_SED="$(basename "$(type -P sed)")"
 
 	[[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g"
-	ECONF_SOURCE=${S} econf ${myconf} --disable-ltdl-install
+
+	ECONF_SOURCE="${S}" econf ${myconf} --disable-ltdl-install
 }
 
 src_install() {