[gentoo-commits] repo/gentoo:master commit in: sys-devel/automake-vanilla/

[Sam James]

commit:     b932b7740e8a09c22ed91516fa4f9053b59e6951
Author:     Arsen Arsenović <arsen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 12:05:33 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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ć <arsen <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> 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
 }