From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 679A415802F for ; Tue, 28 Mar 2023 15:15:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9CA79E0830; Tue, 28 Mar 2023 15:15:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68EBEE0830 for ; Tue, 28 Mar 2023 15:15:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 83BE9335C06 for ; Tue, 28 Mar 2023 15:15:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB1F79A1 for ; Tue, 28 Mar 2023 15:15:04 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1680016405.2bdbb194e23c49876ca405ee997ad15decdbd34f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/autoconf/autoconf-2.72c-r1.ebuild sys-devel/autoconf/autoconf-2.72c-r2.ebuild sys-devel/autoconf/autoconf-9999.ebuild X-VCS-Directories: sys-devel/autoconf/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2bdbb194e23c49876ca405ee997ad15decdbd34f X-VCS-Branch: master Date: Tue, 28 Mar 2023 15:15:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ee59732b-50e3-4ae1-be08-69bdbf3a3c6e X-Archives-Hash: b1a82fc0d5362b44e06a17b6a44a558f commit: 2bdbb194e23c49876ca405ee997ad15decdbd34f Author: Sam James gentoo org> AuthorDate: Tue Mar 28 15:13:00 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 28 15:13:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bdbb194 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 gentoo.org> ...toconf-2.72c-r1.ebuild => autoconf-2.72c-r2.ebuild} | 18 ++++++++++-------- 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 similarity index 86% rename from sys-devel/autoconf/autoconf-2.72c-r1.ebuild rename to 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