commit: bd75d46ed98623712e23b29491a3fa64b6c4a1cf Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Feb 3 15:22:30 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Feb 4 21:20:44 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd75d46e
sys-devel/automake: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/3791 .../automake/files/automake-1.10.1-tests.patch | 111 --------------------- .../automake/files/automake-1.10.2-bash4.patch | 22 ---- 2 files changed, 133 deletions(-) diff --git a/sys-devel/automake/files/automake-1.10.1-tests.patch b/sys-devel/automake/files/automake-1.10.1-tests.patch deleted file mode 100644 index 02e7194..00000000 --- a/sys-devel/automake/files/automake-1.10.1-tests.patch +++ /dev/null @@ -1,111 +0,0 @@ -commit eed743342cfa0ff8cc69666243233229e7417f8f -Author: Ralf Wildenhues <[email protected]> -Date: Wed Jan 30 21:23:16 2008 +0100 - - Split instsh2.test, so that only the new part requires non-root. - - * tests/instsh2.test: Split off testing of `install-sh -C' ... - * tests/instsh3.test: ... to this new test, requiring non-root. - * tests/Makefile.am: Adjust. - * THANKS: Update. - Report by Theodoros V. Kalamatianos. - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index ec10801..8405c7a 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -293,6 +293,7 @@ install2.test \ - installdir.test \ - instsh.test \ - instsh2.test \ -+instsh3.test \ - instdat.test \ - instdat2.test \ - instexec.test \ -diff --git a/tests/Makefile.in b/tests/Makefile.in -index 6ba81ab..1bcb573 100644 ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -442,6 +442,7 @@ install2.test \ - installdir.test \ - instsh.test \ - instsh2.test \ -+instsh3.test \ - instdat.test \ - instdat2.test \ - instexec.test \ -diff --git a/tests/instsh2.test b/tests/instsh2.test -index 17b61ab..f0b729e 100755 ---- a/tests/instsh2.test -+++ b/tests/instsh2.test -@@ -1,5 +1,5 @@ - #! /bin/sh --# Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc. -+# Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc. - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -77,20 +77,6 @@ test -f d3/y - ./install-sh -T x d3 && exit 1 - ./install-sh -T x d4// && exit 1 - --# Do not change the timestamps when using -C. --echo foo >file --./install-sh -C file d1 --TZ=UTC0 touch -t $old_timestamp d1/file --./install-sh -C file d1 --is_newest file d1/file --echo foo1 >file --./install-sh -C file d1 --diff file d1/file --# Rights must be updated. --./install-sh -C -m 444 file d1 --test -r d1/file --test ! -w d1/file -- - # Ensure that install-sh works with names that include spaces - touch 'a b' - mkdir 'x y' -diff --git a/tests/instsh3.test b/tests/instsh3.test -new file mode 100755 -index 0000000..95b74c7 ---- /dev/null -+++ b/tests/instsh3.test -@@ -0,0 +1,37 @@ -+#! /bin/sh -+# Copyright (C) 2006, 2008 Free Software Foundation, Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3, or (at your option) -+# any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see <http://www.gnu.org/licenses/>. -+ -+# More install-sh checks: check -C. -+ -+required=non-root -+. ./defs || exit 1 -+set -e -+ -+./install-sh -d d1 -+ -+# Do not change the timestamps when using -C. -+echo foo >file -+./install-sh -C file d1 -+TZ=UTC0 touch -t $old_timestamp d1/file -+./install-sh -C file d1 -+is_newest file d1/file -+echo foo1 >file -+./install-sh -C file d1 -+diff file d1/file -+# Rights must be updated. -+./install-sh -C -m 444 file d1 -+test -r d1/file -+test ! -w d1/file diff --git a/sys-devel/automake/files/automake-1.10.2-bash4.patch b/sys-devel/automake/files/automake-1.10.2-bash4.patch deleted file mode 100644 index 01829ce..00000000 --- a/sys-devel/automake/files/automake-1.10.2-bash4.patch +++ /dev/null @@ -1,22 +0,0 @@ -An upstream patch to fix ksh test issues, which also affect bash 4.0 - -http://bugs.gentoo.org/263068 -http://git.savannah.gnu.org/cgit/automake.git/commit/?h=branch-1-10&id=319305db77dfdcbba3d5a1703c781750affdb20a - -2008-12-21 Ralf Wildenhues <[email protected]> - - Testsuite fix for ksh. - * tests/check10.test: Add ':' as last command in subshell, for - zero exit status of the subshell. - Missing backport from master reported by Tim Rice. - ---- a/tests/check10.test -+++ b/tests/check10.test -@@ -72,6 +72,7 @@ - env TESTS="xpass xpass2" $MAKE -e check - env TESTS='pass skip xfail' $MAKE -e check - $MAKE check -+ : - ) >stdout - cat stdout -
