From 115dcc7054f5934a2c8e26fd8a8eed5f3e29e9ce Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 28 Mar 2023 09:49:11 +0100 Subject: gentoo auto-resync : 28:03:2023 - 09:49:10 --- sys-devel/automake/Manifest | 4 +- sys-devel/automake/automake-1.11.6-r4.ebuild | 84 +++++++++++++++++++ sys-devel/automake/automake-1.16.5-r1.ebuild | 119 +++++++++++++++++++++++++++ sys-devel/automake/automake-9999.ebuild | 48 ++++------- 4 files changed, 223 insertions(+), 32 deletions(-) create mode 100644 sys-devel/automake/automake-1.11.6-r4.ebuild create mode 100644 sys-devel/automake/automake-1.16.5-r1.ebuild (limited to 'sys-devel/automake') diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest index cd87ebc590f0..8768f89bf71b 100644 --- a/sys-devel/automake/Manifest +++ b/sys-devel/automake/Manifest @@ -7,6 +7,8 @@ AUX automake-1.16.2-py3-compile.patch 2412 BLAKE2B 20a3ce66047ad5106f0cafccce19f DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88 EBUILD automake-1.11.6-r3.ebuild 2572 BLAKE2B 378123d8b34874e9838ce279363cb9ee3c3e1b4e45335dd8016499809b1c550996943f0e4c46932294a2cfea06eb71bccb9ee6476078eaba2ca3d53a762876d1 SHA512 808f016c339714b8be0745d64e90236ecf91e8ce855aa9d31b1ec8a95906d45c57de512f7d114629584731d08ea537bcca38587ed4bdf6e70562a5b5954cf39e +EBUILD automake-1.11.6-r4.ebuild 2124 BLAKE2B 0bfeb5b427e0fe00411dfd1f176a1e09d5205dfe451e3c08988074ea1f5b94fffc80f5cbea4c538e095867c88909e20f8648efc42487fbf283a77c2ad52c97d5 SHA512 42101bf68884cee5dfc8eb3e0aca89698b5c7b246edc29208786577e96cf428390d352d3c170f9f58869463c8911d8b6a4a50dcb1d91b56a636e079dfc7df57e +EBUILD automake-1.16.5-r1.ebuild 3098 BLAKE2B 91f64a728314399c24faeb8f0ecea0115e07a0674536a10fdcfcebfa14cfe2c14b879da9c50acbe9af50b74d85b7df6c8da087d5523ab75e60c56c89aa3d5822 SHA512 3dd87125131149f54f8fb7ff6d765da379bcedf122e3ac10825a871df0b78f4aeaa84a2309ea01f9f2cc1bff72f92bae198ad9db04d0f782c816f1e9cfa85910 EBUILD automake-1.16.5.ebuild 3541 BLAKE2B e4f466373ac2a2081370759ea2b78f431f83f980ca0962eb4a72fafe1437ddaa6d2d0b73dd83835c0aececbf6186983d3a5b70dc21cf38cbf59541a0cac12e47 SHA512 ffa94dba2cd0a53273099f505f902d618bf22c84eb9d993979c9c7117f07e5dc2b32b3e64ce595e8b39a55ca78310332b346e33cca935d1aa44ae8bcbcf7d324 -EBUILD automake-9999.ebuild 3347 BLAKE2B f7a8f9c5d881f13644cc5a2a8118379d65320bb49e3242327b871c8339341a4f1230b4fe100b581f5bb1071f039cb5c5d268c51bd7f5a836ed2e4a8278f64317 SHA512 05292fce8d754a9f31f45b0489b5b2783e3acf8d4042303682af8bdc81ffe5fb1273e3a8cf5ded3aede805567470f4f056aa1a934e592cfff0945eff81de312e +EBUILD automake-9999.ebuild 2888 BLAKE2B 3e4a5c0a4c8baa3880c17866097b3d25841ecc3c5bd281d5c87faa9ce0fdef18ca604fdd85e9c3f80a70e7d5979b9722b85406f23ec7664bae92adf549346967 SHA512 d110fc619ac32a97eeb77b1f9158870a66e3aeeed5ab4ff086792bc1f9ddb02776b0d6d398d24a418febd0d85c84153a883b6be5e4a04e807a75c060568af6a6 MISC metadata.xml 332 BLAKE2B d33ce6b379d5d8d44ae9104f3e5c5a0b5b25682072f7222bdd6dd92b97123b3cc011ed078178a8d2cb9e3e3d1da03dde67b3a844374819fdb67b879341a8a5fa SHA512 ad4477b610e680468526c77df5550b44f8d0558237aac887312a463d4da29216a63db372710398d0eb478550550507e81421d1deee272038b3658c38b84e5b06 diff --git a/sys-devel/automake/automake-1.11.6-r4.ebuild b/sys-devel/automake/automake-1.11.6-r4.ebuild new file mode 100644 index 000000000000..9f1e6e6abe15 --- /dev/null +++ b/sys-devel/automake/automake-1.11.6-r4.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +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="" +RESTRICT="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" + +PATCHES=( + "${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453 + "${FILESDIR}"/${PN}-1.11-install-sh-avoid-low-risk-race-in-tmp.patch + "${FILESDIR}"/${PN}-1.13-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_compile() { + # Also used in install. + MY_INFODIR="${EPREFIX}/usr/share/automake-${PV}/info" + econf --infodir="${MY_INFODIR}" + + local x + for x in aclocal automake; do + help2man "perl -Ilib ${x}" > doc/${x}-${SLOT}.1 + done +} + +src_install() { + default + + rm \ + "${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} + 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 + + 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 + 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 + INFOPATH="${MY_INFODIR}" + EOF +} diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild b/sys-devel/automake/automake-1.16.5-r1.ebuild new file mode 100644 index 000000000000..912c9637c563 --- /dev/null +++ b/sys-devel/automake/automake-1.16.5-r1.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit python-any-r1 + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" + inherit git-r3 +else + 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + else + 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. + SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" + fi + + 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-arch/gzip + sys-apps/help2man + test? ( ${PYTHON_DEPS} ) +" + +PATCHES=( + "${FILESDIR}"/automake-1.16.2-py3-compile.patch + "${FILESDIR}"/automake-1.16.2-fix-instmany-python.sh-test.patch + "${FILESDIR}"/automake-1.16.2-fix-py-compile-basedir.sh-test.patch +) + +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/automake-${PV}/info" + econf --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} \ + "${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} + 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 + + 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 + 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 + INFOPATH="${MY_INFODIR}" + EOF +} diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild index df5d9b7ecfc6..382a5bfb5943 100644 --- a/sys-devel/automake/automake-9999.ebuild +++ b/sys-devel/automake/automake-9999.ebuild @@ -69,42 +69,14 @@ src_prepare() { src_configure() { use test && python_setup - default -} - -# Slot the info pages. Do this w/out munging the source so we don't have -# to depend on texinfo to regen things. bug #464146 (among others) -slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null || die - rm -f dir - - # Rewrite all the references to other pages. - # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. - # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. - local p pages=( *.info ) args=() - for p in "${pages[@]/%.info}" ; do - args+=( - -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" - -e "s:(${p}):(${p}-${SLOT}):g" - ) - done - sed -i "${args[@]}" * || die - - # Rewrite all the file references, and rename them in the process. - local f d - for f in * ; do - d=${f/.info/-${SLOT}.info} - mv "${f}" "${d}" || die - sed -i -e "s:${f}:${d}:g" * || die - done - - popd >/dev/null || die + # Also used in install. + infopath="${EPREFIX}/usr/share/automake-${PV}/info" + econf --infodir="${infopath}" } src_install() { default - slot_info_pages rm "${ED}"/usr/share/aclocal/README || die rmdir "${ED}"/usr/share/aclocal || die rm \ @@ -124,4 +96,18 @@ src_install() { if [[ -f "${tarfile}" ]] ; then gunzip "${tarfile}" || die fi + + pushd "${D}/${infopath}" >/dev/null || die + for f in *.info*; do + # Install convenience aliases for versioned Automake pages. + ln -s "$f" "${f/./-${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 + INFOPATH="${infopath}" + EOF } -- cgit v1.2.3