diff options
| author |   Sam James <sam@gentoo.org> | 2023-03-28 16:13:00 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-03-28 16:13:25 +0100 |
| commit | 2bdbb194e23c49876ca405ee997ad15decdbd34f (patch) | |
| tree | 15621742a14803d01f965ed3f159b9a1eeea258b /sys-devel/autoconf | |
| parent | media-fonts/ipamonafont: Update SRC_URI (diff) | |
| download | gentoo-2bdbb194e23c49876ca405ee997ad15decdbd34f.tar.gz gentoo-2bdbb194e23c49876ca405ee997ad15decdbd34f.tar.bz2 gentoo-2bdbb194e23c49876ca405ee997ad15decdbd34f.zip | |
sys-devel/autoconf: fix sync with live, fix 2.72 slot
Thanks to Arfrever for reporting, had noticed this in bed last night too.
No real harm done as unkeyworded though.
Fixes: 907791c9cc9b7a5d34201a785e65def0f8597aae
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-devel/autoconf')
| -rw-r--r-- | sys-devel/autoconf/autoconf-2.72c-r2.ebuild (renamed from sys-devel/autoconf/autoconf-2.72c-r1.ebuild) | 18 | ||||
| -rw-r--r-- | sys-devel/autoconf/autoconf-9999.ebuild | 18 |
2 files changed, 20 insertions, 16 deletions
diff --git a/sys-devel/autoconf/autoconf-2.72c-r1.ebuild b/sys-devel/autoconf/autoconf-2.72c-r2.ebuild index 1bd34bcdca1a..d343e10dd0fe 100644 --- a/sys-devel/autoconf/autoconf-2.72c-r1.ebuild +++ b/sys-devel/autoconf/autoconf-2.72c-r2.ebuild @@ -30,7 +30,7 @@ DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" LICENSE="GPL-3+" -SLOT="${PV/_*}" +SLOT="$(ver_cut 1-2)" IUSE="emacs" BDEPEND=" @@ -47,6 +47,15 @@ RDEPEND=" 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}"/${PN}-2.71-darwin.patch ) @@ -55,13 +64,6 @@ src_prepare() { # 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 diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild index 1bd34bcdca1a..d343e10dd0fe 100644 --- a/sys-devel/autoconf/autoconf-9999.ebuild +++ b/sys-devel/autoconf/autoconf-9999.ebuild @@ -30,7 +30,7 @@ DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" LICENSE="GPL-3+" -SLOT="${PV/_*}" +SLOT="$(ver_cut 1-2)" IUSE="emacs" BDEPEND=" @@ -47,6 +47,15 @@ RDEPEND=" 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}"/${PN}-2.71-darwin.patch ) @@ -55,13 +64,6 @@ src_prepare() { # 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 |