8 files changed, 4 insertions, 94 deletions
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 3951d75e1ad9..2912372f6a39 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 32003fb47df6..8068f4f60596 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -10,6 +10,6 @@ DIST audit-2.6.4.tar.gz 1078677 BLAKE2B 056d9f269926d9b0d74f7187f833f1e94d4e03a5
 DIST audit-2.7.1.tar.gz 1099083 BLAKE2B 10f72ac3273ce9e23e1fb8ad8d57dcae772ba1f861f519867399d95e14f4809897637969de45566d62a73a35e5674260155773daf8de00481fcbd1b9c3138f96 SHA512 37964d81deee8608fde5f90d5d096727d3eb009e084be34749adcb0662e607e35c49c80bd83ce38b17161f11363b691721c8a8aa5dea832d320c53ab0ebb7483
 DIST audit-2.8.2.tar.gz 1121970 BLAKE2B bbec694ed1177a8590d035c2d6d197e49343fc370b101589e58736042c3b12cabb68fe796422f3133feb79068ab7d5931efa5414d22edead10c8871fefcd2549 SHA512 888ebf5e8e9d285b82d87377fc8836886d7a8b089c1be4091420a77a0250c9baf09aebb7a6330ff5043fb35f51eb6baf8d4491e26da7ad0811f0087e395b5012
 EBUILD audit-2.6.4.ebuild 6194 BLAKE2B 5e159665e671092224196d91478246d2f9f56092dac4be65d86d6094bc535c276d90f2635be17214bc9fbae94aa9d4e58d1b538766eda940260c00ce9be66591 SHA512 5769b0f13bd033b5b465ca36d707c4324338fb2ce43948a2d656ebdb76d5004030e5a10057aa8d9f532d13484fdc1819f5633ce52a12c20dd301d0b4b7eaffe5
-EBUILD audit-2.7.1.ebuild 6196 BLAKE2B 9cd6721cdaa2470867e6f0e979516f1b236c0646740793aff418837f0b9e37d9c0d147843c08c6496fcfe621ae168a139bf6bbd7606b435b691475f6a4b24b60 SHA512 c45068aea2477d8ee2498db3b6fc61fc4529646e28e95c32cb2d6c214b2fb7df8604e0bf19708813777b9af70b4adcb7bdc8e7da15e57545a797203d88ac2a36
+EBUILD audit-2.7.1.ebuild 6195 BLAKE2B 9f40296698433df2c52c0d41986327519d0b7c47f8f8b38be3d4186ef1a19e00f1690b803afcbcec4a317c0395f844c19fe2201904788557ee7d6a46cca1c921 SHA512 d1228812ad097d58ca2577db360f688b8c7ea2d03deb79303e2410b010a25406c2b0706d0512d0b2529d7077f2128b26906ab81f94f2a08cbeb674d9f1399fc4
 EBUILD audit-2.8.2.ebuild 6205 BLAKE2B 82d223206cf3e14c58ce4bbdec2df18e5ad874eb440b4208a7c7463305ec2ec8039783e6436dff0623478db3dcb0d7909b4f077a819bee494d086f162d455e34 SHA512 ee1194da6ee59e8efb3d625853dfd98b0b4e034282aa72cd5f38860be7023c0e8d795c6898313551fca0b8477912a3d7608d821d74f66851136786620abdd630
 MISC metadata.xml 284 BLAKE2B c99c67d5591687a10bb380f1264dd1cde6370ff3a96864093cb41c7c17617bed826652b7651490b6a4634a7429589bbd137402afd7cf8e79cfd5f636c86baa52 SHA512 84f04c94a976c0e2c7db9a7c8c392b6c714e37650efefe2db9807688c28a8cdb64722064be23b89d0263c82c5de7b7dc412ae13f95b42c97ae928c00bb584fac
diff --git a/sys-process/audit/audit-2.7.1.ebuild b/sys-process/audit/audit-2.7.1.ebuild
index 549371894d20..90d7b0d046ed 100644
--- a/sys-process/audit/audit-2.7.1.ebuild
+++ b/sys-process/audit/audit-2.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="gssapi ldap python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Testcases are pretty useless as they are built for RedHat users/groups and kernels.
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 8562e3994f68..90bdb985afbf 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -9,8 +9,8 @@ AUX htop-2.1.0-ncurses_cflags.patch 1827 BLAKE2B 1881d0de7a8e1e16eb55280fc25d66b
 AUX htop-2.1.0-sysmacros.patch 2913 BLAKE2B 85ab3ffb0892c676a2c00519872faa898a2baad45948ac3d794eacc5bd045f592e0b46be7477c4ba27f1019f54911c11ee18cd90de433e11820cfd018c5aa7bc SHA512 ed4b05923ab4597afe6abd0c39107c858b2e9af7938625aefa23a300cfb12cf11f7f13704133d085c5bd8c64c70cc28d2db2f80a68e7a76ad4af3a9cc8c3bffa
 DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda
 DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb
-DIST htop-3.0.0_beta3.tar.gz 169576 BLAKE2B 6d62a818b53933de1d09e316eac41497f6f9c75b1fced691540e91348af0a0272f38dfd2dd935191c0782d2c4ca2fc6bee64d5827851329b73d7c31c590d3e9f SHA512 05b2f817b67206dce0f727394cc78437ecbd4575fed898dca0a7b25a7acaab42e8b674f4c040139080759d04e73e5fda58aab89c184f2b10e35edf19385e680a
+DIST htop-3.0.0_beta4.tar.gz 179849 BLAKE2B 2990090a3b898673fd3bf985077721aed79d00ee07c8a6808b25eb84e320a9c494bd8ad7440ea142ae01bd634ab8863e2cca01c5a52bd19a7e2f4746334acce8 SHA512 4a9c8765ddbd366b06f23e14dc2176cd2da5346e32867c6fa9f11e57018acb6cc37f9ada044febb1b9d414e4dc5958c3c84455649e9c05f64ddf1b37c59fc05e
 EBUILD htop-2.0.2.ebuild 1390 BLAKE2B d38a5264ba9f0f2c8467f3dc2ad61440c50945a2ae2b8782879e93084b405253899a8430aff263181b9b11bc74376d8a9f087bcbf4e29908e3c9bdd607cf8d6d SHA512 82e5bc99fe341b7492f219193fb74c241ba035455e0faae7cea42635a99069c6d195157d8bb6e13277483e47d5df37a579dcf57c0a6e0a33ec31d983b9b9f5c7
 EBUILD htop-2.1.0-r1.ebuild 1990 BLAKE2B 9e2842b82870620628f502cfb81e53436c78eca5ece566cd393751e6da1878a792d56632c294b52ff4c4aee02bfa1ffc81cbd22da8e7f52136bb6073a9de98ae SHA512 34441c4ea5ea25169d6bf84c89008b1b0d1d54eaaf1fbc6e46b5f3afabe561578ec8823bd02d6da2f563ae87213284fba66436657cb74bb1b18a6502ada5cd53
-EBUILD htop-3.0.0_beta3.ebuild 1958 BLAKE2B f64fd16bfe6b1cdc99131298102eb3ba562da99dfc3ffd7e50ff12ea5402b983fd7215c689c21570d44aebac6c6f6f6ef4be47192ed5ed79085a498bbedb14ea SHA512 fbc846d3d4c64bdb173dd6d0dc6f8ea260e428dd8099010dc4ce4ef63b444a94e87ded7d43aba377007ff1f6c6c569211a41ecfb91739d38dc7db1eaa81e51cb
+EBUILD htop-3.0.0_beta4.ebuild 1849 BLAKE2B 219ddc0369c745dfcd08821a05dbb8115dcc3ec89dc3c5b8bdbaed91da1b408f3258dca8676052a5915d78735f881d253eb017e2707bbc83e0ec9183c67b33ba SHA512 4f42160dc348cb5be44b86ab3e82a6f03043631d64f9d0602c729a3cf8774c54daa70a1c1fd96d166c9efab880412003845ccdadbdef37174711e33e89b45c7f
 MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072
diff --git a/sys-process/htop/htop-3.0.0_beta3.ebuild b/sys-process/htop/htop-3.0.0_beta4.ebuild
index 9400d99d515e..d0ff7771a218 100644
--- a/sys-process/htop/htop-3.0.0_beta3.ebuild
+++ b/sys-process/htop/htop-3.0.0_beta4.ebuild
@@ -53,8 +53,6 @@ src_prepare() {
 	fi
 
 	default
-	use python_single_target_python2_7 || \
-		eapply "${FILESDIR}/${PN}-2.1.0-MakeHeader-python3.patch" #646880
 	eautoreconf
 	python_fix_shebang scripts/MakeHeader.py
 }
diff --git a/sys-process/tini/Manifest b/sys-process/tini/Manifest
index feb38eec873d..e0eabb080ca4 100644
--- a/sys-process/tini/Manifest
+++ b/sys-process/tini/Manifest
@@ -1,9 +1,5 @@
-DIST tini-0.13.2.tar.gz 27828 BLAKE2B 2a983cc654c6553d372ee425d4d153b50522a5e3ee0190262383b650e63c3239f30553504f49925b6e7caaa721fc350bab98e0c87446757d65d4056df58ee4a3 SHA512 117822bf2e45b7cf732bfcd2aa5ea268a189c395f189c03d0e5dcd982872cff29d50adbb1a4d1b85859db4736e932900cfb64a1c487ba271a305146e9677a1d4
-DIST tini-0.15.0.tar.gz 29473 BLAKE2B 24aa6ec5f0d24603907d7de816d15d1b6cb6c90a254e5b0f6a52f29ba1dc2ffd7b578b67a97b68230f49b22b7848a677f73db06c659d60eeef48ca46764c961e SHA512 774addddeb2bcefd1db2e4bff7c55bba6c3f4adc41e0b2a647059eef8cc5cc9d4a47b68cb4b89aa4e9e52b85916fe2680dad2a414c82b3c276beea89e3689481
 DIST tini-0.16.1.tar.gz 29641 BLAKE2B 637ee17bbf8553b7803dc78cc40ec55ea919ec003005c7f2524322df6cc93a2e4c6fc017fa25c581f50eb17482956ebf37bf49c7796c33d227c7327ca467a906 SHA512 aa0a802c403a07771a2b28a07b97fa2c93d40b5d5be2cba6556c8e7a92e608453010625d0236d26c27bdd2820aed3ad9ca676b70f7fcd5986d7f91eb928d053c
 DIST tini-0.17.0.tar.gz 30881 BLAKE2B 8212bfa56b6ade3b79e1d4d3144b10b98e4daf19e9a9c93f6db44dfea22f80b4c6810619832b339984681d1933d00964f7cfbf516286354141f795d3cb5e745f SHA512 4e59241bd621cd89f9c07dcd7a21754a947c87d3571b06bc5f034c0059a20cbc02d4d22fd08a79633b84fd47980dbf5240e2d2fa382aaf5c32e6003710b7691a
-EBUILD tini-0.13.2.ebuild 910 BLAKE2B 44bd74197ebd18fddb00f4f9b285da19dcdbcdce97548317ca4e786e7e3ce5724e3a2c85c5741b6ceff57e46c87c632cd27e2c629a7b18ecb7d98eb91b0f4e63 SHA512 a7f116a229f64b1b90f7117ad3788e514138f30a10779ce13c06672f796fda300e69301426c0c912ee777894e7e156b1dc4421cc3b9d2a994e86a28f25ea2334
-EBUILD tini-0.15.0.ebuild 911 BLAKE2B 6f9ec5ab6f2788df3db968daddcbce06ea1b873392daadfc9b7c895e166497e6e8655d20696b8573c27256897936aaaa93559bc89d91d388ded358666a5a7cf1 SHA512 cb538a26c6d6d0aeed29b976613c85cc5363e790b6eb2c73d78b43ece9185adbe811976e3cc9e9a38ec987e8b5dc5e5585b8bdec3be40cf11b37237f15567f02
 EBUILD tini-0.16.1.ebuild 910 BLAKE2B 44bd74197ebd18fddb00f4f9b285da19dcdbcdce97548317ca4e786e7e3ce5724e3a2c85c5741b6ceff57e46c87c632cd27e2c629a7b18ecb7d98eb91b0f4e63 SHA512 a7f116a229f64b1b90f7117ad3788e514138f30a10779ce13c06672f796fda300e69301426c0c912ee777894e7e156b1dc4421cc3b9d2a994e86a28f25ea2334
 EBUILD tini-0.17.0.ebuild 911 BLAKE2B db44d845dd47b42e0a707d5bb342cfdcc7f6d79ba2f5e114fc03788be003854e7f7b2b53f86b80a1bae961b85d0ae98a8dce34187027aa2e088cd7b33feb4e46 SHA512 1b3d1aa8f75d7ac3fbbae3dbdee31e370e1c2c44c1763ade560e5940153fa0f45c63e7e3ffba97b18fa5c0f41b50efec3bd519964893af77467c2e2c8126709d
 MISC metadata.xml 603 BLAKE2B 5e702a958ad14189e4be030441833428283784695d116c8404be905b6aece027ec8acbe05394c6108d13ad04eae0284dc88cbab77364aeb73dfc21001457f7f7 SHA512 9e6651c7f9ae7a2b3d856af9e74e8656f89de4496fcacf5d97bcbe4d2b20be01c306cb3e116a0ad7eabe213e2476245894ffa53e5c63ef9b4e73ca989584af9c
diff --git a/sys-process/tini/tini-0.13.2.ebuild b/sys-process/tini/tini-0.13.2.ebuild
deleted file mode 100644
index 4e2956b566d1..000000000000
--- a/sys-process/tini/tini-0.13.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="A tiny but valid init for containers"
-HOMEPAGE="https://github.com/krallin/tini"
-SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="+args +static"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# Do not strip binary
-	sed -i -e 's/-Wl,-s")$/")/' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=()
-	use args || mycmakeargs+=(-DMINIMAL=ON)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use static; then
-		mv "${ED%/}"/usr/bin/{${PN}-static,${PN}} || die
-	else
-		rm "${ED%/}"/usr/bin/${PN}-static || die
-	fi
-}
diff --git a/sys-process/tini/tini-0.15.0.ebuild b/sys-process/tini/tini-0.15.0.ebuild
deleted file mode 100644
index 2ba5c74f375a..000000000000
--- a/sys-process/tini/tini-0.15.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="A tiny but valid init for containers"
-HOMEPAGE="https://github.com/krallin/tini"
-SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+args +static"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# Do not strip binary
-	sed -i -e 's/-Wl,-s")$/")/' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=()
-	use args || mycmakeargs+=(-DMINIMAL=ON)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use static; then
-		mv "${ED%/}"/usr/bin/{${PN}-static,${PN}} || die
-	else
-		rm "${ED%/}"/usr/bin/${PN}-static || die
-	fi
-}