gentoo auto-resync : 17:05:2024 - 00:01:35

4 files changed, 185 insertions, 6 deletions

diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 6ec15dc07c1d..095084fdad08 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/libtool/Manifest b/dev-build/libtool/Manifest
index ace861fe8424..876949c5c3d6 100644
--- a/dev-build/libtool/Manifest
+++ b/dev-build/libtool/Manifest
@@ -8,6 +8,8 @@ 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
+DIST libtool-2.5.0.tar.xz 1032148 BLAKE2B a166423dae1000eb0a8d17f3872ed55b3338444ac61f51752f43a5886bc22fd233e060c7f4c8c7fa093bf50e589f03b755c628199534ef7b8a41935e1bf9d887 SHA512 7b426fe9550a7899de93c372d2c355867be02f7bb39f2b1de06ff30cb34c81bf89759c835bdb23081cef60bfeb39b786ed90bac43e7300956fd8ee1f7dc0a609
 EBUILD libtool-2.4.7-r4.ebuild 3764 BLAKE2B 50a9b74ed16d701dba58c7b0aa7f2af9d0520d5722c1be553fa1496b93279fa3ae5620092059593e6dbf1d32a9f73bdb89d3a51576ffbebc993998c2e81545d8 SHA512 3570c57b455382196b2e2c9cf1b8b50aa41a8b7cdb48a8f0bfab3c84a4205192c584581e75c484ba48b7188d3bf05f76335a93854e7b2074d20e055c9a2b4870
-EBUILD libtool-9999.ebuild 3686 BLAKE2B 8880f98cb6136e3d5e000305e0b6cee68288145d39ea3c506cf87dca8b17cfcf8559d69078145e4b124327b99dcf5518d8d88c63d4fd060ba6a8cc40970f6951 SHA512 a8edf507841dde998eefafd55eba26106f6b6b701b6f5a0d8a0e45f442c946aea6864aafad321165f17dfadca2d9653296bcf38f3ca44bd5609a6ee534b58a78
+EBUILD libtool-2.5.0.ebuild 4405 BLAKE2B 67616a35ebcdfbeae9954b627e7d63bef185c87df10bd63a4baa2a48e3ddd84fb62e7f933adff370123a7c978662563ef7446dc563bbacb808a3c14d3c8cc29a SHA512 8f2df4646049b565f04a210da6de4a6c63ce1370e0123d184b44d45af7edc5de06b8a480aa1103565d21c56eb457201f318f8c4f09611274ca3c1f3ae313329a
+EBUILD libtool-9999.ebuild 4405 BLAKE2B 67616a35ebcdfbeae9954b627e7d63bef185c87df10bd63a4baa2a48e3ddd84fb62e7f933adff370123a7c978662563ef7446dc563bbacb808a3c14d3c8cc29a SHA512 8f2df4646049b565f04a210da6de4a6c63ce1370e0123d184b44d45af7edc5de06b8a480aa1103565d21c56eb457201f318f8c4f09611274ca3c1f3ae313329a
 MISC metadata.xml 387 BLAKE2B 67cf835b47b93429e11c197920fa03784c03bbc55f85968bc338859054b67e037f6dcf4b12c949da802b822a97090896b520fb9cf890375f72e0aa53b13bcab1 SHA512 f61389a94f3241944037c02d6179bb962f1f4c6d9b502dc3f49147a682922e9f80033977afc0af0677afce4de9633a901e1a8fef2767e286c2ee40204b62418c
diff --git a/dev-build/libtool/libtool-2.5.0.ebuild b/dev-build/libtool/libtool-2.5.0.ebuild
new file mode 100644
index 000000000000..170c55f2db74
--- /dev/null
+++ b/dev-build/libtool/libtool-2.5.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with dev-libs/libltdl.
+
+# bug #225559
+LIBTOOLIZE="true"
+WANT_LIBTOOL="none"
+inherit autotools flag-o-matic prefix multiprocessing
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git"
+	inherit git-r3
+elif ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
+	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
+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:*
+"
+DEPEND="${RDEPEND}"
+[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
+
+# Note that we have more patches in https://gitweb.gentoo.org/proj/elt-patches.git/
+# for package builds. The patches here are just those which are definitely fine
+# for the system-wide libtool installation as well.
+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
+)
+
+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.
+	# Do not bother hardcoding the full path to sed.
+	# Just rely on $PATH. bug #574550
+	export CONFIG_SHELL="${EPREFIX}"/bin/bash
+	export ac_cv_path_SED="sed"
+	export ac_cv_path_EGREP="grep -E"
+	export ac_cv_path_EGREP_TRADITIONAL="grep -E"
+	export ac_cv_path_FGREP="grep -F"
+	export ac_cv_path_GREP="grep"
+	export ac_cv_path_lt_DD="dd"
+
+	local myeconfargs=(
+		# Split into dev-libs/libltdl
+		--disable-ltdl-install
+
+		# Tests break otherwise (when porting to EAPI 8)
+		# https://lists.gnu.org/archive/html/bug-libtool/2014-10/msg00013.html
+		--enable-static
+	)
+
+	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( "--program-prefix=g" )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	(
+		# The testsuite is sensitive to warnings, expects static
+		# archives to really be archives (not compiler IR), etc.
+		strip-flags
+		filter-flags -fno-semantic-interposition
+		filter-flags '-Wstrict-aliasing=*' '-Werror=*'
+		filter-lto
+
+		emake -Onone check \
+			CFLAGS="${CFLAGS}" \
+			CXXFLAGS="${CXXFLAGS}" \
+			FFLAGS="${FFLAGS}" \
+			FCFLAGS="${FCFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
+			TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
+	)
+}
+
+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-9999.ebuild b/dev-build/libtool/libtool-9999.ebuild
index 8c2693567e42..170c55f2db74 100644
--- a/dev-build/libtool/libtool-9999.ebuild
+++ b/dev-build/libtool/libtool-9999.ebuild
@@ -1,18 +1,20 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Please bump with dev-libs/libltdl.
 
 # bug #225559
 LIBTOOLIZE="true"
 WANT_LIBTOOL="none"
-inherit autotools prefix multiprocessing
+inherit autotools flag-o-matic prefix multiprocessing
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git"
 	inherit git-r3
+elif ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
+	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
 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"
@@ -106,13 +108,37 @@ src_configure() {
 	export ac_cv_path_GREP="grep"
 	export ac_cv_path_lt_DD="dd"
 
-	[[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g"
+	local myeconfargs=(
+		# Split into dev-libs/libltdl
+		--disable-ltdl-install
 
-	ECONF_SOURCE="${S}" econf ${myconf} --disable-ltdl-install
+		# Tests break otherwise (when porting to EAPI 8)
+		# https://lists.gnu.org/archive/html/bug-libtool/2014-10/msg00013.html
+		--enable-static
+	)
+
+	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( "--program-prefix=g" )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 src_test() {
-	emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
+	(
+		# The testsuite is sensitive to warnings, expects static
+		# archives to really be archives (not compiler IR), etc.
+		strip-flags
+		filter-flags -fno-semantic-interposition
+		filter-flags '-Wstrict-aliasing=*' '-Werror=*'
+		filter-lto
+
+		emake -Onone check \
+			CFLAGS="${CFLAGS}" \
+			CXXFLAGS="${CXXFLAGS}" \
+			FFLAGS="${FFLAGS}" \
+			FCFLAGS="${FCFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
+			TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
+	)
 }
 
 src_install() {