From 6b3a23b766b2ee1c19712e8a5c4925b9eb1ba0dd Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Sat, 1 Sep 2018 17:19:27 +0200
Subject: [PATCH] dev-libs/apr: skip testlfs test

Test only runs on non 64-bit systems and fails due to
a Gentoo sandbox issue. To avoid requiring FEATURES=-usersandbox
for this package, we are now skipping this test.

Closes: https://bugs.gentoo.org/603244
Package-Manager: Portage-2.3.48, Repoman-2.3.10
---
 dev-libs/apr/apr-1.6.3-r2.ebuild               |  1 +
 .../apr-1.6.3-skip-known-failing-tests.patch   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 dev-libs/apr/files/apr-1.6.3-skip-known-failing-tests.patch

diff --git a/dev-libs/apr/apr-1.6.3-r2.ebuild b/dev-libs/apr/apr-1.6.3-r2.ebuild
index cdc87b36fe4f..a65df23cc468 100644
--- a/dev-libs/apr/apr-1.6.3-r2.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r2.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
 	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
 	"${FILESDIR}"/${PN}-1.6.3-fix-overflow-check-in-overflow_strfsize.patch
+	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/apr/files/apr-1.6.3-skip-known-failing-tests.patch b/dev-libs/apr/files/apr-1.6.3-skip-known-failing-tests.patch
new file mode 100644
index 000000000000..79efb502a8d0
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.6.3-skip-known-failing-tests.patch
@@ -0,0 +1,18 @@
+Skip testlfs test which only runs on non 64-bit systems and fails
+on Gentoo due to a sandbox issue. Bug #603244
+
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -172,7 +172,11 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
+ 				fi; \
+ 			done; \
+ 	        else \
+-			./$$prog -v; \
++			if test "$$prog" = 'testall@EXEEXT@'; then \
++				./$$prog -v -x testlfs; \
++			else \
++				./$$prog -v; \
++			fi; \
+ 			status=$$?; \
+ 			if test $$status != 0; then \
+ 				teststatus=$$status; \
-- 
2.26.2