gentoo resync : 18.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-18 11:06:49 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-18 11:06:49 +0000
commit: ab3da91fb6c91a9df52fff8f991570f456fd3c7a (patch)
tree: e8f3bfa2c6c3d20ec3b9c352c839e23949068b6b /sys-libs
parent: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (diff)
48 files changed, 158 insertions, 1156 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index bdd922de7425..fa974b2da3b9 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index d6979e7cd979..f5add60839fb 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -67,7 +67,7 @@ EBUILD db-1.85-r4.ebuild 1306 BLAKE2B ecd0cc2b53b8ef0a1cf0a0b3934d41d0f45e190dd6
 EBUILD db-18.1.32.ebuild 6940 BLAKE2B 869d66cd41771a5fb8ca879079c3c166645b6047d75429c0f12e55e975fc784d7acdbf69cbbc6e46940583cd840896d39368840d3d466f5e54cf3ef2f11c3c04 SHA512 d741d0203a37cc47cbff6adbc2d2072130823f54be2d50096191307b4b88ff62d660884ea2b5d701a3ee86ec9a2d17490a6635628298751d3d1aa5917ca9e434
 EBUILD db-18.1.40.ebuild 6771 BLAKE2B b9bd4262dc684c638db48d8739a374c28879eeb4a26ebbf5ab5954264008643fba6abaa91c5cb2484c2220aee0dcfcc410f22b8d117a6762795ee7741cb60d8f SHA512 b2721666e9deba98d0309f7db173fe112cc7d27465904da62bad0519617c596ffe267eba7a5304c83ac6c6c1b88102c87a69c6b0df4de145fc8104becba649c1
 EBUILD db-3.2.9_p2-r1.ebuild 4898 BLAKE2B ed7d56c9bfa4593755cfd5f769a099f6fdb4e2a091f938501be28fcc0a2e96c1642be763a4bffe0ea992b4063cf3b64f3f92999b88755fe4f43344a113803b71 SHA512 acadbbd870165059a9cf640126679974eb7034d53b878ca71a5117d3792f8224a7806a02c31a5b34619b60f6a733344d9ffebf0a19f3e65d3afd3fb98546e045
-EBUILD db-4.2.52_p5-r3.ebuild 4628 BLAKE2B c0091684c0b7b0fff8a3bcb5079e1407a8b8df8d948f2bdac41ed805cf12ca748ea51ca693be9bb33807056f95c05bd2ff6f2cd0b6a6d9dc799d61802a943ee9 SHA512 d124c6d5a71fd813e368550ff096fa1ed4d20cac6cffd40942d682f77c54a5e56ecfdfa5843ca1faed65c4e54513e083ebc730f46e159427260073f16d889a8e
+EBUILD db-4.2.52_p5-r3.ebuild 4639 BLAKE2B 3a3d88d2be0361e9a80ac746bcaddceee73cc0e316c4994f25a6af08e66779bf3f7b54afda8ddb32c7516b9a500488ebd90b86f57b538610bc0ff1ea9f27951a SHA512 e806042667d98fc9f37f22980acc8e9ede0730363dc657c2e49e5aad597f47c05cfb35acd5286a22063697260a5c7f4ad0c32968ed88fec21ba9eff6365bca64
 EBUILD db-4.3.29_p1-r3.ebuild 4538 BLAKE2B 96c516cff7265d233970675813e8baad5f348fca381ebc600cb7c6566bcc1bd4782098117e18ec24322b0d106c5edbd49e32367035a6174376b3e56bbffb8007 SHA512 508347615aa4de923ade8124e9697102b5fc40ed2dbde727dbc7ebd82fbfc4ae5600f92ee437d5b66da00ccbdafeec01a912f6755f708c65b2b8693b156c8169
 EBUILD db-4.4.20_p4-r3.ebuild 4427 BLAKE2B d50b789a433d466e1bc72625aae2f759121ff47048e248c8b42911907714035411f31affd7314a4dec2f19e941e75156a07e6120e3cc54f991495af6f21aaadc SHA512 f67c3d6a7e4350d1ba4c641abfa96ab909a8083fcaabbcbd2d8b6d10155a3c5775edc2f2a9f676c433922b5620f4832eaf6322f7a63782ae09611767306af682
 EBUILD db-4.5.20_p2-r3.ebuild 4666 BLAKE2B a614fa3f48db7e280387faf5e4fd426c5f70d979e1c09183818347b37401e3f415ccf7af0193dfde54ec0356b9f19af21b1ad75cbafd941bc4427b9abdff817d SHA512 38c027d8eb609d4ca573d4bd380bba37f70470a73fe18359354902ace847e8cae06809a258602f60de0f63fbe9e014139ec11119cdc0a978c5ec236d2078d49a
@@ -85,5 +85,5 @@ EBUILD db-5.3.28-r5.ebuild 7223 BLAKE2B 7c8a59c326a0f421bf21cabe2e8177460c48c570
 EBUILD db-6.0.35-r2.ebuild 7133 BLAKE2B a8402401fd22d8c1d09094fe1ee01f887cb13a16ca73917f8147a57646c377661e0c4e3bef770e9e9d8addee01a9b70484a33b53d13814dd9cce910e1d6efa4c SHA512 05a4722efd0b38d20a565e548697b9e13d014939777698d19b38db4ba80ca3a042d89024750fb950ea41771b8abdfb1acbe938d172dcbad6a16ffaf21eba6deb
 EBUILD db-6.0.35-r3.ebuild 7218 BLAKE2B c6453cda0ab007727b863519403a92fd8cfb984dee7a8a88102e8ba1f2d7a853ec64a62f540acd5b082dce87419ab77e3083ed2bf81bed6ccce486f71a684bcf SHA512 ba3f614f8d6e2adb3abf3c4aed96ca5e88379a13ffe3233fd8edfd191211614f416cf5527047340f561275d275af8297b9539b39988d9abe345bc35e15a7d600
 EBUILD db-6.1.38.ebuild 6989 BLAKE2B ba7118aeac3d04c88e1b471d8d56c82d818d5abfc1c82fe5d582caa8efeece7daf6818b05b64526780d4ff1578938e1141ab45a33844734d1456297f72e4ccd7 SHA512 90bff446525f6c051816dfdc5c3f406f62413360cad570d43404c23b6ea94be3cbcac54ac57ef804eb505b9269caef17128f906995bdf5a986a26ee15c633ecd
-EBUILD db-6.2.38.ebuild 6992 BLAKE2B 9839ba0cd1320d025221c2234edb4e2e6e8841f626ccde86637f1ca161a8b7624233041b9f3de328d267ca479c26f73cdee1aa11a99676d67bbef5de3bdcb10c SHA512 1c2a1e099ee8ab19a9bfe184af445f48f2f1145b0d1d2c925c7b4dac9f2897e60294ecde0f7690ced541791f2da2fd2adf51bb3bd37aff299fc419201697e065
+EBUILD db-6.2.38.ebuild 7180 BLAKE2B 77945f4ecb7980ac47c8f748cfc9c4f265126e873ce6a0100de9e9d10bb2eafa1161aa9790c7c9677d2ee455c75fecca28372563a2fba9efb99c97b65946a716 SHA512 b2fb9f168a2c29709c8617a61242a2503c44ebe904f3d42fae8e58e01315cbf7d8369614ace6d6f429a60a3eb68fb5774945afd7625bd214dc94f0dd74ad89f4
 MISC metadata.xml 1260 BLAKE2B e98fbefa3a80d0fa577c4b5afdda7652db360f86026c356e2f52581189d63a492747857acd8b8f2627a184580a6a98b3c6d144d209e08850cd6e89581e169a68 SHA512 63b883d28b987d8fdc58399d6ed5d942fad361c75cfb62a39dce7d50b155ecba82c17139542d1311effb061e535077a1903052b7f5c2bd3700464af77ef39fa0
diff --git a/sys-libs/db/db-4.2.52_p5-r3.ebuild b/sys-libs/db/db-4.2.52_p5-r3.ebuild
index dd191ead6b9f..9280a2a20aeb 100644
--- a/sys-libs/db/db-4.2.52_p5-r3.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r3.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/db/db-6.2.38.ebuild b/sys-libs/db/db-6.2.38.ebuild
index 091651e008b5..7f8d9f870aed 100644
--- a/sys-libs/db/db-6.2.38.ebuild
+++ b/sys-libs/db/db-6.2.38.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
@@ -38,7 +38,8 @@ REQUIRED_USE="test? ( tcl )"
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jdk-1.5 )
-	>=sys-devel/binutils-2.16.1"
+	kernel_linux? ( >=sys-devel/binutils-2.16.1 )
+	kernel_SunOS? ( >=sys-devel/binutils-2.16.1 )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jre-1.5 )"
 
@@ -148,7 +149,7 @@ multilib_src_configure() {
 
 	# Add linker versions to the symbols. Easier to do, and safer than header file
 	# mumbo jumbo.
-	if use userland_GNU ; then
+	if use kernel_linux || use kernel_SunOS; then
 		append-ldflags -Wl,--default-symver
 	fi
 
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 8bcc6f529e98..9e6bd1ec6da0 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,4 +1,5 @@
 AUX gdbm-1.18.1-gcc-10.patch 1243 BLAKE2B d956231e7df353c203e37054438aa9c50f875e83afbefad5de5d150ee272131a2f4825f330b25a2eaf8aa0e2977645e827934778f77f9752aaa887fe99917b86 SHA512 23dd6edcad930bfffd8248015862674fa12402693a24dea65ba61819d81c9e4eb594223c85483cb6ca5b908967f3509ace2753702118db3e79e7d137b63c00b2
+AUX gdbm-1.18.1-gettext.patch 444 BLAKE2B 43496bf0e950e1af452439f881bca4fe5e318717c27692639196884405b0b6ed8e32e056afeda2040f651d26ff1607e69e7f482d023c2b98b7c080b67f3392b2 SHA512 fd033d7de3a1bc53c10115fd27d7001ce1b376126c11f934adf8a25c9df195754835fd707f40c540539553c091fa196115e02bb56cc41702a12a1d4fb1724a52
 DIST gdbm-1.18.1.tar.gz 941863 BLAKE2B b7717224e966321d7499a90214bfb62d0402e867db475ed4eddacfe3944d8d9cca1052e41d625f447936bfb3cbd7f1b79cfe6ff435a018efed3d5a7c5eae52d7 SHA512 adf9d6c5bc843ff0d7f88c2a1667d509973b2d63378d0001d7e74cc10aee6ea498a4513cc88ddf78c32ba4db5cb040b2794f4f1b3338c65d9894058850e2f5ef
-EBUILD gdbm-1.18.1-r1.ebuild 1347 BLAKE2B c4f0541f0adcaee9c083a5fcae9ace6af706f2e163ea04d4e8a7e2ea4b405b841477c7c18929eba9fa8ccb48bbc53b6a14b869f71285b82fcd7f9f7423274f09 SHA512 f9da141c6c441a12e2dca0f44ca6738c58c6c83a116194a0681d462f96ee068f0369d7749f1a4e4225881537abfd9cdf11d01031e6583f077d343e7de7709e5a
+EBUILD gdbm-1.18.1-r1.ebuild 1400 BLAKE2B a53f0bf252d2cde959c7024b2d04f9f068e1f5f8893681413a12c34474f841632f41d1a3c312874b7575bb7d6a502efa8f8b9954ad78ff51c546efd43b5dd2f3 SHA512 089c88f982a07cc549644a0e09158a6f5ee43f866000bcb899c2ed598adf119b3afca9485a3378cefa2dfb7ac5cff28ccbab6406bc055856abd76f4572c2b9fd
 MISC metadata.xml 359 BLAKE2B f58b008f8cd663d499052f6d3ea0f658b3816d28c044a4fb8a341a8ce7382104962f58b5ba881bb1dcfc8835cbfc22782471eb48088c547706caa63c35e21e97 SHA512 12da6a0492c269ebff68bf1b1d5ea44b9e011a9197c353157da04283fe865ffff01d6f6c28ecc73b5985ec39959c1c7911b2aa5c3e905929f41521b7cae0b169
diff --git a/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch b/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch
new file mode 100644
index 000000000000..2f0c0c450733
--- /dev/null
+++ b/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch
@@ -0,0 +1,12 @@
+diff -ruN gdbm-1.18.1.orig/configure.ac gdbm-1.18.1/configure.ac
+--- gdbm-1.18.1.orig/configure.ac	2018-10-27 08:46:09.000000000 +0300
++++ gdbm-1.18.1/configure.ac	2020-12-17 14:12:14.249678303 +0200
+@@ -94,7 +94,7 @@
+ 
+ dnl Internationalization macros.
+ AM_GNU_GETTEXT([external], [need-ngettext])
+-AM_GNU_GETTEXT_VERSION(0.18)
++AM_GNU_GETTEXT_REQUIRE_VERSION(0.18)
+ 
+ AC_CHECK_HEADERS([sys/file.h sys/termios.h string.h locale.h getopt.h])
+ 
diff --git a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
index a4583e1df778..b7c4e924cac2 100644
--- a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
@@ -19,7 +19,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=("${FILESDIR}"/${PN}-1.18.1-gcc-10.patch)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.1-gcc-10.patch
+	"${FILESDIR}"/${PN}-1.18.1-gettext.patch #696838
+)
 
 src_prepare() {
 	default
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 7e449a917d89..3141bf6e349f 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -4,6 +4,6 @@ DIST ldb-2.0.12.tar.gz 1680114 BLAKE2B 44d7b8f9ff0c1d2adc59378b9da814fb280043c8b
 DIST ldb-2.1.4.tar.gz 1673335 BLAKE2B 581ea127715d82d849f78c11fc66eb278e45f6c9ff9b379d5a3cfaa8c9c424004614a5a9c2120710d23feb1252294e2abd4983158a2a46e5d70180ad3c765dbd SHA512 7e0eecccc973881dde2390568dc71a2ffe7c7ed894daaa9cadf80c221e1b969fd9a8729f3c48a0f611a64b2941c295a2bc7bd8ba869881ba14f75b8bf331167e
 DIST ldb-2.2.0.tar.gz 1676551 BLAKE2B 1ad84372b024e1ed680a09d215324027c9a37883204c2e69bb39d28a280cba639a4a46ec12b12d89f291f5505f55849eee880345412c6d95d9b6d6e9c00a4fd9 SHA512 3814078a51d2110eeda291ac859c0027df88475812bd6b5f2ce8f8f50aba9c84faced97c37aa1f45e406783a8df97c60ae778df897bb0e89ba3ac8568acced69
 EBUILD ldb-2.0.12-r1.ebuild 2819 BLAKE2B 84a079740d46a4eb3db474c3fee68ce8797ab66e62cd34db73a77eb8b42c530c711a9440780447b3c1861f9abdb1dd5578ad6acb7c3551b594df84cfd828109f SHA512 9b22bc0bc7b6568edb97900837b4385823ef2ff06ae3a9efeba35cc91ef56906e2d099ee777510376a6c26518e93df5930b345b569cd13646127864596da996c
-EBUILD ldb-2.1.4-r1.ebuild 2821 BLAKE2B 73df60a13101b18e6dc77caa18894a68018b6c0dfdabbf752d886788f185f23a9d755333870871bb64adcc38b4790986de5b5252aa309818f9d061f15c2d9138 SHA512 91afc59a4dfd13db3d79fa865c789b6b4c035f44ab4ffd32846cf64e1666223c2faa32f4a8ad7e5f1edd156a9b39d805fbf30bb1f8cf91bf63ed20fbb14c2c7c
+EBUILD ldb-2.1.4-r1.ebuild 2820 BLAKE2B bfa8c0c00811fa751a45deec7357a9ebf53586430c4abfcfe42c58642cdf1bb44c58ff3b8eec8d27f961d3d54a015916b0d30041f870eadfe9b4da59920887b5 SHA512 8a5856c112bffe9e44d0e72a800fa452c54ad225d561b8b9eec4b3613af46a4a2674fef878998da2012fd7845730cdbfb9252562b517b2704679be7c00d66232
 EBUILD ldb-2.2.0-r1.ebuild 2826 BLAKE2B 39118d964d6497cb1e1184f0bee5cb0736766bc956c769c6c21ca427166406a69f8a35b6d804014f46ea5a8bdf83933111b1e50df493be04159571467b140653 SHA512 fc3b82d24b418d04bd09894a6ec27f2405a3ae91d9e3db0c94f52888867decad1053d0f42f12c7f824673a96adf8bbc2d5272ac84e2020c1e7140357402f7653
 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95
diff --git a/sys-libs/ldb/ldb-2.1.4-r1.ebuild b/sys-libs/ldb/ldb-2.1.4-r1.ebuild
index 837fb552f8cb..5710d4163f57 100644
--- a/sys-libs/ldb/ldb-2.1.4-r1.ebuild
+++ b/sys-libs/ldb/ldb-2.1.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
 IUSE="doc +ldap +lmdb python test"
 
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 825edb672663..95f0f426f05a 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,4 +1,4 @@
 DIST libblockdev-2.24.tar.gz 905838 BLAKE2B dcc31021d72c2a4f92d8f70387537ec409302e85a9bdb338a09449b02318113d40cabf7fc2f6b4aca819400baccba69a9f67a616b30c744cf843eeac785875e4 SHA512 92b7d734ea2cefbb67e626bef369d6785ba2a4bbbf09a4f59345febe977bc32319fb44f38b3c3177b8652abbc1f87b6cc76d41fdd2d70783c1c168049bdcb1d6
-EBUILD libblockdev-2.24.ebuild 2607 BLAKE2B bcbea123737ddc41ba5811b1aff290888761783d886f269d0bb42961a6799fd4171fa48ebc93fbef04413678ea153ecd4c405713a2963160e1b813317efa4796 SHA512 0f153da86f4581df17fe70e35486d6f798cb5ee219bc22b4aa6739f5882efeb1d36ee5895b1effbcee8e36c3008e8e22336b31452931e5c788a260bbc0e66755
-EBUILD libblockdev-9999.ebuild 2614 BLAKE2B 2564de34bbb1d7d376b638f8b095614115d0dad98bf9678cb6edbbd48b2257bc7c1517c9564d48fcf20a1c421afb7656686173f6efe14058b07f5871b237247d SHA512 4a1fc6d0795f14ff69971396a9f174da7a6e82d38866fc3e094457ce2e2a0ccb730944e3f22382227191f980cbba2f1a76b849d866fcf85268442f852a24b332
+EBUILD libblockdev-2.24.ebuild 2609 BLAKE2B cd467ffa39fc43f450442e2bf04e48a940c1e3549b7919a3b99a53adddd150596084414e67332cbc4f9c7330b10100729f45f8c6109fa6b788e034fceda9ac12 SHA512 a218d7304aa985e4284f327f7e6736dccde450e15674545881ffd90fcefad8af4c2a50f0486d91dd7d882db44d71e3bb01ad92d837465f7610715f06866912af
+EBUILD libblockdev-9999.ebuild 2616 BLAKE2B 360fefe9c24a28bd4e61e543662d1d31617f7bfb386492edc42da27b8a399746372e4ac6674becb3dfb9b11eed88914b0e0f13e5b3a57c0e0ccbdfbd62bcbea4 SHA512 c74464e57af06d0017ceef5ecf367ea77121fdf4756f52431317e1b48f3d6a3f7810ce3fe23efef399ca5780e19f9b243c82fa5c116b8b7aed1b6fd693ea0c8e
 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/libblockdev-2.24.ebuild b/sys-libs/libblockdev/libblockdev-2.24.ebuild
index 04aa60d48088..413a9123fade 100644
--- a/sys-libs/libblockdev/libblockdev-2.24.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.24.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit autotools python-single-r1 xdg-utils
 
 DESCRIPTION="A library for manipulating block devices"
diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild
index 1ad37598e5fe..29119d41e3eb 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit autotools python-single-r1 xdg-utils
 
 DESCRIPTION="A library for manipulating block devices"
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index aba08c492ada..4c9c0b7f42ae 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -1,7 +1,11 @@
 DIST libcap-ng-0.7.11.tar.gz 450541 BLAKE2B 66217f7fb9e3b3876ada6f355a2b69f16fda4ab3ab490e524358c4120583280ce6497770ec6452596426594b877d79c0e03db10d6413c1cf20bd01e996f7347b SHA512 150c4f48d7334966aa7af683e46bc3b8b4d4a2e80be826e6f6a61a0ea0666e2f4dafcd012c536fa321c4954c00059c689cc8d6dc089000ca1dca2fd52e3efe9c
+DIST libcap-ng-0.8.1.tar.gz 454950 BLAKE2B d2d8902526f1cb6f1f579ec4ca1ca33bf45db325eac07a94b97dcee58411f8657591a840cb7420a94617bf8c21858c4b31138ca3126f6cfaff6b8c82b991149f SHA512 cd28ceb43e2cf5d3a0140fddbd2ea13dfda8eeea8a6de1817f3cc3b38df874ab8653917dbd405ad7aaaa71bcb9ec246d995079aa3cb0af1cffbdb37dfdd99232
+DIST libcap-ng-0.8.2-apply-disable.patch 723 BLAKE2B 70d9959c55119c02bbc4ea605251491c04c477511c20b9fe93e6527ffd3fe2f35a72fabab5ca149c4aaf536c6cd8dceb15375297158f8827a0c676744381bbc1 SHA512 8c9317bdd4fde7d6a4618ec613bce46bed7646891bd16bc3fa307e9a814e38601bf3c6ad13102389d4596d9ed6a7ad853cca58624e724fe07383007e386c51f8
+DIST libcap-ng-0.8.2-apply.patch 2898 BLAKE2B 4c388bc2a61646639a78b6b3038a1027df7807076b9d0bef7c850e8c86e354260eaee47b4f3d10a1db3d961584935005e155eba04a38decbe4256fc3e5fab968 SHA512 1d3d443c524fb4b885702b460f7ec7eda6377ed571528ca679add9494eb8172ead607ba32e139d4150672e81e79e12687a5b09c93d4f24eb2edb1381c2ced76d
 DIST libcap-ng-0.8.2.tar.gz 456066 BLAKE2B 7e721d05b92fd3708b970527e76b1898daa91bde3ab6ed5d8f23b1435404fbe7d15731461c6d9d2c791738e5498d1f5eaba727413480d34b7edea13c8691c32b SHA512 0ac6e55c03b1fba3a849048b721e250951afb59190d9646704d4fd9938eccc3bd0767380fbddc42f186b4f55695475e31f34f537ae91c04a37662577a5b7a19b
 DIST libcap-ng-0.8.tar.gz 453181 BLAKE2B 8f4b2e13e5c2c21f1ac1455ebdaf04b42e07fa79d9026651f41eab041cdf99bd40d91b8ce2262e58bc2de3e2a793f676df8c69d832ccadfa4b486ebefeb4b128 SHA512 d410d66f46ad25765f35ffac17e0d36740329c334c6535d55a13fa218718a750763b7ad4610efa47efe7c256c143ead7dde7d37a29e99cb5c55161f577c40bb2
 EBUILD libcap-ng-0.7.11.ebuild 2051 BLAKE2B 0af271d6ac33450aea40a2a30babe0aa35944ae805a7ce19cb68811aaa37d2232ae661d43206c7ada85f41e97ade23d502e7fe572981ced38555bbc5337ff0e9 SHA512 67c4fe214505c9be91fdcf3b71962619533669ec1383d23391d96b8d9624201bd18096fea674aee55f6ab34a7e8a32a61c96ef5282e59de2ac29c566f523dea4
-EBUILD libcap-ng-0.8.2.ebuild 2059 BLAKE2B 1449b5306be6edf0ff31c2065ee8752be4404e85cd00c43a30e9ee7f40f5e188cda77119b201683b49d26abfbd83dd62b38067d2dacb23f9c30735a4fb776a14 SHA512 31618b5b583ae3bdb8025dcb706abdda819f965c59a993de0acd2c81ad905754151db3a23dc519f73c2aa9d4a92ec094a17b57e4cd10c8bdaca451de4ef4dacc
+EBUILD libcap-ng-0.8.1-r1.ebuild 2650 BLAKE2B 802e9173fd92a33c3b7eaba65debc72abc775234dc6a95ec1b0d0800fe97514efe7e5cb4306154cf4318243b8098b92c7119b191f578b9a91d35023c465b7e93 SHA512 93701fc688f3ba2383bb1c023a795c8a57d1ce3ecae034e172466f076ad253a7d4bc68d60f6b46b04e6a50fc99550b5bb7e59c50e372b2428a9382ec153b3da0
+EBUILD libcap-ng-0.8.2-r1.ebuild 2369 BLAKE2B 04524e0fa80ad0e2e60df83ee8cb7e30e768f096e23a34712734f92c0eb0d9d64de780b5148144d48fe4553e964d208af7dd063bd7ddf3ce0c76e4dd10b204e9 SHA512 919640a8700f018039f0f9c4af59971884f98ea3c7feaa7df01f17405324c93b580fd4a7bc5d2ae433c1664264ebcf16144e522a88a6b2e3e2cbaaa5878780c1
 EBUILD libcap-ng-0.8.ebuild 2059 BLAKE2B 1449b5306be6edf0ff31c2065ee8752be4404e85cd00c43a30e9ee7f40f5e188cda77119b201683b49d26abfbd83dd62b38067d2dacb23f9c30735a4fb776a14 SHA512 31618b5b583ae3bdb8025dcb706abdda819f965c59a993de0acd2c81ad905754151db3a23dc519f73c2aa9d4a92ec094a17b57e4cd10c8bdaca451de4ef4dacc
 MISC metadata.xml 673 BLAKE2B f4890411426cd85bc65373e34f5e1c2b5b294ee6774b8af47cb8effcb4d5730772fee52bcf0fdd477f56b412b1918214467cc0afc3f13b56098d45a98009ce4d SHA512 8f15beccf0bed144b7cceb7699e9e90e05bca2b0fa2bc198dc6cdc5af95f57c9fb07c9049d5b7229b2ec71b945cee3b20210874ebb030566caee850d50980d95
diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.1-r1.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..a83d11757d88
--- /dev/null
+++ b/sys-libs/libcap-ng/libcap-ng-0.8.1-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools flag-o-matic python-r1
+
+DESCRIPTION="POSIX 1003.1e capabilities"
+HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/"
+# Fedora 0.8.1 https://src.fedoraproject.org/rpms/libcap-ng/c/49e3114cf75fabe9919300e42f7b151eee9e37d1?branch=master
+# Fedora 0.8.2 https://src.fedoraproject.org/rpms/libcap-ng/c/a5b0f536df1132d8e7afa4c0ce07b630e7970cad?branch=master
+SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz
+		https://src.fedoraproject.org/rpms/libcap-ng/raw/49e3114cf75fabe9919300e42f7b151eee9e37d1/f/libcap-ng-0.8.2-apply.patch
+		https://src.fedoraproject.org/rpms/libcap-ng/raw/a5b0f536df1132d8e7afa4c0ce07b630e7970cad/f/libcap-ng-0.8.2-apply-disable.patch"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers"
+BDEPEND="python? ( >=dev-lang/swig-2 )"
+
+PATCHES=(
+	"${DISTDIR}"/libcap-ng-0.8.2-apply.patch
+	"${DISTDIR}"/libcap-ng-0.8.2-apply-disable.patch
+)
+
+src_prepare() {
+	default
+	if use prefix ; then
+		sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die
+		eautomake #668722
+	fi
+}
+
+src_configure() {
+	use sparc && replace-flags -O? -O0
+
+	local ECONF_SOURCE="${S}"
+
+	local myconf=(
+		$(use_enable static-libs static)
+	)
+
+	local pythonconf=( --without-python --without-python3 )
+
+	# set up python bindings build(s)
+	if use python ; then
+		setup_python_flags_configure() {
+			pythonconf=( --without-python --with-python3 )
+			run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}"
+		}
+
+		python_foreach_impl setup_python_flags_configure
+	else
+		local BUILD_DIR=${WORKDIR}/build
+		run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}"
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_foreach_impl run_in_build_dir emake
+	else
+		local BUILD_DIR=${WORKDIR}/build
+		emake -C "${BUILD_DIR}"
+	fi
+}
+
+src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions."
+		return
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	else
+		local BUILD_DIR=${WORKDIR}/build
+		emake -C "${BUILD_DIR}" check
+	fi
+}
+
+src_install() {
+	if use python; then
+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	else
+		local BUILD_DIR=${WORKDIR}/build
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+	fi
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.2.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild
index 846ebcd8aae4..ba79ffe1c0b6 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.8.2.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild
@@ -9,7 +9,9 @@ inherit autotools flag-o-matic python-r1
 
 DESCRIPTION="POSIX 1003.1e capabilities"
 HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/"
-SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
+# Fedora 0.8.2 https://src.fedoraproject.org/rpms/libcap-ng/c/a5b0f536df1132d8e7afa4c0ce07b630e7970cad?branch=master
+SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz
+		https://src.fedoraproject.org/rpms/libcap-ng/raw/a5b0f536df1132d8e7afa4c0ce07b630e7970cad/f/libcap-ng-0.8.2-apply-disable.patch"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -22,6 +24,10 @@ DEPEND="${RDEPEND}
 	sys-kernel/linux-headers"
 BDEPEND="python? ( >=dev-lang/swig-2 )"
 
+PATCHES=(
+	"${DISTDIR}"/libcap-ng-0.8.2-apply-disable.patch
+)
+
 src_prepare() {
 	default
 	if use prefix ; then
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 1d702b464297..a28d985c9d7b 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,9 +1,5 @@
 AUX 0001-libselinux-Use-Python-distutils-to-install-SELinux-p.patch 8172 BLAKE2B 3c301b206a809311fd7eb1eb35b3925c064731146e35702b7dab5b47f41cb2a61723db7243d67caf4ce317f3b4ca2d1a999b0533e0185c44b2892e72d8cf8bb0 SHA512 287e82b5888f973bc3545b1777d9baa33965fb2bb3810834871b6843b163d11e4dacde9a7361088f715f70947e9087de89331b0b35dec1e37bddd523e5a12c1b
-DIST libselinux-2.9.tar.gz 211546 BLAKE2B 5b06b922690e48924865c98ed34ebfc1ce5e30e78dbeaccb6b9c931a35bed113c030f8f8575084429fe13b91aeafc73abaa24fe609a17ba54c8472d783f6ac61 SHA512 727b211d09f374d45aa3fa4dec7fd5463dfdcf5aaa47f7fcaccee51fb74896c3aa1a6f0bac9cdd47ebe4929effff13f66f5f70447b27b783dca5f7b1576d30d0
-DIST libselinux-3.0.tar.gz 212096 BLAKE2B 7502c77243928adfc445f55357b0e894087859c3a83e2beb446c31818362d10111c3e52b970150638c055f96cccca6fccde79440026201a2a48bfda3565c27d3 SHA512 6fd8c3711e25cb1363232e484268609b71d823975537b3863e403836222eba026abce8ca198f64dba6f4c1ea4deb7ecef68a0397b9656a67b363e4d74409cd95
 DIST libselinux-3.1.tar.gz 204703 BLAKE2B 72ff2d99dd6640405e804f58bdfbf05e152615ea92f902b3942602af13dc17080afeabb942ed33ae6b3f528870f4b11584e533848e455a97bf8f7151a8d44646 SHA512 57730cddd2d4751556d9e1f207c0f85119c81848f0620c16239e997150989e3f9a586a8c23861fd51ed89f7e084ad441190a58a288258a49a95f7beef7dbbb13
-EBUILD libselinux-2.9-r1.ebuild 4245 BLAKE2B b0e9aeb008f9a1d8e0cb540960020a5627ff1c2b9f65142fdcf0ad97b84fee1cdfc3b194a9af9f9a934c41a79e0a50506536ad91be14e9ab34a59f01b2e23a5e SHA512 1dcaa430921c721a9d390dca4152124d6f794cc954d0314780ca5d7c7769e1c16e98a02c40e6485b5136f993145e19fdd3036833b3912e8a07b03b7196e62c60
-EBUILD libselinux-3.0.ebuild 4215 BLAKE2B 09618d2fec347866b6bff952aa543a097ac5e183eca36ca7bcb338da8003a66a2b57e3cb12fe789639f7205ec630584dae67b0aaf58f20436efa10419ce3110a SHA512 90fad4e56ba9c1a511ddef1b76374be8adec12c4d3c72d2c44712485eb0f4982710978a3894e314eadff60d070009a48906eab1f29181b55ede7f0dfd58bab6f
 EBUILD libselinux-3.1-r1.ebuild 4224 BLAKE2B f51671c06ece8c7fa63cad1cf7d901593435d4ddbc329ea3c11f6600a6d461832421859b92f7f3a15eccaf996ceb5bc21cda9fb7d11c0fd2b1f936f5b27dcfbb SHA512 64db5320e7c5c9ff8193c727018c2897c0a0962d69390ac8d94d5ccddf2d1df944f5d28e0d87993e3cb3ab474579205c4d88cd3fcb766feb620d0c879155f0cf
 EBUILD libselinux-9999.ebuild 4226 BLAKE2B cf6479f1c938e92238459f77d71550b25d242b898998feb2ee3be6b8f804b04627719a8f7104a5401896ed8a71727f74090a863c8ac20573fcd448187ec55938 SHA512 98f642b8485609ba9dceb1ea2a1a5a4fff60b7c4775cb6a7622ed58f00575d4791c72a9d18280115e65f83dd02ae624342bb60253021ff65bd224f778c1934ff
 MISC metadata.xml 745 BLAKE2B 6658dad55bd195725b345865e152b62528e04201b9743dd3688058eeb6f3ca87add86035c2a14bea0b238273328464f5e2fa36ce6b96ac35fb1cc679e3cb4a7c SHA512 ee405602d0345a118c4b8eac9126417f082f4a37a7d5816a991e21191d4ce71ec883abe7e91f10f5330cdc61e6f7a174968c12f873b08a4bda5186cc4986b363
diff --git a/sys-libs/libselinux/libselinux-2.9-r1.ebuild b/sys-libs/libselinux/libselinux-2.9-r1.ebuild
deleted file mode 100644
index e418cecf3c1f..000000000000
--- a/sys-libs/libselinux/libselinux-2.9-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
-USE_RUBY="ruby24 ruby25"
-
-# No, I am not calling ruby-ng
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-SEPOL_VER="${PV}"
-MY_RELEASEDATE="20190315"
-
-DESCRIPTION="SELinux userland library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="public-domain"
-SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby24 ruby_targets_ruby25"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
-	!pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
-	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-		ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-	)
-	elibc_musl? ( sys-libs/fts-standalone )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )
-	ruby? ( >=dev-lang/swig-2.0.9 )"
-PATCHES=(
-	"${FILESDIR}/0001-libselinux-Use-Python-distutils-to-install-SELinux-p.patch"
-)
-
-src_prepare() {
-	default
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC PKG_CONFIG RANLIB
-
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
-		USE_PCRE2="$(usex pcre2 y n)" \
-		FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building() {
-			emake \
-				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-				pywrap
-		}
-		python_foreach_impl building
-	fi
-
-	if multilib_is_native_abi && use ruby; then
-		building() {
-			einfo "Calling rubywrap for ${1}"
-			# Clean up .lo file to force rebuild
-			rm -f src/selinuxswig_ruby_wrap.lo || die
-			emake \
-				RUBY=${1} \
-				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-				rubywrap
-		}
-		for RUBYTARGET in ${USE_RUBY}; do
-			use ruby_targets_${RUBYTARGET} || continue
-
-			building ${RUBYTARGET}
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		USE_PCRE2="$(usex pcre2 y n)" \
-		install
-
-	if multilib_is_native_abi && use python; then
-		installation() {
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				install-pywrap
-			python_optimize # bug 531638
-		}
-		python_foreach_impl installation
-	fi
-
-	if multilib_is_native_abi && use ruby; then
-		installation() {
-			einfo "Calling install-rubywrap for ${1}"
-			# Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
-			rm src/selinuxswig_ruby_wrap.lo
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				RUBY=${1} \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				install-rubywrap
-		}
-		for RUBYTARGET in ${USE_RUBY}; do
-			use ruby_targets_${RUBYTARGET} || continue
-
-			installation ${RUBYTARGET}
-		done
-	fi
-
-	use static-libs || rm "${D}"/usr/lib*/*.a || die
-}
-
-pkg_postinst() {
-	# Fix bug 473502
-	for POLTYPE in ${POLICY_TYPES};
-	do
-		mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
-		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
-		# Fix bug 516608
-		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
-			if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then
-				sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \
-				|| die "Failed to recompile contexts"
-			fi
-		done
-	done
-}
diff --git a/sys-libs/libselinux/libselinux-3.0.ebuild b/sys-libs/libselinux/libselinux-3.0.ebuild
deleted file mode 100644
index c8e582b74e9b..000000000000
--- a/sys-libs/libselinux/libselinux-3.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_{6..9} )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-# No, I am not calling ruby-ng
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-SEPOL_VER="${PV}"
-MY_RELEASEDATE="20191204"
-
-DESCRIPTION="SELinux userland library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="public-domain"
-SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
-	!pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
-	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-		ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-		ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-	)
-	elibc_musl? ( sys-libs/fts-standalone )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )
-	ruby? ( >=dev-lang/swig-2.0.9 )"
-
-src_prepare() {
-	eapply_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC PKG_CONFIG RANLIB
-
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
-		USE_PCRE2="$(usex pcre2 y n)" \
-		FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building() {
-			emake \
-				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-				pywrap
-		}
-		python_foreach_impl building
-	fi
-
-	if multilib_is_native_abi && use ruby; then
-		building() {
-			einfo "Calling rubywrap for ${1}"
-			# Clean up .lo file to force rebuild
-			rm -f src/selinuxswig_ruby_wrap.lo || die
-			emake \
-				RUBY=${1} \
-				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-				rubywrap
-		}
-		for RUBYTARGET in ${USE_RUBY}; do
-			use ruby_targets_${RUBYTARGET} || continue
-
-			building ${RUBYTARGET}
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		USE_PCRE2="$(usex pcre2 y n)" \
-		install
-
-	if multilib_is_native_abi && use python; then
-		installation() {
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				install-pywrap
-			python_optimize # bug 531638
-		}
-		python_foreach_impl installation
-	fi
-
-	if multilib_is_native_abi && use ruby; then
-		installation() {
-			einfo "Calling install-rubywrap for ${1}"
-			# Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
-			rm src/selinuxswig_ruby_wrap.lo
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				RUBY=${1} \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				install-rubywrap
-		}
-		for RUBYTARGET in ${USE_RUBY}; do
-			use ruby_targets_${RUBYTARGET} || continue
-
-			installation ${RUBYTARGET}
-		done
-	fi
-
-	use static-libs || rm "${D}"/usr/lib*/*.a || die
-}
-
-pkg_postinst() {
-	# Fix bug 473502
-	for POLTYPE in ${POLICY_TYPES};
-	do
-		mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
-		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
-		# Fix bug 516608
-		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
-			if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then
-				sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \
-				|| die "Failed to recompile contexts"
-			fi
-		done
-	done
-}
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index 1462331851e1..4caf6937f831 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -1,9 +1,4 @@
-DIST libsemanage-2.9.tar.gz 157690 BLAKE2B 98a7800a4f4a5b6eeaad8be9870a49bc697cec6cd053cb44bcd618d22146ed1adc32b432667f8fd245ac073a458e048894cbaf68903b79577bc8596b1c255f56 SHA512 ea2924e8ce97d376519d40d499145b3db413cf9cc1eb995ed338b95c131e043d8c43b87b2012cee2bb6354a6e3161ebf5ce4a1200278d3ecd4294b43d177a5c2
-DIST libsemanage-3.0.tar.gz 180745 BLAKE2B a7e7f0c98e365fcc132e2e66de736db29b46599be2da227dbf1384110a607120f141975b859e55073f734e3ff533bdf90b7bbefd79f7bc5857bbb0722a75ad4e SHA512 f960e1bd6815d3c9f000efa7ae717bc7937e742af5a7fea4aa865cf1aee49486e34897d83dbdb9cf77975a09a5ad77e5512d47690a74512a468a89432b72a42c
 DIST libsemanage-3.1.tar.gz 179601 BLAKE2B 69450a4eda1f3728d339f65db1eec9940995fcea5208d17dca531ebc998aefbfec48fe91beffa3490e1502953aa550405fb696635d01b0eb8050c8f00f11106a SHA512 8609ca7d13b5c603677740f2b14558fea3922624af182d20d618237ba11fcf2559fab82fc68d1efa6ff118f064d426f005138521652c761de92cd66150102197
-EBUILD libsemanage-2.9.ebuild 4646 BLAKE2B 1ed46e0bec6805c3759a182e839a3f296954dc643f560b4e343e14790919f5ad082cbb3e3bc5f45162f9bfa9a0a1392001a06f42344e6e17108d06bcc73104f2 SHA512 39f5b2672d5425e205f76ea05fe2761bc29dbd7aa2c7399a713d3aedcf56038cc4f89ef094979322dab66795786dc1f1ac8c0fd2645a51b25a55f7396af389d8
-EBUILD libsemanage-3.0-r1.ebuild 4700 BLAKE2B 2ba6d17b0bfd6ebc2d3e88c2e4b61a3022e2d602ba4ae621802a92a005852650dcba58062997941bcc72fa250161b85754734451f87b7e15b0a16a1de7749491 SHA512 bbd622c190ec2d68d7d10bea5fc6ebb81b39c640a3849c4b86b4e6ac40ace1f575eeb06e6a822ffe7d0a781c9b4d1c2b03e7f66572e262b90651f5ac757b9bc3
-EBUILD libsemanage-3.0.ebuild 4658 BLAKE2B 9de1e8527dd161016ee3ea2a3bfc23f901b7f77818a41ffb0b4722d16cca9cdd6d94628fc241e8f9602a9b1eb25a4d2730985807375ee437e414d835a213bd75 SHA512 d54343724a8b853c549c68ff2331ad705f9db6725b8a4680069b504d84c39f0ba0b57eca5c01b7aa93e61a3f13b3720c3e44b0ee79f91f6c8d5e7547b43e7ff6
 EBUILD libsemanage-3.1-r1.ebuild 4298 BLAKE2B d1491b55eb23349bee26b646ccdb25c8205314086edff38861a72d9b09d34122c18129b068afb88f96c588e61312daaf7e2e82c3612814d3d016027e199bbb0d SHA512 4eee1d71e83fba1038946f37a6c27ef6bd1b68452db72cb41c8474737269fb42f0cd1d07de38af877c9dc5f931f66256a2c6918028b7f8bc2d64396267570030
 EBUILD libsemanage-9999.ebuild 4300 BLAKE2B 1180edbcd9265598c2e1379f4e9f14e31700faa39a72da48a30f7ba4bf19d8b46bc241f79eeb9c09ada1cf04352a5da4e5f03845c12470460facffdb5cfbbd80 SHA512 5bf7865189ec86dfab1ede90aa73ab33d3406ca1f5a01199327a4e9c7ab0c49244a853e699e26943d0558fc8a551350733e027fe7341026ed161bba905604fce
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-libs/libsemanage/libsemanage-2.9.ebuild b/sys-libs/libsemanage/libsemanage-2.9.ebuild
deleted file mode 100644
index 194834f7856c..000000000000
--- a/sys-libs/libsemanage/libsemanage-2.9.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
-
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20190315"
-
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-
-DESCRIPTION="SELinux kernel and policy management library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
-	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
-	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
-	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	python? (
-		>=dev-lang/swig-2.0.4-r1
-		virtual/pkgconfig
-	)"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
-	eapply_user
-
-	echo >> "${S}/src/semanage.conf"
-	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
-	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
-	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
-	echo "save-linked=false" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
-	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
-	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
-	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
-	echo "# would catch." >> "${S}/src/semanage.conf"
-	echo "expand-check=1" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
-	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
-	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
-	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
-	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
-	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
-	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
-	echo "bzip-small=true" >> "${S}/src/semanage.conf"
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building_py() {
-			emake \
-				AR="$(tc-getAR)" \
-				CC="$(tc-getCC)" \
-				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-				"$@"
-		}
-		python_foreach_impl building_py swigify
-		python_foreach_impl building_py pywrap
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${ED}" install
-
-	if multilib_is_native_abi && use python; then
-		installation_py() {
-			emake DESTDIR="${ED}" \
-				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-				install-pywrap
-			python_optimize # bug 531638
-		}
-		python_foreach_impl installation_py
-	fi
-}
-
-pkg_postinst() {
-	# Migrate the SELinux semanage configuration store if not done already
-	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null)
-	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${selinuxtype}/active ] ; then
-		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
-		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
-		ewarn "If there are any issues, it can be done manually by running:"
-		ewarn "/usr/libexec/selinux/semanage_migrate_store"
-		ewarn "For more information, please see"
-		ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
-	fi
-
-	# Run the store migration without rebuilds
-	for POLICY_TYPE in ${POLICY_TYPES} ; do
-		if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
-			einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)."
-			"${EROOT}/usr/libexec/selinux/semanage_migrate_store" -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
-		fi
-	done
-}
diff --git a/sys-libs/libsemanage/libsemanage-3.0-r1.ebuild b/sys-libs/libsemanage/libsemanage-3.0-r1.ebuild
deleted file mode 100644
index dcff5645ff97..000000000000
--- a/sys-libs/libsemanage/libsemanage-3.0-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20191204"
-
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-
-DESCRIPTION="SELinux kernel and policy management library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
-	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
-	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
-	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2.0.4-r1
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
-	eapply_user
-
-	echo >> "${S}/src/semanage.conf"
-	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
-	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
-	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
-	echo "save-linked=false" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
-	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
-	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
-	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
-	echo "# would catch." >> "${S}/src/semanage.conf"
-	echo "expand-check=1" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
-	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
-	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
-	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
-	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
-	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
-	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
-	echo "bzip-small=true" >> "${S}/src/semanage.conf"
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		all
-
-	if multilib_is_native_abi; then
-		building_py() {
-			emake \
-				AR="$(tc-getAR)" \
-				CC="$(tc-getCC)" \
-				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-				"$@"
-		}
-		python_foreach_impl building_py swigify
-		python_foreach_impl building_py pywrap
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${ED}" install
-
-	if multilib_is_native_abi; then
-		installation_py() {
-			emake DESTDIR="${ED}" \
-				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-				install-pywrap
-			python_optimize # bug 531638
-		}
-		python_foreach_impl installation_py
-	fi
-}
-
-multiib_src_install_all() {
-	python_setup
-	python_fix_shebang "${ED}"/usr/libexec/selinux/semanage_migrate_store
-}
-
-pkg_postinst() {
-	# Migrate the SELinux semanage configuration store if not done already
-	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null)
-	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${selinuxtype}/active ] ; then
-		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
-		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
-		ewarn "If there are any issues, it can be done manually by running:"
-		ewarn "/usr/libexec/selinux/semanage_migrate_store"
-		ewarn "For more information, please see"
-		ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
-	fi
-
-	# Run the store migration without rebuilds
-	for POLICY_TYPE in ${POLICY_TYPES} ; do
-		if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
-			einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)."
-			"${EROOT}/usr/libexec/selinux/semanage_migrate_store" -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
-		fi
-	done
-}
diff --git a/sys-libs/libsemanage/libsemanage-3.0.ebuild b/sys-libs/libsemanage/libsemanage-3.0.ebuild
deleted file mode 100644
index 09d82c6ba64a..000000000000
--- a/sys-libs/libsemanage/libsemanage-3.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20191204"
-
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-
-DESCRIPTION="SELinux kernel and policy management library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
-	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
-	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
-	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	python? (
-		>=dev-lang/swig-2.0.4-r1
-		virtual/pkgconfig
-	)"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
-	eapply_user
-
-	echo >> "${S}/src/semanage.conf"
-	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
-	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
-	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
-	echo "save-linked=false" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
-	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
-	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
-	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
-	echo "# would catch." >> "${S}/src/semanage.conf"
-	echo "expand-check=1" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
-	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
-	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
-	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
-	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
-	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
-	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
-	echo "bzip-small=true" >> "${S}/src/semanage.conf"
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building_py() {
-			emake \
-				AR="$(tc-getAR)" \
-				CC="$(tc-getCC)" \
-				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-				"$@"
-		}
-		python_foreach_impl building_py swigify
-		python_foreach_impl building_py pywrap
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${ED}" install
-
-	if multilib_is_native_abi && use python; then
-		installation_py() {
-			emake DESTDIR="${ED}" \
-				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-				install-pywrap
-			python_optimize # bug 531638
-		}
-		python_foreach_impl installation_py
-	fi
-}
-
-pkg_postinst() {
-	# Migrate the SELinux semanage configuration store if not done already
-	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null)
-	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${selinuxtype}/active ] ; then
-		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
-		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
-		ewarn "If there are any issues, it can be done manually by running:"
-		ewarn "/usr/libexec/selinux/semanage_migrate_store"
-		ewarn "For more information, please see"
-		ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
-	fi
-
-	# Run the store migration without rebuilds
-	for POLICY_TYPE in ${POLICY_TYPES} ; do
-		if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
-			einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)."
-			"${EROOT}/usr/libexec/selinux/semanage_migrate_store" -n -s "${POLICY_TYPE}" || ewarn "Failed to migrate store ${POLICY_TYPE}"
-		fi
-	done
-}
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index e43b23eb8bd1..3b47bcbf2947 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -1,8 +1,4 @@
-DIST libsepol-2.9.tar.gz 474861 BLAKE2B 2d0941a003bbe6f15f047e3e55ce4561c36fb4946ce46b618df1b884881579cd192a0ac7cbedfb67ae5e926ab03ca35988d2a4fc279f31a88c83874e85862d13 SHA512 415af623c2b2898d98828c9bf0b12cf05d05790d2b412cad291f0759a8c3feacf1bd88c2ba6f2f1bca8f9f71e1627e9d5b1b69d60e7ef96fdd52df8a3d57d3e9
-DIST libsepol-3.0.tar.gz 473864 BLAKE2B ff4da6e12c1635de88a2aaba26bd3630576a3806543d7176d8fbdb4deda5c9c5fbf8a5a4f68c8041cca0af97429e720d908cd31052d13ac72780bc85db1f56c8 SHA512 82a5bae0afd9ae53b55ddcfc9f6dd61724a55e45aef1d9cd0122d1814adf2abe63c816a7ac63b64b401f5c67acb910dd8e0574eec546bed04da7842ab6c3bb55
 DIST libsepol-3.1.tar.gz 473842 BLAKE2B ef1d596c4d53cc0a87e899ef4aeb5bf29c9d6b8303632ddc866c100d30debd8aedd0e8b38cb4ce3141b80421cd914148ff072e492d63dc2dacf03ac2ce59ca5a SHA512 4b5f4e82853ff3e9b4fac2dbdea5c2fc3bb7b508af912217ac4b75da6540fbcd77aa314ab95cd9dfa94fbc4a885000656a663c1a152f65b4cf6970ea0b6034ab
-EBUILD libsepol-2.9.ebuild 1101 BLAKE2B 15d24d96643fe4cd0448a5fa917f0784bf34310ad5f326f428896e58eb7e4b4de02f6acab25c9f4f833b237a06b4ac7044e9c10d15548b8bc56dd00308515ad1 SHA512 caf47ce74e8463c2ece4bf8c39271f28c92a9700a6eaed4e39d35356a0169f09f83af257e7afa1b56099b22e6b79e373427e644a017eb9addf515ae0da2e18a6
-EBUILD libsepol-3.0.ebuild 1175 BLAKE2B 5a6b43474a6d61bc1f17351d50e0c95808132c4c05eb4a836e2089575c46a6fe1969fe2e5d075da05ac24831d2e51d755d92832a06e904624b6137f14494ad09 SHA512 928fd7ccbd052b9b2d66d195db9d702fea2d4c76be0e7634d52a8bad44a4934d0ec0fb211b55133aa4228beeb75e3d6de897562bbc0bad3035eaf840aa7d80d0
 EBUILD libsepol-3.1.ebuild 1175 BLAKE2B 328820118f6657851eded73262d8f7d34187a7b9598c19e1ab3f3735a12cd6c87152a3f311890daaa97d19aaba0c7a13f0a68d3040b58c0d03469a8bdaaa3cb1 SHA512 d46ed4792c0e215d82facbbe4b715e284e7f411357257a8bca7ba6fbbf31bfae876a6f60d9e01da41dea917115e78f4ab4b6eee88ad17857fd4a4cae3cb6daa5
 EBUILD libsepol-9999.ebuild 1177 BLAKE2B c57df83301d492f61448cf804de24e1f6d4eec6c50fb2215684e9321eb734ecd3d5542d6c9514fbcb6326cf3a18adf9ffac62e93c540608400798b16ba7ac609 SHA512 dabaaff3825a5e71fd0ad66d6de40fc03273115d018f91b0faba0a2935829983f2f39392afc5a5ade5091f65b9455cc0c332a514792a8fc8fde51bb35da68776
 MISC metadata.xml 401 BLAKE2B 8d8df536f4fc4276a16dd448cd50fc3344f4f934ec7a8bc34a69e86e368ba47e69d1b8522771229f24dcb6400b3256106b26f9662ec1173cacfd539bffd7ba9a SHA512 67f5d428e108ff13135a3260189f3a4ae70b50f52e1d342029c25fa7e2c8ff2bc1ad579117a0f0caa0cad427a6f1f2aa6b8a6c540551656dd61849b495e10029
diff --git a/sys-libs/libsepol/libsepol-2.9.ebuild b/sys-libs/libsepol/libsepol-2.9.ebuild
deleted file mode 100644
index 6ce341e348ec..000000000000
--- a/sys-libs/libsepol/libsepol-2.9.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20190315"
-
-DESCRIPTION="SELinux binary policy representation library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-# tests are not meant to be run outside of the full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
-	eapply_user
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC AR RANLIB
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		install
-}
diff --git a/sys-libs/libsepol/libsepol-3.0.ebuild b/sys-libs/libsepol/libsepol-3.0.ebuild
deleted file mode 100644
index 91881924e6a8..000000000000
--- a/sys-libs/libsepol/libsepol-3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20191204"
-
-DESCRIPTION="SELinux binary policy representation library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-# tests are not meant to be run outside of the full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
-	eapply_user
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC AR RANLIB
-
-	# https://bugs.gentoo.org/706730
-	local -x CFLAGS="${CFLAGS} -fcommon"
-
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		install
-}
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index c23c64290185..3c45816281aa 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -5,5 +5,5 @@ AUX libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch 1290 BLAKE2B eac4
 DIST libunwind-1.4.0.tar.gz 872941 BLAKE2B 39628dd46151d2748372c8f1dfa3cd39114770b85e890b048304f8395b2778a22da4cc468eb6fe1e2357a41bed5a6067e12992634859dabe30addd0fd39b4269 SHA512 60bce1e840f071d3a48cfa8e2acff988977956f659c5c04ce83f00751348fbbeddbfc54e8c9bd6ebc9073423ca5ee1816655dc5aa59fefd0a8edc9c3f7f3b913
 DIST libunwind-1.5.0.tar.gz 878355 BLAKE2B ee35441289926ac22a58bedb9f831d8e13bacd663a99b3ce25eed229f25f0423bbbd90e09e3d62b003518d7a620aa6d15b0dd5b93632736a89fa0667b35d5fc2 SHA512 1df20ca7a8cee2f2e61294fa9b677e88fec52e9d5a329f88d05c2671c69fa462f6c18808c97ca9ff664ef57292537a844f00b18d142b1938c9da701ca95a4bab
 EBUILD libunwind-1.4.0.ebuild 3084 BLAKE2B 2c1791c707e2b2fe38abea2faa0f904a414d49c46c61ddc8ced7603294221cdec275758f230a2696e0378db1ea0c4e26fcf66e1e9a2840e32ba90b4ce291ff9f SHA512 efc6aaa08d84b322fb31485c83881447657a6ad588cc5b29a50ff78e3a4ade8a14d4c99370eb042aa19f7baef716decedd71dc1b6697921a66f53c6b80dc87de
-EBUILD libunwind-1.5.0.ebuild 3237 BLAKE2B 7c58b15d4b3bc2f793021331856884cc1b63a16ce131b6b0e04847401179bf25406a4880ff54f663b773c831a5ee185f7a7ab1cd15d50f0cb681fe451c1df6a7 SHA512 3bed8c0c966f494b2507b72e25cb7823934e7239aaa59b64014209e2fda3d9b0a88bd67175654da5804329956e379c9e8f84ce837c1d716f3804730b2c77cd86
+EBUILD libunwind-1.5.0.ebuild 3234 BLAKE2B 49fd0f035b58211350dad8d60fe706f306fc85a1805384e069ce3f2c6024d86b84c77d59d334defc09b6c90e62b39d8f5df7628288402eb401b326d5dc7ebe56 SHA512 8d9017bd8162a3a06c1fcc3d21a97a63ae6b397a7575c6aed6b812ad2f31ddd108a4048761278cbb60f115edd305c5d38dffbab3bf77ab1d2c5e0caa6ba53b59
 MISC metadata.xml 489 BLAKE2B c0a884e7161b62e8548fdf3c8c1d34b24936c71a99fef37713b7c36e0ef3423563e5c98eae8e9748db059645ce85cf972448e0584b1ed92e51c228794e5ed10d SHA512 d7586420e24a7b841cb090ce8dc7bb1c1260a3e2afbc6606d0a974243ca20c0586b4aa3e770b5b98787f8d34b8255846d87550c16f68da6e9d3f55f8b57bde40
diff --git a/sys-libs/libunwind/libunwind-1.5.0.ebuild b/sys-libs/libunwind/libunwind-1.5.0.ebuild
index 187e84c1b7ba..42ee07e1b350 100644
--- a/sys-libs/libunwind/libunwind-1.5.0.ebuild
+++ b/sys-libs/libunwind/libunwind-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/8" # libunwind.so.8
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame doc libatomic lzma +static-libs zlib"
 
 RESTRICT="test" # some tests are broken (toolchain version dependent, rely on external binaries)
diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index 6a1f1a65a79f..ae81504a58c7 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -1,6 +1,6 @@
 DIST liburing-0.6.tar.bz2 81429 BLAKE2B f905238a324d5e3f4fd0c572aa7db7a2c337aea282175d2a0f89802588d3900d2fb3ef8d6787aea38a406f1ccc57bf143864b708a4716783b09d4208164d2d99 SHA512 07fb0f61cc1d204bd340ef55ec65579a718ca266e4b9c8cdd6e47ae06defa3a9521e83fb3e6ed7c8910f52428dd62f4af900c4ec13c3509c7e366b4c13e7feb5
 DIST liburing-0.7.tar.bz2 86386 BLAKE2B a4fa00cc8e384f9909f3c628d479774beaffd5ab09c9f321ef22bfbabd273e4c8d4dbb30a3280633e89e1a79e893348e68f0aa2f3b1b4deda56759f77d9b1875 SHA512 9a23bc08e0fa59273264295859dddbe3276b2911df6d937b3c6f7647a250a3175222b5f051f3094efc98e48cacd242511327c5c5b895ebde10c8c87929ba4328
 EBUILD liburing-0.6.ebuild 1077 BLAKE2B 61d1f9a0da5d7e0d49a9f7eb05d97e70894160a164c9933d42fe2a49807b0cf655bd5137eec0e3decc877a8520b7532d44eae1c2fe3f923530bc4f709f3cb884 SHA512 f4c72fe74e2c9314d58cca8d1cc61422fe4db5d6f6da46ecb74cee5652ec8dfa42af55c3f7f251443edeadc5a550d5ebebcbc39e84e84b61fe16db4029aa6ee8
-EBUILD liburing-0.7-r1.ebuild 1220 BLAKE2B 99830a1a01a88d59574e8ae3974f83f0e59a60f26949df2b86a8aa90ae79ec2b13805a8eecbf270e970b2eee572b0fb48888b56e9d6a79a95bc1ec949fe46be0 SHA512 bb86cd5c955cd65b281baf5984fa9b6c28c00a8fecf225bed9425b85f9781a99cd935e45eb07375b9f186073b0bb689a310d07a25266ce1f8bd1dec4298778bc
+EBUILD liburing-0.7-r1.ebuild 1219 BLAKE2B 40db49cdbb2ab5b0f5b972196bbd75c0ede59e9826fb974513dd726a271f9d4b50b9858d409de826be3d5e9a4b7414f08abd12f54107332846180e1da037487c SHA512 a6703f4204111cccd5405ea16012ca550654a7638973bd6e031d4befb8bb2d654bb40f9e8688da7afd86f08241adb7c960c527844ed927f1f1ae4f153fdff3aa
 EBUILD liburing-9999.ebuild 1221 BLAKE2B 1fa154683e221123884d144814f389b28362a2eca51138669c4cb79c407b38889f3e512856cb9b3daf9cba13db6c5bddf7493a0d0a903392255029d6dc3e6ae1 SHA512 c4096dedbddf76c48851e3c0782f7ff015c16bc6e50acb115e1455a072e13877d0f3ea9dea4a9ad8bf7e2dd1d9bbf4c28e86ed2a785158d44cb342d29317c0ef
 MISC metadata.xml 330 BLAKE2B 9999abbe311550c99eac0de3e7942a37bab51413090b5ca192c0deeac61e3b0d3017a0c05650a433041e1589a6518539ea6686494cd9f57d787ab7519caa78fd SHA512 fe3f892ef7bea57e0c2889ef07f25a8f4230bd54484c73c8c00685a5a05d269271513b7235bf15dcb594b2e18e5e7d638d5d37c4b4563449dc6af1afbacec1c3
diff --git a/sys-libs/liburing/liburing-0.7-r1.ebuild b/sys-libs/liburing/liburing-0.7-r1.ebuild
index 284efb838d67..dc6b60760777 100644
--- a/sys-libs/liburing/liburing-0.7-r1.ebuild
+++ b/sys-libs/liburing/liburing-0.7-r1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/axboe/liburing.git"
 else
 	SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 fi
 LICENSE="MIT"
 SLOT="0/1.0.7" # liburing.so version
diff --git a/sys-libs/libvpd/Manifest b/sys-libs/libvpd/Manifest
index 58ce113ef5a1..38a0fa01ba17 100644
--- a/sys-libs/libvpd/Manifest
+++ b/sys-libs/libvpd/Manifest
@@ -1,6 +1,3 @@
-AUX libvpd-2.2.6-localstatedir.patch 688 BLAKE2B e1674fd78b6b863310a4f6a0c2f0f031a7e5009cf3e392fa373ef4b6a8de950632839cd5111876f1337527471c61bce34dea9c4f33259fad5607d65dd72c0493 SHA512 8ce3f73d5ef84922dfb7574cbf01adc9fd0d2eb34b9e9f56a57aa888944ef66cd4b35286b559dd4d0769a024693622896900adbfec391d316e20b533781dbe49
-DIST libvpd-2.2.6.tar.gz 374262 BLAKE2B b7741948aa62ad6221d28a674f765d085e1446c0bb45d7aa7a5f08599471023b2bb794ad5645c3b70af5806cd48cc87f117f9b4021e0f8c872ca48b748cc1e60 SHA512 17046eeb6ccc5372d465848eff7135cf6e9f876a2d82862e1d01a9f674b691958942e119f846bc3220c1e8f7eb549c5c7867d5d5e896072c733f400d202abc1d
 DIST libvpd-2.2.8.tar.gz 52725 BLAKE2B 76bdc6ddf80236a6848185273c2cac181d44214f0c609d7c5af6fa4d09a7cd816324af35745617ce3daa7268311e2ed754335600df1d4970a324eb327015d051 SHA512 d0b7d1760c6ae54717c538405c651317b7318dec5780961f5386c09b7d245e35a84c2fc47d89c47c3cd2168d73d7186f5819981d52c3ba962514639833dc62aa
-EBUILD libvpd-2.2.6.ebuild 896 BLAKE2B b5b1f44f7baeb76b113abb72bb93ab264264cfcf401ae2feda707f6cbb4443ad9827cdb44fd4100fdbd0bd2511f63033c80b1cc6555dd744820aec6b7c4d2ddd SHA512 68d26a3b3c1c7a9db3f39a8201cf07a4809e5be5424a177aabbddd58dd796e4c759466242099135e94fe8d62e89413524a0f10c55813e76e70c3b76327e79328
-EBUILD libvpd-2.2.8.ebuild 911 BLAKE2B 71b4ca4d178740dd80642635562400b1c166fb3e22d6717462190accfe346fd57af9dc4242d5b19bfc4addaa61992e424b0e74cc530b561ef301b82f6d0d1253 SHA512 e46a8cba1cd7ff8d6de787e069d11b6b5c37408e0fae107e4d267f296057548838898fec35c643dc1a5eeb486b5bda19305b8a5067019e154d092587a0f11c91
+EBUILD libvpd-2.2.8.ebuild 909 BLAKE2B 6b3e715ce6d8c736d205340513b93479f1c8d176e29b2e162f27d448f8d08fe962232050a44eb57c46d9049c4a4cf5af8f533a4061dd2670b6504e579042abd4 SHA512 c1af2a36595cae47c3d803b2ce14e664587aa7348376f03f194d5d89a7c64e86c15e8da0aff50858a8862bf194b8dfaa597b3000fa4940dce91d38ac4c304e08
 MISC metadata.xml 343 BLAKE2B 88ff852b7b901d0f81c494ab49f283835edb7e312965526050fde66fcf0b259c197e0b1b312e09910a77257e4e1b8d8f3fd6c465b95a9fbe7288b8d64a4a6659 SHA512 42f1b8b76a107cfa61ae9db8b900aed22a3bc8e8d3573dbb3c507ebde688ef2c50f7f79847eb345e738365fbb99ba22d99aee56e302c6eed064379ddc1e3a710
diff --git a/sys-libs/libvpd/files/libvpd-2.2.6-localstatedir.patch b/sys-libs/libvpd/files/libvpd-2.2.6-localstatedir.patch
deleted file mode 100644
index 78a44a6351c6..000000000000
--- a/sys-libs/libvpd/files/libvpd-2.2.6-localstatedir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -66,6 +66,6 @@
- 
- install-exec-hook:
- 	mkdir -p $(DESTDIR)/${sysconfdir}/udev/rules.d/
--	mkdir -p $(DESTDIR)/${localstatedir}/lib/lsvpd/
-+	mkdir -p $(DESTDIR)/${localstatedir}/lsvpd/
- 	install -D --mode=644 90-vpdupdate.rules \
-                 ${DESTDIR}/${sysconfdir}/udev/rules.d/90-vpdupdate.rules
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1046,7 +1046,7 @@
- 
- install-exec-hook:
- 	mkdir -p $(DESTDIR)/${sysconfdir}/udev/rules.d/
--	mkdir -p $(DESTDIR)/${localstatedir}/lib/lsvpd/
-+	mkdir -p $(DESTDIR)/${localstatedir}/lsvpd/
- 	install -D --mode=644 90-vpdupdate.rules \
-                 ${DESTDIR}/${sysconfdir}/udev/rules.d/90-vpdupdate.rules
- 
diff --git a/sys-libs/libvpd/libvpd-2.2.6.ebuild b/sys-libs/libvpd/libvpd-2.2.6.ebuild
deleted file mode 100644
index 2a691e27d0c6..000000000000
--- a/sys-libs/libvpd/libvpd-2.2.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit udev
-
-DESCRIPTION="Library implementation for listing vpds"
-HOMEPAGE="https://sourceforge.net/projects/linux-diag/"
-SRC_URI="https://sourceforge.net/projects/linux-diag/files/libvpd/${PV}/libvpd-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="ppc ppc64"
-IUSE="static-libs"
-
-DEPEND="
-	>=dev-db/sqlite-3.7.8
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.6-localstatedir.patch
-)
-
-src_configure() {
-	# sysconfdir is used only to establish where the udev rules file should go
-	# unfortunately it also adds the subdirs on its own so we strip it down to
-	# dirname
-	econf \
-		$(use_enable static-libs static) \
-		--sysconfdir="$( dirname $(get_udevdir) )"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/lsvpd
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/libvpd/libvpd-2.2.8.ebuild b/sys-libs/libvpd/libvpd-2.2.8.ebuild
index 9c9a0165e233..0c38cecb19fc 100644
--- a/sys-libs/libvpd/libvpd-2.2.8.ebuild
+++ b/sys-libs/libvpd/libvpd-2.2.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~ppc ~ppc64"
+KEYWORDS="ppc ppc64"
 
 DEPEND="
 	dev-db/sqlite:3
diff --git a/sys-libs/nss_wrapper/Manifest b/sys-libs/nss_wrapper/Manifest
index a6daa046e346..dd45a480589c 100644
--- a/sys-libs/nss_wrapper/Manifest
+++ b/sys-libs/nss_wrapper/Manifest
@@ -1,5 +1,5 @@
 DIST nss_wrapper-1.1.10.tar.gz 89593 BLAKE2B 9f478f87acbe9a842edf443ddfc45642621cee22dd03342cfb7dcc03fd4b188950a43527d3b332b03714729f7f57cf072b77ffb38574b98124dfdbb4b03f227d SHA512 7c2f0eccdb3535643015aea8b4bdb87b421c3575c3124b62c8f17c9d3db54d92ba012524674c41c16f02a1b6ebe4177724f04eefdc04760ca49b32d3f77910c5
 DIST nss_wrapper-1.1.6.tar.gz 57893 BLAKE2B 4952b1af2b2b0487104b650b98694e5d39aed9edb44992d22e10ea38a2c4009f076aafa36f43775a021eca5b1f2708c9f42fa711d6715c43b077a9a3341570e8 SHA512 213d611abc072cb8d098b0782f661b4cdf1dcfd04fb564fb05034f023197aeed15a684478c660c00fb72f9438a192914e7b6878e505e4380435534bef52e0328
-EBUILD nss_wrapper-1.1.10.ebuild 407 BLAKE2B cf485f8b2895c1733ed5191737eefa958b695ceaf09c4c85aacf96640ed3c0d40402a5899ad7ce81e151f75864ca58736cd15ce4c5bfbdd12221ddecb7cd7079 SHA512 2436a0db28b39060454bc1b517c1dd9cd2a1634b9dbbd285ff49a0e97e136e7adfb100f0cb7b6f72612f6d4d8f5738b2b055ce4a5070d78b037b70aa146e8953
+EBUILD nss_wrapper-1.1.10.ebuild 406 BLAKE2B 9c7f1db9406e4d19353b3aa905030a59f2a66efaf5ba59d13c33e8a57636685f2cf334819bd6b7ff93f5b2c25677296189b8d500d0108262c260e2a354baaf89 SHA512 5cdab07c6b3373f84cca9e8fb751c2cf23e1893352a8ab4ace9dc2d6bdc4a974214c12cc7b1869da92496b7f03b3857d0181d722dd78fe2433647ef0df47757d
 EBUILD nss_wrapper-1.1.6.ebuild 406 BLAKE2B 9c7f1db9406e4d19353b3aa905030a59f2a66efaf5ba59d13c33e8a57636685f2cf334819bd6b7ff93f5b2c25677296189b8d500d0108262c260e2a354baaf89 SHA512 5cdab07c6b3373f84cca9e8fb751c2cf23e1893352a8ab4ace9dc2d6bdc4a974214c12cc7b1869da92496b7f03b3857d0181d722dd78fe2433647ef0df47757d
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.10.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.10.ebuild
index 81bca4f18a7a..5c9ce92a6146 100644
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.10.ebuild
+++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.10.ebuild
@@ -12,4 +12,4 @@ SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 8a11dff82e50..ed511aa33fad 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,4 +1,4 @@
 DIST Linux-PAM-1.5.1-docs.tar.xz 441632 BLAKE2B 1b3ad1b5167936b8c38977b5328ee11c7d280eb905a0f444e555d24f9d5332583f7e0ce0a758242292ff1244bc082b73d661935647e583e2ebcd8d5058df413e SHA512 95f0b0225e96386f06f5f869203163a201af3ac5c1a4fa8bd30779b9f55290e1a5b63fa49e2efafa1a51476bad1acf258b1f37f56a4bdc3935f9fe5928cbc1f7
 DIST Linux-PAM-1.5.1.tar.xz 972964 BLAKE2B a1714569587a383fa8211b23765c66b08b18dc2808c1521a904171dc2886cced56e9afa27408e8a9d5eec6226b31390dc8f14434071370f4e1147c77ce8b36ac SHA512 1db091fc43b934dde220f1b85f35937fbaa0a3feec699b2e597e2cdf0c3ce11c17d36d2286d479c9eed24e8ca3ca6233214e4dff256db47249e358c01d424837
-EBUILD pam-1.5.1.ebuild 3768 BLAKE2B 2fd1a0ff5d0e6dd0ee32bb6e2a62d1bb436f8f54d884e57450d7ba3ec0386f53795d8f6232310c0a016ab502f937b9878dbac7ae74a955975b2374dc23603b64 SHA512 2dd18640fe75b6a2657cca01c6746cc73b5a8bd0abdfa92706bb80b77a02c66acd764daa84ca0e32c0986df130a75c72b4e06a8f70f778bbd778ac51b0fe9b3b
+EBUILD pam-1.5.1.ebuild 3758 BLAKE2B b41ec65e33241e391a61c7b93149c1d3766743d57cc789fdd5fff392ee2f7db636d46494a4e9b04ed0e7a8f3c453830b81680e946a5540d1c9b9d68fc3b59983 SHA512 8056f7540e38702d4e02f8fdcd1f1fd3b8abe248b9b67a285c789877389eeb856c9e623700384d08c5933c8060f43a51bd7902c27375fdef907094d04f0ff166
 MISC metadata.xml 695 BLAKE2B 26bfcf404440c1262220cc12bba80561529e9bf1c5f7f0c9f84375874f348f35b08866117061c087f4b870f6d6f80ebe16f4a42a63ff5e95aa69ae9bcf97c9d9 SHA512 87045043ba8805232883ffdbcfa50dc53de3d46e7889e520481c7b126b4ef9c9c2b83878a73d26a8edd71c0edeff8dd7bcd4a8b2a34893574b8bc8e7e94c6fc7
diff --git a/sys-libs/pam/pam-1.5.1.ebuild b/sys-libs/pam/pam-1.5.1.ebuild
index f9d428c8afbe..9b922b712136 100644
--- a/sys-libs/pam/pam-1.5.1.ebuild
+++ b/sys-libs/pam/pam-1.5.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="audit berkdb debug nis +pie selinux"
+IUSE="audit berkdb debug nis selinux"
 
 BDEPEND="
 	dev-libs/libxslt
@@ -65,6 +65,7 @@ multilib_src_configure() {
 		--includedir="${EPREFIX}"/usr/include/security
 		--libdir="${EPREFIX}"/usr/$(get_libdir)
 		--exec-prefix="${EPREFIX}"
+		--enable-pie
 		--enable-unix
 		--disable-prelude
 		--disable-doc
@@ -75,7 +76,6 @@ multilib_src_configure() {
 		$(use_enable berkdb db)
 		$(use_enable debug)
 		$(use_enable nis)
-		$(use_enable pie)
 		$(use_enable selinux)
 		--enable-isadir='.' #464016
 		)
diff --git a/sys-libs/pinktrace/Manifest b/sys-libs/pinktrace/Manifest
deleted file mode 100644
index fccb9e4b2175..000000000000
--- a/sys-libs/pinktrace/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pinktrace-0.9.3.tar.bz2 405153 BLAKE2B b627f7696acf9e1a0300c4731ecdcc63e490a80277f6ec47f5c5bab62f7dc874534855ad8efaaa47e63b865cd5c3c8770f0c12668da34324c2f12cd356cbde75 SHA512 8250699d5c7c48b0d8c7df795a81f0aea724471bc32d81aeea1163b8c763028c36905b812e9c3eeb8d7642583bd32200d659d019edafb146835232f9736b6591
-EBUILD pinktrace-0.9.3.ebuild 564 BLAKE2B 1db29d423bfff26d2d1cfd619fa034708d8b71e766ef49ffe042990a8b204028494a0f16ccd11f63c556b0a1d66630a016a97391293d7e7b662e1d778f887486 SHA512 f6bc36180b12228708f219634281b3a13e019f2dcd6200b70b4c30acfad776107d6d3b5aa1e10e1ee63e8ef951f2bbf0c68d86ae268bcd89efaf73087f829836
-MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/sys-libs/pinktrace/metadata.xml b/sys-libs/pinktrace/metadata.xml
deleted file mode 100644
index 0319eec4c8be..000000000000
--- a/sys-libs/pinktrace/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sys-libs/pinktrace/pinktrace-0.9.3.ebuild b/sys-libs/pinktrace/pinktrace-0.9.3.ebuild
deleted file mode 100644
index 5a6bc3e8662f..000000000000
--- a/sys-libs/pinktrace/pinktrace-0.9.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="ptrace() easy wrapper library"
-HOMEPAGE="https://dev.exherbo.org/~alip/pinktrace/"
-SRC_URI="http://distfiles.exherbo.org/distfiles/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0/0.9"
-KEYWORDS="~amd64"
-IUSE="ipv6"
-
-src_configure() {
-	local myconf=(
-		$(use_enable ipv6)
-		--disable-doxygen
-		--disable-python
-		--disable-python-doc
-		--disable-static
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index a4b882f7ffbf..b44f2d263d5c 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,3 +1,3 @@
 DIST talloc-2.3.1.tar.gz 638878 BLAKE2B 3d014a47639434c65f5dda2c51da3c6c28d5d60dbc9afdaca27b8ec903cde3433a8fa4ca33305750ff60911f7e43171d0d932d98c2d30ea38494aa532d6d9626 SHA512 064fc39a9aaace6e0209f3251c8ff198d8a318b4cf4198006ff9892ca6e15e7d817b2fda43e0444fbbf04d2c3e70d06523dff5d57cbb796d27317ef4759e062e
-EBUILD talloc-2.3.1.ebuild 3429 BLAKE2B 9d549023980e9a44467dcc3f02dcc40e070229e0cd6ccaf534cdcae035690dcec05b0b02b296e5bcbe9be6242d0ca6e33212362c997ac788751dbf8c12a315ba SHA512 6bbb0c51b61a738ab9ec1a4db14d3329bb5f56533c02c54b657fda4a48e35ea7b271b07ca64a6248e2340612bd28222ad0f70587eb2cc49dfa9991cdbcf44cf2
+EBUILD talloc-2.3.1.ebuild 3431 BLAKE2B bd7a22877aa80dc94a1db756b1377f96925b95a1bf90225402bd0081a81e004c73a2275da97a53cbd0128ea69332dd1cc7d85aeab09e48fa712f59551e8b39ba SHA512 7acda5f7387af1492a4bb63400af5eb932caa4a1d3985a94b949da49b26b39c003aa339ce628edc65b3e791f638750a78e24118ffe025d89c938c6ad8b503b41
 MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3
diff --git a/sys-libs/talloc/talloc-2.3.1.ebuild b/sys-libs/talloc/talloc-2.3.1.ebuild
index e6dbe274fd69..a1ea35754f4b 100644
--- a/sys-libs/talloc/talloc-2.3.1.ebuild
+++ b/sys-libs/talloc/talloc-2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit waf-utils python-single-r1 multilib multilib-minimal
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index 785fc5581d28..1cf4d317bd70 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -1,3 +1,3 @@
 DIST tevent-0.10.2.tar.gz 800731 BLAKE2B 5ea6b83378b04dbe1666432db0dbd4c0df2e6b0bf5ebcc8ec4ec9bdeb834efec75c87b2019dc78c691aba6c4f6467394101febd6010f106046a1fb8848e27405 SHA512 1da8f28898f35daab515892b880d1de601062cc3e2b2570cd62e6913df17b0195a05acb7b484c628cddc0eb8b0cde893105ede3feb32bc5764e7d25684f332ba
-EBUILD tevent-0.10.2.ebuild 1605 BLAKE2B 401623d3836fbea1cffb8d8fe9d68e1fafdcabacee166885dfbc19fe482a1081c0d4920a62d4ffdfda9095c82473a11f4dbf8175aa7c5a66091e11162c32ed63 SHA512 6c01a01dba4bf300abb8c4d96e0b9d4a1693a50a1f3e3ac84305126418afbdc8f56bf652da5cc36c21c8863beafc018ba7b7c49c9d8d4e173af63089b91edf5b
+EBUILD tevent-0.10.2.ebuild 1637 BLAKE2B 3bd8a260460f1e11c8d6764f7636ba54b37691ff4eb50d2ce3742aa8f4df3cd1ae4d4c326ba11853bb53333bd32c8a96923362873fcd46de09880bdcccbb5d3a SHA512 308ebbafc5cc1881615cfc6782e4b47ce9557fd7af8e9be6a49cee63af7a7681cc3c79a02a5e9ba07158c3b4369de01e7336fecb7490aee3a0183dd32fae563f
 MISC metadata.xml 345 BLAKE2B 2b19478c92e6a2e49d4421494986bf139e3e130ee9486f8ee2a208ac91db84662fee1b5ced560b29c926e6ab1c07752a4d6679582f220c50713c3b1dc2aa2e6b SHA512 35515a1369eeb1e4949415f8571fc54e7546ac83a59b506e04dc795f0a9b4cb06d7c8e1785577c20ca398fd87543f1742d9d4267fc09320503835bad1fc36cf5
diff --git a/sys-libs/tevent/tevent-0.10.2.ebuild b/sys-libs/tevent/tevent-0.10.2.ebuild
index 0d5e3cf69422..59709b2d5cc5 100644
--- a/sys-libs/tevent/tevent-0.10.2.ebuild
+++ b/sys-libs/tevent/tevent-0.10.2.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 IUSE="elibc_glibc python"
 
 RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.3.1[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	python? ( ${PYTHON_DEPS} )"
 
 DEPEND="${RDEPEND}
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 3811fd3e173b..bebe8d190e63 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,7 +1,4 @@
-DIST tzcode2020a.tar.gz 257509 BLAKE2B 21335f0b6a3b98ba8203d49d1273c2016bfbef9903c394cda6ca97cc5ec5d1fb1605bb73ba9aa6c73eca3fe115fb2924da37b736bf0a8a0e214eed547100fe70 SHA512 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2
 DIST tzcode2020d.tar.gz 260182 BLAKE2B ddf00c3a87b09de52f9ebb8ce8141ca22c2cec5340a476df041fdbfa5899af4c78cfa63d733e33e63b7efa3f37541eacc0bd4b240bcbcaa8708ee9c13cf582fa SHA512 315ce86574780d89482761298137b2871a21cb4391886abdc9f29c6cc09e8b8f6585f96d3f4dfef8d7b54e24720214f5c77144114ad58cc91aa5bbde350c0f9b
-DIST tzdata2020a.tar.gz 397245 BLAKE2B 2a85a9a9badbf2b74ba2ace3f7fd436cc7752202557785be503c1c8f2f698dfc8cfb412b3f08ebc0bd4a8d0e27293b47eeedf937f713dadb4386dad14322b871 SHA512 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d
 DIST tzdata2020d.tar.gz 401479 BLAKE2B 0136bf157e9a97fba56a02a2a495be19cc9b2008c6106eb9d4f4af13cb24848bd72e7e9c0182ca4643819a95ecfdff8750ff199bb2d1f9a560b4cd6685b41e50 SHA512 362e4569a666b0776614be3f63f1fe3d5ae259055e7051c9875f36023db9c52b0c5a10c19067114443a4cf2bf92475f8a0aebdf79bac836d967527fcdea4e9b6
-EBUILD timezone-data-2020a.ebuild 5200 BLAKE2B 3db29450f1cd759b3cb5cd1c8f45dd8ad4663aad1928c10bd3d81220f650ca76f859e6d220759cffcbde9d36f3e203264ca26793318b69fcb93bbcbabd50387f SHA512 9c2bb39c24a32a282abcaf345ef87f41fcaf8ed878ab6e5a2d814d982c8ffa9bb9b0b8f0081f1a2494e2862a11dc79d6df6e2abda41070cb12743e330c83a505
 EBUILD timezone-data-2020d.ebuild 5400 BLAKE2B 202c859b79dc9ea54084967cdb68d8ad18d6692d8a32223bc73f442be7be6f0bb2280aab5a508203b1b13967c64aa0c0777ac7e9e40c4941c97fc4686916330d SHA512 828f2646fd5c3172cc01a5e990fc50753dfa21d49aea99c8985a35a33c7961a94358da8aa48beb0eeb0c4c697d5267a173b7ff7462f125753e530c7a50abac8d
 MISC metadata.xml 728 BLAKE2B b390f4f3d184c7f424d97a36883c9ab67f56a2445d6ecfe6deca69d42864b1249fa2fec6a48bf693f9b2101c167597e5a435cf13a8797784e8f37ad870bf3daf SHA512 36e2c2fa026441ae4b21d33b9425a7195c4d4d404e8f010e9bf894be3095b0d461079a87126f22c398475652777301aa5dcf151b195502d25b4094420c56c7e4
diff --git a/sys-libs/timezone-data/timezone-data-2020a.ebuild b/sys-libs/timezone-data/timezone-data-2020a.ebuild
deleted file mode 100644
index 04def569f2a5..000000000000
--- a/sys-libs/timezone-data/timezone-data-2020a.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="https://www.iana.org/time-zones"
-SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls leaps-timezone elibc_FreeBSD"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
-	default
-
-	# check_web contacts validator.w3.org
-	sed -i -e 's/check_tables check_web/check_tables/g' \
-		Makefile || die "Failed to disable check_web"
-
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-src_configure() {
-	tc-export CC
-
-	append-lfs-flags #471102
-
-	if use elibc_FreeBSD || use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	fi
-
-	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
-	LDLIBS=""
-	if use nls ; then
-		# See if an external libintl is available. #154181 #578424
-		local c="${T}/test"
-		echo 'main(){}' > "${c}.c"
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
-			LDLIBS+=" -lintl"
-		fi
-	fi
-}
-
-_emake() {
-	emake \
-		REDO=$(usex leaps-timezone posix_right posix_only) \
-		TZDATA_TEXT= \
-		TOPDIR="${EPREFIX}" \
-		ZICDIR='$(TOPDIR)/usr/bin' \
-		"$@"
-}
-
-src_compile() {
-	_emake \
-		AR="$(tc-getAR)" \
-		cc="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			AR="$(tc-getBUILD_AR)" \
-			cc="$(tc-getBUILD_CC)" \
-			RANLIB="$(tc-getBUILD_RANLIB)" \
-			CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_test() {
-	# VALIDATE_ENV is used for extended/web based tests.  Punt on them.
-	emake check VALIDATE_ENV=true
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
-	rm -rf "${D}/nukeit" "${ED}/etc" || die
-
-	insinto /usr/share/zoneinfo
-	doins "${S}"/leap-seconds.list
-
-	# Delete man pages installed by man-pages package.
-	rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
-	dodoc CONTRIBUTING README NEWS *.html
-}
-
-get_TIMEZONE() {
-	local tz src="${EROOT}/etc/timezone"
-	if [[ -e ${src} ]] ; then
-		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
-	else
-		tz="FOOKABLOIE"
-	fi
-	[[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
-	local tz=$(get_TIMEZONE)
-	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
-		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
-		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
-		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
-		eerror "be using right/xxx for the system timezone as it breaks programs."
-		die "Please fix your timezone setting"
-	fi
-
-	# Trim the symlink by hand to avoid portage's automatic protection checks.
-	rm -f "${EROOT}"/usr/share/zoneinfo/posix
-
-	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
-		elog "Support for accessing posix/ and right/ directly has been dropped to match"
-		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
-		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
-		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
-	fi
-}
-
-configure_tz_data() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime"
-
-	# If it's a symlink, assume the user knows what they're doing and
-	# they're managing it themselves. #511474
-	if [[ -L "${etc_lt}" ]] ; then
-		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
-		return 0
-	fi
-
-	if ! tz=$(get_TIMEZONE) ; then
-		einfo "Assuming your empty ${etc_lt} file is what you want; skipping update."
-		return 0
-	fi
-	if [[ "${tz}" == "FOOKABLOIE" ]] ; then
-		elog "You do not have TIMEZONE set in ${src}."
-
-		if [[ ! -e "${etc_lt}" ]] ; then
-			cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
-			elog "Setting ${etc_lt} to Factory."
-		else
-			elog "Skipping auto-update of ${etc_lt}."
-		fi
-		return 0
-	fi
-
-	if [[ ! -e "${EROOT}/usr/share/zoneinfo/${tz}" ]] ; then
-		elog "You have an invalid TIMEZONE setting in ${src}"
-		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
-		tz="Factory"
-	fi
-	einfo "Updating ${etc_lt} with ${EROOT}/usr/share/zoneinfo/${tz}"
-	cp -f "${EROOT}/usr/share/zoneinfo/${tz}" "${etc_lt}"
-}
-
-pkg_config() {
-	configure_tz_data
-}
-
-pkg_postinst() {
-	configure_tz_data
-}
diff --git a/sys-libs/uid_wrapper/Manifest b/sys-libs/uid_wrapper/Manifest
index aa77e4eb598a..7a07740d72e7 100644
--- a/sys-libs/uid_wrapper/Manifest
+++ b/sys-libs/uid_wrapper/Manifest
@@ -1,5 +1,5 @@
 DIST uid_wrapper-1.2.7.tar.gz 47580 BLAKE2B f33a2a29a3e61315ae48317b759898cabcfcc50f72a7fac9388b2b5791a76f66e88a6339ca45c319df102354d592d6a26c8046193b7c4d07c4e4ce3f4031672e SHA512 ed906638ded4fbd981212f38de66112e65514b618bda6b1bda85a915c00691d471859df7c8dc7915b546e5c8e107e2e07e6b3a841fcebeedc8cf4b18e5c16f1a
 DIST uid_wrapper-1.2.8.tar.gz 47864 BLAKE2B d165954b4418ee23c7564d809a3c2189fc43c91822c8e4a73bdf6ea8e1621156bf0a29097b07a4d8b31ea1d10af35c3be367c4ca8f1e13db1b430f297b47b6ea SHA512 536f353f35e84ffd350a3cd5a96ff30e7b1fd4ba455dbe34fd232ed1a14b061351110c7e0cb4376a27cbde1eda789ef93e635ffa2e9948cadc41c2f1fdcfc3b5
 EBUILD uid_wrapper-1.2.7.ebuild 448 BLAKE2B 82427f8b6b11ccd7956351dffa127d41b48c9fe106d127ff1b676b1b461a7254405fb62b673ef02d0ab36a07ec2ab22512db5bc87d5bf3e2c471099890b120aa SHA512 9a3acb300189688453139b1e58d5cb0a6cf41d3ac4729c1cdaef42fd7a8993d68ac151eb8b03257acab41daa2a71f63b173ec53c85037e58ea2dca9e6f0983a5
-EBUILD uid_wrapper-1.2.8.ebuild 449 BLAKE2B adf6573cff70b77a7c9795911058c58b34903ff1e2da45c641e84e138675567eb163c0d7cdb8ff5f5a40baa36c00cb4701835d391c9909b258c6a2385e085cd4 SHA512 67a57ec6145d8d09afba5c913187311af36ef5713964c653376192761839255ba81f27cde7507120351461232f26ff3834cc1d3410867b4f7fb3a7a39e371127
+EBUILD uid_wrapper-1.2.8.ebuild 448 BLAKE2B 82427f8b6b11ccd7956351dffa127d41b48c9fe106d127ff1b676b1b461a7254405fb62b673ef02d0ab36a07ec2ab22512db5bc87d5bf3e2c471099890b120aa SHA512 9a3acb300189688453139b1e58d5cb0a6cf41d3ac4729c1cdaef42fd7a8993d68ac151eb8b03257acab41daa2a71f63b173ec53c85037e58ea2dca9e6f0983a5
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild
index 65c553494e10..00c61d6d09c3 100644
--- a/sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild
@@ -13,4 +13,4 @@ SRC_URI="https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-18 11:06:49 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-18 11:06:49 +0000
commit	ab3da91fb6c91a9df52fff8f991570f456fd3c7a (patch)
tree	e8f3bfa2c6c3d20ec3b9c352c839e23949068b6b /sys-libs
parent	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (diff)