gentoo resync : 15.12.2019

12 files changed, 2 insertions, 580 deletions

diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 495ee563d856..38f01767a3da 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,21 +1,8 @@
 AUX keyutils-1.5.10-disable-tests.patch 1214 BLAKE2B ac79e98a45b02575433e3604a04b1597a386b96f45d872f175dbd36d134d9aa5cf44f0dd4a3a4b9bea38c9986a85a9d60b45f7f4a7576d19a6a5c369bea1ce4c SHA512 dda49b7c3aeadcd7d4e52d304ecf60fedbb84d02a11d0a641dfa4d563c6f6fcc2c577b46eb688c159feaf0be32c0aff4470adec5d1c3bff544d5dcea47162cbe
-AUX keyutils-1.5.10-endian-check-1.patch 796 BLAKE2B 1860c4fdb076a34127be13546007832d4b4b6a23e2033f39cdfafd84207c96d854df199a8831d7e11e0a17aedb16193483a7470d7449f11101f0a6e268f668ed SHA512 56c22165fb69c24381384e81e2927f01054cf6ba7c781c02d0891b6d55a405d63aa542d846a809a7c0ea1ae29d2b44d711890d72ce1fb18eb6146adc0ad1e9d6
-AUX keyutils-1.5.10-makefile-fixup.patch 798 BLAKE2B 42dec4f0a6b8439a631e1dbe319a893379e719b640ab2908da28f251bf837efa5d1b85d2d265250cd8248f4c3b24a02b99e0afd021ec2f203bcee4c071eeb244 SHA512 76b1eb98157f2f45b9acce9fd99f2fb10d592cfe61463075a8f6b963ffa2ab97f44aa3e5a3cc7bacaf53d08f51e81225506324edb6d3fa7d5c51954fce783e1e
-AUX keyutils-1.5.10-silence-rpm-check.patch 605 BLAKE2B 7f18a8e8530fc7ca13522bb1cfe3066c980cf9a0dab4d390a28adbd0e34fdf5011de5b14cbfedb26f3c99d6e7cdd7f3b85d29ffd64e33da2df4e7752a8989e26 SHA512 4d9f0c177be36b29fc9e23f56b964d47d4dda89c80f78c4a46c5725614816934b656dc83cf4b6920df72eaf0b9c4fe10825c7cca8fb4363277aa45befa816fa9
-AUX keyutils-1.5.5-makefile-fixup.patch 879 BLAKE2B a4c5fe84445c638e126dc017a2caf05e97803d83a21706cec4ca116982f2111d54acdcf76cff63684dd50bbe8cdd38fbde1b18b7c73f82a8d943a1558c3d377b SHA512 d3628be5cd759fd59e3fb07897db2f23615cc4b2b12d537438c4c186e5588d8d7c22438fdb26003be29ace4910db24a889d4e35550b74a91958a4fcb4bc654c0
-AUX keyutils-1.5.9-disable-tests.patch 1146 BLAKE2B 8f4206d5c46e735e51172cc470c52c0f1326d392c05fdb2c5a8885e79e3c9108336ffaff778b0953a274c161e0bde4a4f23048c5e12e220ad996b916711be638 SHA512 cae4f6457587328efba4d391726d8ca61a7d4a2ca0fbf2b8eb6ccfadce53240ad9cb44137dc178efe7cfa78bef48d6d84fffd7af07cee15a949f5c62eae493e2
-AUX keyutils-1.5.9-endian-check-1.patch 1254 BLAKE2B b4416a587c208f7e8926c205a0a565495e7508df5245466bcd8abc4f7a19214626da759d0321d7db1d51f2e4553383d5475749ea8f9f6d58ad8749762f56d6ad SHA512 95f05393186546ff3b28e14184c8da6d507085e687e6921470bcb433a925b56dfc7b806eaf63a552552d0cad3a73294614f990db583e3a6b89ff973ffad1dce6
-AUX keyutils-1.5.9-endian-check-2.patch 1131 BLAKE2B a5fd6fd62dd94be2bb23b3b60cedd1b8d6d3b06bdd32fcbbdcbdbc08150484eb6122271f20432bad3fa8697e626676c329ba08bf23d4a31788949b0c2bf7aede SHA512 9604b79b1d85bb1c56f5ca261f7f72fe84176fff0a098ce2fa35bb0ab5b325a7613f3e37f5f27ff1e9269d5779d77715baa0bd74a0d4f0b7c9bb1aa27b84b214
 AUX keyutils-1.5.9-header-extern-c.patch 1154 BLAKE2B df4ecd72145c8634b2ea043e45e05ca95374234a0aa2babf0eaabfd429997c96099f6698d33104ad45cb9e90a83316a2db93b0f73b9138be7618591bc1b1e235 SHA512 f6e91c6eb9785ff8e661fc80ab275a3a35d87cfc73ab9cc45195734aaa5126e5ddc219dce8a78834869b67448a730265f2b72390f0b517dedf6c729bf22d828e
 AUX keyutils-1.6-endian-check-1.patch 1152 BLAKE2B 7614e1b72ae012f1d3126a2edfd26b17bdc80621c4197c3f7a2e47c3cdb9fd703fe92adfb5da419775d4b4bb334ffe7fb57e26645a8fc201568f070b11cdd923 SHA512 f7d5423173c0e65080931653604d9179a9c6dbc4e22c7e62b67685d444e81b33a2a61d26906e47987521a61e28c199fe4ab4fc7f9ba8cacd2faf00bc443259c1
 AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba833cae1a5e4b7c6975fc88e6848ba76ee30e0c59a42ee2110b9874da5db8e60880265f93798abe55f6a12e71346a6b01de SHA512 4becdbc7b1a68b3e6e8e32b2d08005e435f838d02a3406757216717ec82712f181ff0a32397c995b36264469e29cf39fe9311a762e62427f4507f94418c9400b
 AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8ff4c259ff9ef8ce775f350765cc20bd9b990a2eadedd60745e1c3c31e682b12af0d945b9422f8c2a989f72ccdc56b67b60f8244 SHA512 cd6b0472475089e522c796a33eb1dffe8a6fcf4e3a515d4e379e46b4a82c8b92216ec00fe9a6f4c88e318f6e397aca625040537eed83e0ce30278b9e810fedc9
-DIST keyutils-1.5.11.tar.bz2 87644 BLAKE2B 1a601b7036bcfe69b6272ae2b4fad44cbb22877aa94722fa26460f8addf105ff8898e851ad7c4f28bc755f7fe293c74bc70cffbe877978e462bc21c428c9a11d SHA512 5f0dc5d5ceb673cf0ba71d3a0b525d09adc8d501a795372aa3dc29215ef393cb8577c72051cecabdb9a46dca4fcaa11e629291fb857290872475a7e445f47d43
-DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
 DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9 SHA512 a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2
-DIST keyutils-1.6.tar.bz2 93973 BLAKE2B 250275852d13fb5f77786350e64175c9c0909d1a7e44750e44b09f79217acb9c40536bd61e15d1abdfe36b9e161832f4c59f11b73915d457356a273ad4999990 SHA512 ee50da165099ea26904066d24b27c5165cb1eb78df6768cba3a534aa318a5c8d926ec6e5322a38c8cedaa768cd79bdcb26ef918aa8447df2e5dfbbe7b8f200ff
-EBUILD keyutils-1.5.11-r1.ebuild 3820 BLAKE2B d929dd8276d16e2f2cd38f6e815bf5fa63c43e20699ab69523d291ff88e2bac54386d7db45626564b50205f3e3943185a1066f9af1fc781bcef437f739cae244 SHA512 390277040f96c6ccd9b7d8a329e66c09fda691762e8c479e4f6c18cba6a02c718e139c9ea074ec678f4c7bc0e8b3f5d66e4a5eb758c93e02ecbb468e8cc3f6d4
-EBUILD keyutils-1.5.9-r4.ebuild 2986 BLAKE2B 75f613871ba022cc24deebd12dea2cb0dee06db56477c96693c59b65fa4f63c33c212af624ac73bc4ad1c34aadc12783867821300cde0b2d49426e31401ac42f SHA512 bf13e04b7e089a1cedbd3a9f12a941066043352ad66128d6ba7a02149ff0e54b2030e81c93556f805fd2d5b286df121e20ecff7d06bd02d1a5852321b83558aa
-EBUILD keyutils-1.6.1.ebuild 3854 BLAKE2B def1bd28c663309d7741660db52de2eda58492903c65d92a59cfb4278861f86f9980f90cc78d6b3b0eb882877e5efa69da1d1f8f64dcaad3014b6a7c74036803 SHA512 c585bd4a530b98916c91cdfa8f44f9908b5fc3b9177ba72143c222299351503b268d65e643c8f0b2d9680fab9d52742a9d33a37ade62829aaae0bc28b0ba5f69
-EBUILD keyutils-1.6.ebuild 3805 BLAKE2B 9bfc8ac3ae965220f36b021b4dc2373e911387097aaa7f828334fa661964577a23bb6cf97818f7225f38de279d16b7d1fad8e96131482288e885e094e14d5402 SHA512 c35a43569ff5bfced26b1be0813d4f6420c12268af2be95294b5dbf53a0ca87887668f4aa8dc733d81ddc40f012cd179806c84697e82581f3f594ac4fd6b4018
+EBUILD keyutils-1.6.1.ebuild 3881 BLAKE2B a4d2e8b5706b3f7cf6d9536a1e6a90c81c1590860244e4a132a670efa24211e822ec6aa469851be226c7d52b4575cf0c0b11ee1ff3d8d3b32593ec5b322e141f SHA512 40f28d6f85afc9a248b7d8e467bfe7e2e2feb93418f4800d3bc3680f702116b18b86e0a79468df27f5ee99e0f238722e97f879eeee060c16caf799c08e2ff9ff
 MISC metadata.xml 424 BLAKE2B f4eb452bb90bf6b62f39d726bae137111c6fca619076888bb475bd2fb042e23db8f5d94240901d36a0c2f15a5774728429e2db2689dbad9ef4bb6d54b0a19b1f SHA512 211515865fbe17798b072bde0c699b67ec10e0716bad11224a3f1e00a729feea67b015cec4e8d870fa708179884176ee0799aee6d237cb4f2798f54a28c8042e
diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch b/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch
deleted file mode 100644
index 99cf23fbb21f..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-fix regexp match against `file /proc/$$/exe` for -fPIE bash
-Now that bash is built with PIE enabled, keyutils' check for endianness
-fails because file no longer returns "executable", but instead returns
-"shared object" for file << 5.33 and "pie executable" for file >= 5.33.
-
---- a/tests/toolbox.inc.sh
-+++ b/tests/toolbox.inc.sh
-@@ -13,10 +13,10 @@
- echo === $OUTPUTFILE ===
- 
- endian=`file -L /proc/$$/exe`
--if expr "$endian" : '.* MSB \+\(executable\|shared object).*' >&/dev/null
-+if expr "$endian" : '.* MSB \+\(executable\|shared object\|pie executable\).*' >&/dev/null
- then
-     endian=BE
--elif expr "$endian" : '.* LSB \+\(executable\|shared object\).*' >&/dev/null
-+elif expr "$endian" : '.* LSB \+\(executable\|shared object\|pie executable\).*' >&/dev/null
- then
-     endian=LE
- else
diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-makefile-fixup.patch b/sys-apps/keyutils/files/keyutils-1.5.10-makefile-fixup.patch
deleted file mode 100644
index c37cca0dbfd7..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.10-makefile-fixup.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 19b92eb56ca53cb4967e7bd27e3bc5e3b0e29736 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 16 Mar 2017 09:55:42 +0100
-Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 824bbbf..8ce3a13 100644
---- a/Makefile
-+++ b/Makefile
-@@ -167,7 +167,7 @@ ifeq ($(NO_SOLIB),0)
- 	$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
- 	$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
- 	mkdir -p $(DESTDIR)$(USRLIBDIR)
--	$(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
-+	$(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
- endif
- 	$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
- 	$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
--- 
-2.12.0
-
diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch b/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch
deleted file mode 100644
index dafd7de8dd91..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Hide
-
-> grep: /etc/rpm: No such file or directory
-> grep: /usr/lib/rpm: No such file or directory
-
-errors.
-
-Bug: https://bugs.gentoo.org/656446
-
---- a/Makefile
-+++ b/Makefile
-@@ -245,7 +245,7 @@ SRCBALL	:= rpmbuild/SOURCES/$(TARBALL)
- ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL)
- 
- BUILDID	:= .local
--dist	:= $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm))
-+dist	:= $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm 2>/dev/null))
- release	:= $(word 2,$(shell grep ^Release: $(SPECFILE)))
- release	:= $(subst %{?dist},$(dist),$(release))
- release	:= $(subst %{?buildid},$(BUILDID),$(release))
diff --git a/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch b/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch
deleted file mode 100644
index ff4bcfa94d85..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Raw patch edit based on:
-
-From af14e945bd617bb82ebc4c6c8d4fb948d715f16a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 2 Sep 2011 13:30:30 -0400
-Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils
-
----
- Makefile |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 9e3fa9b..46695d1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -91,7 +91,7 @@
- 	$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
- 	$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
- 	mkdir -p $(DESTDIR)$(USRLIBDIR)
--	$(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
-+	$(LNS) $(SONAME) $(DESTDIR)$(LIBDIR)/$(DEVELLIB)
- 	$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
- 	$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
- 	$(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh
--- 
-1.7.6
-
diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-disable-tests.patch b/sys-apps/keyutils/files/keyutils-1.5.9-disable-tests.patch
deleted file mode 100644
index 0a5a02b3a484..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.9-disable-tests.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-disable tests that mess with system wide settings
-
-https://bugs.gentoo.org/519062
-
---- a/tests/bugzillas/bz1031154/runtest.sh
-+++ b/tests/bugzillas/bz1031154/runtest.sh
-@@ -11,6 +11,8 @@
- result=PASS
- echo "++++ BEGINNING TEST" >$OUTPUTFILE
- 
-+if false; then
-+
- # we need a reference time to scan the audit log from so as not to pick up old
- # results from this test.
- base_date=`date +"%x@%X"`
-@@ -81,6 +83,10 @@
- 	fi
- fi
- 
-+else
-+marker "Gentoo: skipping test due to system wide modifications"
-+fi
-+
- echo "++++ FINISHED TEST: $result" >>$OUTPUTFILE
- 
- # --- then report the results in the database ---
-
-https://bugs.gentoo.org/522050
-
---- a/tests/keyctl/padd/useradd/runtest.sh
-+++ b/tests/keyctl/padd/useradd/runtest.sh
-@@ -40,6 +40,8 @@
- marker "UNLINK KEY"
- unlink_key $keyid @s
- 
-+if false; then
-+
- # add keys with huge payloads
- old_root_quota=`cat /proc/sys/kernel/keys/root_maxbytes`
- if [ $old_root_quota -lt 65536 ]
-@@ -76,6 +78,10 @@
-     sleep 1
- fi
- 
-+else
-+marker "Gentoo: skipping test due to system wide modifications"
-+fi
-+
- echo "++++ FINISHED TEST: $result" >>$OUTPUTFILE
- 
- # --- then report the results in the database ---
diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-1.patch b/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-1.patch
deleted file mode 100644
index 18344b94940e..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-1.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-patch from upstream
-
-https://bugs.gentoo.org/426424
-
-From f0d9a8c15f1525d0404077f32fddccb606a61bac Mon Sep 17 00:00:00 2001
-From: Tyler Hicks <tyhicks@canonical.com>
-Date: Mon, 24 Feb 2014 18:52:41 -0600
-Subject: [PATCH] TEST: Make endianness detection work with file 5.14
-
-The 5.14 release of file outputs an extra space after [LM]SB:
-
-$ ./src/file -m magic/magic.mgc -L /proc/$$/exe
-/proc/12755/exe: ELF 64-bit LSB  executable, ...
-
-This was due to the elf magic file containing some trailing spaces in
-the 5.14 release.
-
-Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
-Signed-off-by: David Howells <dhowells@redhat.com>
----
- tests/toolbox.inc.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh
-index cbc49e0fce23..fe3c7f71299a 100644
---- a/tests/toolbox.inc.sh
-+++ b/tests/toolbox.inc.sh
-@@ -17,10 +17,10 @@ includes=${includes%/*}/
- echo === $OUTPUTFILE ===
- 
- endian=`file -L /proc/$$/exe`
--if expr "$endian" : '.* MSB executable.*' >&/dev/null
-+if expr "$endian" : '.* MSB \+executable.*' >&/dev/null
- then
-     endian=BE
--elif expr "$endian" : '.* LSB executable.*' >&/dev/null
-+elif expr "$endian" : '.* LSB \+executable.*' >&/dev/null
- then
-     endian=LE
- else
--- 
-2.11.0
-
diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-2.patch b/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-2.patch
deleted file mode 100644
index bc96dae464b8..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-patch from upstream
-
-https://bugs.gentoo.org/426424
-
-From ce92e974b8ecff19cf430b7b58a09b8190645b5c Mon Sep 17 00:00:00 2001
-From: David Howells <dhowells@redhat.com>
-Date: Fri, 26 Feb 2016 10:07:00 +0000
-Subject: [PATCH] TEST: Fix endianness determination
-
-Endianness determination was broken sometime after Fedora 20 when
-executables switched to being DYN objects rather than EXEC objects.  This
-caused the output of file to change.
-
-Signed-off-by: David Howells <dhowells@redhat.com>
----
- tests/toolbox.inc.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh
-index f2463c57b40e..5ac23ffc04fb 100644
---- a/tests/toolbox.inc.sh
-+++ b/tests/toolbox.inc.sh
-@@ -13,10 +13,10 @@
- echo === $OUTPUTFILE ===
- 
- endian=`file -L /proc/$$/exe`
--if expr "$endian" : '.* MSB \+executable.*' >&/dev/null
-+if expr "$endian" : '.* MSB \+\(executable\|shared object\).*' >&/dev/null
- then
-     endian=BE
--elif expr "$endian" : '.* LSB \+executable.*' >&/dev/null
-+elif expr "$endian" : '.* LSB \+\(executable\|shared object\).*' >&/dev/null
- then
-     endian=LE
- else
--- 
-2.11.0
-
diff --git a/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild b/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
deleted file mode 100644
index d133ff0065c1..000000000000
--- a/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs linux-info multilib-minimal usr-ldscript
-
-DESCRIPTION="Linux Key Management Utilities"
-HOMEPAGE="https://people.redhat.com/dhowells/keyutils/"
-SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/1.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static static-libs test"
-
-RDEPEND=""
-DEPEND="app-crypt/mit-krb5
-	!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.10-endian-check-1.patch
-	"${FILESDIR}"/${PN}-1.5.10-makefile-fixup.patch
-	"${FILESDIR}"/${PN}-1.5.10-silence-rpm-check.patch #656446
-	"${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
-	"${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
-)
-
-pkg_setup() {
-	# To prevent a failure in test phase and false positive bug reports
-	# we are enforcing the following options because testsuite expects
-	# that these options are available. I.e. testsuite only decides based
-	# on kernel version which tests will be called, no feature checking.
-	if use test ; then
-		CONFIG_CHECK="KEYS"
-		ERROR_KEYS="You must have CONFIG_KEYS to run the package testsuite!"
-
-		if kernel_is -ge 2 6 10 && kernel_is -lt 4 0 0 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} KEYS_DEBUG_PROC_KEYS"
-			ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
-		fi
-
-		if kernel_is -ge 4 7 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
-			ERROR_KEY_DH_OPERATIONS="You must have CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
-		fi
-	else
-		CONFIG_CHECK="~KEYS"
-		ERROR_KEYS="You will be unable to use this package on this system because CONFIG_KEYS is not set!"
-
-		if kernel_is -ge 4 7 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
-			ERROR_KEY_DH_OPERATIONS="You will be unable to use Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
-		fi
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# The lsb check is useless, so avoid spurious command not found messages.
-	sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
-	# All the test files are bash, but try to execute via `sh`.
-	sed -i -r \
-		-e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
-		tests/{Makefile*,*.sh} || die
-	find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} +
-	# Some tests call the kernel which calls userspace, but that will
-	# run the install keyutils rather than the locally compiled one,
-	# so disable round trip tests.
-	rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC
-	sed -i \
-		-e "1iRPATH = $(usex static -static '')" \
-		-e '/^C.*FLAGS/s|:=|+=|' \
-		-e 's:-Werror::' \
-		-e '/^BUILDFOR/s:=.*:=:' \
-		-e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
-		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
-		-e "s: /: ${EPREFIX}/:g" \
-		-e '/^NO_ARLIB/d' \
-		Makefile || die
-
-	# We need the static lib in order to statically link programs.
-	if use static ; then
-		export NO_ARLIB=0
-		# Hack the progs to depend on the static lib instead.
-		sed -i \
-			-e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) $(SONAME):' \
-			Makefile || die
-	else
-		export NO_ARLIB=$(usex static-libs 0 1)
-	fi
-	emake
-}
-
-multilib_src_test() {
-	# Execute the locally compiled code rather than the
-	# older versions already installed in the system.
-	LD_LIBRARY_PATH=${BUILD_DIR} \
-	PATH="${BUILD_DIR}:${PATH}" \
-	emake test
-}
-
-multilib_src_install() {
-	# Possibly undo the setting for USE=static (see src_compile).
-	export NO_ARLIB=$(usex static-libs 0 1)
-
-	default
-	use static || gen_usr_ldscript -a keyutils
-}
-
-multilib_src_install_all() {
-	dodoc README
-}
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
deleted file mode 100644
index dfe742f2070a..000000000000
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib eutils toolchain-funcs linux-info multilib-minimal usr-ldscript
-
-DESCRIPTION="Linux Key Management Utilities"
-HOMEPAGE="https://people.redhat.com/dhowells/keyutils/"
-SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static static-libs test"
-
-RDEPEND=""
-DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
-
-pkg_setup() {
-	CONFIG_CHECK="~KEYS"
-	ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
-
-	if use test && kernel_is lt 4 0 0; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
-		ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
-	fi
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch
-	epatch "${FILESDIR}"/${PN}-1.5.9-endian-check-{1,2}.patch #426424
-	epatch "${FILESDIR}"/${PN}-1.5.9-disable-tests.patch #519062 #522050
-	epatch "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
-
-	# The lsb check is useless, so avoid spurious command not found messages.
-	sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
-	# All the test files are bash, but try to execute via `sh`.
-	sed -i -r \
-		-e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
-		tests/{Makefile*,*.sh} || die
-	find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} +
-	# Some tests call the kernel which calls userspace, but that will
-	# run the install keyutils rather than the locally compiled one,
-	# so disable round trip tests.
-	rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
-
-	# Delete man pages that are included in the common package now. #612640
-	rm man/*-keyring.7 man/keyrings.7 || die
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC
-	sed -i \
-		-e "1iRPATH = $(usex static -static '')" \
-		-e '/^C.*FLAGS/s|:=|+=|' \
-		-e 's:-Werror::' \
-		-e '/^BUILDFOR/s:=.*:=:' \
-		-e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
-		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
-		-e "s: /: ${EPREFIX}/:g" \
-		-e '/^NO_ARLIB/d' \
-		Makefile || die
-
-	# We need the static lib in order to statically link programs.
-	if use static ; then
-		export NO_ARLIB=0
-		# Hack the progs to depend on the static lib instead.
-		sed -i \
-			-e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB):' \
-			Makefile || die
-	else
-		export NO_ARLIB=$(usex static-libs 0 1)
-	fi
-	emake
-}
-
-multilib_src_test() {
-	# Execute the locally compiled code rather than the
-	# older versions already installed in the system.
-	LD_LIBRARY_PATH=${BUILD_DIR} \
-	PATH="${BUILD_DIR}:${PATH}" \
-	emake test
-}
-
-multilib_src_install() {
-	# Possibly undo the setting for USE=static (see src_compile).
-	export NO_ARLIB=$(usex static-libs 0 1)
-
-	default
-	use static || gen_usr_ldscript -a keyutils
-}
-
-multilib_src_install_all() {
-	dodoc README
-}
diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index d6bea1f56a1a..b69a471cf390 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
diff --git a/sys-apps/keyutils/keyutils-1.6.ebuild b/sys-apps/keyutils/keyutils-1.6.ebuild
deleted file mode 100644
index b09c313644d6..000000000000
--- a/sys-apps/keyutils/keyutils-1.6.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs linux-info multilib-minimal usr-ldscript
-
-DESCRIPTION="Linux Key Management Utilities"
-HOMEPAGE="https://people.redhat.com/dhowells/keyutils/"
-SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/1.8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static static-libs test"
-
-RDEPEND=""
-DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6-endian-check-1.patch
-	"${FILESDIR}"/${PN}-1.6-makefile-fixup.patch
-	"${FILESDIR}"/${PN}-1.5.10-silence-rpm-check.patch #656446
-	"${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
-	"${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
-)
-
-pkg_setup() {
-	# To prevent a failure in test phase and false positive bug reports
-	# we are enforcing the following options because testsuite expects
-	# that these options are available. I.e. testsuite only decides based
-	# on kernel version which tests will be called, no feature checking.
-	if use test ; then
-		CONFIG_CHECK="KEYS"
-		ERROR_KEYS="You must have CONFIG_KEYS to run the package testsuite!"
-
-		if kernel_is -ge 2 6 10 && kernel_is -lt 4 0 0 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} KEYS_DEBUG_PROC_KEYS"
-			ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
-		fi
-
-		if kernel_is -ge 4 7 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
-			ERROR_KEY_DH_OPERATIONS="You must have CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
-		fi
-	else
-		CONFIG_CHECK="~KEYS"
-		ERROR_KEYS="You will be unable to use this package on this system because CONFIG_KEYS is not set!"
-
-		if kernel_is -ge 4 7 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
-			ERROR_KEY_DH_OPERATIONS="You will be unable to use Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
-		fi
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# The lsb check is useless, so avoid spurious command not found messages.
-	sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
-	# All the test files are bash, but try to execute via `sh`.
-	sed -i -r \
-		-e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
-		tests/{Makefile*,*.sh} || die
-	find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} + || die
-	# Some tests call the kernel which calls userspace, but that will
-	# run the install keyutils rather than the locally compiled one,
-	# so disable round trip tests.
-	rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC
-	sed -i \
-		-e "1iRPATH = $(usex static -static '')" \
-		-e '/^C.*FLAGS/s|:=|+=|' \
-		-e 's:-Werror::' \
-		-e '/^BUILDFOR/s:=.*:=:' \
-		-e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
-		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
-		-e "s: /: ${EPREFIX}/:g" \
-		-e '/^NO_ARLIB/d' \
-		Makefile || die
-
-	# We need the static lib in order to statically link programs.
-	if use static ; then
-		export NO_ARLIB=0
-		# Hack the progs to depend on the static lib instead.
-		sed -i \
-			-e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) $(SONAME):' \
-			Makefile || die
-	else
-		export NO_ARLIB=$(usex static-libs 0 1)
-	fi
-	emake
-}
-
-multilib_src_test() {
-	# Execute the locally compiled code rather than the
-	# older versions already installed in the system.
-	LD_LIBRARY_PATH=${BUILD_DIR} \
-	PATH="${BUILD_DIR}:${PATH}" \
-	emake test
-}
-
-multilib_src_install() {
-	# Possibly undo the setting for USE=static (see src_compile).
-	export NO_ARLIB=$(usex static-libs 0 1)
-
-	default
-	use static || gen_usr_ldscript -a keyutils
-}
-
-multilib_src_install_all() {
-	dodoc README
-}