diff --git a/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.17-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.17-r1.ebuild index 12f7549746..ac6f9937d6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.17-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.17-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,7 +35,7 @@ else mirror://gnu/${PN}/${P}.tar.xz.sig ) " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi fi diff --git a/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.17-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.17-r2.ebuild new file mode 100644 index 0000000000..add36e6de7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.17-r2.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Bumping notes: +# * Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in dev-build/automake-wrapper +# on new automake (major) releases, as well as the dependency in RDEPEND below too. +# * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass. + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit python-any-r1 verify-sig + +MANGLED_SLOT=${PV:0:4} + +if [[ ${PV} == 9999 ]] ; then + EGIT_MIN_CLONE_TYPE=single + EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jimmeyering.asc + if [[ $(ver_cut 3) -ge 90 ]] ; then + MANGLED_SLOT=$(ver_cut 1).$(($(ver_cut 2) + 1)) + SRC_URI=" + https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz + verify-sig? ( + https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz.sig + ) + " + else + SRC_URI=" + mirror://gnu/${PN}/${P}.tar.xz + verify-sig? ( + mirror://gnu/${PN}/${P}.tar.xz.sig + ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi +fi + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/" + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${MANGLED_SLOT}" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/perl-5.6 + >=dev-build/automake-wrapper-20240607 + >=dev-build/autoconf-2.69:* + sys-devel/gnuconfig +" +BDEPEND=" + app-alternatives/gzip + sys-apps/help2man + dev-build/autoconf-wrapper + dev-build/autoconf + test? ( + ${PYTHON_DEPS} + dev-util/dejagnu + sys-devel/bison + sys-devel/flex + ) + verify-sig? ( sec-keys/openpgp-keys-jimmeyering ) +" + +PATCHES=( + "${FILESDIR}"/${P}-perl-5.41.patch + "${FILESDIR}"/${P}-perl-no-werror.patch +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + export WANT_AUTOCONF=2.5 + # Don't try wrapping the autotools - this thing runs as it tends + # to be a bit esoteric, and the script does `set -e` itself. + ./bootstrap || die + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die + + # bug #628912 + if ! has_version -b sys-apps/texinfo ; then + touch doc/{stamp-vti,version.texi,automake.info} || die + fi +} + +src_configure() { + # Also used in install. + infopath="${EPREFIX}/usr/share/automake-${PV}/info" + econf --infodir="${infopath}" +} + +src_test() { + # Fails with byacc/flex + emake YACC="bison -y" LEX="flex" check +} + +src_install() { + default + + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die + rm \ + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + local x + for x in guess sub ; do + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} + done + + # Avoid QA message about pre-compressed file in docs + local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi + + pushd "${D}/${infopath}" >/dev/null || die + for f in *.info*; do + # Install convenience aliases for versioned Automake pages. + ln -s "$f" "${f/./-${PV}.}" || die + done + popd >/dev/null || die + + if [[ ${PV} == 9999 ]]; then + local major="89" + local minor="999" + else + local major="$(ver_cut 1)" + if [[ $(ver_cut 3) -ge 90 ]] ; then + local minor=$(($(ver_cut 2) + 1)) + else + local minor="$(ver_cut 2)" + fi + fi + local idx="$((99999-(major*1000+minor)))" + newenvd - "06automake${idx}" <<-EOF + INFOPATH="${infopath}" + EOF + + docompress "${infopath}" +} diff --git a/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.11.6-perl-5.16.patch b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.11.6-perl-5.16.patch index 19fe249e0c..b35fb39a3f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.11.6-perl-5.16.patch +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.11.6-perl-5.16.patch @@ -17,14 +17,6 @@ instead of "&func(ARGS...)"). * THANKS, NEWS: Update. Signed-off-by: Stefano Lattarini ---- - NEWS | 4 ++++ - THANKS | 1 + - aclocal.in | 42 ++++++++++++++++++++++++++++++++++-------- - 3 files changed, 39 insertions(+), 8 deletions(-) - -diff --git a/aclocal.in b/aclocal.in -index dfb851b..e8855d5 100644 --- a/aclocal.in +++ b/aclocal.in @@ -152,8 +152,34 @@ my $erase_me; diff --git a/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch index bf8819adcf..4bd7ab16fb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch @@ -15,12 +15,6 @@ https://bugzilla.redhat.com/1239379 * bin/automake.in (substitute_ac_subst_variables): Escape the occurrence of '{' character. ---- - bin/automake.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/automake.in b/bin/automake.in -index 0c29184..c294ced 100644 --- a/automake.in +++ b/automake.in @@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker diff --git a/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.17-perl-5.41.patch b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.17-perl-5.41.patch new file mode 100644 index 0000000000..425ce723e1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.17-perl-5.41.patch @@ -0,0 +1,25 @@ +https://git.savannah.gnu.org/cgit/automake.git/commit/?id=b5403ee7a035872a21135c2ee4871a6c284c91dd + +From b5403ee7a035872a21135c2ee4871a6c284c91dd Mon Sep 17 00:00:00 2001 +From: Collin Funk +Date: Thu, 30 Jan 2025 15:34:52 -0800 +Subject: automake: avoid precedence error when using Perl 5.41+. + +Reported by Igor Todorovski in +. + +* bin/automake.in (transform): Parentheses the '!' operators so +Perl 5.41.8 doesn't warn about "possible precedence problem". +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -6871,7 +6871,7 @@ sub transform ($\%) + { + my $neg = ($1 eq '!') ? 1 : 0; + my $val = transform_token ($token, %$transform, $2); +- return (!!$val == $neg) ? '##%' : ''; ++ return ((!!$val) == $neg) ? '##%' : ''; + } + else + { +-- +cgit v1.1 diff --git a/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.17-perl-no-werror.patch b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.17-perl-no-werror.patch new file mode 100644 index 0000000000..ff0fb79014 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.17-perl-no-werror.patch @@ -0,0 +1,460 @@ +https://git.savannah.gnu.org/cgit/automake.git/commit/?id=fc1c3f658517be4fe70bdf33bc6cd594d3faa0b2 + +From fc1c3f658517be4fe70bdf33bc6cd594d3faa0b2 Mon Sep 17 00:00:00 2001 +From: Karl Berry +Date: Fri, 31 Jan 2025 09:20:47 -0800 +Subject: automake: just use warnings, with no => FATAL. + +Per Perl recommendation: + https://perldoc.perl.org/warnings#Fatal-Warnings +Suggested by Collin Funk: + https://lists.gnu.org/archive/html/automake/2025-01/msg00003.html +And in the Perl discussion: + https://github.com/Perl/perl5/issues/22954#issuecomment-2622966302 + +* bin/aclocal.in: just use warnings, not making them fatal. +* bin/automake.in: +* contrib/tap-driver.pl: +* gen-testsuite-part: +* lib/Automake/ChannelDefs.pm: +* lib/Automake/Channels.pm: +* lib/Automake/Condition.pm: +* lib/Automake/Config.in: +* lib/Automake/Configure_ac.pm: +* lib/Automake/DisjConditions.pm: +* lib/Automake/FileUtils.pm: +* lib/Automake/General.pm: +* lib/Automake/Getopt.pm: +* lib/Automake/Item.pm: +* lib/Automake/ItemDef.pm: +* lib/Automake/Language.pm: +* lib/Automake/Location.pm: +* lib/Automake/Options.pm: +* lib/Automake/Rule.pm: +* lib/Automake/RuleDef.pm: +* lib/Automake/VarDef.pm: +* lib/Automake/Variable.pm: +* lib/Automake/Version.pm: +* lib/Automake/Wrap.pm: +* lib/Automake/XFile.pm: +* t/ax/deltree.pl: +* t/ax/extract-testsuite-summary.pl: +* t/check-fd-redirect.sh: +* t/tap-signal.tap: +* t/tests-environment-fd-redirect.sh: +* t/testsuite-summary-count-many.sh: +--- a/bin/aclocal.in ++++ b/bin/aclocal.in +@@ -19,9 +19,7 @@ + # Written by Tom Tromey , and + # Alexandre Duret-Lutz . + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + BEGIN + { +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -22,9 +22,7 @@ + + package Automake; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + BEGIN + { +--- a/contrib/tap-driver.pl ++++ b/contrib/tap-driver.pl +@@ -27,12 +27,12 @@ + # Imports, static data, and setup. # + # ---------------------------------- # + +-use warnings FATAL => 'all'; +-use strict; ++use strict; use warnings; + use Getopt::Long (); ++ + use TAP::Parser; + +-my $VERSION = '2013-12-24.15'; # UTC ++my $VERSION = '2024-12-03.03'; # UTC + + my $ME = "tap-driver.pl"; + +--- a/gen-testsuite-part ++++ b/gen-testsuite-part +@@ -20,8 +20,8 @@ + + #-------------------------------------------------------------------------- + +-use warnings FATAL => "all"; + use strict; ++use warnings; + use File::Basename (); + use constant TRUE => 1; + use constant FALSE => 0; +--- a/lib/Automake/ChannelDefs.pm ++++ b/lib/Automake/ChannelDefs.pm +@@ -49,10 +49,7 @@ shorthand function to output on specific channels. + + =cut + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Exporter; + + use Automake::Channels; +--- a/lib/Automake/Channels.pm ++++ b/lib/Automake/Channels.pm +@@ -66,10 +66,7 @@ etc.) that can also be overridden on a per-message basis. + + =cut + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Carp; + use Exporter; + use File::Basename; +--- a/lib/Automake/Condition.pm ++++ b/lib/Automake/Condition.pm +@@ -15,10 +15,7 @@ + + package Automake::Condition; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Carp; + use Exporter; + +--- a/lib/Automake/Config.in ++++ b/lib/Automake/Config.in +@@ -17,9 +17,7 @@ + + package Automake::Config; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Exporter; + +--- a/lib/Automake/Configure_ac.pm ++++ b/lib/Automake/Configure_ac.pm +@@ -20,9 +20,7 @@ + + package Automake::Configure_ac; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Exporter; + +--- a/lib/Automake/DisjConditions.pm ++++ b/lib/Automake/DisjConditions.pm +@@ -15,9 +15,7 @@ + + package Automake::DisjConditions; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Carp; + use Automake::Condition qw (TRUE FALSE); +--- a/lib/Automake/FileUtils.pm ++++ b/lib/Automake/FileUtils.pm +@@ -34,9 +34,7 @@ This perl module provides various general purpose file handling functions. + + =cut + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + BEGIN + { +--- a/lib/Automake/General.pm ++++ b/lib/Automake/General.pm +@@ -15,9 +15,7 @@ + + package Automake::General; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Exporter; + use File::Basename; +--- a/lib/Automake/Getopt.pm ++++ b/lib/Automake/Getopt.pm +@@ -35,9 +35,7 @@ line options in conformance to the GNU Coding standards. + + =cut + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Carp qw (confess croak); + use Exporter (); +--- a/lib/Automake/Item.pm ++++ b/lib/Automake/Item.pm +@@ -15,9 +15,7 @@ + + package Automake::Item; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Carp; + +--- a/lib/Automake/ItemDef.pm ++++ b/lib/Automake/ItemDef.pm +@@ -15,10 +15,7 @@ + + package Automake::ItemDef; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Carp; + + =head1 NAME +--- a/lib/Automake/Language.pm ++++ b/lib/Automake/Language.pm +@@ -15,9 +15,7 @@ + + package Automake::Language; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Class::Struct (); + +--- a/lib/Automake/Location.pm ++++ b/lib/Automake/Location.pm +@@ -15,9 +15,7 @@ + + package Automake::Location; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + =head1 NAME + +--- a/lib/Automake/Options.pm ++++ b/lib/Automake/Options.pm +@@ -15,10 +15,7 @@ + + package Automake::Options; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Exporter; + + use Automake::Config; +--- a/lib/Automake/Rule.pm ++++ b/lib/Automake/Rule.pm +@@ -15,10 +15,7 @@ + + package Automake::Rule; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Carp; + use Exporter; + +--- a/lib/Automake/RuleDef.pm ++++ b/lib/Automake/RuleDef.pm +@@ -15,10 +15,7 @@ + + package Automake::RuleDef; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Carp; + use Exporter; + +--- a/lib/Automake/VarDef.pm ++++ b/lib/Automake/VarDef.pm +@@ -15,10 +15,7 @@ + + package Automake::VarDef; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Carp; + use Exporter; + +--- a/lib/Automake/Variable.pm ++++ b/lib/Automake/Variable.pm +@@ -15,10 +15,7 @@ + + package Automake::Variable; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Carp; + use Exporter; + +--- a/lib/Automake/Version.pm ++++ b/lib/Automake/Version.pm +@@ -15,9 +15,7 @@ + + package Automake::Version; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Automake::ChannelDefs; + +--- a/lib/Automake/Wrap.pm ++++ b/lib/Automake/Wrap.pm +@@ -15,10 +15,7 @@ + + package Automake::Wrap; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Exporter; + + our @ISA = qw (Exporter); +--- a/lib/Automake/XFile.pm ++++ b/lib/Automake/XFile.pm +@@ -69,10 +69,7 @@ and C methods to translate C<\r\n> to C<\n>. + + =cut + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Errno; + use Exporter; + use IO::File; +--- a/t/ax/deltree.pl ++++ b/t/ax/deltree.pl +@@ -17,8 +17,7 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + +-use strict; +-use warnings FATAL => 'all'; ++use strict; use warnings; + use File::Path qw/rmtree/; + + my $exit_status = 0; +--- a/t/ax/extract-testsuite-summary.pl ++++ b/t/ax/extract-testsuite-summary.pl +@@ -17,8 +17,7 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + +-use warnings FATAL => 'all'; +-use strict; ++use strict; use warnings; + + my $br = '=' x 76; + my @sections = (''); +--- a/t/check-fd-redirect.sh ++++ b/t/check-fd-redirect.sh +@@ -81,8 +81,7 @@ do_check + + echo "#! $PERL -w" > foo.test + cat >> foo.test <<'END' +-use warnings FATAL => 'all'; +-use strict; ++use strict; use warnings; + + open (FD3, "<&=3") or die "opening FD3: $!"; + open (FD4, ">&=4") or die "opening FD4: $!"; +--- a/t/tap-signal.tap ++++ b/t/tap-signal.tap +@@ -52,7 +52,7 @@ for sig in $all_signals; do + # We need autoflush to avoid losing output, which could cause spurious + # "no test plan seen" in the TAP driver. + BEGIN { $| = 1 } +- use warnings FATAL => "all"; ++ use warnings; + print "1..1\\n"; + print "ok 1\\n"; + kill $sig, \$\$; +--- a/t/tests-environment-fd-redirect.sh ++++ b/t/tests-environment-fd-redirect.sh +@@ -44,8 +44,8 @@ END + + echo "#! $PERL -w" > bar.test + cat >>bar.test <<'END' +-use warnings FATAL => 'all'; + use strict; ++use warnings; + open(FD8, ">&=8") or die "$!"; + open(FD9, ">&=9") or die "$!"; + print FD8 " $0: 8888\n"; +--- a/t/testsuite-summary-count-many.sh ++++ b/t/testsuite-summary-count-many.sh +@@ -52,8 +52,8 @@ END + chmod a+x all.test + + $PERL -w -e ' +- use warnings FATAL => "all"; + use strict; ++ use warnings; + + my $base = 1000; + my %count = ( +-- +cgit v1.1 + +