sys-devel/automake: Bump to version 1.16.2
authorLars Wendler <polynomial-c@gentoo.org>
Sun, 22 Mar 2020 13:01:51 +0000 (14:01 +0100)
committerLars Wendler <polynomial-c@gentoo.org>
Sun, 22 Mar 2020 13:03:20 +0000 (14:03 +0100)
Thanks-to: Michał Górny <mgorny@gentoo.org>
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
sys-devel/automake/Manifest
sys-devel/automake/automake-1.16.2.ebuild [new file with mode: 0644]
sys-devel/automake/files/automake-1.16.2-py3-compile.patch [new file with mode: 0644]

index abbe0d83c4f2476e5a4556c5992fb3973bb081b6..f32953b5b1c82cd7c9067c55b6753dab458441b9 100644 (file)
@@ -5,6 +5,7 @@ DIST automake-1.13.4.tar.xz 1449608 BLAKE2B 03dee42d65362a6f36e81c83d516c85faba1
 DIST automake-1.14.1.tar.xz 1488984 BLAKE2B a4c9b1f2c5ca35fba62e57423be2b6c060c63df8198d06a904a236745053072cb14ca4b333fb6cf370ef73378ee8771f4c10bcc111dcbd69e40f75abc16475fa SHA512 5de971159dfca2ec74c3c9a2f1368331efc437b146d675740c8735fcb0d32a30d0560fd29df64c3279efdf9278152c82a9ff09040b3e64d84743aaf25b26ce69
 DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688
 DIST automake-1.16.1.tar.xz 1534936 BLAKE2B 0a3b42375361ff3c07e861eb2974fa094f8e76e4c6fcad02d6413402d201506b1cd660a187ffa1d2b29d8955ef60088f7b07d96405d803895b593b35b78f443a SHA512 4013bd31f4903b10875caa7d6ac16a14623a4eb91aa758924dee5b990e234fb50848d131e2dbdbbbc32f89c41a14f9c52a0064c37aa6760c524d607b354b13c3
+DIST automake-1.16.2.tar.xz 1545912 BLAKE2B 88e12fc7792c1a3a9c3b9095760145c2ebf3799602320efe5885a0cac16ced2cfb95865abf0a96b6969aa4652eb2b3d2ac8dae550d721392be45fc10c2458b67 SHA512 a4aa0e41ceaa7df5bc303a6004597fb158f4198594017cd2c586fd9f5a29233e081766bf22b7e4ef0d4c8c3d45a8591009427efa319b362922a958ac1ef6e27b
 DIST automake-1.4-p6.tar.gz 375060 BLAKE2B 681c70a2932ae1697d0b9907c8a8d12ed0d506be4a2812dff93af7c3b659ee1ed24a97f0a653f9a49c0d4a78a70965482b39f1297e9f6d6099d3857a2d451f69 SHA512 3f3235e68ab6703668deac015926124c7eeeea6925e830c6820cb156f15f8ee3febd0fd0cc2ab4f4b5c405b528e4ce12b2459347f62ed6a1a862bc9969163d9e
 DIST automake-1.5.tar.gz 526934 BLAKE2B 4b613c81f933d550cc9e5e40dd9ce1160f49c388f4e9292b1a8843b0f4cfc57d72a3dc10bce03260cffa61ab8d67a5b27d781bd7a4c2d842764135158dc2b54f SHA512 b9dbece18935b6c08f7d17c456b0359a17362dc030692629cf5d66db675e46a5f24d60dfd20a50780e4096163454f1922d4281c4bb7af336d61e527b579e3bfc
 DIST automake-1.6.3.tar.bz2 476275 BLAKE2B 5d0b7f69cbf9fda3b1f1426548fae45c631375898568b442cc5d3561a618ad3f15b6103f55539487dcbf4088a6f75887dce5d00851bc4c09c5db45012d6bc2f1 SHA512 8407ea7d51a238622326d89c22777050c2a49d456e3e33c53985f40e4108094ef149693568d926cd1e9b2ddbdb5693c0d0ec6220e0f7bbae4341b6be9f0d060f
diff --git a/sys-devel/automake/automake-1.16.2.ebuild b/sys-devel/automake/automake-1.16.2.ebuild
new file mode 100644 (file)
index 0000000..eec850f
--- /dev/null
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit python-any-r1
+
+if [[ ${PV} == 9999 ]] ; then
+       EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
+
+       inherit git-r3
+else
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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"
+       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="$(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
+       >=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
+)
+# All patches have been submitted upstream.
+
+pkg_setup() {
+       use test && 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 sys-apps/texinfo ; then
+               touch doc/{stamp-vti,version.texi,automake.info} || die
+       fi
+}
+
+# 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
+       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
+}
+
+src_install() {
+       default
+
+       slot_info_pages
+       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
+}
diff --git a/sys-devel/automake/files/automake-1.16.2-py3-compile.patch b/sys-devel/automake/files/automake-1.16.2-py3-compile.patch
new file mode 100644 (file)
index 0000000..7924f20
--- /dev/null
@@ -0,0 +1,73 @@
+From aa449bd4c836abf0320033c5077259fc760b622d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 3 Nov 2019 11:51:19 +0100
+Subject: [PATCH] py-compile: Support -OO for py3.5+, and -O&-OO for pypy3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ lib/py-compile | 29 +++++++++++++++++++++++++----
+ 1 file changed, 25 insertions(+), 4 deletions(-)
+
+diff --git a/lib/py-compile b/lib/py-compile
+index e56d98d6e..5b9ae5d5d 100755
+--- a/lib/py-compile
++++ b/lib/py-compile
+@@ -126,12 +126,10 @@ if test "$python_major" -le 2; then
+   import_lib=imp
+   import_test="hasattr(imp, 'get_tag')"
+   import_call=imp.cache_from_source
+-  import_arg2=', False' # needed in one call and not the other
+ else
+   import_lib=importlib
+   import_test="hasattr(sys.implementation, 'cache_tag')"
+   import_call=importlib.util.cache_from_source
+-  import_arg2=
+ fi
+ $PYTHON -c "
+@@ -159,7 +157,7 @@ $PYTHON -O -c "
+ import sys, os, py_compile, $import_lib
+ # pypy does not use .pyo optimization
+-if hasattr(sys, 'pypy_translation_info'):
++if hasattr(sys, 'pypy_translation_info') and sys.hexversion < 0x03050000:
+     sys.exit(0)
+ files = '''$files'''
+@@ -173,7 +171,30 @@ for file in files.split():
+     sys.stdout.write(file)
+     sys.stdout.flush()
+     if $import_test:
+-        py_compile.compile(filepath, $import_call(filepath$import_arg2), path)
++        py_compile.compile(filepath, $import_call(filepath), path)
++    else:
++        py_compile.compile(filepath, filepath + 'o', path)
++sys.stdout.write('\n')" 2>/dev/null || :
++
++$PYTHON -OO -c "
++import sys, os, py_compile, $import_lib
++
++# python<3.5 does not have split files for -O and -OO
++if sys.hexversion < 0x03050000:
++    sys.exit(0)
++
++files = '''$files'''
++sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n')
++for file in files.split():
++    $pathtrans
++    $filetrans
++    if not os.path.exists(filepath) or not (len(filepath) >= 3
++                                            and filepath[-3:] == '.py'):
++          continue
++    sys.stdout.write(file)
++    sys.stdout.flush()
++    if $import_test:
++        py_compile.compile(filepath, $import_call(filepath), path)
+     else:
+         py_compile.compile(filepath, filepath + 'o', path)
+ sys.stdout.write('\n')" 2>/dev/null || :
+-- 
+2.25.2