[gentoo-commits] repo/gentoo:master commit in: sys-apps/coreutils/, sys-apps/coreutils/files/

[Thomas Deutschmann]

commit:     48e9dffe89142a528409ef9a57a56e4ac62bc72c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 30 01:04:14 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 01:04:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e9dffe

sys-apps/coreutils: fix sandbox-env-test.patch

I extended PR and excluded more tests. However, I overlooked
that one of these tests aren't present in 8.31.

This commit will fix previous commit a48e67d33ef6edd58b2cd6111884dbb4fdef7491
and provide two versions of the patch.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-apps/coreutils/coreutils-8.32-r1.ebuild                  |  2 +-
 .../coreutils/files/coreutils-8.31-sandbox-env-test.patch    | 12 ------------
 ...-env-test.patch => coreutils-8.32-sandbox-env-test.patch} |  0
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
index 3eac2b76aae..153e7d36ac9 100644
--- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
@@ -71,7 +71,7 @@ src_prepare() {
 
 	if ! use vanilla ; then
 		PATCHES+=( "${WORKDIR}"/patch )
-		PATCHES+=( "${FILESDIR}"/${PN}-8.31-sandbox-env-test.patch )
+		PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch )
 	fi
 
 	default

diff --git a/sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch b/sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch
index 40b1554d948..f81ea13776b 100644
--- a/sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch
+++ b/sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch
@@ -12,18 +12,6 @@ Skip tests known to fail when running under Gentoo sandbox.
  print_ver_ du
  
  require_perl_
---- a/tests/ls/removed-directory.sh
-+++ b/tests/ls/removed-directory.sh
-@@ -19,6 +19,9 @@
- # along with this program.  If not, see <https://www.gnu.org/licenses/>.
- 
- . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-+# Avoid #413621 until #548250 is resolved
-+test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)"
-+
- print_ver_ ls
- 
- case $host_triplet in
 --- a/tests/ls/stat-free-symlinks.sh
 +++ b/tests/ls/stat-free-symlinks.sh
 @@ -17,6 +17,9 @@

diff --git a/sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch b/sys-apps/coreutils/files/coreutils-8.32-sandbox-env-test.patch
similarity index 100%
copy from sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch
copy to sys-apps/coreutils/files/coreutils-8.32-sandbox-env-test.patch