commit: 1cf0eee856a8a6425af5b38a9f55cd9b24d7cefb
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 13:01:11 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 13:01:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf0eee8
sys-devel/automake: rebase patches
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-devel/automake/automake-1.11.6-r4.ebuild | 6 +++---
sys-devel/automake/automake-1.16.5-r1.ebuild | 8 ++++----
...> automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch} | 0
...omake-1.10-perl-5.16.patch => automake-1.11.6-perl-5.16.patch} | 0
...1.patch => automake-1.11.6-perl-escape-curly-bracket-r1.patch} | 0
...st.patch => automake-1.16.5-fix-instmany-python.sh-test.patch} | 0
...patch => automake-1.16.5-fix-py-compile-basedir.sh-test.patch} | 0
...1.16.2-py3-compile.patch => automake-1.16.5-py3-compile.patch} | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys-devel/automake/automake-1.11.6-r4.ebuild
b/sys-devel/automake/automake-1.11.6-r4.ebuild
index e8c72f202f6c..e8d4e6b93eda 100644
--- a/sys-devel/automake/automake-1.11.6-r4.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r4.ebuild
@@ -30,9 +30,9 @@ BDEPEND="
"
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
+ "${FILESDIR}"/${P}-perl-5.16.patch #424453
+ "${FILESDIR}"/${P}-install-sh-avoid-low-risk-race-in-tmp.patch
+ "${FILESDIR}"/${P}-perl-escape-curly-bracket-r1.patch
)
src_prepare() {
diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild
b/sys-devel/automake/automake-1.16.5-r1.ebuild
index 131a6418d150..029332afd7db 100644
--- a/sys-devel/automake/automake-1.16.5-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.5-r1.ebuild
@@ -53,11 +53,11 @@ BDEPEND="
"
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
+ "${FILESDIR}"/${PN}-1.16.5-py3-compile.patch
+ "${FILESDIR}"/${PN}-1.16.5-fix-instmany-python.sh-test.patch
+ "${FILESDIR}"/${PN}-1.16.5-fix-py-compile-basedir.sh-test.patch
# upstreamed
- "${FILESDIR}"/automake-1.16.5-apostrophe-in-tests.patch
+ "${FILESDIR}"/${PN}-1.16.5-apostrophe-in-tests.patch
)
pkg_setup() {
diff --git
a/sys-devel/automake/files/automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch
b/sys-devel/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch
similarity index 100%
rename from
sys-devel/automake/files/automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch
rename to
sys-devel/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch
diff --git a/sys-devel/automake/files/automake-1.10-perl-5.16.patch
b/sys-devel/automake/files/automake-1.11.6-perl-5.16.patch
similarity index 100%
rename from sys-devel/automake/files/automake-1.10-perl-5.16.patch
rename to sys-devel/automake/files/automake-1.11.6-perl-5.16.patch
diff --git
a/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket-r1.patch
b/sys-devel/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch
similarity index 100%
rename from
sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket-r1.patch
rename to
sys-devel/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch
diff --git
a/sys-devel/automake/files/automake-1.16.2-fix-instmany-python.sh-test.patch
b/sys-devel/automake/files/automake-1.16.5-fix-instmany-python.sh-test.patch
similarity index 100%
rename from
sys-devel/automake/files/automake-1.16.2-fix-instmany-python.sh-test.patch
rename to
sys-devel/automake/files/automake-1.16.5-fix-instmany-python.sh-test.patch
diff --git
a/sys-devel/automake/files/automake-1.16.2-fix-py-compile-basedir.sh-test.patch
b/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
similarity index 100%
rename from
sys-devel/automake/files/automake-1.16.2-fix-py-compile-basedir.sh-test.patch
rename to
sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
diff --git a/sys-devel/automake/files/automake-1.16.2-py3-compile.patch
b/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
similarity index 98%
rename from sys-devel/automake/files/automake-1.16.2-py3-compile.patch
rename to sys-devel/automake/files/automake-1.16.5-py3-compile.patch
index 7924f204ad4f..5333520b5db1 100644
--- a/sys-devel/automake/files/automake-1.16.2-py3-compile.patch
+++ b/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
@@ -68,6 +68,6 @@ index e56d98d6e..5b9ae5d5d 100755
+ py_compile.compile(filepath, $import_call(filepath), path)
else:
py_compile.compile(filepath, filepath + 'o', path)
- sys.stdout.write('\n')" 2>/dev/null || :
+ sys.stdout.write('\n')" 2>/dev/null || exit $?
--
2.25.2
