commit:     211c52657cf98dedce503ac2d27b282763e56500
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 16 22:27:12 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 00:00:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=211c5265

sys-devel/autoconf-vanilla: new package, add 2.13, 2.69, 2.71, 2.72c, 9999

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/autoconf-vanilla/Manifest                |  5 ++
 .../autoconf-vanilla/autoconf-vanilla-2.13.ebuild  | 58 +++++++++++++++
 .../autoconf-vanilla/autoconf-vanilla-2.69.ebuild  | 68 +++++++++++++++++
 .../autoconf-vanilla/autoconf-vanilla-2.71.ebuild  | 85 +++++++++++++++++++++
 .../autoconf-vanilla/autoconf-vanilla-2.72c.ebuild | 87 ++++++++++++++++++++++
 .../autoconf-vanilla/autoconf-vanilla-9999.ebuild  | 87 ++++++++++++++++++++++
 .../files/autoconf-2.13-destdir.patch              | 26 +++++++
 .../files/autoconf-2.13-gentoo.patch               | 36 +++++++++
 .../files/autoconf-2.13-perl-5.26.patch            | 12 +++
 .../files/autoconf-2.13-test-fixes.patch           | 18 +++++
 .../files/autoconf-2.61-darwin.patch               | 11 +++
 .../files/autoconf-2.69-fix-libtool-test.patch     | 31 ++++++++
 ...autoconf-2.69-make-tests-bash5-compatible.patch | 63 ++++++++++++++++
 .../files/autoconf-2.69-perl-5.26-2.patch          | 30 ++++++++
 .../files/autoconf-2.69-perl-5.26.patch            | 28 +++++++
 .../files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch   | 35 +++++++++
 .../files/autoconf-2.71-darwin.patch               | 11 +++
 .../files/autoconf-2.71-make-4.4.patch             | 25 +++++++
 .../files/autoconf-2.71-time.patch                 | 49 ++++++++++++
 sys-devel/autoconf-vanilla/metadata.xml            | 11 +++
 20 files changed, 776 insertions(+)

diff --git a/sys-devel/autoconf-vanilla/Manifest 
b/sys-devel/autoconf-vanilla/Manifest
new file mode 100644
index 000000000000..17182635f127
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/Manifest
@@ -0,0 +1,5 @@
+DIST autoconf-2.13.tar.gz 443844 BLAKE2B 
ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6
 SHA512 
602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
+DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B 
ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e
 SHA512 
55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da
+DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 
71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d
 SHA512 
995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
+DIST autoconf-2.71.tar.xz 1292296 BLAKE2B 
7fd4b98b4cfff10720e8da6ee91045637991643b50fcb3e47a0ecfcc01600f7b7b36fd1c0a5f08b68a418f1bdbd8d5a98de1008157595dd37cc3a31facb61416
 SHA512 
73d32b4adcbe24e3bafa9f43f59ed3b6efbd3de0f194e5ec90375f35da1199c583f5d3e89139b7edbad35171403709270e339ffa56a2ecb9b3123e9285021ff0
+DIST autoconf-2.72c.tar.xz 1374524 BLAKE2B 
066a1687d66f22f31dfc889c89e618b3b8f3887162639d5349e95517fba7784d88355310f6ec22b3f85838be5e1dbf27b27e618e079e1fefd0358d835e718443
 SHA512 
7baa0af656879ef446ffca75763cde3a2391851fcc2dc08ddd00846fa474bb7a6beccc694a5ccb72fc5e0261a90f14b4aa72b6b91a8689ff8c651aa7706b55d5

diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.13.ebuild 
b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.13.ebuild
new file mode 100644
index 000000000000..d64e6199a1de
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.13.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-autoconf
+
+MY_PN=${PN/-vanilla}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html";
+SRC_URI="mirror://gnu/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="${PV:0:3}"
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+       dev-lang/perl
+       sys-devel/m4
+       test? ( dev-util/dejagnu )
+"
+RDEPEND="
+       ${BDEPEND}
+       sys-apps/texinfo
+       >=sys-devel/autoconf-wrapper-13
+"
+
+PATCHES=(
+       "${FILESDIR}"/${MY_P}-gentoo.patch
+       "${FILESDIR}"/${MY_P}-destdir.patch
+       "${FILESDIR}"/${MY_P}-test-fixes.patch #146592
+       "${FILESDIR}"/${MY_P}-perl-5.26.patch
+)
+
+src_configure() {
+       # need to include --exec-prefix and --bindir or our
+       #        DESTDIR patch will trigger sandbox hate :(
+       #
+       # need to force locale to C to avoid bugs in the old
+       # configure script breaking the install paths #351982
+       #
+       # force to `awk` so that we don't encode another awk that
+       #  happens to currently be installed, but might later be
+       # uninstalled (like mawk).  same for m4.
+       export ac_cv_path_M4="m4" ac_cv_prog_AWK="awk"
+       export LC_ALL=C
+
+       toolchain-autoconf_src_configure \
+               --exec-prefix="${EPREFIX}"/usr \
+               --bindir="${EPREFIX}"/usr/bin \
+               --datadir="${EPREFIX}"/usr/share/${MY_P} \
+               --infodir="${TC_AUTOCONF_INFOPATH}"
+}

diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.69.ebuild 
b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.69.ebuild
new file mode 100644
index 000000000000..bd7c8e898fa5
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.69.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]] ; then
+       EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git";
+       inherit git-r3
+else
+       MY_PN=${PN/-vanilla}
+       MY_P=${MY_PN}-${PV}
+
+       SRC_URI="
+               mirror://gnu/${MY_PN}/${MY_P}.tar.xz
+               
https://dev.gentoo.org/~polynomial-c/dist/${MY_P}-runstatedir_patches.tar.xz
+       "
+       KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html";
+
+LICENSE="GPL-3+"
+SLOT="${PV}"
+IUSE="emacs"
+
+BDEPEND="
+       >=sys-devel/m4-1.4.16
+       >=dev-lang/perl-5.6
+"
+RDEPEND="
+       ${BDEPEND}
+       >=sys-devel/autoconf-wrapper-13
+       !~sys-devel/${P}:2.5
+"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+PATCHES=(
+       "${FILESDIR}"/${MY_PN}-2.69-perl-5.26.patch
+       "${FILESDIR}"/${MY_P}-fix-libtool-test.patch
+       "${FILESDIR}"/${MY_PN}-2.69-perl-5.26-2.patch
+       "${FILESDIR}"/${MY_P}-make-tests-bash5-compatible.patch
+
+       "${WORKDIR}"/patches/${MY_P}-texinfo.patch
+)
+
+src_prepare() {
+       # usr/bin/libtool is provided by binutils-apple, need gnu libtool
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               PATCHES+=( "${FILESDIR}"/${MY_PN}-2.61-darwin.patch )
+       fi
+
+       # Save timestamp to avoid later makeinfo call
+       touch -r doc/{,old_}autoconf.texi || die
+
+       toolchain-autoconf_src_prepare
+
+       # Restore timestamp to avoid makeinfo call
+       # We already have an up to date autoconf.info page at this point.
+       touch -r doc/{old_,}autoconf.texi || die
+}

diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.71.ebuild 
b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.71.ebuild
new file mode 100644
index 000000000000..02255def2731
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.71.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]] ; then
+       EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git";
+       inherit git-r3
+else
+       MY_PN=${PN/-vanilla}
+       MY_P=${MY_PN}-${PV}
+
+       SRC_URI="
+               mirror://gnu/${MY_PN}/${MY_P}.tar.xz
+               https://alpha.gnu.org/pub/gnu/${MY_PN}/${MY_P}.tar.xz
+       "
+
+       if ! [[ ${PV} == *_beta* ]] ; then
+               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
+       S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html";
+
+LICENSE="GPL-3+"
+SLOT="${PV/_*}"
+IUSE="emacs"
+
+# for 2.71, our Perl time resolution patch changes our min Perl from 5.6
+# (vanilla upstream for 2.71) to 5.8.
+BDEPEND=">=sys-devel/m4-1.4.16
+       >=dev-lang/perl-5.8"
+RDEPEND="${BDEPEND}
+       >=sys-devel/autoconf-wrapper-15
+       sys-devel/gnuconfig
+       !~sys-devel/${P}:2.5"
+[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+PATCHES=(
+       "${FILESDIR}"/${MY_P}-AC_LANG_CALL_C_cxx.patch
+       "${FILESDIR}"/${MY_P}-time.patch
+       "${FILESDIR}"/${MY_P}-make-4.4.patch
+)
+
+src_prepare() {
+       # usr/bin/libtool is provided by binutils-apple, need gnu libtool
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               PATCHES+=( "${FILESDIR}"/${MY_PN}-2.71-darwin.patch )
+       fi
+
+       # Save timestamp to avoid later makeinfo call
+       touch -r doc/{,old_}autoconf.texi || die
+
+       local pdir
+       for pdir in "${WORKDIR}"/{upstream_,}patches ; do
+               if [[ -d "${pdir}" ]] ; then
+                       eapply ${pdir}
+               fi
+       done
+
+       toolchain-autoconf_src_prepare
+
+       # Restore timestamp to avoid makeinfo call
+       # We already have an up to date autoconf.info page at this point.
+       touch -r doc/{old_,}autoconf.texi || die
+}
+
+src_test() {
+       emake check
+}
+
+src_install() {
+       toolchain-autoconf_src_install
+
+       local f
+       for f in config.{guess,sub} ; do
+               ln -fs ../../gnuconfig/${f} \
+                       "${ED}"/usr/share/autoconf-*/build-aux/${f} || die
+       done
+}

diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.72c.ebuild 
b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.72c.ebuild
new file mode 100644
index 000000000000..eab283a242b6
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.72c.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]] ; then
+       EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git";
+       inherit git-r3
+else
+       MY_PN=${PN/-vanilla}
+       # For _beta handling replace with real version number
+       MY_PV="${PV}"
+       MY_P="${MY_PN}-${MY_PV}"
+       #PATCH_TARBALL_NAME="${MY_PN}-2.70-patches-01"
+
+       SRC_URI="
+               mirror://gnu/${MY_PN}/${MY_P}.tar.xz
+               https://alpha.gnu.org/pub/gnu/${MY_PN}/${MY_P}.tar.xz
+               https://meyering.net/ac/${MY_P}.tar.xz
+       "
+        S="${WORKDIR}"/${MY_P}
+
+       if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
+               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
+fi
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html";
+
+LICENSE="GPL-3+"
+SLOT="$(ver_cut 1-2)"
+IUSE="emacs"
+
+BDEPEND="
+       >=dev-lang/perl-5.10
+       >=sys-devel/m4-1.4.16
+"
+RDEPEND="
+       ${BDEPEND}
+       >=sys-devel/autoconf-wrapper-15
+       sys-devel/gnuconfig
+       !~sys-devel/${P}:2.5
+"
+[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+src_prepare() {
+       if [[ ${PV} == *9999 ]] ; then
+               # Avoid the "dirty" suffix in the git version by generating it
+               # before we run later stages which might modify source files.
+               local ver=$(./build-aux/git-version-gen .tarball-version)
+               echo "${ver}" > .tarball-version || die
+
+               autoreconf -f -i || die
+       fi
+
+       # usr/bin/libtool is provided by binutils-apple, need gnu libtool
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               PATCHES+=( "${FILESDIR}"/${MY_PN}-2.71-darwin.patch )
+       fi
+
+       # Save timestamp to avoid later makeinfo call
+       touch -r doc/{,old_}autoconf.texi || die
+
+       toolchain-autoconf_src_prepare
+
+       # Restore timestamp to avoid makeinfo call
+       # We already have an up to date autoconf.info page at this point.
+       touch -r doc/{old_,}autoconf.texi || die
+}
+
+src_test() {
+       emake check
+}
+
+src_install() {
+       toolchain-autoconf_src_install
+
+       local f
+       for f in config.{guess,sub} ; do
+               ln -fs ../../gnuconfig/${f} \
+                       "${ED}"/usr/share/autoconf-*/build-aux/${f} || die
+       done
+}

diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-9999.ebuild 
b/sys-devel/autoconf-vanilla/autoconf-vanilla-9999.ebuild
new file mode 100644
index 000000000000..eab283a242b6
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-9999.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]] ; then
+       EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git";
+       inherit git-r3
+else
+       MY_PN=${PN/-vanilla}
+       # For _beta handling replace with real version number
+       MY_PV="${PV}"
+       MY_P="${MY_PN}-${MY_PV}"
+       #PATCH_TARBALL_NAME="${MY_PN}-2.70-patches-01"
+
+       SRC_URI="
+               mirror://gnu/${MY_PN}/${MY_P}.tar.xz
+               https://alpha.gnu.org/pub/gnu/${MY_PN}/${MY_P}.tar.xz
+               https://meyering.net/ac/${MY_P}.tar.xz
+       "
+        S="${WORKDIR}"/${MY_P}
+
+       if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
+               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
+fi
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html";
+
+LICENSE="GPL-3+"
+SLOT="$(ver_cut 1-2)"
+IUSE="emacs"
+
+BDEPEND="
+       >=dev-lang/perl-5.10
+       >=sys-devel/m4-1.4.16
+"
+RDEPEND="
+       ${BDEPEND}
+       >=sys-devel/autoconf-wrapper-15
+       sys-devel/gnuconfig
+       !~sys-devel/${P}:2.5
+"
+[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+src_prepare() {
+       if [[ ${PV} == *9999 ]] ; then
+               # Avoid the "dirty" suffix in the git version by generating it
+               # before we run later stages which might modify source files.
+               local ver=$(./build-aux/git-version-gen .tarball-version)
+               echo "${ver}" > .tarball-version || die
+
+               autoreconf -f -i || die
+       fi
+
+       # usr/bin/libtool is provided by binutils-apple, need gnu libtool
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               PATCHES+=( "${FILESDIR}"/${MY_PN}-2.71-darwin.patch )
+       fi
+
+       # Save timestamp to avoid later makeinfo call
+       touch -r doc/{,old_}autoconf.texi || die
+
+       toolchain-autoconf_src_prepare
+
+       # Restore timestamp to avoid makeinfo call
+       # We already have an up to date autoconf.info page at this point.
+       touch -r doc/{old_,}autoconf.texi || die
+}
+
+src_test() {
+       emake check
+}
+
+src_install() {
+       toolchain-autoconf_src_install
+
+       local f
+       for f in config.{guess,sub} ; do
+               ln -fs ../../gnuconfig/${f} \
+                       "${ED}"/usr/share/autoconf-*/build-aux/${f} || die
+       done
+}

diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-destdir.patch 
b/sys-devel/autoconf-vanilla/files/autoconf-2.13-destdir.patch
new file mode 100644
index 000000000000..47605af5f59c
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.13-destdir.patch
@@ -0,0 +1,26 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -41,18 +41,18 @@
+ 
+ transform=@program_transform_name@
+ 
+-prefix = @prefix@
++prefix = $(DESTDIR)@prefix@
+-exec_prefix = @exec_prefix@
++exec_prefix = $(DESTDIR)@exec_prefix@
+ 
+ # Directory in which to install scripts.
+-bindir = @bindir@
++bindir = $(DESTDIR)@bindir@
+ 
+ # Directory in which to install library files.
+-datadir = @datadir@
++datadir = $(DESTDIR)@datadir@
+ acdatadir = $(datadir)/autoconf
+ 
+ # Directory in which to install documentation info files.
+-infodir = @infodir@
++infodir = $(DESTDIR)@infodir@
+ 
+ #### End of system configuration section. ####
+ 

diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-gentoo.patch 
b/sys-devel/autoconf-vanilla/files/autoconf-2.13-gentoo.patch
new file mode 100644
index 000000000000..44f09cba92f0
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.13-gentoo.patch
@@ -0,0 +1,36 @@
+--- a/configure
++++ b/configure
+@@ -654,12 +654,10 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-if test "$PERL" != no; then
+-  SCRIPTS=autoscan
+-else
+-  echo "configure: warning: autoscan will not be built since perl is not 
found" 1>&2
++if test "$PERL" = no; then
++  PERL=/usr/bin/perl
+ fi
+-
++SCRIPTS=autoscan
+ ac_aux_dir=
+ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+   if test -f $ac_dir/install-sh; then
+--- a/configure.in
++++ b/configure.in
+@@ -14,12 +14,10 @@
+ AC_PATH_PROG(PERL, perl, no)
+ AC_SUBST(PERL)dnl
+ AC_SUBST(SCRIPTS)dnl
+-if test "$PERL" != no; then
+-  SCRIPTS=autoscan
+-else
+-  AC_MSG_WARN(autoscan will not be built since perl is not found)
++if test "$PERL" = no; then
++  PERL=/usr/bin/perl
+ fi
+-
++SCRIPTS=autoscan
+ AC_PROG_INSTALL
+ 
+ # Work with the GNU or Cygnus source tree layout.

diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-perl-5.26.patch 
b/sys-devel/autoconf-vanilla/files/autoconf-2.13-perl-5.26.patch
new file mode 100644
index 000000000000..6fbc0cd1bc89
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.13-perl-5.26.patch
@@ -0,0 +1,12 @@
+diff -ruN autoconf-2.13.orig/autoscan.pl autoconf-2.13/autoscan.pl
+--- autoconf-2.13.orig/autoscan.pl     1999-01-05 14:28:42.000000000 +0100
++++ autoconf-2.13/autoscan.pl  2018-12-22 19:55:10.986732296 +0100
+@@ -232,7 +232,7 @@
+       # Strip out comments and variable references.
+       s/#.*//;
+       s/\$\([^\)]*\)//g;
+-      s/\${[^\}]*}//g;
++      s/\$\{[^\}]*}//g;
+       s/@[^@]*@//g;
+ 
+       # Variable assignments.

diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-test-fixes.patch 
b/sys-devel/autoconf-vanilla/files/autoconf-2.13-test-fixes.patch
new file mode 100644
index 000000000000..b8a7e3b8ce99
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.13-test-fixes.patch
@@ -0,0 +1,18 @@
+newer gcc versions don't provide g77, so if it doesn't exist,
+don't bother trying to test it (and failing)
+
+http://bugs.gentoo.org/146592
+
+--- autoconf-2.13/testsuite/autoconf.s/syntax.exp
++++ autoconf-2.13/testsuite/autoconf.s/syntax.exp
+@@ -5,6 +5,10 @@
+ set macros [exec sed -n $script $srcdir/../acspecific.m4]
+ 
+ foreach mac $macros {
++    if { [string match "*F77*" "$mac"] && [catch {exec which g77} 
ignore_output] } then {
++        send_user "XFAIL: $mac\n"
++        continue
++    }
+     send_user "$mac\n"
+     autoconf_test $mac $mac
+ }

diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.61-darwin.patch 
b/sys-devel/autoconf-vanilla/files/autoconf-2.61-darwin.patch
new file mode 100644
index 000000000000..83f450e6f5af
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.61-darwin.patch
@@ -0,0 +1,11 @@
+--- a/bin/autoreconf.in
++++ b/bin/autoreconf.in
+@@ -110,7 +110,7 @@
+ my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@';
+ my $automake   = $ENV{'AUTOMAKE'}   || 'automake';
+ my $aclocal    = $ENV{'ACLOCAL'}    || 'aclocal';
+-my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
++my $libtoolize = $ENV{'LIBTOOLIZE'} || 'glibtoolize';
+ my $autopoint  = $ENV{'AUTOPOINT'}  || 'autopoint';
+ 
+ # --install -- as --add-missing in other tools.

diff --git 
a/sys-devel/autoconf-vanilla/files/autoconf-2.69-fix-libtool-test.patch 
b/sys-devel/autoconf-vanilla/files/autoconf-2.69-fix-libtool-test.patch
new file mode 100644
index 000000000000..e75eba621606
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.69-fix-libtool-test.patch
@@ -0,0 +1,31 @@
+From 247b02e5a5bb79ca6666e91de02ae2d3cb0cd325 Mon Sep 17 00:00:00 2001
+From: "Gary V. Vaughan" <g...@gnu.org>
+Date: Mon, 3 Nov 2014 07:25:03 +0100
+Subject: tests: avoid spurious test failure with libtool 2.4.3
+
+Based on a report by Bruce Dubbs.
+
+* tests/foreign.at (Libtool): Be tolerant of 'quote' replacing the
+older `quote'.
+
+Signed-off-by: Eric Blake <ebl...@redhat.com>
+---
+ tests/foreign.at | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/foreign.at b/tests/foreign.at
+index a9dc33c..d4702cd 100644
+--- a/tests/foreign.at
++++ b/tests/foreign.at
+@@ -57,7 +57,7 @@ AT_CHECK([./config.guess || exit 77], [], [ignore], [ignore])
+ # Make sure at-path contains something valid, and let the test suite
+ # display it when verbose.  And fail, skipping would too easily hide
+ # problems.
+-AT_CHECK([sed -n ["s,^.*\`\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout])
++AT_CHECK([sed -n ["s,^[^']*[\`']\\(/[^']*\\)'.*,\\1,p"] stdout], [0], 
[stdout])
+ AT_CHECK([test -f "`sed -n 1p stdout`"])
+ 
+ # Older libtoolize installed everything but install-sh...
+-- 
+cgit v1.0-41-gc330
+

diff --git 
a/sys-devel/autoconf-vanilla/files/autoconf-2.69-make-tests-bash5-compatible.patch
 
b/sys-devel/autoconf-vanilla/files/autoconf-2.69-make-tests-bash5-compatible.patch
new file mode 100644
index 000000000000..1afcec15bb4f
--- /dev/null
+++ 
b/sys-devel/autoconf-vanilla/files/autoconf-2.69-make-tests-bash5-compatible.patch
@@ -0,0 +1,63 @@
+From 5b9db67786a428164abafe626ab11a2754aad528 Mon Sep 17 00:00:00 2001
+From: Ondrej Dubaj <odu...@redhat.com>
+Date: Wed, 28 Aug 2019 07:39:50 +0200
+Subject: Port tests to Bash 5
+
+* tests/local.at (AT_CHECK_ENV, AT_CONFIG_CMP):
+Add BASH_ARGC, BASH_ARGV to list of variables to be ignored when
+comparing variable space dumps.
+(AT_CONFIG_CMP): Also ignore LINENO.
+* tests/m4sh.at: Also unset LINENO in 'reference' and 'test/test-1'.
+---
+ tests/local.at | 5 ++++-
+ tests/m4sh.at  | 4 ++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/tests/local.at b/tests/local.at
+index a22958c0..852be285 100644
+--- a/tests/local.at
++++ b/tests/local.at
+@@ -325,7 +325,7 @@ if test -f state-env.before && test -f state-env.after; 
then
+       [AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|RANLIB|SET_MAKE|YACC],
+       [GREP|[EF]GREP|SED],
+       [[_@]|.[*#?$].],
+-      [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
++      
[argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
+      $act_file ||
+        test $? -eq 1 || echo failed >&2
+     ) 2>stderr-$act_file |
+@@ -382,6 +382,9 @@ do
+       /'\'\\\$\''=/ d
+       /^argv=/ d
+       /^ARGC=/ d
++      /^BASH_ARGC=/ d
++      /^BASH_ARGV=/ d
++      /^LINENO=/ d
+       ' $act_file >at_config_vars-$act_file
+ done
+ AT_CMP([at_config_vars-$1], [at_config_vars-$2])[]dnl
+diff --git a/tests/m4sh.at b/tests/m4sh.at
+index e9d70b02..cbdfcb62 100644
+--- a/tests/m4sh.at
++++ b/tests/m4sh.at
+@@ -254,7 +254,7 @@ AT_CHECK([autom4te -l m4sh $1.as -o $1])
+ # `_oline_', once processed and ran, produces our reference.
+ # We check that we find ourselves by looking at a string which is
+ # available only in the original script: `_oline_'.
+-AT_DATA_LINENO([reference], [false], [__OLINE__], [_oline__])
++AT_DATA_LINENO([reference], [true], [__OLINE__], [_oline__])
+ AT_CHECK([./reference], 0, [stdout])
+ 
+ # The reference:
+@@ -264,7 +264,7 @@ mv stdout expout
+ # Be sure to be out of the PATH.
+ AT_CHECK([mkdir test || exit 77])
+ 
+-AT_DATA_LINENO([test/test-1], [false], [__LINENO__], [LINENO])
++AT_DATA_LINENO([test/test-1], [true], [__LINENO__], [LINENO])
+ AT_CHECK([./test/test-1],                          0, [expout])
+ AT_CHECK([(PATH=test$PATH_SEPARATOR$PATH; export PATH; exec test-1)],
+                                                  0, [expout])
+-- 
+cgit v1.2.1
+

diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26-2.patch 
b/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26-2.patch
new file mode 100644
index 000000000000..6becf807c43e
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26-2.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/625576
+
+--- autoconf-2.69/bin/autoheader.in
++++ autoconf-2.69/bin/autoheader.in
+@@ -173,6 +173,12 @@
+ # Source what the traces are trying to tell us.
+ verb "$me: running $autoconf to trace from $ARGV[0]";
+ my $quoted_tmp = shell_quote ($tmp);
++my $perl_tmp;
++if ( $tmp =~ /^\// ) {
++  $perl_tmp=$tmp;
++} else {
++  $perl_tmp="./".$tmp;
++}
+ xsystem ("$autoconf"
+        # If you change this list, update the
+        # `Autoheader-preselections' section of autom4te.in.
+@@ -182,9 +188,9 @@
+        . " " . shell_quote ($ARGV[0]) . " >$quoted_tmp/traces.pl");
+ 
+ local (%verbatim, %symbol);
+-debug "$me: \`do'ing $tmp/traces.pl:\n" . `sed 's/^/| /' 
$quoted_tmp/traces.pl`;
+-do "$tmp/traces.pl";
+-warn "couldn't parse $tmp/traces.pl: $@" if $@;
++debug "$me: \`do'ing $perl_tmp/traces.pl:\n" . `sed 's/^/| /' 
$quoted_tmp/traces.pl`;
++do "$perl_tmp/traces.pl";
++warn "couldn't parse $perl_tmp/traces.pl: $@" if $@;
+ unless ($config_h)
+   {
+     error "error: AC_CONFIG_HEADERS not found in $ARGV[0]";

diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26.patch 
b/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26.patch
new file mode 100644
index 000000000000..b3d7888ca722
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26.patch
@@ -0,0 +1,28 @@
+From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001
+From: Paul Eggert <egg...@cs.ucla.edu>
+Date: Tue, 29 Jan 2013 13:46:48 -0800
+Subject: [PATCH] autoscan: port to perl 5.17
+
+* bin/autoscan.in (scan_sh_file): Escape '{'.  This avoids a
+feature that is deprecated in Perl 5.17.  Reported by Ray Lauff in
+<http://lists.gnu.org/archive/html/bug-autoconf/2013-01/msg00059.html>.
+---
+ bin/autoscan.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/autoscan.in b/bin/autoscan.in
+index 993a750..db1df79 100644
+--- a/bin/autoscan.in
++++ b/bin/autoscan.in
+@@ -358,7 +358,7 @@ sub scan_sh_file ($)
+     {
+       # Strip out comments and variable references.
+       s/#.*//;
+-      s/\${[^\}]*}//g;
++      s/\$\{[^\}]*}//g;
+       s/@[^@]*@//g;
+ 
+       # Tokens in the code.
+-- 
+1.9.1
+

diff --git 
a/sys-devel/autoconf-vanilla/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch 
b/sys-devel/autoconf-vanilla/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch
new file mode 100644
index 000000000000..5b53d17135bc
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch
@@ -0,0 +1,35 @@
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc
+
+Note: we drop the comma from the comment because some packages
+have bad quoting, and while that will need to be sorted when/if
+autoconf 2.72 is released, we've got our hands full with the
+Clang situation right now (bug #871753).
+
+From b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc Mon Sep 17 00:00:00 2001
+From: Paul Eggert <egg...@cs.ucla.edu>
+Date: Tue, 31 Aug 2021 16:30:46 -0700
+Subject: Port AC_LANG_CALL(C) to C++
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* lib/autoconf/c.m4 (AC_LANG_CALL(C)): Add an extern "C" if C++.
+Problem reported by Vincent Lefèvre (sr #110532).
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -126,7 +126,13 @@ m4_define([AC_LANG_CALL(C)],
+ m4_if([$2], [main], ,
+ [/* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
++   builtin and then its argument prototype would still apply.
++   The 'extern "C"' is for builds by C++ compilers;
++   although this is not generally supported in C code supporting it here
++   has little cost and some practical benefit (sr 110532).  */
++#ifdef __cplusplus
++extern "C"
++#endif
+ char $2 ();])], [return $2 ();])])
+ 
+ 
+cgit v1.1

diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-darwin.patch 
b/sys-devel/autoconf-vanilla/files/autoconf-2.71-darwin.patch
new file mode 100644
index 000000000000..c122aee4b22d
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.71-darwin.patch
@@ -0,0 +1,11 @@
+--- a/bin/autoreconf.in
++++ b/bin/autoreconf.in
+@@ -122,7 +122,7 @@
+ my $autom4te    = $ENV{'AUTOM4TE'}    || '@bindir@/@autom4te-name@';
+ my $automake    = $ENV{'AUTOMAKE'}    || 'automake';
+ my $aclocal     = $ENV{'ACLOCAL'}     || 'aclocal';
+-my $libtoolize  = $ENV{'LIBTOOLIZE'}  || 'libtoolize';
++my $libtoolize  = $ENV{'LIBTOOLIZE'}  || 'glibtoolize';
+ my $intltoolize = $ENV{'INTLTOOLIZE'} || 'intltoolize';
+ my $gtkdocize   = $ENV{'GTKDOCIZE'}   || 'gtkdocize';
+ my $autopoint   = $ENV{'AUTOPOINT'}   || 'autopoint';

diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-make-4.4.patch 
b/sys-devel/autoconf-vanilla/files/autoconf-2.71-make-4.4.patch
new file mode 100644
index 000000000000..4dcf05996180
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.71-make-4.4.patch
@@ -0,0 +1,25 @@
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=31f673434ee402258b45e958c88acc8725d82b1a
+https://savannah.gnu.org/bugs/?63040
+https://bugs.gentoo.org/869257
+
+From 31f673434ee402258b45e958c88acc8725d82b1a Mon Sep 17 00:00:00 2001
+From: Paul Eggert <egg...@cs.ucla.edu>
+Date: Fri, 9 Sep 2022 16:54:11 -0500
+Subject: Port to GNU make 4.4
+
+* cfg.mk (PATH): Assign eagerly, and simplify shell use, avoiding
+use of the shell entirely if PWD is set, as it should be.
+Problem reported by Sergei Trofimovich in:
+https://lists.gnu.org/r/autoconf-patches/2022-09/msg00007.html
+--- a/cfg.mk
++++ b/cfg.mk
+@@ -18,7 +18,7 @@
+ # This file is '-include'd into GNUmakefile.
+ 
+ # Build with our own versions of these tools, when possible.
+-export PATH = $(shell echo "`pwd`/tests:$$PATH")
++export PATH := $(or $(PWD),$(shell pwd))/tests:$(PATH)
+ 
+ # Remove the autoreconf-provided INSTALL, so that we regenerate it.
+ _autoreconf = autoreconf -i -v && rm -f INSTALL
+cgit v1.1

diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-time.patch 
b/sys-devel/autoconf-vanilla/files/autoconf-2.71-time.patch
new file mode 100644
index 000000000000..8ecfe10f40a3
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.71-time.patch
@@ -0,0 +1,49 @@
+From e194b3c7e00429612a9d40e78ea571687fd25b91 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfri...@gentoo.org>
+Date: Sun, 1 Aug 2021 19:07:48 +0200
+Subject: [PATCH] Use stat from Time::HiRes (instead of File::stat)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas K. Hüttel <dilfri...@gentoo.org>
+---
+ lib/Autom4te/FileUtils.pm | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm
+index a182031b..27a5fd91 100644
+--- a/lib/Autom4te/FileUtils.pm
++++ b/lib/Autom4te/FileUtils.pm
+@@ -34,12 +34,12 @@ This perl module provides various general purpose file 
handling functions.
+ 
+ =cut
+ 
+-use 5.006;
++use 5.008;
+ use strict;
+ use warnings FATAL => 'all';
+ 
+ use Exporter;
+-use File::stat;
++use Time::HiRes qw(stat);
+ use IO::File;
+ 
+ use Autom4te::Channels;
+@@ -115,10 +115,11 @@ sub mtime ($)
+   return 0
+     if $file eq '-' || ! -f $file;
+ 
+-  my $stat = stat ($file)
++  my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
++    $atime,$mtime,$ctime,$blksize,$blocks) = stat ($file)
+     or fatal "cannot stat $file: $!";
+ 
+-  return $stat->mtime;
++  return $mtime;
+ }
+ 
+ 
+-- 
+2.31.1
+

diff --git a/sys-devel/autoconf-vanilla/metadata.xml 
b/sys-devel/autoconf-vanilla/metadata.xml
new file mode 100644
index 000000000000..4ff4a48125bc
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+  <maintainer type="project">
+    <email>base-sys...@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">autoconf</remote-id>
+  </upstream>
+</pkgmetadata>

Reply via email to