gentoo auto-resync : 24:03:2024 - 19:00:40

6 files changed, 13 insertions, 130 deletions

diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index f4ac7a454636..cd20b894d9a0 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/libtool/Manifest b/dev-build/libtool/Manifest
index b032d2ee4e85..6eea0b0dbade 100644
--- a/dev-build/libtool/Manifest
+++ b/dev-build/libtool/Manifest
@@ -8,7 +8,6 @@ AUX libtool-2.4.6-pthread_bootstrapped.patch 532 BLAKE2B aeb1592c07a9c5eeed81c48
 AUX libtool-2.4.7-grep-3.8.patch 1282 BLAKE2B b64b6eab6bed4b5595ef228c9d3bc65a8b2f56ba7e8358d33d46e7e11fee334b4584a24004e2669a272880197f71f54848820bfd8d861e24f3e2b039298f3a96 SHA512 175c5c5d5a9aa6021bfc9a6a38a184c008dd97e76ee756df3f3fdac7610dac545d6539b5717713b771de46322a437ba3416581f4961af56be635659c2498f015
 AUX libtool-2.4.7-werror-lto.patch 2248 BLAKE2B 3537c599ee310fda695b1a671770e1d2c5a943e763641515738e8d13907b807b92727182a34af4c20598c3ad228a2b660f10fd582c2f65d1fdef11b92f5fc68a SHA512 b16f835fbec1ecf6c8408c0705fc94886f35443394298e9ae1d1893dbf7dbad11325b636ccc9d0ddeecc00a13a7b5ae78867dd1369b0fc2fcd9276808f326146
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
-EBUILD libtool-2.4.7-r1.ebuild 3328 BLAKE2B b6be29a2ba3ef55e4f0ef285965c5575bb890a5627f12918ce4757394e2125a11415aa96a992598e6d55af33de27ceafd56bedc66576bfbadeec49750cd9b495 SHA512 0041100d2d6897a0e37eec7fdd3446194c7231c018a1736d826ec5d7d88ec4c3204c39911b2c120b0e4a4c45a44728f7595c21210b3fbd462610064373212351
-EBUILD libtool-2.4.7-r2.ebuild 3608 BLAKE2B a26fd7cb7e75058c6b11d8e1483845c72ced47cc374388dbf83ca25ace2e1e512b99275d013e131803be8135a6d61fedeeb14df0a30a1ae73d1caac337d437cd SHA512 e75c5a3153792c2da20a516bb797bb97fe53908d06588817f98c059c401cf4d2c35fb605b63850a2f8f3597b65e4220f243f1ad230af677928741d675f52f783
-EBUILD libtool-9999.ebuild 3530 BLAKE2B 4ca095c93f68e20d424d57f61370ed310efc3411776f2e204e476bc5657b16bcbd729723b77c27847818de832b595162e52e596400b12946d95376cf3146654f SHA512 a2c51bece0819f9d003a2a3b4f31aa3be1c564c39ba945337bd0efbbb4ccbaea109e51d3d6084caefd1d8b80bf5c21bb4104a4c179f97952b7a9bf272b6ccb92
-MISC metadata.xml 331 BLAKE2B 4a4cfaad20b2f1c22b0b5ab23b4557e1bef50dbc49d0b7d821d4099e06bf488fdc6c7cb4a29431910d0e1b8cfb7c8b565cd3296afb30925a08389e023c777150 SHA512 9ca8e937181de31beb06558475dc8c10e61765d5280a882576a2d1e4e87fb750bc1c2e99aafdfffe343343797e0565814c0a5f8c18c7fba5b7fe9275100f2609
+EBUILD libtool-2.4.7-r3.ebuild 3612 BLAKE2B dcb4ebc17dfa9689d8a376bf7158e16ee952c05be839c2382538ec9a77b791500d20f666a0dac103694bf1b5fb23288ecd898b710d6e43c062a86bd381c3a9e3 SHA512 93ffa8af8fc59d29b4ec7210d7524fff22e9767ac296c3152490eeedc9a736a46c13f1328d9dfdb797303926eaae1026267b7403234af742386318afe828973a
+EBUILD libtool-9999.ebuild 3534 BLAKE2B 2c1847d402febf2e13892089445b3bdc83916eb5c68f6603f94ac842df03b3cdbb664475a9e8bc5d0917d9c1d820401788bc657365e9f4b014183c7bd1f9c815 SHA512 6055c9da25db2bbcc91878816d153ca2e3baf79cdc109fa7109a33535e07f6cbb859b35cba0ac988a37d7984060e9fefad8810c2ad4524c4be3caa322efce5d2
+MISC metadata.xml 387 BLAKE2B 67cf835b47b93429e11c197920fa03784c03bbc55f85968bc338859054b67e037f6dcf4b12c949da802b822a97090896b520fb9cf890375f72e0aa53b13bcab1 SHA512 f61389a94f3241944037c02d6179bb962f1f4c6d9b502dc3f49147a682922e9f80033977afc0af0677afce4de9633a901e1a8fef2767e286c2ee40204b62418c
diff --git a/dev-build/libtool/libtool-2.4.7-r1.ebuild b/dev-build/libtool/libtool-2.4.7-r1.ebuild
deleted file mode 100644
index aa94eae26eeb..000000000000
--- a/dev-build/libtool/libtool-2.4.7-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-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
-	>=dev-build/autoconf-2.69:*
-	>=dev-build/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.2.6a-darwin-module-bundle.patch
-	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
-	"${FILESDIR}"/${PN}-2.4.7-werror-lto.patch
-	"${FILESDIR}"/${PN}-2.4.7-grep-3.8.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=true
-	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/dev-build/libtool/libtool-2.4.7-r2.ebuild b/dev-build/libtool/libtool-2.4.7-r3.ebuild
index 9aeb0ed28993..75bdf19f6d2a 100644
--- a/dev-build/libtool/libtool-2.4.7-r2.ebuild
+++ b/dev-build/libtool/libtool-2.4.7-r3.ebuild
@@ -98,7 +98,7 @@ src_configure() {
 	# 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)"
+	export CONFIG_SHELL="${EPREFIX}"/bin/bash
 
 	# Do not bother hardcoding the full path to sed.
 	# Just rely on $PATH. bug #574550
diff --git a/dev-build/libtool/libtool-9999.ebuild b/dev-build/libtool/libtool-9999.ebuild
index e5ecf26e0972..033495d8ee02 100644
--- a/dev-build/libtool/libtool-9999.ebuild
+++ b/dev-build/libtool/libtool-9999.ebuild
@@ -96,7 +96,7 @@ src_configure() {
 	# 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)"
+	export CONFIG_SHELL="${EPREFIX}"/bin/bash
 
 	# Do not bother hardcoding the full path to sed.
 	# Just rely on $PATH. bug #574550
diff --git a/dev-build/libtool/metadata.xml b/dev-build/libtool/metadata.xml
index 151cc38da6c6..3a9f14ae2105 100644
--- a/dev-build/libtool/metadata.xml
+++ b/dev-build/libtool/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:gnu:libtool</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:libtool</remote-id>
+		<remote-id type="savannah">libtool</remote-id>
+	</upstream>
 </pkgmetadata>