diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2020-09-24 15:31:53 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2020-09-24 15:33:31 +0200 |
commit | 0ae69faf0a570e57ea9a8c54308770e2c0fd3962 (patch) | |
tree | 7335bce6a0ff43ebf1b9e6db38300900c1c0364b /sys-devel/automake | |
parent | profiles/use.mask: Unmask postgres-13 POSTGRES_TARGETS (diff) | |
download | gentoo-0ae69faf0a570e57ea9a8c54308770e2c0fd3962.tar.gz gentoo-0ae69faf0a570e57ea9a8c54308770e2c0fd3962.tar.bz2 gentoo-0ae69faf0a570e57ea9a8c54308770e2c0fd3962.zip |
sys-devel/automake: Great EAPI-7 bump
- Removed all python2 stuff from ebuilds
- Restrict tests for all ebuilds that required python2
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'sys-devel/automake')
19 files changed, 236 insertions, 244 deletions
diff --git a/sys-devel/automake/automake-1.10.3-r3.ebuild b/sys-devel/automake/automake-1.10.3-r3.ebuild index 9326962123a8..f70d8537f23a 100644 --- a/sys-devel/automake/automake-1.10.3-r3.ebuild +++ b/sys-devel/automake/automake-1.10.3-r3.ebuild @@ -1,10 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 +EAPI=7 DESCRIPTION="Used to generate Makefile.in from Makefile.am" HOMEPAGE="https://www.gnu.org/software/automake/" @@ -14,16 +11,16 @@ LICENSE="GPL-2" # Use Gentoo versioning for slotting. SLOT="${PV:0:4}" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" +IUSE="" +RESTRICT="test" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + sys-apps/help2man" +BDEPEND="app-arch/gzip" PATCHES=( "${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453 @@ -31,20 +28,15 @@ PATCHES=( "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch ) -pkg_setup() { - use test && python-any-r1_pkg_setup -} - src_prepare() { default export WANT_AUTOCONF=2.5 - chmod a+rx tests/*.test } # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die + pushd "${ED}"/usr/share/info >/dev/null || die rm -f dir || die # Rewrite all the references to other pages. @@ -79,12 +71,19 @@ src_install() { for x in aclocal automake ; do help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1 doman ${x}-${SLOT}.1 - rm -f "${ED%/}"/usr/bin/${x} + rm -f "${ED}"/usr/bin/${x} done # remove all config.guess and config.sub files replacing them # w/a symlink to a specific gnuconfig version for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + 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/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi } diff --git a/sys-devel/automake/automake-1.11.6-r3.ebuild b/sys-devel/automake/automake-1.11.6-r3.ebuild index fb2d2c65c290..58ccde9a40ba 100644 --- a/sys-devel/automake/automake-1.11.6-r3.ebuild +++ b/sys-devel/automake/automake-1.11.6-r3.ebuild @@ -1,10 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 +EAPI=7 DESCRIPTION="Used to generate Makefile.in from Makefile.am" HOMEPAGE="https://www.gnu.org/software/automake/" @@ -14,16 +11,16 @@ 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" -IUSE="test" -RESTRICT="!test? ( test )" +IUSE="" +RESTRICT="test" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + sys-apps/help2man" +BDEPEND="app-arch/gzip" PATCHES=( "${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453 @@ -31,14 +28,9 @@ PATCHES=( "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch ) -pkg_setup() { - use test && python-any-r1_pkg_setup -} - src_prepare() { default export WANT_AUTOCONF=2.5 - chmod a+rx tests/*.test export HELP2MAN=true sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die export TZ="UTC" #589138 @@ -56,7 +48,7 @@ src_compile() { # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die + pushd "${ED}"/usr/share/info >/dev/null || die rm -f dir || die # Rewrite all the references to other pages. @@ -82,24 +74,25 @@ slot_info_pages() { popd >/dev/null || die } -src_test() { - unset HELP2MAN # 583108 - - default -} - src_install() { default slot_info_pages rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.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} + 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/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi } diff --git a/sys-devel/automake/automake-1.12.6-r2.ebuild b/sys-devel/automake/automake-1.12.6-r2.ebuild index 50123d8e2db9..3292e87d89b9 100644 --- a/sys-devel/automake/automake-1.12.6-r2.ebuild +++ b/sys-devel/automake/automake-1.12.6-r2.ebuild @@ -1,10 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 +EAPI=7 DESCRIPTION="Used to generate Makefile.in from Makefile.am" HOMEPAGE="https://www.gnu.org/software/automake/" @@ -14,26 +11,22 @@ LICENSE="GPL-2" # Use Gentoo versioning for slotting. SLOT="${PV:0:4}" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" +IUSE="" +RESTRICT="test" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + sys-apps/help2man" +BDEPEND="app-arch/gzip" PATCHES=( "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch "${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch ) -pkg_setup() { - use test && python-any-r1_pkg_setup -} - src_prepare() { default export WANT_AUTOCONF=2.5 @@ -43,7 +36,7 @@ src_prepare() { # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die + pushd "${ED}"/usr/share/info >/dev/null || die rm -f dir || die # Rewrite all the references to other pages. @@ -73,16 +66,23 @@ src_install() { default slot_info_pages - rm "${ED%/}"/usr/share/aclocal/README || die - rmdir "${ED%/}"/usr/share/aclocal || die + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.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} + 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/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi } diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild index cb464ade7c1f..21c2e6bf016e 100644 --- a/sys-devel/automake/automake-1.13.4-r2.ebuild +++ b/sys-devel/automake/automake-1.13.4-r2.ebuild @@ -1,10 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 +EAPI=7 DESCRIPTION="Used to generate Makefile.in from Makefile.am" HOMEPAGE="https://www.gnu.org/software/automake/" @@ -14,16 +11,16 @@ 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" +IUSE="" +RESTRICT="test" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + sys-apps/help2man" +BDEPEND="app-arch/gzip" PATCHES=( "${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch @@ -32,10 +29,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch ) -pkg_setup() { - use test && python-any-r1_pkg_setup -} - src_prepare() { default export WANT_AUTOCONF=2.5 @@ -45,7 +38,7 @@ src_prepare() { # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die + pushd "${ED}"/usr/share/info >/dev/null || die rm -f dir || die # Rewrite all the references to other pages. @@ -75,16 +68,23 @@ src_install() { default slot_info_pages - rm "${ED%/}"/usr/share/aclocal/README || die - rmdir "${ED%/}"/usr/share/aclocal || die + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.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} + 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/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi } diff --git a/sys-devel/automake/automake-1.14.1-r2.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild index efc4d1200e8a..3d8d7f660278 100644 --- a/sys-devel/automake/automake-1.14.1-r2.ebuild +++ b/sys-devel/automake/automake-1.14.1-r2.ebuild @@ -1,17 +1,14 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 versionator +EAPI=7 if [[ ${PV/_beta} == ${PV} ]]; then MY_P=${P} SRC_URI="mirror://gnu/${PN}/${P}.tar.xz https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" else - MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b" + MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" MY_P="${PN}-${MY_PV}" # Alpha/beta releases are not distributed on the usual mirrors. @@ -25,16 +22,16 @@ LICENSE="GPL-2" # Use Gentoo versioning for slotting. SLOT="${PV:0:4}" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" +IUSE="" +RESTRICT="test" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + sys-apps/help2man" +BDEPEND="app-arch/gzip" PATCHES=( "${FILESDIR}"/${PN}-1.14-gzip-fix.patch @@ -44,10 +41,6 @@ PATCHES=( S="${WORKDIR}/${MY_P}" -pkg_setup() { - use test && python-any-r1_pkg_setup -} - src_prepare() { default export WANT_AUTOCONF=2.5 @@ -62,7 +55,7 @@ src_prepare() { # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die + pushd "${ED}"/usr/share/info >/dev/null || die rm -f dir || die # Rewrite all the references to other pages. @@ -92,16 +85,23 @@ src_install() { default slot_info_pages - rm "${ED%/}"/usr/share/aclocal/README || die - rmdir "${ED%/}"/usr/share/aclocal || die + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.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} + 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/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi } diff --git a/sys-devel/automake/automake-1.15.1-r2.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild index 80447194c28f..8ec205e95c9c 100644 --- a/sys-devel/automake/automake-1.15.1-r2.ebuild +++ b/sys-devel/automake/automake-1.15.1-r2.ebuild @@ -1,10 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 versionator +EAPI=7 if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" @@ -17,7 +14,7 @@ else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" else - MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b" + MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" MY_P="${PN}-${MY_PV}" # Alpha/beta releases are not distributed on the usual mirrors. @@ -32,23 +29,19 @@ HOMEPAGE="https://www.gnu.org/software/automake/" LICENSE="GPL-2" # Use Gentoo versioning for slotting. SLOT="${PV:0:4}" -IUSE="test" -RESTRICT="!test? ( test )" +IUSE="" +RESTRICT="test" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + sys-apps/help2man" +BDEPEND="app-arch/gzip" PATCHES=( "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch ) -pkg_setup() { - use test && python-any-r1_pkg_setup -} - src_prepare() { default export WANT_AUTOCONF=2.5 @@ -66,7 +59,7 @@ src_prepare() { # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die + pushd "${ED}"/usr/share/info >/dev/null || die rm -f dir || die # Rewrite all the references to other pages. @@ -96,16 +89,23 @@ src_install() { default slot_info_pages - rm "${ED%/}"/usr/share/aclocal/README || die - rmdir "${ED%/}"/usr/share/aclocal || die + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.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} + 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/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi } diff --git a/sys-devel/automake/automake-1.16.1-r1.ebuild b/sys-devel/automake/automake-1.16.1-r1.ebuild index 4a5093369fe7..fb84f2113fed 100644 --- a/sys-devel/automake/automake-1.16.1-r1.ebuild +++ b/sys-devel/automake/automake-1.16.1-r1.ebuild @@ -1,10 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 versionator +EAPI=7 if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" @@ -17,7 +14,7 @@ else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" else - MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b" + MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" MY_P="${PN}-${MY_PV}" # Alpha/beta releases are not distributed on the usual mirrors. @@ -32,20 +29,15 @@ HOMEPAGE="https://www.gnu.org/software/automake/" LICENSE="GPL-2" # Use Gentoo versioning for slotting. SLOT="${PV:0:4}" -IUSE="test" -RESTRICT="!test? ( test )" +IUSE="" +RESTRICT="test" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" - -pkg_setup() { - use test && python-any-r1_pkg_setup -} + sys-apps/help2man" src_prepare() { default @@ -64,7 +56,7 @@ src_prepare() { # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die + pushd "${ED}"/usr/share/info >/dev/null || die rm -f dir || die # Rewrite all the references to other pages. @@ -94,16 +86,17 @@ src_install() { default slot_info_pages - rm "${ED%/}"/usr/share/aclocal/README || die - rmdir "${ED%/}"/usr/share/aclocal || die + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.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} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done } diff --git a/sys-devel/automake/automake-1.4_p6-r2.ebuild b/sys-devel/automake/automake-1.4_p6-r2.ebuild index 8f5f42f51afa..328151c0dcb6 100644 --- a/sys-devel/automake/automake-1.4_p6-r2.ebuild +++ b/sys-devel/automake/automake-1.4_p6-r2.ebuild @@ -1,9 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" - -inherit eutils +EAPI=7 MY_P="${P/_/-}" DESCRIPTION="Used to generate Makefile.in from Makefile.am" @@ -18,29 +16,33 @@ IUSE="" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69 + >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND}" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4-nls-nuisances.patch #121151 + "${FILESDIR}"/${PN}-1.4-libtoolize.patch + "${FILESDIR}"/${PN}-1.4-subdirs-89656.patch + "${FILESDIR}"/${PN}-1.4-ansi2knr-stdlib.patch + "${FILESDIR}"/${PN}-1.4-CVE-2009-4029.patch #295357 + "${FILESDIR}"/${PN}-1.4-perl-5.11.patch + "${FILESDIR}"/${PN}-1.4-perl-dyn-call.patch +) src_prepare() { + default export WANT_AUTOCONF=2.5 - epatch "${FILESDIR}"/${PN}-1.4-nls-nuisances.patch #121151 - epatch "${FILESDIR}"/${PN}-1.4-libtoolize.patch - epatch "${FILESDIR}"/${PN}-1.4-subdirs-89656.patch - epatch "${FILESDIR}"/${PN}-1.4-ansi2knr-stdlib.patch - epatch "${FILESDIR}"/${PN}-1.4-CVE-2009-4029.patch #295357 - epatch "${FILESDIR}"/${PN}-1.4-perl-5.11.patch - epatch "${FILESDIR}"/${PN}-1.4-perl-dyn-call.patch sed -i 's:error\.test::' tests/Makefile.in #79529 } # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null - rm -f dir + pushd "${ED}"/usr/share/info >/dev/null || die + rm -f dir || die # Rewrite all the references to other pages. # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. @@ -62,7 +64,7 @@ slot_info_pages() { sed -i -e "s:${f}:${d}:g" * || die done - popd >/dev/null + popd >/dev/null || die } src_install() { @@ -70,14 +72,16 @@ src_install() { pkgdatadir=/usr/share/automake-${SLOT} \ m4datadir=/usr/share/aclocal-${SLOT} slot_info_pages - rm -f "${ED}"/usr/bin/{aclocal,automake} + rm -f "${ED}"/usr/bin/{aclocal,automake} || die dosym automake-${SLOT} /usr/share/automake dodoc NEWS README THANKS TODO AUTHORS ChangeLog # 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} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done } diff --git a/sys-devel/automake/automake-1.5-r2.ebuild b/sys-devel/automake/automake-1.5-r2.ebuild index 06253da239ee..5d33bc94d3d5 100644 --- a/sys-devel/automake/automake-1.5-r2.ebuild +++ b/sys-devel/automake/automake-1.5-r2.ebuild @@ -1,9 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" - -inherit eutils +EAPI=7 DESCRIPTION="Used to generate Makefile.in from Makefile.am" HOMEPAGE="https://www.gnu.org/software/automake/" @@ -17,26 +15,30 @@ IUSE="" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69 + >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/automake-1.4-nls-nuisances.patch #121151 + "${FILESDIR}"/${P}-target_hook.patch + "${FILESDIR}"/${P}-slot.patch + "${FILESDIR}"/${P}-test-fixes.patch #79505 + "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914 + "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357 + "${FILESDIR}"/${PN}-1.5-perl-5.11.patch +) + src_prepare() { + default export WANT_AUTOCONF=2.5 - epatch "${FILESDIR}"/automake-1.4-nls-nuisances.patch #121151 - epatch "${FILESDIR}"/${P}-target_hook.patch - epatch "${FILESDIR}"/${P}-slot.patch - epatch "${FILESDIR}"/${P}-test-fixes.patch #79505 - epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914 - epatch "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357 - epatch "${FILESDIR}"/${PN}-1.5-perl-5.11.patch } # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null - rm -f dir + pushd "${ED}"/usr/share/info >/dev/null || die + rm -f dir || die # Rewrite all the references to other pages. # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. @@ -58,7 +60,7 @@ slot_info_pages() { sed -i -e "s:${f}:${d}:g" * || die done - popd >/dev/null + popd >/dev/null || die } src_install() { @@ -67,13 +69,14 @@ src_install() { local x for x in aclocal automake ; do - mv "${ED}"/usr/bin/${x}{,-${SLOT}} || die "rename ${x}" - mv "${ED}"/usr/share/${x}{,-${SLOT}} || die "move ${x}" + mv "${ED}"/usr/bin/${x}{,-${SLOT}} || die + mv "${ED}"/usr/share/${x}{,-${SLOT}} || die done # remove all config.guess and config.sub files replacing them # w/a symlink to a specific gnuconfig version for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done } diff --git a/sys-devel/automake/automake-1.6.3-r2.ebuild b/sys-devel/automake/automake-1.6.3-r2.ebuild index 92eb4fa57aa8..6c0cd2f16749 100644 --- a/sys-devel/automake/automake-1.6.3-r2.ebuild +++ b/sys-devel/automake/automake-1.6.3-r2.ebuild @@ -1,9 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" - -inherit eutils +EAPI=7 DESCRIPTION="Used to generate Makefile.in from Makefile.am" HOMEPAGE="https://www.gnu.org/software/automake/" @@ -17,23 +15,27 @@ IUSE="" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69 + >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-test-fixes.patch #159557 + "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914 + "${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357 + "${FILESDIR}"/${PN}-1.5-perl-5.11.patch +) + src_prepare() { + default export WANT_AUTOCONF=2.5 - epatch "${FILESDIR}"/${P}-test-fixes.patch #159557 - epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914 - epatch "${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357 - epatch "${FILESDIR}"/${PN}-1.5-perl-5.11.patch } # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null - rm -f dir + pushd "${ED}"/usr/share/info >/dev/null || die + rm -f dir || die # Rewrite all the references to other pages. # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. @@ -55,18 +57,19 @@ slot_info_pages() { sed -i -e "s:${f}:${d}:g" * || die done - popd >/dev/null + popd >/dev/null || die } src_install() { default slot_info_pages - rm -f "${ED}"/usr/bin/{aclocal,automake} + rm -f "${ED}"/usr/bin/{aclocal,automake} || 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} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done } diff --git a/sys-devel/automake/automake-1.7.9-r3.ebuild b/sys-devel/automake/automake-1.7.9-r3.ebuild index 37a3480981c2..df9f506f48e6 100644 --- a/sys-devel/automake/automake-1.7.9-r3.ebuild +++ b/sys-devel/automake/automake-1.7.9-r3.ebuild @@ -1,9 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" - -inherit eutils +EAPI=7 DESCRIPTION="Used to generate Makefile.in from Makefile.am" HOMEPAGE="https://www.gnu.org/software/automake/" @@ -17,26 +15,30 @@ IUSE="" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69 + >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-infopage-namechange.patch + "${FILESDIR}"/${P}-test-fixes.patch + "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225 + "${FILESDIR}"/${P}-libtool-2.patch #257544 + "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914 + "${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357 + "${FILESDIR}"/${PN}-1.5-perl-5.11.patch +) + src_prepare() { + default export WANT_AUTOCONF=2.5 - epatch "${FILESDIR}"/${P}-infopage-namechange.patch - epatch "${FILESDIR}"/${P}-test-fixes.patch - epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225 - epatch "${FILESDIR}"/${P}-libtool-2.patch #257544 - epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914 - epatch "${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357 - epatch "${FILESDIR}"/${PN}-1.5-perl-5.11.patch } # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null - rm -f dir + pushd "${ED}"/usr/share/info >/dev/null || die + rm -f dir || die # Rewrite all the references to other pages. # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. @@ -58,18 +60,19 @@ slot_info_pages() { sed -i -e "s:${f}:${d}:g" * || die done - popd >/dev/null + popd >/dev/null || die } src_install() { default slot_info_pages - rm -f "${ED}"/usr/bin/{aclocal,automake} + rm -f "${ED}"/usr/bin/{aclocal,automake} || 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} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done } diff --git a/sys-devel/automake/automake-1.8.5-r5.ebuild b/sys-devel/automake/automake-1.8.5-r5.ebuild index 241a20422cee..f545e1e2fdee 100644 --- a/sys-devel/automake/automake-1.8.5-r5.ebuild +++ b/sys-devel/automake/automake-1.8.5-r5.ebuild @@ -1,9 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" - -inherit eutils +EAPI=7 DESCRIPTION="Used to generate Makefile.in from Makefile.am" HOMEPAGE="https://www.gnu.org/software/automake/" @@ -17,26 +15,30 @@ IUSE="" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69 + >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-1.8.2-infopage-namechange.patch + "${FILESDIR}"/${P}-test-fixes.patch #159557 + "${FILESDIR}"/${PN}-1.9.6-aclocal7-test-sleep.patch #197366 + "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225 + "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914 + "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357 + "${FILESDIR}"/${PN}-1.8-perl-5.11.patch +) + src_prepare() { + default export WANT_AUTOCONF=2.5 - epatch "${FILESDIR}"/${PN}-1.8.2-infopage-namechange.patch - epatch "${FILESDIR}"/${P}-test-fixes.patch #159557 - epatch "${FILESDIR}"/${PN}-1.9.6-aclocal7-test-sleep.patch #197366 - epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225 - epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914 - epatch "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357 - epatch "${FILESDIR}"/${PN}-1.8-perl-5.11.patch } # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null - rm -f dir + pushd "${ED}"/usr/share/info >/dev/null || die + rm -f dir || die # Rewrite all the references to other pages. # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. @@ -58,18 +60,19 @@ slot_info_pages() { sed -i -e "s:${f}:${d}:g" * || die done - popd >/dev/null + popd >/dev/null || die } src_install() { default slot_info_pages - rm -f "${ED}"/usr/bin/{aclocal,automake} + rm -f "${ED}"/usr/bin/{aclocal,automake} || 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} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done } diff --git a/sys-devel/automake/automake-1.9.6-r5.ebuild b/sys-devel/automake/automake-1.9.6-r5.ebuild index 9d9571840123..bfb4a120b038 100644 --- a/sys-devel/automake/automake-1.9.6-r5.ebuild +++ b/sys-devel/automake/automake-1.9.6-r5.ebuild @@ -1,10 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 +EAPI=7 DESCRIPTION="Used to generate Makefile.in from Makefile.am" HOMEPAGE="https://www.gnu.org/software/automake/" @@ -14,8 +11,8 @@ LICENSE="GPL-2" # Use Gentoo versioning for slotting. SLOT="${PV:0:3}" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" +IUSE="" +RESTRICT="test" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 @@ -23,8 +20,7 @@ RDEPEND="dev-lang/perl >=sys-apps/texinfo-4.7 sys-devel/gnuconfig" DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + sys-apps/help2man" PATCHES=( "${FILESDIR}"/${PN}-1.9.6-infopage-namechange-r1.patch @@ -37,10 +33,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.8-perl-5.11.patch ) -pkg_setup() { - use test && python-any-r1_pkg_setup -} - src_prepare() { default export WANT_AUTOCONF=2.5 @@ -49,7 +41,7 @@ src_prepare() { # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die + pushd "${ED}"/usr/share/info >/dev/null || die rm -f dir || die # Rewrite all the references to other pages. @@ -83,12 +75,13 @@ src_install() { for x in aclocal automake ; do help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1 doman ${x}-${SLOT}.1 - rm -f "${ED%/}"/usr/bin/${x} + rm -f "${ED}"/usr/bin/${x} done # remove all config.guess and config.sub files replacing them # w/a symlink to a specific gnuconfig version for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done } diff --git a/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch b/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch index 78aa2e3d6a3f..62a076107ee5 100644 --- a/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch +++ b/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch @@ -1,5 +1,5 @@ ---- ansi2knr.c.orig 2005-01-30 06:54:09.702046352 -0500 -+++ ansi2knr.c 2005-01-30 06:54:17.719827464 -0500 +--- a/ansi2knr.c ++++ b/ansi2knr.c @@ -132,7 +132,7 @@ #endif /* not HAVE_CONFIG_H */ diff --git a/sys-devel/automake/files/automake-1.4-libtoolize.patch b/sys-devel/automake/files/automake-1.4-libtoolize.patch index d71d66c973c5..3e818ca960ba 100644 --- a/sys-devel/automake/files/automake-1.4-libtoolize.patch +++ b/sys-devel/automake/files/automake-1.4-libtoolize.patch @@ -1,7 +1,7 @@ Patch from redhat/fedora which made it into upstream. ---- automake.in Wed Jul 12 11:40:03 2000 -+++ automake.in Thu Nov 9 07:04:46 2000 +--- a/automake.in ++++ b/automake.in @@ -6882,9 +6882,11 @@ $suppress = 1; diff --git a/sys-devel/automake/files/automake-1.4-nls-nuisances.patch b/sys-devel/automake/files/automake-1.4-nls-nuisances.patch index 16aa657c8ebb..d84d29698e64 100644 --- a/sys-devel/automake/files/automake-1.4-nls-nuisances.patch +++ b/sys-devel/automake/files/automake-1.4-nls-nuisances.patch @@ -1,5 +1,5 @@ ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -46,6 +46,16 @@ infodir='${prefix}/info' mandir='${prefix}/man' diff --git a/sys-devel/automake/files/automake-1.5-slot.patch b/sys-devel/automake/files/automake-1.5-slot.patch index 348775abe751..640e73c7b794 100644 --- a/sys-devel/automake/files/automake-1.5-slot.patch +++ b/sys-devel/automake/files/automake-1.5-slot.patch @@ -1,5 +1,5 @@ ---- aclocal.in.orig 2004-10-22 11:11:05.361192040 -0400 -+++ aclocal.in 2004-10-22 11:11:45.362110976 -0400 +--- a/aclocal.in ++++ b/aclocal.in @@ -33,5 +33,5 @@ $prefix = "@prefix@"; # Note that this isn't pkgdatadir, but a separate directory. @@ -20,8 +20,8 @@ + print "/usr/share/aclocal", "\n"; exit 0; } ---- automake.in.orig 2004-10-22 11:14:10.787003032 -0400 -+++ automake.in 2004-10-22 11:14:22.072287408 -0400 +--- a/automake.in ++++ b/automake.in @@ -32,7 +32,7 @@ BEGIN { diff --git a/sys-devel/automake/files/automake-1.5-target_hook.patch b/sys-devel/automake/files/automake-1.5-target_hook.patch index 6f40cbb67d39..5f3bdb1f06c0 100644 --- a/sys-devel/automake/files/automake-1.5-target_hook.patch +++ b/sys-devel/automake/files/automake-1.5-target_hook.patch @@ -1,6 +1,5 @@ -diff -C 2 -r -N /tmp/automake-1.5/automake.in automake-1.5/automake.in -*** /tmp/automake-1.5/automake.in Thu Aug 23 07:26:53 2001 ---- automake-1.5/automake.in Tue Feb 5 20:38:55 2002 +*** automake-1.5/automake.in +--- automake-1.5/automake.in *************** *** 1941,1945 **** @@ -16,9 +15,8 @@ diff -C 2 -r -N /tmp/automake-1.5/automake.in automake-1.5/automake.in ! } if ($derived_source) -diff -C 2 -r -N /tmp/automake-1.5/m4/depout.m4 automake-1.5/m4/depout.m4 -*** /tmp/automake-1.5/m4/depout.m4 Mon May 14 02:01:09 2001 ---- automake-1.5/m4/depout.m4 Wed Jan 30 22:03:33 2002 +*** automake-1.5/m4/depout.m4 +--- automake-1.5/m4/depout.m4 *************** *** 13,18 **** for mf in $CONFIG_FILES; do diff --git a/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch b/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch index 0e6708a55099..bb1c21175175 100644 --- a/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch +++ b/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch @@ -1,5 +1,5 @@ ---- Makefile.in 2003-06-30 17:07:30.000000000 +0000 -+++ Makefile.in 2003-06-30 17:09:28.000000000 +0000 +--- a/Makefile.in ++++ b/Makefile.in @@ -199,8 +199,9 @@ .texi.info: |