commit: 7ba8609866702b70240c38135f90dff84fbdf918
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 11 18:33:18 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jan 11 18:33:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ba86098
sys-devel/automake: Removed old
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-devel/automake/Manifest | 1 -
sys-devel/automake/automake-1.16.1-r1.ebuild | 102 -----------
sys-devel/automake/automake-1.16.1-r2.ebuild | 128 --------------
.../files/automake-1.16.1-py3-compile-test.patch | 12 --
.../files/automake-1.16.1-py3-compile.patch | 61 -------
.../files/automake-1.16.1-py3-no-pyo-files.patch | 192 ---------------------
.../automake-1.16.1-py3-pep3147-cmdline.patch | 16 --
.../files/automake-1.16.1-py3-pep3147.patch | 39 -----
8 files changed, 551 deletions(-)
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 5cd3ba98c84..35bea52e417 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -4,7 +4,6 @@ DIST automake-1.12.6.tar.xz 1400336 BLAKE2B
b1d9befdda70f9caab881c1159921ea883a7
DIST automake-1.13.4.tar.xz 1449608 BLAKE2B
03dee42d65362a6f36e81c83d516c85faba1aac59bdc0d941077fde9be7742da0f57b48d678169e7a0e8b652c3ef46c314cdd3efb0fc489c389852fed1c39a02
SHA512
c9b145c1b822a4d83f2899f4280a76ccae932301b273f4c9718dc7f53161aa03dc1be2c1fb1a61083c54186e1908ae2c8284250aa1d8f6dea484767aca1344d3
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.16.3.tar.xz 1590708 BLAKE2B
ab6001a1b09e171ec83bac07155a77ab0fc29f5185116616aa3080b27e8bbf759472cd0dfb75630b26f7ad8d0741e668662d00b370ef79cf5ef6c62e945c94da
SHA512
7265aeb7f82a8a205761d76e6ade7b7e97831c283349fd80f86e511f4b0b3e17f429d1506fca84c76079f63781e5dbf5ca81455d6bf6cda27d2e5c3d23b0d1aa
DIST automake-1.4-p6.tar.gz 375060 BLAKE2B
681c70a2932ae1697d0b9907c8a8d12ed0d506be4a2812dff93af7c3b659ee1ed24a97f0a653f9a49c0d4a78a70965482b39f1297e9f6d6099d3857a2d451f69
SHA512
3f3235e68ab6703668deac015926124c7eeeea6925e830c6820cb156f15f8ee3febd0fd0cc2ab4f4b5c405b528e4ce12b2459347f62ed6a1a862bc9969163d9e
diff --git a/sys-devel/automake/automake-1.16.1-r1.ebuild
b/sys-devel/automake/automake-1.16.1-r1.ebuild
deleted file mode 100644
index cd16023c5dc..00000000000
--- a/sys-devel/automake/automake-1.16.1-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~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=""
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
- >=sys-devel/automake-wrapper-11
- >=sys-devel/autoconf-2.69:*
- sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
- sys-apps/help2man"
-
-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 || die
-
- # 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
-}
diff --git a/sys-devel/automake/automake-1.16.1-r2.ebuild
b/sys-devel/automake/automake-1.16.1-r2.ebuild
deleted file mode 100644
index 563dd100f04..00000000000
--- a/sys-devel/automake/automake-1.16.1-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~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.1-py3-compile.patch
- "${FILESDIR}"/automake-1.16.1-py3-no-pyo-files.patch
- "${FILESDIR}"/automake-1.16.1-py3-pep3147.patch
- "${FILESDIR}"/automake-1.16.1-py3-pep3147-cmdline.patch
- "${FILESDIR}"/automake-1.16.1-py3-compile-test.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.1-py3-compile-test.patch
b/sys-devel/automake/files/automake-1.16.1-py3-compile-test.patch
deleted file mode 100644
index bd5a6759c29..00000000000
--- a/sys-devel/automake/files/automake-1.16.1-py3-compile-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN automake-1.16.1.orig/t/py-compile-basedir.sh
automake-1.16.1/t/py-compile-basedir.sh
---- automake-1.16.1.orig/t/py-compile-basedir.sh 2020-01-20
05:07:12.915260159 +0100
-+++ automake-1.16.1/t/py-compile-basedir.sh 2020-01-20 05:07:45.827074984
+0100
-@@ -42,7 +42,7 @@
- py_installed "$d2/$f.pyc"
- py_installed "$d2/sub/$f.pyc"
- files=$(find "$d2" | grep '\.py[co]$')
-- test $(echo "$files" | wc -l) -eq 4
-+ test $(echo "$files" | wc -l) -eq 4 -o $(echo "$files" | wc -l) -eq 6
- case $d2 in
- .|..) rm -f $files;;
- *) rm -rf "$d2";;
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-compile.patch
b/sys-devel/automake/files/automake-1.16.1-py3-compile.patch
deleted file mode 100644
index bbb08454763..00000000000
--- a/sys-devel/automake/files/automake-1.16.1-py3-compile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d3edb7e0f3a5553b1ed919e566ec8c41022251a2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@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 <mgo...@gentoo.org>
----
- lib/py-compile | 27 +++++++++++++++++++++++++--
- 1 file changed, 25 insertions(+), 2 deletions(-)
-
-diff --git a/lib/py-compile b/lib/py-compile
-index 1a3f4d644..44be97fc4 100755
---- a/lib/py-compile
-+++ b/lib/py-compile
-@@ -140,7 +140,7 @@ $PYTHON -O -c "
- import sys, os, py_compile, imp
-
- # 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'''
-@@ -154,7 +154,30 @@ for file in files.split():
- sys.stdout.write(file)
- sys.stdout.flush()
- if hasattr(imp, 'get_tag'):
-- py_compile.compile(filepath, imp.cache_from_source(filepath, False),
path)
-+ py_compile.compile(filepath, imp.cache_from_source(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, imp
-+
-+# 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 (-OO 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 hasattr(imp, 'get_tag'):
-+ py_compile.compile(filepath, imp.cache_from_source(filepath), path)
- else:
- py_compile.compile(filepath, filepath + 'o', path)
- sys.stdout.write('\n')" 2>/dev/null || :
---
-2.23.0
-
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch
b/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch
deleted file mode 100644
index 0d2ff91b620..00000000000
--- a/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From: Lukas Fleischer
-Subject: python tests: Do not require .pyo files
-Date: Sun, 20 May 2018 17:28:52 +0200
-
-As of Python 3.5, but unoptimized and optimized bytecode are stored
-within .pyc files; .pyo files are no longer generated. Update the Python
-tests such that the test do not fail if .pyo files are missing.
-
-Source:
https://lists.gnu.org/archive/html/automake-patches/2018-05/msg00002.html
-Reviewed-by: Andreas K. Hüttel <dilfri...@gentoo.org>
-
-* t/py-compile-basedir.sh: Remove all .pyo checks.
-* t/py-compile-basic.sh: Likewise.
-* t/py-compile-destdir.sh: Likewise.
-* t/py-compile-option-terminate.sh: Likewise.
-* t/python-virtualenv.sh: Likewise.
-* t/python10.sh: Likewise.
-* t/python12.sh: Likewise.
-* t/python3.sh: Likewise.
----
- t/py-compile-basedir.sh | 2 --
- t/py-compile-basic.sh | 3 ---
- t/py-compile-destdir.sh | 12 +++++-------
- t/py-compile-option-terminate.sh | 5 -----
- t/python-virtualenv.sh | 4 ----
- t/python10.sh | 6 ------
- t/python12.sh | 3 +--
- t/python3.sh | 1 -
- 8 files changed, 6 insertions(+), 30 deletions(-)
-
-diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh
-index 6921d16d5..9f927d066 100644
---- a/t/py-compile-basedir.sh
-+++ b/t/py-compile-basedir.sh
-@@ -40,9 +40,7 @@ for d in foo foo/bar "$(pwd)/foo" . .. ../foo ''; do
- ./py-compile --basedir "$d" "$f.py" "sub/$f.py"
- find "$d2" # For debugging.
- py_installed "$d2/$f.pyc"
-- py_installed "$d2/$f.pyo"
- py_installed "$d2/sub/$f.pyc"
-- py_installed "$d2/sub/$f.pyo"
- files=$(find "$d2" | grep '\.py[co]$')
- test $(echo "$files" | wc -l) -eq 4
- case $d2 in
-diff --git a/t/py-compile-basic.sh b/t/py-compile-basic.sh
-index 24df600cb..4c5cf57aa 100644
---- a/t/py-compile-basic.sh
-+++ b/t/py-compile-basic.sh
-@@ -61,10 +61,7 @@ mkdir -p 1/_/2/_/3/_
-
- ./py-compile foo.py sub/bar.py 1/_/2/_/3/_/0.py
- py_installed foo.pyc
--py_installed foo.pyo
- py_installed sub/bar.pyc
--py_installed sub/bar.pyo
- py_installed 1/_/2/_/3/_/0.pyc
--py_installed 1/_/2/_/3/_/0.pyo
-
- :
-diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh
-index 07aa1f44f..d2ccafee5 100644
---- a/t/py-compile-destdir.sh
-+++ b/t/py-compile-destdir.sh
-@@ -34,13 +34,11 @@ echo 'def bar (): return "bar"' > $destdir/sub/bar.py
-
- find $destdir # For debugging.
- st=0
--for x in c o; do
-- for b in foo sub/bar; do
-- f=$(pyc_location -p "$destdir/$b.py$x")
-- test -f "$f"
-- strings "$f" || : # For debugging.
-- $FGREP $destdir $f && { echo BAD: $f; st=1; }
-- done
-+for b in foo sub/bar; do
-+ f=$(pyc_location -p "$destdir/$b.pyc")
-+ test -f "$f"
-+ strings "$f" || : # For debugging.
-+ $FGREP $destdir $f && { echo BAD: $f; st=1; }
- done
- exit $st
-
-diff --git a/t/py-compile-option-terminate.sh
b/t/py-compile-option-terminate.sh
-index 1aaeec21b..80ae55a88 100644
---- a/t/py-compile-option-terminate.sh
-+++ b/t/py-compile-option-terminate.sh
-@@ -27,17 +27,12 @@ cp "$am_scriptdir/py-compile" . \
- : > ./--foo.py
- ./py-compile -- -o.py --foo.py
- py_installed ./-o.pyc
--py_installed ./-o.pyo
- py_installed ./--foo.pyc
--py_installed ./--foo.pyo
- rm -f ./-*.py[co]
- : > x.py
- ./py-compile x.py -o.py --foo.py
- py_installed ./x.pyc
--py_installed ./x.pyo
- py_installed ./-o.pyc
--py_installed ./-o.pyo
- py_installed ./--foo.pyc
--py_installed ./--foo.pyo
-
- :
-diff --git a/t/python-virtualenv.sh b/t/python-virtualenv.sh
-index 3bcd6ec76..7f9708866 100644
---- a/t/python-virtualenv.sh
-+++ b/t/python-virtualenv.sh
-@@ -124,10 +124,8 @@ check_install ()
-
- test -f "$py_site"/am_foo.py
- py_installed "$py_site"/am_foo.pyc
-- py_installed "$py_site"/am_foo.pyo
- py_installed "$py_site"/am_virtenv/__init__.py
- py_installed "$py_site"/am_virtenv/__init__.pyc
-- py_installed "$py_site"/am_virtenv/__init__.pyo
- test -f "$py_site"/libquux.a
- test -f "$py_site"/am_virtenv/libzardoz.a
- }
-@@ -138,10 +136,8 @@ check_uninstall ()
-
- test ! -e "$py_site"/am_foo.py
- py_installed --not "$py_site"/am_foo.pyc
-- py_installed --not "$py_site"/am_foo.pyo
- test ! -e "$py_site"/am_virtenv/__init__.py
- py_installed --not "$py_site"/am_virtenv/__init__.pyc
-- py_installed --not "$py_site"/am_virtenv/__init__.pyo
- test ! -e "$py_site"/libquux.a
- test ! -e "$py_site"/am_virtenv/libzardoz.a
- }
-diff --git a/t/python10.sh b/t/python10.sh
-index 4def103ff..9c7a46175 100644
---- a/t/python10.sh
-+++ b/t/python10.sh
-@@ -60,27 +60,21 @@ cwd=$(pwd) || fatal_ "getting current working directory"
- $MAKE install
- test -f "$inst/your/two.py"
- py_installed "$inst/your/two.pyc"
--py_installed "$inst/your/two.pyo"
- py_installed --not "$inst/my/one.py"
- py_installed --not "$inst/my/one.pyc"
--py_installed --not "$inst/my/one.pyo"
- $MAKE uninstall
- py_installed --not "$inst/your/two.py"
- py_installed --not "$inst/your/two.pyc"
--py_installed --not "$inst/your/two.pyo"
-
- ../configure --prefix=$cwd/"$inst" one=1
- $MAKE install
- py_installed --not "$inst/your/two.py"
- py_installed --not "$inst/your/two.pyc"
--py_installed --not "$inst/your/two.pyo"
- test -f "$inst/my/one.py"
- py_installed "$inst/my/one.pyc"
--py_installed "$inst/my/one.pyo"
- $MAKE uninstall
- py_installed --not "$inst/my/one.py"
- py_installed --not "$inst/my/one.pyc"
--py_installed --not "$inst/my/one.pyo"
-
- $MAKE disttest
-
-diff --git a/t/python12.sh b/t/python12.sh
-index d998ae8ad..cca057e6d 100644
---- a/t/python12.sh
-+++ b/t/python12.sh
-@@ -44,11 +44,10 @@ $MAKE install DESTDIR=$destdir
-
- # Perfunctory test that the files were created.
- test -f "$destdir/usr/share/my/my.py"
--pyo=$(pyc_location -p "$destdir/usr/share/my/my.pyo")
- pyc=$(pyc_location -p "$destdir/usr/share/my/my.pyc")
-
- # If DESTDIR has made it into the byte compiled files, fail the test.
--st=0; $FGREP "$destdir" "$pyc" "$pyo" || st=$?
-+st=0; $FGREP "$destdir" "$pyc" || st=$?
- test $st -eq 1
-
- :
-diff --git a/t/python3.sh b/t/python3.sh
-index 0008eadd7..131aeb48d 100644
---- a/t/python3.sh
-+++ b/t/python3.sh
-@@ -42,6 +42,5 @@ cd build
- $MAKE install
- py_installed inst/my/one.py
- py_installed inst/my/one.pyc
--py_installed inst/my/one.pyo
-
- :
---
-2.17.0
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch
b/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch
deleted file mode 100644
index 7ece18ebc30..00000000000
--- a/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN automake-1.16.1.orig/t/instmany-python.sh
automake-1.16.1/t/instmany-python.sh
---- automake-1.16.1.orig/t/instmany-python.sh 2018-02-26 21:38:28.000000000
+0100
-+++ automake-1.16.1/t/instmany-python.sh 2020-01-20 02:44:37.192352310
+0100
-@@ -21,7 +21,11 @@
- required='python'
- . test-init.sh
-
--limit=2500
-+limit=3200
-+# Let's increase the number here a bit, otherwise the __pycache__ dirs
-+# make the test fail. I know this is a hack, but does anything conform
-+# to the POSIX limit of 4096 still anyway?
-+
- subdir=long_subdir_name_with_many_characters
- nfiles=81
- list=$(seq_ 1 $nfiles)
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch
b/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch
deleted file mode 100644
index 545544d89fe..00000000000
--- a/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Lukas Fleischer
-Subject: python: Properly uninstall __pycache__ in subdirectories
-Date: Sun, 20 May 2018 17:28:51 +0200
-
-When uninstalling __pycache__ files in a subdirectory "sub", the
-Makefile incorrectly removed the files from __pycache__/sub/ instead of
-sub/__pycache__/.
-
-* lib/am/python.am (uninstall-%DIR%PYTHON): Use the correct path when
-uninstalling byte-compiled files installed in '__pycache__'
-subdirectories.
-
-Source:
https://lists.gnu.org/archive/html/automake-patches/2018-05/msg00000.html
-Reviewed-by: Andreas K. Hüttel <dilfri...@gentoo.org>
----
- lib/am/python.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff -ruN automake-1.16.1.orig/lib/am/python.am
automake-1.16.1/lib/am/python.am
---- automake-1.16.1.orig/lib/am/python.am 2018-02-26 21:38:27.000000000
+0100
-+++ automake-1.16.1/lib/am/python.am 2020-01-19 05:35:01.212177206 +0100
-@@ -97,7 +97,7 @@
- if %?INSTALL%
-
- ?FIRST?am__pep3147_tweak = \
--?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|'
-+?FIRST? sed -e 's|\.py$$||' -e
's|[^/]*$$|__pycache__/&.*.pyc\n__pycache__/&.*.pyo|'
-
- .PHONY uninstall-am: uninstall-%DIR%PYTHON
- uninstall-%DIR%PYTHON:
-@@ -116,7 +116,7 @@
- done; \
- ## This is somewhat tricky, because for newer pythons we have to take PEP-3147
- ## into account. Avoid exceeding the command-line length limit.
-- dir='$(DESTDIR)$(%NDIR%dir)/__pycache__'; \
-+ dir='$(DESTDIR)$(%NDIR%dir)'; \
- echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \
- while read files; do \
- $(am__uninstall_files_from_dir) || st=$$?; \
