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 A76A0158099 for ; Wed, 22 Nov 2023 00:00:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76DF52BC03C; Wed, 22 Nov 2023 00:00:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 539DE2BC03C for ; Wed, 22 Nov 2023 00:00:27 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66BD9335D8A for ; Wed, 22 Nov 2023 00:00:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6170513B1 for ; Wed, 22 Nov 2023 00:00:23 +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: <1700611208.b932b7740e8a09c22ed91516fa4f9053b59e6951.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake-vanilla/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild sys-devel/automake-vanilla/automake-vanilla-9999.ebuild X-VCS-Directories: sys-devel/automake-vanilla/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b932b7740e8a09c22ed91516fa4f9053b59e6951 X-VCS-Branch: master Date: Wed, 22 Nov 2023 00:00:23 +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: 63094494-021a-4e05-88a1-945a725b6ab2 X-Archives-Hash: 4072daa1fc1d75d8a4a6708831b9760f commit: b932b7740e8a09c22ed91516fa4f9053b59e6951 Author: Arsen Arsenović gentoo org> AuthorDate: Wed Nov 15 12:05:33 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Nov 22 00:00:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b932b774 sys-devel/automake-vanilla: resolve conflicts with sys-devel/automake Signed-off-by: Arsen Arsenović gentoo.org> Signed-off-by: Sam James gentoo.org> sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild | 6 +++--- sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild | 6 +++--- sys-devel/automake-vanilla/automake-vanilla-9999.ebuild | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild b/sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild index f769b162739b..ae731a0451ef 100644 --- a/sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild +++ b/sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild @@ -49,7 +49,7 @@ src_prepare() { src_configure() { # Also used in install. - MY_INFODIR="${EPREFIX}/usr/share/automake-vanilla-${PV}/info" + MY_INFODIR="${EPREFIX}/usr/share/${P}/info" econf \ --datadir="${EPREFIX}"/usr/share/automake-vanilla-${PV} \ --program-suffix="-vanilla" \ @@ -90,14 +90,14 @@ src_install() { pushd "${D}/${MY_INFODIR}" >/dev/null || die for f in *.info*; do # Install convenience aliases for versioned Automake pages. - ln -s "$f" "${f/./-${PV}.}" || die + ln -s "$f" "${f/./-vanilla-${PV}.}" || die done popd >/dev/null || die local major="$(ver_cut 1)" local minor="$(ver_cut 2)" local idx="$((99999-(major*1000+minor)))" - newenvd - "06automake${idx}" <<-EOF + newenvd - "07automake${idx}" <<-EOF INFOPATH="${MY_INFODIR}" EOF } diff --git a/sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild b/sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild index 1ffbeb5076d6..ad6816d67687 100644 --- a/sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild +++ b/sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild @@ -75,7 +75,7 @@ src_prepare() { src_configure() { use test && python_setup # Also used in install. - MY_INFODIR="${EPREFIX}/usr/share/automake-${PV}/info" + MY_INFODIR="${EPREFIX}/usr/share/${P}/info" econf \ --datadir="${EPREFIX}"/usr/share/automake-vanilla-${PV} \ --program-suffix="-vanilla" \ @@ -108,14 +108,14 @@ src_install() { pushd "${D}/${MY_INFODIR}" >/dev/null || die for f in *.info*; do # Install convenience aliases for versioned Automake pages. - ln -s "$f" "${f/./-${PV}.}" || die + ln -s "$f" "${f/./-vanilla-${PV}.}" || die done popd >/dev/null || die local major="$(ver_cut 1)" local minor="$(ver_cut 2)" local idx="$((99999-(major*1000+minor)))" - newenvd - "06automake${idx}" <<-EOF + newenvd - "07automake${idx}" <<-EOF INFOPATH="${MY_INFODIR}" EOF } diff --git a/sys-devel/automake-vanilla/automake-vanilla-9999.ebuild b/sys-devel/automake-vanilla/automake-vanilla-9999.ebuild index 9232ed261086..878f8d02ab85 100644 --- a/sys-devel/automake-vanilla/automake-vanilla-9999.ebuild +++ b/sys-devel/automake-vanilla/automake-vanilla-9999.ebuild @@ -67,7 +67,7 @@ src_prepare() { src_configure() { use test && python_setup # Also used in install. - MY_INFODIR="${EPREFIX}/usr/share/automake-vanilla-${PV}/info" + MY_INFODIR="${EPREFIX}/usr/share/${P}/info" econf \ --datadir="${EPREFIX}"/usr/share/automake-vanilla-${PV} \ --program-suffix="-vanilla" \ @@ -100,14 +100,14 @@ src_install() { pushd "${D}/${MY_INFODIR}" >/dev/null || die for f in *.info*; do # Install convenience aliases for versioned Automake pages. - ln -s "$f" "${f/./-${PV}.}" || die + ln -s "$f" "${f/./-vanilla-${PV}.}" || die done popd >/dev/null || die local major="$(ver_cut 1)" local minor="$(ver_cut 2)" local idx="$((99999-(major*1000+minor)))" - newenvd - "06automake${idx}" <<-EOF + newenvd - "07automake${idx}" <<-EOF INFOPATH="${MY_INFODIR}" EOF }