commit:     907791c9cc9b7a5d34201a785e65def0f8597aae
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 27 16:55:07 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 27 16:55:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=907791c9

sys-devel/autoconf: add 2.72c (unkeyworded)

2.73 will be the actual release, this is a snapshot of it before it's released,
as a test.

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

 sys-devel/autoconf/Manifest              |  1 +
 sys-devel/autoconf/autoconf-2.72c.ebuild | 84 ++++++++++++++++++++++++++++++++
 sys-devel/autoconf/autoconf-9999.ebuild  | 66 +++++++++++++++++--------
 3 files changed, 131 insertions(+), 20 deletions(-)

diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index e7e8a8d234f7..17182635f127 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -2,3 +2,4 @@ DIST autoconf-2.13.tar.gz 443844 BLAKE2B 
ade10f9d4a0b1a0e8b752eee817cfe100d77b07
 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/autoconf-2.72c.ebuild 
b/sys-devel/autoconf/autoconf-2.72c.ebuild
new file mode 100644
index 000000000000..1bd34bcdca1a
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.72c.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]] ; then
+       EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git";
+       inherit git-r3
+else
+       # For _beta handling replace with real version number
+       MY_PV="${PV}"
+       MY_P="${PN}-${MY_PV}"
+       #PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
+
+       SRC_URI="
+               mirror://gnu/${PN}/${MY_P}.tar.xz
+               https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz
+               https://meyering.net/ac/${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 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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="${PV/_*}"
+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() {
+       # usr/bin/libtool is provided by binutils-apple, need gnu libtool
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               PATCHES+=( "${FILESDIR}"/${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/autoconf-9999.ebuild 
b/sys-devel/autoconf/autoconf-9999.ebuild
index 61ddd6318e4d..1bd34bcdca1a 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.ebuild
@@ -1,15 +1,27 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
        EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git";
        inherit git-r3
 else
-       SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-               ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x86-linux"
+       # For _beta handling replace with real version number
+       MY_PV="${PV}"
+       MY_P="${PN}-${MY_PV}"
+       #PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
+
+       SRC_URI="
+               mirror://gnu/${PN}/${MY_P}.tar.xz
+               https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz
+               https://meyering.net/ac/${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 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+       fi
 fi
 
 inherit toolchain-autoconf
@@ -18,29 +30,43 @@ DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html";
 
 LICENSE="GPL-3+"
-SLOT="${PV}"
+SLOT="${PV/_*}"
 IUSE="emacs"
 
-BDEPEND=">=sys-devel/m4-1.4.16
-       >=dev-lang/perl-5.10"
-RDEPEND="${BDEPEND}
-       >=sys-devel/autoconf-wrapper-14
+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"
+       !~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
+       # usr/bin/libtool is provided by binutils-apple, need gnu libtool
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               PATCHES+=( "${FILESDIR}"/${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() {
@@ -48,7 +74,7 @@ src_test() {
 }
 
 src_install() {
-       default
+       toolchain-autoconf_src_install
 
        local f
        for f in config.{guess,sub} ; do

Reply via email to