[gentoo-commits] repo/gentoo:master commit in: sys-devel/automake-vanilla/, x11-libs/fox-wrapper/files/, profiles/updates/, ...
commit: b17d7668660bdb029954074b520f963d9f192b0b Author: Michał Górny gentoo org> AuthorDate: Sun Jan 14 20:21:52 2024 + Commit: Michał Górny gentoo org> CommitDate: Mon Jan 15 15:58:24 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b17d7668 Move {sys-devel → dev-build}/automake-wrapper Signed-off-by: Michał Górny gentoo.org> {sys-devel => dev-build}/automake-wrapper/Manifest| 0 .../automake-wrapper/automake-wrapper-20221207.ebuild | 2 +- .../automake-wrapper/automake-wrapper-.ebuild | 2 +- {sys-devel => dev-build}/automake-wrapper/metadata.xml| 0 profiles/updates/1Q-2024 | 1 + sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild | 2 +- sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild | 2 +- sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild | 2 +- sys-devel/automake-vanilla/automake-vanilla-.ebuild | 2 +- sys-devel/automake/automake-1.11.6-r4.ebuild | 2 +- sys-devel/automake/automake-1.16.5-r1.ebuild | 4 ++-- sys-devel/automake/automake-.ebuild | 4 ++-- x11-libs/fox-wrapper/files/fox-wrapper-3.sh | 2 +- 13 files changed, 13 insertions(+), 12 deletions(-) diff --git a/sys-devel/automake-wrapper/Manifest b/dev-build/automake-wrapper/Manifest similarity index 100% rename from sys-devel/automake-wrapper/Manifest rename to dev-build/automake-wrapper/Manifest diff --git a/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild b/dev-build/automake-wrapper/automake-wrapper-20221207.ebuild similarity index 97% rename from sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild rename to dev-build/automake-wrapper/automake-wrapper-20221207.ebuild index 6983b29ed534..cd58f716d799 100644 --- a/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild +++ b/dev-build/automake-wrapper/automake-wrapper-20221207.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sys-devel/automake-wrapper/automake-wrapper-.ebuild b/dev-build/automake-wrapper/automake-wrapper-.ebuild similarity index 97% rename from sys-devel/automake-wrapper/automake-wrapper-.ebuild rename to dev-build/automake-wrapper/automake-wrapper-.ebuild index 5cc8b5d149bf..ea8e3bb63674 100644 --- a/sys-devel/automake-wrapper/automake-wrapper-.ebuild +++ b/dev-build/automake-wrapper/automake-wrapper-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sys-devel/automake-wrapper/metadata.xml b/dev-build/automake-wrapper/metadata.xml similarity index 100% rename from sys-devel/automake-wrapper/metadata.xml rename to dev-build/automake-wrapper/metadata.xml diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024 index 6e8f84c85186..2b9dac15a98e 100644 --- a/profiles/updates/1Q-2024 +++ b/profiles/updates/1Q-2024 @@ -30,3 +30,4 @@ move sys-devel/autoconf-dickey dev-build/autoconf-dickey slotmove dev-build/autoconf-dickey 2.52_p20210509 2.52 move sys-devel/autoconf-archive dev-build/autoconf-archive move sys-devel/autoconf dev-build/autoconf +move sys-devel/automake-wrapper dev-build/automake-wrapper 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 9bc262282ece..1ce01b55855d 100644 --- a/sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild +++ b/sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild @@ -20,7 +20,7 @@ RESTRICT="test !test? ( test )" RDEPEND=" >=dev-lang/perl-5.6 - >=sys-devel/automake-wrapper-10 + >=dev-build/automake-wrapper-10 >=dev-build/autoconf-2.69:* sys-devel/gnuconfig " diff --git a/sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild b/sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild index 743c72c2c232..0ba1d56add54 100644 --- a/sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild +++ b/sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild @@ -31,7 +31,7 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-lang/perl-5.6 - >=sys-devel/automake-wrapper-11 + >=dev-build/automake-wrapper-11 >=dev-build/autoconf-2.69:* sys-devel/gnuconfig " 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 dc76d9825eca..cd1806c2e420 100644 --- a/sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild +++ b/sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild @@
[gentoo-commits] repo/gentoo:master commit in: sys-devel/automake-vanilla/
commit: d52ec3f06ca19351040698fef08ad54b5e970da9 Author: Sam James gentoo org> AuthorDate: Wed Nov 29 20:02:24 2023 + Commit: Sam James gentoo org> CommitDate: Wed Nov 29 20:02:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d52ec3f0 sys-devel/automake-vanilla: add keywords to 1.15.1, 1.16.5 Signed-off-by: Sam James gentoo.org> sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild | 1 + sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild b/sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild index 8416c83e8723..67615ec94cd2 100644 --- a/sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild +++ b/sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild @@ -25,6 +25,7 @@ HOMEPAGE="https://www.gnu.org/software/automake/; LICENSE="GPL-2" # Use Gentoo versioning for slotting. SLOT="${PV:0:4}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos" IUSE="test" RESTRICT="!test? ( test )" 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 ad6816d67687..428c328f3a7a 100644 --- a/sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild +++ b/sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild @@ -25,6 +25,7 @@ HOMEPAGE="https://www.gnu.org/software/automake/; LICENSE="GPL-2" # Use Gentoo versioning for slotting. SLOT="${PV:0:4}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos" IUSE="test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/automake-vanilla/
commit: 7de7f8c28037efcc50e0d8f3e41c5d9d7abe83e6 Author: Sam James gentoo org> AuthorDate: Tue Nov 21 23:59:34 2023 + Commit: Sam James gentoo org> CommitDate: Wed Nov 22 00:00:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de7f8c2 sys-devel/automake-vanilla: add 1.15.1 Signed-off-by: Sam James gentoo.org> sys-devel/automake-vanilla/Manifest| 1 + .../automake-vanilla-1.15.1.ebuild | 113 + 2 files changed, 114 insertions(+) diff --git a/sys-devel/automake-vanilla/Manifest b/sys-devel/automake-vanilla/Manifest index ee180dcca549..c4d5d7c16d57 100644 --- a/sys-devel/automake-vanilla/Manifest +++ b/sys-devel/automake-vanilla/Manifest @@ -1,2 +1,3 @@ DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba +DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688 DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88 diff --git a/sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild b/sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild new file mode 100644 index ..8416c83e8723 --- /dev/null +++ b/sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) + +inherit python-any-r1 + +if [[ ${PV} == ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/r/${MY_PN}.git; + inherit git-r3 +else + MY_PN=${PN/-vanilla} + MY_P=${MY_PN}-${PV} + + SRC_URI="mirror://gnu/${MY_PN}/${MY_P}.tar.xz" + + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/; + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${PV:0:4}" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/perl-5.6 + >=sys-devel/automake-wrapper-11 + >=sys-devel/autoconf-2.69:* + sys-devel/gnuconfig +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/gzip + sys-apps/help2man + test? ( + ${PYTHON_DEPS} + dev-util/dejagnu + ) +" + +pkg_setup() { + # Avoid python-any-r1_pkg_setup + : +} + +src_prepare() { + default + + export WANT_AUTOCONF=2.5 + # Don't try wrapping the autotools - this thing runs as it tends + # to be a bit esoteric, and the script does `set -e` itself. + ./bootstrap || die + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die + + # bug #628912 + if ! has_version -b sys-apps/texinfo ; then + touch doc/{stamp-vti,version.texi,automake.info} || die + fi +} + +src_configure() { + use test && python_setup + # Also used in install. + MY_INFODIR="${EPREFIX}/usr/share/${P}/info" + econf \ + --datadir="${EPREFIX}"/usr/share/automake-vanilla-${PV} \ + --program-suffix="-vanilla" \ + --infodir="${MY_INFODIR}" +} + +src_install() { + default + + #rm "${ED}"/usr/share/aclocal/README || die + #rmdir "${ED}"/usr/share/aclocal || die + rm \ + "${ED}"/usr/bin/{aclocal,automake}-vanilla \ + "${ED}"/usr/share/man/man1/{aclocal,automake}-vanilla.1 || die + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + local x + for x in guess sub ; do + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} + done + + # Avoid QA message about pre-compressed file in docs + local tarfile="${ED}/usr/share/doc/automake-vanilla-${PVR}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi + + pushd "${D}/${MY_INFODIR}" >/dev/null || die + for f in *.info*; do + # Install convenience aliases for versioned Automake pages. + ln -s "$f" "${f/./-vanilla-${PV}.}" || die + done + popd >/dev/null || die + + local major="$(ver_cut
[gentoo-commits] repo/gentoo:master commit in: sys-devel/automake-vanilla/
commit: b932b7740e8a09c22ed91516fa4f9053b59e6951 Author: Arsen Arsenović gentoo org> AuthorDate: Wed Nov 15 12:05:33 2023 + Commit: Sam James gentoo org> CommitDate: Wed Nov 22 00:00:08 2023 + 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-.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="$((9-(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="$((9-(major*1000+minor)))" - newenvd - "06automake${idx}" <<-EOF + newenvd - "07automake${idx}" <<-EOF INFOPATH="${MY_INFODIR}" EOF } diff --git a/sys-devel/automake-vanilla/automake-vanilla-.ebuild b/sys-devel/automake-vanilla/automake-vanilla-.ebuild index 9232ed261086..878f8d02ab85 100644 --- a/sys-devel/automake-vanilla/automake-vanilla-.ebuild +++ b/sys-devel/automake-vanilla/automake-vanilla-.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="$((9-(major*1000+minor)))" - newenvd - "06automake${idx}" <<-EOF + newenvd - "07automake${idx}" <<-EOF INFOPATH="${MY_INFODIR}" EOF }
[gentoo-commits] repo/gentoo:master commit in: sys-devel/automake-vanilla/, sys-devel/automake-vanilla/files/
commit: 23566373c9b4e0d9456cd059f0e418c17e9b45c9 Author: Sam James gentoo org> AuthorDate: Sun Nov 5 14:34:11 2023 + Commit: Sam James gentoo org> CommitDate: Wed Nov 22 00:00:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23566373 sys-devel/automake-vanilla: new package, add 1.11.6, 1.16.5, Signed-off-by: Sam James gentoo.org> sys-devel/automake-vanilla/Manifest| 2 + .../automake-vanilla-1.11.6.ebuild | 103 + .../automake-vanilla-1.16.5.ebuild | 121 +++ .../automake-vanilla/automake-vanilla-.ebuild | 113 ++ ...1.6-install-sh-avoid-low-risk-race-in-tmp.patch | 77 + .../files/automake-1.11.6-perl-5.16.patch | 128 + ...omake-1.11.6-perl-escape-curly-bracket-r1.patch | 37 ++ .../automake-1.16.5-apostrophe-in-tests.patch | 51 ...tomake-1.16.5-fix-instmany-python.sh-test.patch | 26 + ...ake-1.16.5-fix-py-compile-basedir.sh-test.patch | 26 + .../files/automake-1.16.5-py3-compile.patch| 73 sys-devel/automake-vanilla/metadata.xml| 12 ++ 12 files changed, 769 insertions(+) diff --git a/sys-devel/automake-vanilla/Manifest b/sys-devel/automake-vanilla/Manifest new file mode 100644 index ..ee180dcca549 --- /dev/null +++ b/sys-devel/automake-vanilla/Manifest @@ -0,0 +1,2 @@ +DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba +DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88 diff --git a/sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild b/sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild new file mode 100644 index ..f769b162739b --- /dev/null +++ b/sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=${PN/-vanilla} +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/; +SRC_URI="mirror://gnu/${MY_PN}/${MY_P}.tar.xz" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${PV:0:4}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos" +IUSE="test" +RESTRICT="test !test? ( test )" + +RDEPEND=" + >=dev-lang/perl-5.6 + >=sys-devel/automake-wrapper-10 + >=sys-devel/autoconf-2.69:* + sys-devel/gnuconfig +" +DEPEND=" + ${RDEPEND} + sys-apps/help2man +" +BDEPEND=" + app-arch/gzip + test? ( dev-util/dejagnu ) +" + +PATCHES=( + "${FILESDIR}"/${MY_P}-perl-5.16.patch #424453 + "${FILESDIR}"/${MY_P}-install-sh-avoid-low-risk-race-in-tmp.patch + "${FILESDIR}"/${MY_P}-perl-escape-curly-bracket-r1.patch +) + +src_prepare() { + default + export WANT_AUTOCONF=2.5 + export HELP2MAN=true + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die + export TZ="UTC" #589138 +} + +src_configure() { + # Also used in install. + MY_INFODIR="${EPREFIX}/usr/share/automake-vanilla-${PV}/info" + econf \ + --datadir="${EPREFIX}"/usr/share/automake-vanilla-${PV} \ + --program-suffix="-vanilla" \ + --infodir="${MY_INFODIR}" +} + +src_compile() { + :; + + # TODO: This was missing a || die originally and fails now... + #local x + #for x in aclocal automake; do + # help2man "perl -Ilib ${x}" > doc/${x}-${SLOT}.1 || die + #done +} + +src_install() { + default + + rm \ + "${ED}"/usr/bin/{aclocal,automake}-vanilla \ + "${ED}"/usr/share/man/man1/{aclocal,automake}-vanilla.1 || die + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + local x + for x in guess sub ; do + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} + done + + # Avoid QA message about pre-compressed file in docs + local tarfile="${ED}/usr/share/doc/automake-vanilla-${PVR}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi + + pushd "${D}/${MY_INFODIR}" >/dev/null || die +