gentoo resync : 30.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
commit: f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree: e907cb121b30e3c1df1710719c0ddf4029597a47 /app-admin
parent: db063b515939ab15261136b24e4bc44386335c0c (diff)
74 files changed, 195 insertions, 2192 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index befb8afb24c2..0a0c13f70d31 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/aerospike-amc-community/Manifest b/app-admin/aerospike-amc-community/Manifest
index b09f8ae41e3f..1fe1ed42f51f 100644
--- a/app-admin/aerospike-amc-community/Manifest
+++ b/app-admin/aerospike-amc-community/Manifest
@@ -1,8 +1,6 @@
 AUX amc.init 562 BLAKE2B f4aed655b924f345905aa8d3f149799ad299086cca1555e4902e09b376a47e2da8a34445446b00f7508cf4b6ef1d7eb83df93ae6af7c89d9b6e23d027ea5ce45 SHA512 4f50237b23ec1d2257791266ee5ee4c8b963bb0429c7386d50e4ba74ee8a451cd99a8dde277ed92b490a9b40bf33f5f6920e66c777e388bae43cfe402d255094
 AUX amc.init.4 401 BLAKE2B a649832bdbc6dc33de0f87ac0037b1c38212b97abdec16d25d714db6c183fcaed0eb8374d7fecccaf8c8cdeff2c125007b4a924e208721e9d6a8e83befb93dc6 SHA512 00cca21719821efff950d272bfe1c35bbedaf5597507d2b19ecdf6f6c2e7ac7c1c1bdd42474177551e55b9751060ec396add7f4cc94f693537c105f5cbe1bac6
 AUX amc.init2 583 BLAKE2B 0745a48ecfdc060ac9995c0634761d9b16d7d190df9d6a3d8fd7ec415fda486157e22f6f7ff03b2d4a3afe93632a67e7ad07214831007101bd9ebc71557f6003 SHA512 c91d1e66a6bcd286efec425295fc168c7d277f0d4886c9e0cd43f49e58b9c9ae0b0c2c453d278404d4d07935c55baf91bffe272699de095df13028316cc0d317
-DIST aerospike-amc-community-3.6.13.all.x86_64.deb 1436414 BLAKE2B cd823dd1c546fe69948ef3f77fa8bf0a68a8d95ed3ee778272b84c39b1b1bc4e5afef803931ce859fd957421f4816358590a3c1e0845fdc524a0f029b52ce828 SHA512 8077f8c51aab39ca701eb1ada633a3a378e02fed39ef2e565fed57fa57cf12da6c69a2b3d93e179110c29043a0a5a114512d30752eab6356e1b819ae490d23bb
 DIST aerospike-amc-community-4.0.19.tar.gz 7868527 BLAKE2B 69835bdf3d7f1a4b23cd63bb7344c50b6bbbdc04fd55b2d6ec5783a429a442fa6cdf985c77cb4ac73f8ac0663ed2524c8d7a853e970cc086335cf810fd9eaecf SHA512 821de8569bf020b9a2b829e71aab5d48d25639620468aa0b3ed28dc24e0d57bc61be60939425c0a69c418602fa2fbf5ef60f1870edb3f04fa40a2a2aca281218
-EBUILD aerospike-amc-community-3.6.13-r2.ebuild 1388 BLAKE2B f971126d5b86b400227213acaa81e4505dcf239175d4cdf385a97f853a14e15fe7c9da007c0442ee4c1c9cbb646e15e7d7f307f9f2273eb45d51f468f0355a41 SHA512 9db72a868567033910b7e2ac823cc39203119d8620e0527fe91bc144ac9ea8a2475e61c3ae9726ea954f9af4ac6b0cb1689883a0162a15259c91dae3b0daffc9
 EBUILD aerospike-amc-community-4.0.19-r1.ebuild 539 BLAKE2B f68e4bdeed829f5340c2ce1dd15773da038a1755e7682aa4cc02236e7654ff956f87582be75bcea950c1aafd9f8b26848039990354ac780a9574425ae93b3a55 SHA512 89c275ed1d9706a4cd9bf068f0ab6d7931f6a7b346248b5ced94163e98434461b2c22226c0c83a75cec4f5f13a0efec63ab3a09c8537d513fe6bc1dcdd4681f4
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r2.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r2.ebuild
deleted file mode 100644
index 7c372174c825..000000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-python/eventlet
-	dev-python/flask
-	dev-python/greenlet
-	dev-python/setproctitle
-	www-servers/gunicorn"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	mkdir "${P}"
-	tar -xf data.tar.xz -C "${S}" || die
-	tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
-}
-
-src_install() {
-	mv opt/amc/amc/* opt/amc/
-	rm -rf opt/amc/amc
-	rm -f opt/amc/install
-	rm -f opt/amc/bin/uninstall
-	rm -f opt/amc/bin/amc_*.sh
-	rm -f opt/amc/bin/gunicorn
-	rm -rf opt/amc/server/site-packages/
-	rm -rf opt/amc/server/setups/
-
-	insinto /etc/logrotate.d
-	newins opt/amc/config/logrotate amc
-	rm -f opt/amc/config/logrotate
-
-	insinto /etc/cron.daily
-	newins opt/amc/config/logcron amc
-	rm -f opt/amc/config/logcron
-
-	sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
-
-	insinto /etc/amc/config
-	doins -r opt/amc/config/*
-	rm -rf opt/amc/config/
-
-	echo "${PV}" > opt/amc/amc_version
-
-	insinto /opt/amc/
-	doins -r opt/amc/*
-
-	keepdir /var/log/amc
-
-	newinitd "${FILESDIR}"/amc.init2 amc
-}
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index 4a53ac0c40f9..a9b71bc2e076 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1,6 +1,9 @@
 AUX apg-2.3.0b-cracklib.patch 920 BLAKE2B d1b0decd8a35db02ee8132350a04f61ada715e3316113ac0afa98b85602cf62594f392b14710c617426273acaf0d2d01a930b00809ba84d9ba3bf05b3ff9a327 SHA512 11fba45b144b28c613d6c9dc4cd2ed62d18ab306dfe2fb8e347e3d809d80f605096168b770fee70f9205f07f94aa87f8afe183551133431ad387d383a9b093a3
 AUX apg-2.3.0b-crypt_password.patch 844 BLAKE2B c87ccb6002eac2c363a5b35dc033badf3968562956a4f49697c98368293aa98f2420ff56ac742a7308a2373183c3883c5bce30cd1d8cb72f6f788df2891f8275 SHA512 bde5b1bbc4084cd4d2630ea92ed73c970cd217554638d17980c4d56b0da2f55cd7cafbc76b5073bd0415a7698b70df9d357f0c1731353dae46990e9407d7bb94
+AUX apg-2.3.0b_p20150129-cracklib.patch 1485 BLAKE2B e6df97af3cfe408d68a86461733a060a7045d9cafd1a82821c56756b6c69d27aba5ba6b7b189346daf52cd407703e07ccff4a66965953f0a20c1ac19add4a064 SHA512 d7e3b210627ac6df34cb380c9b6bfdfd3eff790750082c7ebc40a837a88c73467f0e5847633a51b32c7634a57821b06c704bace511dfae18bc5d3e473f9e43ad
 AUX apg-glibc-2.4.patch 260 BLAKE2B b30c414ed89f22eb7dc2d0e3b115dbbc0845aba06f2a9dc0dea61fb36d9ccfa231d56959e7f02b3f1fb337654eec5cf2bd60c53ce24e112470c9fc9b9c225680 SHA512 27463b291aee051a4a149664cfd3dea524a34cd88d5cb90c5b4891fe0722aad9993cfd10df555455890ea631d8844d566d23cbb3812f8cb2859e131ea4c42114
 DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
+DIST apg-2.3.0b_p20150129.tar.xz 313372 BLAKE2B f5a1b894a0379294c478020de512af047aec2e7c9d881cb2f4c79df88583707b5ce0e995623915b6bd11b720e60e0f8696e0ddce472441cb1d04f3bf7a818e32 SHA512 7be813368b4b6fe4ae2882d85c40b6cf80ad44b7aa7e46c8cb97926ef89edf4f59e9a4c76a7aa9f725ac6ce1f0df361f8b68ef6dce798e1e0a8d55767c7a16e8
 EBUILD apg-2.3.0b-r7.ebuild 1239 BLAKE2B 2a055b82dfe3a78baa04b03cbce4c9bc73c43373e54f52cb41e3b9f886c5d3e40cd687df0603193426b57cb0012336ff41bff0d9f22be25455fb884b2e4585f1 SHA512 ebc9adc8af01ebd0109ef693ca63c6a374fd458980c602cbb6556b913059708ae10dd2c78b9fcd8ffed2833d0da559ff7a0c88de6953662f287589ecb902f83d
-MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
+EBUILD apg-2.3.0b_p20150129.ebuild 833 BLAKE2B e27c5f98156804de422c5f742ad17b757ee0fec888c3f3ebaaaf29331283a185ac9f9f7c0d0e24c60257295e63369729306ec094cfea619ad8e33425589e22c3 SHA512 d482bab8448b61ba4cb2f0272295cb709dafd509509d49312ee3a4340d56132aef80a5e18a4ba5758eb295adf002b0a46178664ab5e7097b9b31931619cf3874
+MISC metadata.xml 323 BLAKE2B 3b44b94032a0312054a8d1b5e1d77d8104646ca23a5ee93f20e34a93947184353a2c953141a1de172639fff8100eaf8eda38d1a65690ae99dbc3e533464dff6c SHA512 63dcf35a66f95ba538cc976762491f8e248d5679fe854f06f6c98394731c61f28f66f49bab54e5fad3d48a6cb8f611d2afb90f5ddf48a55eb60ca1b26a649926
diff --git a/app-admin/apg/apg-2.3.0b_p20150129.ebuild b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
new file mode 100644
index 000000000000..0d351d723be8
--- /dev/null
+++ b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+BASEVER=$(ver_cut 1-4)
+
+DESCRIPTION="Another Password Generator"
+HOMEPAGE="https://github.com/wilx/apg"
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cracklib"
+
+DEPEND="cracklib? ( sys-libs/cracklib )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-${BASEVER}-crypt_password.patch"
+	"${FILESDIR}/${P}-cracklib.patch"
+)
+
+DOCS=( CHANGES README THANKS TODO doc/APG_TIPS doc/rfc0972.txt doc/rfc1750.txt )
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with cracklib)
+}
+
+src_install() {
+	default
+	doman doc/man/apg*
+}
diff --git a/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch b/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch
new file mode 100644
index 000000000000..b019f565e154
--- /dev/null
+++ b/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch
@@ -0,0 +1,47 @@
+commit 8c3976544af138aa5d8bc21aa5bc80ba91babc92
+Author: Andrew Savchenko <bircoph@gentoo.org>
+Date:   Wed Sep 30 17:12:18 2020 +0300
+
+    add cracklib support to the new build system
+
+diff --git a/Makefile.am b/Makefile.am
+index 42068bf..3871295 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,9 +19,15 @@ common_apg_sources = \
+         convert.c
+ 
+ apg_SOURCES = $(common_apg_sources)
++if HAVE_CRACKLIB
++apg_LDFLAGS = -lcrack
++apg_CPPFLAGS = -DAPG_USE_CRACKLIB -DCRACKLIB_DICTPATH=\"/usr/lib/cracklib_dict\"
++endif
+ 
+ apgd_SOURCES = $(common_apg_sources)
+ apgd_CPPFLAGS = -DCLISERV
++apgd_CPPFLAGS += $(apg_CPPFLAGS)
++apgd_LDFLAGS = $(apg_LDFLAGS)
+ 
+ apgbfm_SOURCES = apgbfm.c bloom.c sha/sha.c errors.c getopt.c convert.c
+ apgbfm_CPPFLAGS = -DAPGBFM
+diff --git a/configure.ac b/configure.ac
+index d8fd056..75483d1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,8 +43,16 @@ AC_SEARCH_LIBS([strerror], [cposix])
+ AC_CHECK_FUNCS([getpass gettimeofday inet_ntoa memset strchr strerror])
+ AC_CHECK_FUNCS([crypt])
+ 
++AC_ARG_WITH([cracklib],
++    AC_HELP_STRING([--with-cracklib], [Use cracklib for strong password checking [default=no]]))
++AS_IF([test "x$with_cracklib" = "xyes"],[
++    AC_SEARCH_LIBS([FascistCheck],[crack],[HAVE_CRACKLIB=1],
++        AC_MSG_ERROR([cracklib requested but not found]))
++])
++
+ LT_PREREQ([2.4.2])
+ LT_INIT([win32-dll disable-static pic-only])
+ 
++AM_CONDITIONAL([HAVE_CRACKLIB],[test "x$HAVE_CRACKLIB" != "x"])
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
index 585b0dc75dda..039bfee611a0 100644
--- a/app-admin/apg/metadata.xml
+++ b/app-admin/apg/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	</pkgmetadata>
+	<maintainer type="person">
+		<email>bircoph@gentoo.org</email>
+		<name>Andrew Savchenko</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">wilx/apg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest
index f0a11caf0fb2..4dcaf30fcd5b 100644
--- a/app-admin/bastille/Manifest
+++ b/app-admin/bastille/Manifest
@@ -3,6 +3,5 @@ AUX bastille-3.0.9-perl.patch 1049 BLAKE2B 2a82c1883bf795b83a86d34e29fc2b3495123
 AUX bastille-3.0.9-renamewidgets.patch 2015 BLAKE2B 12003ebd9d40296e5285b45b063050787fc71c8d0f1002e07407105eaa2678ed25e2dbee66bd9c057047b323076e19e258a5efd2156c043b3d1fba5a92f8ef70 SHA512 28cf0f8a5bf11c29127f128fee80bd0a169960996b4d97b3666d7cfb2485850ca040670deaaf9d0c728e08747adefeecf02c4647cbd4c0e3673cf327c9b46f92
 DIST Bastille-3.0.9.tar.bz2 319045 BLAKE2B 480288c6e9fc5462e8e6ca84665d5769aab4252813ff478ab0519d382e1f03994da008ac2818b1d4214a09607c7316711665bce154121b3029bace6f2822df09 SHA512 a97ab2c2bb64c655d43ddcfd4000cee8666787e5b5923390e3155b258c3a2cf7d131abd474f9b0dd415eb455b664ab26a875da6636268b2a715ea87dd4dae2f0
 DIST bastille-3.0.9-gentoo-0.2.patch.bz2 14117 BLAKE2B 9c4383eae9e27cc4e110553a21424cd2811172c32609b0d3bcc72ccc3f61ba7cd76bfdbee969de5a89c22d0c1dd91b9ba92ce27ea5ac2b7260e5c0e1ce424be5 SHA512 a4ecfc064d6cf8c12b6f53c81dea841931df270293b03c39266861121f3def28fcbc4127b3bc9374028983e584736fb85361443badaadec7441cfb1570bdea8f
-EBUILD bastille-3.0.9-r1.ebuild 1571 BLAKE2B 1c6d3bf7b0bb37dd60ada30354a097e3cbfc8b80d0f8dccda92a983241cfb759dc97f4c550ee0edfdf674b2249b1ca9629f9808e1b9447693056224d95e6489c SHA512 ff9048baa2a2a47bb7848c298bebe7bca41b249c3ff37ccbd313a0d8930e310de2edd14ecae0abd4043245a0d9564002ae7b8ed4cd4737f6ec51679555297daf
 EBUILD bastille-3.0.9-r2.ebuild 1713 BLAKE2B 751966d54e66ab1d86caf0bcd81eec1ad1642677d69598c8a44ca7b4151888c0975bd2f64307714c62e1b7ec27b7db6e80c89e7e235061205c9510883ac0243b SHA512 7b250fa0d0dd26662c5547d1aac700200baa139e5b439d9401b2613893b95775bdf3131ef9dc91a83748ad0ca51b550bbceaadb3975429b81976089cea154b12
 MISC metadata.xml 335 BLAKE2B c697944d835cd494f8b523f6ff035eb704cece47594480dcdc41c26bb958fb35a7a2c00e7195c0647cf308e7fe963cbcd334aaa49822a53b27bec76d31a34f88 SHA512 d87baaebf80becdabfaf4214b7ea268455eaa806353a53e51a4342ed9a13ea981b4f4c7169ad323fc21fff69e314f3e397981701271db66447c17ad2440892d5
diff --git a/app-admin/bastille/bastille-3.0.9-r1.ebuild b/app-admin/bastille/bastille-3.0.9-r1.ebuild
deleted file mode 100644
index 19860743e3f6..000000000000
--- a/app-admin/bastille/bastille-3.0.9-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit eutils perl-module
-
-PATCHVER=0.2
-MY_PN=${PN/b/B}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_PN}
-DESCRIPTION="Bastille-Linux is a security hardening tool"
-HOMEPAGE="http://bastille-linux.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="X"
-
-RDEPEND="
-	app-admin/logrotate
-	dev-perl/Curses
-	net-firewall/iptables
-	net-firewall/psad
-	virtual/logger
-	X? ( dev-perl/Tk )
-"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
-
-	# make sure the Perl modules go into vendor dir
-	epatch "${FILESDIR}/${P}-perl.patch"
-	perl_set_version
-
-	cd "${S}" || die
-	chmod a+x Install.sh bastille-ipchains bastille-netfilter
-}
-
-src_install() {
-	perl_set_version
-	export VENDOR_LIB
-
-	cd "${S}" || die
-	DESTDIR="${D}" ./Install.sh
-
-	# Example configs
-	cd "${S}" || die
-	insinto /usr/share/Bastille
-	doins *.config
-
-	newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
-
-	# Documentation
-	cd "${S}" || die
-	dodoc *.txt BUGS Change* README*
-	cd "${S}"/docs || die
-	doman *.1m
-}
-
-pkg_postinst() {
-	elog "Please be aware that when using the Server Lax, Server Moderate, or"
-	elog "Server Paranoia configurations, you may need to use InteractiveBastille"
-	elog "to set any advanced network information, such as masquerading and"
-	elog "internal interfaces, if you plan to use them."
-}
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
index e500933cc6a7..23f8e702bd9e 100644
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@@ -1,7 +1,5 @@
 AUX checksec-1.7.2-path.patch 510 BLAKE2B d17d260f41cf0c7e71accfa4b728a9c35511d1d1a90726bbd3a7fbbc401b69e6245f596c62d323013d29142d256eca6d792c6256f4b5d752bf55e64f96e7798a SHA512 5a5af3c35f8e8ca0ef0c44bc84ea3108bdd96c7ee98c3bda31a0f5308fd843c47a0d825fdff39e1995260391a7a747187ef804250fd0da6ccad5f93b3595a706
 DIST checksec-1.11.1.tar.gz 198151 BLAKE2B 2b45834adb045dbf75a0ffab4f03b2640d068a48df20c628223bcf71c94300cf32ccbce8f47c6dd02b6dd9e12b924e4e7221b68eb781351ced52e09ce0cb3848 SHA512 dd742d6c9bc567b10f8d50f5edd2e1f3439b469ced46da05f53e14c0fe5c90310114564e674afc8c7f55170e07beb6359263e1fd153e4b29f3edb4e88cfbf8c0
-DIST checksec-1.7.5.tar.gz 51266 BLAKE2B a77e6d0bf52bc8a0ec18c0f1ffe883b68acccaaee6fd0d1714d456c31c3004b5d9279c3926885be168befba1dc7a75b1269dac5cb5847c247470e765601f08e6 SHA512 7269fb3628907f6fe4e8b720d2dcbd5bf8586e1821bd758533dff6255c6a52be9146b58f60abea798ee92471c3d5ad9e867fa7ad4b8e5ea2d8aa03d5a3b83098
-DIST checksec-1.8.0.tar.gz 52391 BLAKE2B 3720e4faae5aa82172c673ce7ddc662db1433b82d25f25be4c219f1664da8af687d2a5ee9c05703e9f151a998be9226e896e125b7cff05d3881e61e8a9f5c918 SHA512 0236e40ba8b4f7c13ebd3b51f22dd05e6c4442e8646b5a1ee814556d9a6ca19f9bae638af33a6bfec2f8ef95567d222a20dcdcd9eae6ffb7ea5261919f020283
 DIST checksec-1.9.0.tar.gz 196168 BLAKE2B f9095a516f166e9a407c9796e28ed7da4ffd97686923745e46b0ab4110f084690781995b6cc190234b8a26fe1e6eb2c8f32f7f15191f0dbc26b38048c87e9a2d SHA512 8bf68dd0b86a6eceb6f5eb016a15ed1bf7d086777c3ec1c62848ec23e62dceed4579404d76824f17b8e1305e679ba6204f0dc4c224f7a11067651f33c2d96515
 DIST checksec-2.0.1.tar.gz 199903 BLAKE2B 726d3f868cc73649f7a3cd42270ab1c6965d6bed772f3c612064c54dad569e748f5a2d24df2b8663328442ba8126fe0edac04b0034ba6a23bf6e32ca93a78e30 SHA512 b2466b621b6ddb3fa01cfc5eb3dc301d6d616b26ddd2017a622ba2a24e9daf8f5e294236d1dda695fd9ab25fa411724b5f7dbdabc944cdc124e4369c176f35b4
 DIST checksec-2.1.0.tar.gz 200384 BLAKE2B 6e954f574c632da1aee629aecd7ded6286879ba6156252c3d4b5d11f52e3c457bb1d9223934c70f402aaa1e8a8f8d530b55c7f860c024c86c2c2bbcbe9216646 SHA512 66090777de15c492090da3494127037ffe20a169b426b054b3a8f642e9c980b2a99d5c8f8411715d74b1faed41023fb17770d3f07eec5b9efda0a43b64c07a74
@@ -10,8 +8,6 @@ DIST checksec-2.2.1.tar.gz 2241504 BLAKE2B 65d71e4ad589494d34ae0458f4b3e453f6bfb
 DIST checksec-2.2.2.tar.gz 2241541 BLAKE2B 310553aa419373acc9b86bd25d801a99db0173ef76d8ccfdce4b185102a8ad39a91ade906c521c9caf7989aab1da42c35cbfe5e8fcbea23eafb47f917bb87718 SHA512 d975a9cea60869ddda445515396b67b6ea3c9b33770e711071e1cff684f89b4718b135a3a3c1a88b11b96ccde0df72d6b7924cade0619d24e38db428251d22b0
 DIST checksec-2.2.3.tar.gz 2241535 BLAKE2B 850977dc14d1b57dc947f81af904aca71a7d664bf695619de2b6f7a1014a95176813c4fcd8c39a6c89b028291fa1a08a2beaf6f4dce27f53624202bb0e72ed2c SHA512 d1516dc4321f30a57f88d3279fa228b4dbb0f16345c3c7e9d89575ddc3ed9dffae42f392e76321a5a9aba876717aae959365fc829f0abb58c1c21f34dbbf59b7
 EBUILD checksec-1.11.1.ebuild 757 BLAKE2B cb3a4bb1505399b4b6b8f13e5237bb17f74d153a088d782427e2e8c53b2422f740455dca99ff29de6bf3fccaff2b1c8b1bea7ba760d08fadf8eb99bfee9f6150 SHA512 5669162f5f0d7e6c679bbf4cbb374d71c18452c7ac59451d5a4d39979f14dee9cebb91d63a37b61e38ea09d62e6931c3c48e853219dca6109c1cba32aceba52c
-EBUILD checksec-1.7.5.ebuild 761 BLAKE2B 928d7f91b7ac04ac04a9bcfaa14f8ea781eaaf2be75182d7b8d0f3cf63e0bdf9178d03da87732da11286ba172e2368eb5fa490021c3d5d71f3419d426b7b911d SHA512 5a15da1104314647688e68017189e1b661f0efd58d3a7ad5a788ab2cdda79249dce9c07e9db48d775ace6d8fb8679f2cb6669c1f16758f9c6e736e9eca2d57ba
-EBUILD checksec-1.8.0.ebuild 763 BLAKE2B 3456a3d42a58795e00cf46689bc60a99357dfec5a8ea7c43841584c10d4fe8bceb3d3c0e3a4965cd38e7c718b6c716a36cdbf895635a458122aaa34324f13600 SHA512 dd2af6317e19baef0e21112b6a64783dd1ccffaf2f0f2d80acf802b4ee14b021be23548375c9c86c8a073da38bbe4f1c58c533cb5b16cf60e082f8164dc84738
 EBUILD checksec-1.9.0.ebuild 757 BLAKE2B 526fb5bd77d4f06d01dafef1174eae285b5ee2a1ae72882f1d05d07ec141b519ef39f622f16f4e098c3df0b31f8419b6460f2d51a462b09324519efa3235fa67 SHA512 29ec62f61fbf71e19aae933ea6b01e6f606c043e50d4c004214219a04cbc96d8ede61a444a822e1a83c0245e0e379ee553e5f4bc2d7d11a2577aa0b2e9f9eeae
 EBUILD checksec-2.0.1.ebuild 759 BLAKE2B 18b155566819f22cd16c0c13798bda4b70da1bbdc5cbf94c0977d2edcf6877f7819fc91421d6be8619c8a20f7d2fac3fce2f698a41f25aea727e3f843b1ddaab SHA512 3b34ecfcc2c1c73ec5a8565e9c07415bf6b1d6a682c6f7c8b17db07917706c9247c7c67aaca7d03d894547892a978efe11e4fa01322e80c9093d0a6d3b0d0386
 EBUILD checksec-2.1.0.ebuild 757 BLAKE2B f638f3ec54f7d6f7ed1d6b5affb2cc8801ea61686f962e7e7d43391ec7512dc6902e8a0a5ba3c7efc1ac8cb549b7ecf0baa5558acba9d4ee969fab635d1eb36a SHA512 974d9f5c147385193d1525bf5cfac3dc7a9c027d0fde69cdbdd33de9ad384c3de624643da737f978c6efb7f121f3c7d71a5152582cc92a767f23ede3b2a74974
diff --git a/app-admin/checksec/checksec-1.7.5.ebuild b/app-admin/checksec/checksec-1.7.5.ebuild
deleted file mode 100644
index da34dcf8e557..000000000000
--- a/app-admin/checksec/checksec-1.7.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.2-path.patch
-	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
-}
-
-src_install() {
-	default
-
-	doman extras/man/*
-
-	insinto /usr/share/zsh/site-functions
-	doins extras/zsh/_${PN}
-
-	dobin ${PN}
-}
diff --git a/app-admin/checksec/checksec-1.8.0.ebuild b/app-admin/checksec/checksec-1.8.0.ebuild
deleted file mode 100644
index eb85bc06b860..000000000000
--- a/app-admin/checksec/checksec-1.8.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.2-path.patch
-	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
-}
-
-src_install() {
-	default
-
-	doman extras/man/*
-
-	insinto /usr/share/zsh/site-functions
-	doins extras/zsh/_${PN}
-
-	dobin ${PN}
-}
diff --git a/app-admin/cpulimit/Manifest b/app-admin/cpulimit/Manifest
index dac9d5726bc1..e3486ff29bea 100644
--- a/app-admin/cpulimit/Manifest
+++ b/app-admin/cpulimit/Manifest
@@ -1,8 +1,4 @@
 AUX cpulimit.8 1451 BLAKE2B d65e5e47767e6202635cdb1247c343f2a68e49b70b0748e16d7eb8a5e17344ccaa929d77bfc29462d61909b9363d9486b709f9a23552aa0d2db58aac04d410e7 SHA512 3cceb217f5053aa6583a13ada2ef9ed6370859bb072474fcc6fef88f5184985b0a369b1f0c1ead634b07a1318ea1f81a4f4128de95513f9e6cabdf86223f6083
-DIST cpulimit-1.8.tar.gz 20610 BLAKE2B 4b80322b035d79267a97a491e51b2ae82488c59f4383e2dbf87d178a4a69d03a4d1aa653eccd8d801fac48e95c2f0780bd46881f4d38626b3c28b73f0a53bd71 SHA512 3098236139b092eb706ec2a6b84528a090b3f4b8b3adfc8debda1b92ffa119ed9adc508898e0f98add593561f5f6b67d52e0966de01a682a6e2e885e3c47b0fa
-DIST cpulimit-2.2.tar.gz 22224 BLAKE2B e59e65c0bd38ff93b2daaef6858c46cc99b8a1345e5a6dc66b871b1b1c7930557b6d6607d9b61e0538195aaf5fc8eda42edacda38a2f729aa56eb582bb9343a7 SHA512 e708b27e969024ed37689341d76979e5041c050c259359c46f988cfc55f571c16c17f48ca63cd93349041b76bb2c314ab69af36634fec5212e49aa0d0cb0a46e
 DIST cpulimit-2.4.tar.gz 24669 BLAKE2B e0fe0d6766e76e6e2a68dcdc553039400233daabbb14ce4a9dae46a7b694d2ecd660f4c1d13f417a74b12365c719780c732a03bd91c6384d1e7118d0fce521fb SHA512 008dc3fbdcbd8afd875a2a1ce03d609db595c6e110803140c676d3713ea60f4877a1bb8e7aa0e8b669dce31522ad81e2703f616341a0f4cbc69a6b01865b66d0
-EBUILD cpulimit-1.8.ebuild 575 BLAKE2B 6d289bdc46838d5c495908533e0d4c5419ddd7f5f7024a7acd39858cfe46544662ab64adb03dc967c146fa49be34a8ddf6fa2c027733f40b240b85fc7ca9f576 SHA512 5b726887834de6eb7ccaef9d8797998a4bd82e3cd06c8e8982895d9780178afda4778ed2a3a55bdf89125ee78d179c594c1ca82d3d7f7bbad4384d83e6da5cf4
-EBUILD cpulimit-2.2.ebuild 593 BLAKE2B 1571a3b20a315aeac1c051e04691bb71ac832d969908de2e85a95b68876c51d3479476adc5bae4a1f248b98bb0dd27d712209d8d628e71b6dbafc488aa96524c SHA512 a488c04229230cbcc83f800ae39a391a61d8ecb7c704bdeaba85d6dcfc02179e939bbf098b26520350be25350f3ec3a8a2a709cf25991b7777b53a609c6942ac
 EBUILD cpulimit-2.4.ebuild 637 BLAKE2B efcc65d22d2e18aec1fcc72d2e6efce525e4c5eb5ddc295690cfe5e8075e8e7b551420a500118e1d19ba34892ad0f562566383a1e6235c0c33303a0c95ac079b SHA512 ede24c34a0a8f35f8127c81fbf0857f64817cd5f21be4c73cc53d32b80dfbc18eb558caad64eba93d052f14cfb4349359696dd906ebca104d910df08e10321d7
 MISC metadata.xml 328 BLAKE2B cfd9269eca123a335dd8b842cf59029ae1aef98293d1f955cd4cf33ddd56a658c1aba076e7de6318720c4ee0a282bee3c5282dab611e316a1ddbbf45c18af334 SHA512 5bf3122d96aba89083a0776bfeb5cd1ca84cdabc59a1ad4e158b1b50e4eb42b3ebf7a45a51807af380a040c6ae106ddc30c97003a2398e7944bce932fb35d8b1
diff --git a/app-admin/cpulimit/cpulimit-1.8.ebuild b/app-admin/cpulimit/cpulimit-1.8.ebuild
deleted file mode 100644
index bdc78ff5f3f2..000000000000
--- a/app-admin/cpulimit/cpulimit-1.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Limits the CPU usage of a process"
-HOMEPAGE="http://cpulimit.sourceforge.net"
-SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	tc-export CC
-	# set correct VERSION
-	sed -i -e '/^#define VERSION/s/1.7/1.8/' cpulimit.c || die 'sed on VERSION string failed'
-}
-
-src_install() {
-	dosbin ${PN}
-	doman "${FILESDIR}/${PN}.8"
-}
diff --git a/app-admin/cpulimit/cpulimit-2.2.ebuild b/app-admin/cpulimit/cpulimit-2.2.ebuild
deleted file mode 100644
index 8df40c18cf64..000000000000
--- a/app-admin/cpulimit/cpulimit-2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Limits the CPU usage of a process"
-HOMEPAGE="http://cpulimit.sourceforge.net"
-SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	tc-export CC
-	# set correct VERSION
-	sed -i -e "/^#define VERSION/s@[[:digit:]\.]\+\$@${PV}@" cpulimit.c || die 'sed on VERSION string failed'
-}
-
-src_install() {
-	dosbin ${PN}
-	doman "${FILESDIR}/${PN}.8"
-}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index e993367bcc9a..5fad7f71b031 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.17.0.tar.gz 4399134 BLAKE2B d065cdbe698792afe19e1058c3e0e6c112c8ed66a0fdab8b182918022cc10cf51d4d1eb8eff42c2ff27250cbde56b627110f9b581e73d7ccbe32746081bf6de7 SHA512 2a60c80c87d9ca33dc3708c4c60b6219431751a522a9e5869fe255c1c68247c0863e9f098cc85c4652ad1ffde08386634d5374c4ddb2c82828f201a37a214075
-EBUILD exo-1.17.0.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
+DIST exo-1.18.0.tar.gz 4625622 BLAKE2B 618aec5cec7a41f06963d728c627f043f08ba39695691154118261a6fb71bac93cdb07b039e74e05a464227dca4da66c17c4c319553894f2d46af6203a36a038 SHA512 862dd138a6b6cbf9471206a07cf4447df113a77f44523e72e89a1f87362086fa168ded51d43c32408946b8cf2d6cb9668ff29818494a2eb6d94b0ef7d3bf4420
+EBUILD exo-1.18.0.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.17.0.ebuild b/app-admin/exo/exo-1.18.0.ebuild
index 0c2c8d861fe4..0c2c8d861fe4 100644
--- a/app-admin/exo/exo-1.17.0.ebuild
+++ b/app-admin/exo/exo-1.18.0.ebuild
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index 73e34210ddc2..63508216c066 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -1,37 +1,3 @@
-AUX github-backup-utils-python27.patch 497 BLAKE2B 204708abe587590b2479783f5fc355ab035a08af8dd85ccec600828384917ca6806abe3d50ada9ce133435b797d698699d777432e49f8a63513b2ae21e59baaf SHA512 9eb416ea2a9847d84d56da84c6355942f3320f8ed97711e602ab74e81f9dca32eff54f68a83586403c415e63fb7d13a0b6b67aa7b01cd05732160df08b9164a7
-AUX github-backup-utils-tarball-fix.patch 1440 BLAKE2B 8b6ff7b996317de913f82670da1e688bfb2796b51db9cb515a6a2d33d2f690e24030b9213c0ebd08fab316aded4d561f9b0d5e2fb1fc5f20d0190234e59e64af SHA512 738227c94b8c9cb569258ce2573db0ff9c8a216c74d891944969173add6eb31c0c46696d20977d986b5c29a9cdb2b3934563ed220527ef798de1cbeb680f6533
-DIST github-backup-utils-2.10.0.tar.gz 73061 BLAKE2B 072a3cf8b3a775b368e4f5c89f7b9b29f7fec26bf4fd9abec58a6f1d4f02a981881a547bbdede8f8b64d0ed01dfba334193132a5d1363de3f4cd8f11d9047602 SHA512 e4ec432289da71e7c8d50023e4874b4aef5e99b27f67c42ebadc61473f5b0bce473f768ff19d1d611d91944ce887ad496535f1bc8d6557a31a99353e100f7776
-DIST github-backup-utils-2.11.0.tar.gz 75105 BLAKE2B f14f30db263cc304aac0d2a9a6d82883067b80bd69292018876fa1b01b1e47d9f8dd44bdafed0eb1198fdabe2b25ec8e6f20117ae905a2ae17bb9a17174642ea SHA512 7d96aff4c2e2bcce7b2b2d32854e759d561de8e683a13d3890bbbc5177cea861a666a60527b4b6ec4d4d7e8123bfff4618b6dfd0c3db73b1829cca0c43c0a9ec
-DIST github-backup-utils-2.11.1.tar.gz 79378 BLAKE2B d887cf6d3e41c1537816edc6073a85c66dcaae0db5882187f5c9202ecaef0c7ad6c3593145a6619cc27e106cacd5343f4b26615569890e112db4ec67f98293f6 SHA512 7bdd34386d8604bfddb07d958d6cc435ec3e00705a83e53730f44a82a02eb98be311b73bba299db80513169a0680641927d9e2e9583b936c4fffa86de2ce2cda
-DIST github-backup-utils-2.11.2.tar.gz 79492 BLAKE2B 0eeba783fda89c862d1b6ecb56bc51dcb5130cc3ae8b35f38bba2b6fd850ee086d0b808f5cebb74617a1dea2f4ea3843c60a6162ac97e3139211b3796cc052d9 SHA512 64a622b090c8fe02ffba3c50b213ca177cc87e6aa41991cc3ee5031fc07b707e5f108f32d9346d2cd727939d76779d1f46dc6733e399c70e58ff8cb54087ddb8
-DIST github-backup-utils-2.13.0.tar.gz 79173 BLAKE2B 567865ede11d200a9dbc4641d9820864d72a325aa6b6439f3633b5fccf2d2a55fdd8f9351a280321d0ee5a1bc7f331369ed09b2e8e5274a9442f98227c82963c SHA512 e78c299b0131d76bd9f5d916f72a1a361a8ea706789c93d60b1980d348c4dad75e371ad84c725d8d8b05c45984d0edcf612d1a9e69e63657c212a848d359ad28
-DIST github-backup-utils-2.13.2.tar.gz 83126 BLAKE2B f79d378a1126a16f366930a40ca6db43865c2615edb65b13a3b4a1ac693f3f3419f6b821ec4454cd2b4858fd13038ca66e158c37338b671f69f14aca2e36c6de SHA512 b394dfde420d2f1adbaad6b61a665fa99e6a35007fd5162114ec01629a04be31780f3f36e9133456bbb015c6a3939430b5d65572e580d8757f023a2309d104ca
-DIST github-backup-utils-2.14.2.tar.gz 84628 BLAKE2B 579088448da16330083ee4ffbbd2d9e286eac7bf89bc9146bb4eaed8aee42971238ea997625da2e5c6f10097b329ffb7db876aab20acdbe7d17c1a8bcb9a3801 SHA512 6a93861441388866ba57c8be13ece0df6967e711fd643138c00490ce439fb74d29ceb5b482f6315d1a47df0cb90ab4a835bb25bdcc92172f5f200b5900108bd4
-DIST github-backup-utils-2.15.0.tar.gz 84856 BLAKE2B cc31d45711d4b26d246e08565b48bf5b65e3c6127bbeb01064273e4bcc8e3f3b5fd8e439cd4717c4c8d103113b00eba4ed670737169ce6ffa7a8256b08386e01 SHA512 3294641c8220cd7d5e212e47b7011f188432e5e6437e6d97a9d6c38182fd451a0229588ee28872d5c1bb1b0cab93eb612586a268761d42cb763f38ad13ec0ab4
-DIST github-backup-utils-2.15.1.tar.gz 84627 BLAKE2B 14f448a8c15b45cdf2a2868d70d90bd91228bbeb3d7534fd89ed1812fd1bcc52e9720d4063fc33f9463035eb34736c919c888c17b2602ebb772fdef4830592f5 SHA512 72a0c70ef629f17a2b3be12661379a94150181c0ac87803e4490a9b927e84760917e936e3346d2da6a0ec004ef8fa9b1297b41341bce115a2dd26bbcc62c1843
-DIST github-backup-utils-2.16.1.tar.gz 84847 BLAKE2B 5c6c0cbe8268ae176321739582783e920454efbebb62a0058ceeddb675a46050db3126897054c0120a74bcfa16bd28b4dd311cbd6a5e23dac262a49bc026c90d SHA512 bde17ed47ec0b89fd95e0a018cc0709045da6f27ffbf492d555219a09e3fcca612d67da1e0d5786fa8ea08a7eaa6d183dc1d40fd45d7bace5d05899ae0007fcb
-DIST github-backup-utils-2.17.0.tar.gz 89926 BLAKE2B 82e89d616f78d630a4c537ad110f1097fd4925f9d0b45ebd117a5f4dbce21ec84bddd1f7a2cfebc52464e8fff9117bd4b0cc5e862e666d4b3d05f11a9b88730d SHA512 aeae5d5f662a687e13ff0aed54801759480ba39e31f0ad49a9ecc4fabad5aa5e124e774c7b939a366a33135e81614d1cee6f1004481bbe94150b48a11f222a90
-DIST github-backup-utils-2.18.0.tar.gz 90357 BLAKE2B e9f6c155246914a36d26ec8cddf4a1e9feca73b3450ceb8e6df11df7c077b86f18cfa23b51e77425ba4e28ce4a3664200c1ddb15e6eb856d6b8930379dd3e348 SHA512 1778bf4cf404444e567f9f6b98bcd01bf9880939b4645692d75dbf10e7b31b40678521b66fbdabfedef648561f34709492b7860ce16442757e161db2ffda45a2
-DIST github-backup-utils-2.19.1.tar.gz 90260 BLAKE2B 403feca60cc6037a2fbcb4cc467520fb3283916fdc78e16e960656b695e1c55341c55e74fe246c56fbc2cd86a85e33bcede4d94132adaa446ea48ed8f3f75022 SHA512 60155021d23eadc5ab1ddcadf95dbab43f19456c0e7ef34e93c75d173c1279b354c7019b304d72cabcac674edbd0c4a0c4e50c08606a8559ea662858a9cdb206
-DIST github-backup-utils-2.20.2.tar.gz 92628 BLAKE2B a6c9fb91b005d20b15ce0b2fc289a145bbfd8316aca4511300cda8a9f1b1e52afb9619a9f467e6e87eec673244776a0bf469d0d4a4c608af0f462eae7a06dc44 SHA512 0d2c56fd2e98c8f858cf3a03e2c2d84c20555716d015cdf1f0a789171cb6ea301050a41d1314a15316258f3f159123ba21526c1fd69cba548e8f259c70a92ab9
-DIST github-backup-utils-2.21.0.tar.gz 89907 BLAKE2B 4261d127a73bc4701521f6c5078444c38b3d97ac4ab883f644e02057090b8a53b6c86849b988175416b6fb0566327b9938f28887417fef109dd59c1b246cf961 SHA512 fc037d180ce6cb238d4613583a1551256ffbc58ec8276945905c0127fb6e29f7d547dfdcbec30bb581202ce0447365642218e18ed8865f01e76037898d0a5126
-EBUILD github-backup-utils-2.10.0-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
-EBUILD github-backup-utils-2.10.0.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
-EBUILD github-backup-utils-2.11.0-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
-EBUILD github-backup-utils-2.11.0.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
-EBUILD github-backup-utils-2.11.1-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
-EBUILD github-backup-utils-2.11.1.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
-EBUILD github-backup-utils-2.11.2-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
-EBUILD github-backup-utils-2.11.2.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
-EBUILD github-backup-utils-2.13.0.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.13.2.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.14.2.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.15.0.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.15.1.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.16.1.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.17.0.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.18.0.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
-EBUILD github-backup-utils-2.19.1.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
-EBUILD github-backup-utils-2.20.2.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
-EBUILD github-backup-utils-2.21.0.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
+DIST github-backup-utils-2.22.0.tar.gz 102576 BLAKE2B ce9007c8a5d2843ccc2b3d11b03c13840b89d6ae7906d63420cc0e18191766c92c91e1072723439610ae8bdfdd0174601d1e3b7211cd6a1c9a748f9f793ff760 SHA512 e77b4afc6f90b16caf61dc4313787dab0751590b4819dca2d7e21acd0ca774d19ea359171b76f2892ca0fb4f86fd4240e77b00e107de79d496fea429fb12cee8
+EBUILD github-backup-utils-2.22.0.ebuild 1126 BLAKE2B 9e16911d27c5813a8e08cc387462a9c74d7deb4c848c3529e30c682e75588e7ef10bc458932a2eee7f9a6d8fda14e7d7c0648512f56e072c4b5756f04b0af689 SHA512 90b8a464f4eb4a245f9aa97797478fc72208d609ae633987251960600e34fb2c13dcafc209629aac7edcbf3360c45757a24b052c5ac64f39d677ce38d9e37346
 MISC metadata.xml 342 BLAKE2B 9f590d0c03e75e395500a57d1b99020742fb9fc04835b6fca8a896435dec7ba274204df2c5356ec1ef101f721a4bafdb848299c57b209c8d9aa41efdeb674e8f SHA512 5a9f0cb678377962ec6e4cf33ed40423e568f15cb71dfe5dd87e427a21584043e5698bbb2baa5b77907bf8f15c9ad8cfa8b05b4fdcdf2c8876ceb968afcb2d07
diff --git a/app-admin/github-backup-utils/files/github-backup-utils-python27.patch b/app-admin/github-backup-utils/files/github-backup-utils-python27.patch
deleted file mode 100644
index c305b688ceca..000000000000
--- a/app-admin/github-backup-utils/files/github-backup-utils-python27.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/bin/python b/test/bin/python
-index c79b0a4..a9c2991 100755
---- a/test/bin/python
-+++ b/test/bin/python
-@@ -18,7 +18,7 @@ cat >/dev/null
- # verify the python compiles at least. if this fails then the python code passed
- # to -c failed basic syntax checks.
- echo "$2" |
--/usr/bin/python -c "import sys; __import__('compiler').parse(sys.stdin.read())"
-+/usr/bin/python2.7 -c "import sys; __import__('compiler').parse(sys.stdin.read())"
- 
- # pretend we found zero processes.
- echo 0
diff --git a/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch b/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch
deleted file mode 100644
index b0f0b8de3140..000000000000
--- a/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit ef6709b5e3510a7d0bcf0db91dbf5af5bc27b001
-Author: Austin English <austinenglish@gmail.com>
-Date:   Tue Nov 28 16:36:39 2017 -0600
-
-    test/test-ghe-backup.sh: skip test if not in a git checkout
-
-diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
-index 296429e..08bced2 100755
---- a/test/test-ghe-backup.sh
-+++ b/test/test-ghe-backup.sh
-@@ -475,14 +475,20 @@ begin_test "ghe-backup stores version when not run from a clone"
-   # Make sure this doesn't exist
-   rm -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version"
- 
--  tmpdir=$(mktemp -d $TRASHDIR/foo.XXXXXX)
--  git clone $ROOTDIR $tmpdir/backup-utils
--  cd $tmpdir/backup-utils
--  rm -rf .git
--  ./bin/ghe-backup
--
--  # verify that ghe-backup wrote its version information to the host
--  [ -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version" ]
-+  tmpdir=$(mktemp -d "$TRASHDIR/foo.XXXXXX")
-+
-+  # If user is running the tests extracted from a release tarball, git clone will fail.
-+  if GIT_DIR="$ROOTDIR/.git" git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
-+      git clone "$ROOTDIR" "$tmpdir/backup-utils"
-+      cd "$tmpdir/backup-utils"
-+      rm -rf .git
-+      ./bin/ghe-backup
-+
-+      # Verify that ghe-backup wrote its version information to the host
-+      [ -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version" ]
-+  else
-+      echo ".git directory not found, skipping ghe-backup not from a clone test"
-+  fi
- )
- end_test
- 
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
deleted file mode 100644
index fb7dd4be7234..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
-	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
-
-	# Fix for python3 systems
-	eapply "${FILESDIR}/github-backup-utils-python27.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
deleted file mode 100644
index c7f2534ca0c2..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
deleted file mode 100644
index fb7dd4be7234..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
-	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
-
-	# Fix for python3 systems
-	eapply "${FILESDIR}/github-backup-utils-python27.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
deleted file mode 100644
index c7f2534ca0c2..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
deleted file mode 100644
index fb7dd4be7234..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
-	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
-
-	# Fix for python3 systems
-	eapply "${FILESDIR}/github-backup-utils-python27.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
deleted file mode 100644
index c7f2534ca0c2..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
deleted file mode 100644
index fb7dd4be7234..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
-	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
-
-	# Fix for python3 systems
-	eapply "${FILESDIR}/github-backup-utils-python27.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild
deleted file mode 100644
index c7f2534ca0c2..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.19.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.19.1.ebuild
deleted file mode 100644
index 9a251dd782d8..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.19.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.20.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.20.2.ebuild
deleted file mode 100644
index 9a251dd782d8..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.20.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.21.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.21.0.ebuild
deleted file mode 100644
index 9a251dd782d8..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.21.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild
index 9a251dd782d8..cdc41c6dad52 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
+# Python3 support: https://github.com/github/backup-utils/pull/627
+PYTHON_COMPAT=(python3_{6,7,8})
 inherit python-any-r1
 
 DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
@@ -17,14 +17,18 @@ KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+# moreutils parallel is now used for speedups in main code:
+# https://github.com/github/backup-utils/pull/635
+RDEPEND="net-misc/rsync
+	sys-apps/moreutils"
+
+# tests invoke parallel & rsync
 DEPEND="test? (
+	${RDEPEND}
 	dev-util/checkbashisms
-	sys-apps/moreutils
 	${PYTHON_DEPS}
 )"
 
-RDEPEND="net-misc/rsync"
-
 MY_PN="${PN/#github-/}"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
@@ -44,7 +48,7 @@ src_install() {
 	insinto etc/${PN}
 	newins backup.config-example backup.config
 
-dodoc -r docs/*
+	dodoc -r docs/*
 }
 
 src_test() {
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index cfc949ebf98f..6eb30457a412 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -1,11 +1,7 @@
-DIST haskell-updater-1.2.10.tar.gz 26586 BLAKE2B adc46f85118fa55e530aa079ef2df0663b178b15311f4f2ff6474db75aacf1277238a27a2bb98841fc1fe50b556d7f01a677861b3ce9559fe809a02db401ef8d SHA512 c0a72ae77362e5ed4ea0e244449175454119b1284756adeb43534bf58b661f3cabb88e08bd5903d415a9f95a6de309753dedf974ddd853b300fd215250e0ad7c
 DIST haskell-updater-1.2.12.tar.gz 26708 BLAKE2B d0b040cb3b6211b3c5c60f8cfa3dbccbf9cb15d246b21609a21aac746a8a034e284fe0b99891b5035980252a7aa8b376ad943f32882dc29e16226d95583cb053 SHA512 f3a993cb556919bf2e57fdaca7eea9146abc59096e779cbffb69a5c29fc5f6ef889c8ccf4d8331dbd9279919ea91bb05a16d83ad70085d5ef5a44d61120fe7e7
-DIST haskell-updater-1.2.9.tar.gz 26675 BLAKE2B a3d11cdcee886a07d87cd2888a9deea1d963b7234b4a10a6b78e9467fae4e9382c92f14a6ba0593f86bf9422ab2cb4bec823de96f34b463590ae18429c118edb SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da
 DIST haskell-updater-1.3.1.tar.gz 26573 BLAKE2B 68e5357e8f24b9b372dba4feac76595cbf35602d9d9094d616497c9d0040177b5f1def5833770041b693220717f3a4976877e0608858d5d8d4dddd26620c71e5 SHA512 39c36c4a8997806bb4d64625bc9ed72334a68e57f8c32f75d0c3704ab52b3b68605444c89480e5186c04bb275b3608ea9544366ebc5a00e010cc5fb4ae8296df
 DIST haskell-updater-1.3.2.tar.gz 26133 BLAKE2B ea72850e5ca35ec18fa00136c654435a852b072aea0402003c962abbb0e0f09e8a84568f78c9186324b0b0ee9658de1b413670e268cfe1c0056810b8c61b479c SHA512 a4d80ecb65efa9ae21008e04b1363ff2196df4ba431fc5ec899bb9904c598c7a109a38f7dd86dd2dc86faca8ed5083d036d700e7f7796840ee5470401c24f3d9
-EBUILD haskell-updater-1.2.10.ebuild 1027 BLAKE2B 50859793aa557110a1120aff3f22b7841318502f4c710851246c1847df505f02af7323711cb51249f7774cb452c1c6207b989e96de50acb76e87887350ef5a68 SHA512 ddd96b11e6da8006c488cecb95aae19473f1490de6e8cc7adc9ab58d44600054caa3bf8015f84f53bd806d3035dcb7db48c2b7b26ca04d57e9d85e1ad728a8f7
 EBUILD haskell-updater-1.2.12-r1.ebuild 1037 BLAKE2B ef35b3e4d5f936770a7ecefb3d94971078031298fe832fb5c56e2004dd476030b5e0742ea29dff976a59e7aa895062cecc494ae5953e49dbf5836ed536e93bbe SHA512 979671949e1ed11cfece3f0bec2ca8baf634c303fa7f61e2aea56a2d60f2f6692c548716172bf1caa3ba4f626bfb5100cf61be47f1758e2ddf0cd6bd65fb3f11
-EBUILD haskell-updater-1.2.9.ebuild 1027 BLAKE2B 50859793aa557110a1120aff3f22b7841318502f4c710851246c1847df505f02af7323711cb51249f7774cb452c1c6207b989e96de50acb76e87887350ef5a68 SHA512 ddd96b11e6da8006c488cecb95aae19473f1490de6e8cc7adc9ab58d44600054caa3bf8015f84f53bd806d3035dcb7db48c2b7b26ca04d57e9d85e1ad728a8f7
 EBUILD haskell-updater-1.3.1.ebuild 1048 BLAKE2B 43bb858e8a653c0feb06b3f4dbbfaff1f3facee0e3d04242e0d618423d63baab1cfb816607417881bcabcb8beb3ffa112dde18e15c3138745141b544d1cda07a SHA512 8c5f336bc8998af7d5381a949e7de202a9b1e04309e13c0cc2a5de720fef9383b967dae565a4fcdd9221ca83dd0bb1c07132adba1786290d4a93e1319a1502c2
 EBUILD haskell-updater-1.3.2.ebuild 1048 BLAKE2B 43bb858e8a653c0feb06b3f4dbbfaff1f3facee0e3d04242e0d618423d63baab1cfb816607417881bcabcb8beb3ffa112dde18e15c3138745141b544d1cda07a SHA512 8c5f336bc8998af7d5381a949e7de202a9b1e04309e13c0cc2a5de720fef9383b967dae565a4fcdd9221ca83dd0bb1c07132adba1786290d4a93e1319a1502c2
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
deleted file mode 100644
index 83ccef6f2133..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-		sys-apps/pkgcore )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
deleted file mode 100644
index 83ccef6f2133..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-		sys-apps/pkgcore )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 296402afadb1..95563ebfd019 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,7 +1,3 @@
-DIST hcloud-1.17.0.tar.xz 687880 BLAKE2B c83530946dd04afc59d45a2bbb12b6a4034dfe5b8c3826e4e78f29e88891672c21e896fd9d24394ce943f9b6574928ae144a564abde3fec8a243cc5fc87e8bdb SHA512 5025357392e9b7661876f059a416e6d6f9eea89e16a9abaacaeb72506aaa5d4d6a193e266d23f01cd0f5d32048f66a3f6e22a1c9c042c2e3183a1e164da2ccc6
-DIST hcloud-1.18.0.tar.xz 691988 BLAKE2B 1d0d6cac56cefa9023796f259fce238952766e038568d843259845d8ebeb040b75dab9dc18908003fba1a10fc76fd45936e46db50536e26dd90a47354feba34a SHA512 39b09b5b79f1e8715fbc17c8576e51955b7729032385fd1aed3f171c56d041d0576dc99662fc9e222f5fe1837a4fddbd57cd406d98fd38a5b9eb116d2a83af3a
 DIST hcloud-1.19.1.tar.xz 781068 BLAKE2B 74362fae9255121771a9e03f187ea6f101e71ed4ab226c218d33a335b740dc72d0df78e76d4c28e1b4760e1c76fe4dcba40f6a41db99cd0955ecb221d5314767 SHA512 24434de9396b30843698feff549163a23443f8536f3e2298edf23620f107dcf5287701c10aba10c4f6ecd61fa4b6a1a80661d9a330c3a4a11d1c986f750550ec
-EBUILD hcloud-1.17.0.ebuild 712 BLAKE2B 989221cd61ab4500042665da2679e7f611c9a7db8ce4f38ce81ee40be0d292c4be438846cf643bc056f3785889adba86765a6ee7845ec66cac15481933d9b8ce SHA512 761fa5b38c983a29cd12c069d1c79b141f88b077071351935b670c87e5534a96c9436c8dbd4479ef8401811539c2ab5124b62fc0eccb07a53a85980f9b6622a5
-EBUILD hcloud-1.18.0.ebuild 713 BLAKE2B 64b198fe517c5b6d22fb6024249e86236336cdb4cd7dda78f252cb3bad4af5e7f279358f8370d00fc4013b03331515ff8439aa82cf42f12cc05cafb532d07247 SHA512 dfdddb5e8356d7bfa8a641ea6f2e75747f0e0812a924f9b0e2517c5b6cf7f1e59769d336a37de8eba4eb03230746cc0bb15cab76e47957795a69ae465a96d978
-EBUILD hcloud-1.19.1.ebuild 713 BLAKE2B 64b198fe517c5b6d22fb6024249e86236336cdb4cd7dda78f252cb3bad4af5e7f279358f8370d00fc4013b03331515ff8439aa82cf42f12cc05cafb532d07247 SHA512 dfdddb5e8356d7bfa8a641ea6f2e75747f0e0812a924f9b0e2517c5b6cf7f1e59769d336a37de8eba4eb03230746cc0bb15cab76e47957795a69ae465a96d978
+EBUILD hcloud-1.19.1.ebuild 712 BLAKE2B 989221cd61ab4500042665da2679e7f611c9a7db8ce4f38ce81ee40be0d292c4be438846cf643bc056f3785889adba86765a6ee7845ec66cac15481933d9b8ce SHA512 761fa5b38c983a29cd12c069d1c79b141f88b077071351935b670c87e5534a96c9436c8dbd4479ef8401811539c2ab5124b62fc0eccb07a53a85980f9b6622a5
 MISC metadata.xml 337 BLAKE2B b05bca1fb33b8d8d66798d3fa410b5a00bd63fc245d29c76d812415dcfd38d6e86187c5ea74500debdac3715b559289881b4bcb5cdb1dc4d1ffcde409d666b6b SHA512 e3b82ce2611ece38238d64baa5424f680c406cfa491037024af80dbb3b2e9e6737ab5756d732852b6749a132aee61701116515fd3fb52c597ceea255534c7f2a
diff --git a/app-admin/hcloud/hcloud-1.17.0.ebuild b/app-admin/hcloud/hcloud-1.17.0.ebuild
deleted file mode 100644
index 8d044f742d31..000000000000
--- a/app-admin/hcloud/hcloud-1.17.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A command-line interface for Hetzner Cloud"
-HOMEPAGE="https://github.com/hetznercloud/cli"
-SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-QA_FLAGS_IGNORED=".*"
-
-src_compile() {
-	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
-}
-
-src_test() {
-	# For upstream a simple test is run 'hcloud version'
-	./hcloud version
-	if [[ $? -ne 0 ]]
-	then
-		die "Test failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-admin/hcloud/hcloud-1.18.0.ebuild b/app-admin/hcloud/hcloud-1.18.0.ebuild
deleted file mode 100644
index bdb4bb4366ef..000000000000
--- a/app-admin/hcloud/hcloud-1.18.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A command-line interface for Hetzner Cloud"
-HOMEPAGE="https://github.com/hetznercloud/cli"
-SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-QA_FLAGS_IGNORED=".*"
-
-src_compile() {
-	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
-}
-
-src_test() {
-	# For upstream a simple test is run 'hcloud version'
-	./hcloud version
-	if [[ $? -ne 0 ]]
-	then
-		die "Test failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-admin/hcloud/hcloud-1.19.1.ebuild b/app-admin/hcloud/hcloud-1.19.1.ebuild
index bdb4bb4366ef..8d044f742d31 100644
--- a/app-admin/hcloud/hcloud-1.19.1.ebuild
+++ b/app-admin/hcloud/hcloud-1.19.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE=""
 DEPEND="dev-lang/go:="
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 50b8d98b58e1..1c2a88e56135 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -4,6 +4,8 @@ AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a
 AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84e914a82cce16782b2c9dfdc83123d609cabd4e9e60eb38a9e43fe7a22a2afca8f53c3dc8e65ac87 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75
 DIST mcelog-170.tar.gz 312911 BLAKE2B bab27c60fca937442a0f07929eaedd392c3e8de3e5f705f717d787652b6c0fa91e42169b835ea2527729c487773c7baabfceeebd3fd58d64a853ff17d8fdd8a8 SHA512 f5d29bde88cd3925c0e629850adce7f1040ecc4703c45427424f5d56f28a0add1fb24538e5c4e0749743c92479d3ea6da583c23bb41eb6a8d899626d818cb6a4
 DIST mcelog-172.tar.gz 313103 BLAKE2B f3acf5a5ebd1db92f7cddfa0e8a848bd6fbd361932ae52400c26f5aeaf7727f6dfd278ab7c1282229d9208474add124401a4665a4febe0debffad7818bcf6223 SHA512 adfde12b9f6f21ec6276c55d3554a3cdbf156e44df2f85c28d9d608418fa57b3f4a0bfcbacd13e92b77eddc1efdaeacfe3c89d203b8cbd3757f35fe419806547
+DIST mcelog-173.tar.gz 313098 BLAKE2B f9ddcd85294bdcb1d9e8e888040af94e5e17f4902efb47788b69737bb3408e59014481f822ea083947725f75b7db21250f4c645e7b409a6c23ce7a9ce3708a62 SHA512 fd83828d19f889e3cbb2ffda8fca95f3097644161bfe2ede1fd7600718fa56d343cd985b831eb643dc613a453730e07847de0f05fb14b4a03a8dcd73281199e8
 EBUILD mcelog-170.ebuild 1367 BLAKE2B 420ec47206fdc6484a7aafc47005ff34a82bd689da636958c99df79fd884fc25f353aee6a63a3673c4357d0f6e5716309251704a26865766d0ea8d135cbc2c15 SHA512 7f980c2058ea1a07c2934a2cc49b8bdb083b6a4fd3a6c1eaf2a9889fbc845f36a6f6c3b27a6b69162badf71824d219bcad047265f77b064a15cb3ad8ffd4a6cb
 EBUILD mcelog-172.ebuild 1369 BLAKE2B 28898352135feee6b52597bc287a9662dedcda130127b27d504641117f102422da9c41cc6dbdc70bebbe50f8c43f63ef997199406c4618e9ac1a58a985d74e33 SHA512 ed1b2bc475a69db7772e5ee18b56766ca7cb4776f09fa14ff7baefd369127be5167ccf56e038d6e793277a0928b1f8b25437ab7b6aa103ef1608acc15450dc21
+EBUILD mcelog-173.ebuild 1369 BLAKE2B 28898352135feee6b52597bc287a9662dedcda130127b27d504641117f102422da9c41cc6dbdc70bebbe50f8c43f63ef997199406c4618e9ac1a58a985d74e33 SHA512 ed1b2bc475a69db7772e5ee18b56766ca7cb4776f09fa14ff7baefd369127be5167ccf56e038d6e793277a0928b1f8b25437ab7b6aa103ef1608acc15450dc21
 MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/mcelog-173.ebuild b/app-admin/mcelog/mcelog-173.ebuild
new file mode 100644
index 000000000000..e0b67a2d755e
--- /dev/null
+++ b/app-admin/mcelog/mcelog-173.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	insinto /etc/cron.daily
+	newins ${PN}.cron ${PN}
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodoc *.pdf
+}
+
+pkg_postinst() {
+	einfo "The default configuration set is now installed in /etc/${PN}"
+	einfo "you might want to edit those files."
+	einfo
+	einfo "A sample cronjob is installed into /etc/cron.daily"
+	einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 29a6bddc3a22..3ca6afb055e0 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -10,8 +10,8 @@ EBUILD mongo-tools-3.6.13.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8d
 EBUILD mongo-tools-3.6.17.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
 EBUILD mongo-tools-4.0.12.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-4.0.16.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
-EBUILD mongo-tools-4.0.19.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
+EBUILD mongo-tools-4.0.19.ebuild 1612 BLAKE2B 388fce2721c6febaf554a4eaf68d3ec2def017e01b0a88ff7acb039b06dfd90081776dd1628ea4c51612b55e5fd113176c1b87fd9dd8d14991bcb8e6b21e462d SHA512 123c899168d48b40b75cabf913ad76eea8bad3f0537101a312988191d4cf6cb07b3f5b14232d92bac2785d92d1229ae2209c1f96843c845cde6967dcf9ef4c95
 EBUILD mongo-tools-4.2.3.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
 EBUILD mongo-tools-4.2.6.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
-EBUILD mongo-tools-4.2.8.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
+EBUILD mongo-tools-4.2.8.ebuild 1619 BLAKE2B 1faf21c01243af30bbc274c99995ea875579473f53485d8100b487d1934880c495d9cb276e346646ecdad476a56284e90646cc83ac1dc47a1ce0cba7bf670f98 SHA512 91811cd08ce9d3e3577ccd0ba845ba9880e6bf681dc14925fb5a43a750914b4e1732d578ff64335ad935665548ddacfa59bc0fc22abed2d053cec0e6da1af939
 MISC metadata.xml 331 BLAKE2B 62e95d5bc17f92830615f6a251ac64e2824c9fb7bf5025f0d3898fa2d0cfd0a033fef7e04d6536b4122241462674148ee0516f0ac54ee30587f375404ff86c6e SHA512 00442ab0d006a7e4fb525dcd9df46d45eafa25f85afe5964bc98efd0996898a1b27334d939ea2d5cc843b5249632613585e0a40d9fa0f227334040c8c3d7b741
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.19.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.19.ebuild
index 86f626904b91..1be2c812c418 100644
--- a/app-admin/mongo-tools/mongo-tools-4.0.19.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.0.19.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/mongo-tools/mongo-tools-4.2.8.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.8.ebuild
index 7d8cc9a0ebc2..083aebc281b1 100644
--- a/app-admin/mongo-tools/mongo-tools-4.2.8.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.2.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/passook/Manifest b/app-admin/passook/Manifest
deleted file mode 100644
index 2ea8de9df8bc..000000000000
--- a/app-admin/passook/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX passook.patch 778 BLAKE2B cf0e4af5987f70e3bee262d3a11f3bdd8c96686b0f28de3eeff7b248c0b8ade17efe5b1da8f165113d4231e1ebc67abd8b1053916b95022f4e7b24e49b449171 SHA512 cbba3e7b7353acb43056db909ec868eaa741dc81eba3596c4c51e88f7b0922f7637d0a3a862377eba0f20eef52ca43314e3964cb011bd3fc7e3436724d9289d6
-DIST passook-20121001.tar.gz 13992 BLAKE2B c253fafa45c1f3ff30c91bc697ffece20fd6a58f36075909043041b281d558ab0a9e4352d867e00404bed81bdf44a5bf236bfeb72b9f41fd5ffe78a3b33a9900 SHA512 8c3c72f3001fc3c88060f77685b4f238d42dd65d599522604cf3f3fede2c3b94f4a12622e006d10a4f026283b885f90e4f2e2fa9282a48e181480bec4e2d13cb
-EBUILD passook-20121001.ebuild 669 BLAKE2B f6af186354f31c7d6e5d272f29ef05fd108ce2fadc24b0be9ccfa77400268d702b7412e6cff8bdaa92a273883fc1851a8deff60dc911bb264af0cae6ed11b53d SHA512 f1f9b5b48155eef9999e6d5f0fe54f4bb6a178879b5000d3b047763a200f63f1b063778b2be038a21a47ba29d2e84c860a80e25c03c51b985482a375244ebb59
-MISC metadata.xml 393 BLAKE2B 024b68ca2ae37df6718088689b79d3d70546681a051deeedd6012f7cc2d987208437831ad8423f8bddd40fa894cb2f27b96ed2be65ac3776a5be4a8aa86e60d0 SHA512 f08f94a5ae03e1b89f218db3b462bd595905ac95336be3cf1eb43b3e018101c5b2dfb5d526f285c1a51388214463d6676d770ae805be21b2bc1463069c93467f
diff --git a/app-admin/passook/files/passook.patch b/app-admin/passook/files/passook.patch
deleted file mode 100644
index db14e6ec817c..000000000000
--- a/app-admin/passook/files/passook.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- passook.orig
-+++ passook
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl
- 
- srand;
- $p = 3; #default pronouce level
-@@ -38,7 +38,7 @@
- }
- 
- sub fourletterword {
--	my $grepstring = 'egrep "^....$" /usr/dict/words';
-+	my $grepstring = 'egrep "^....$" @GENTOO_PORTAGE_EPREFIX@/usr/share/dict/words';
- 	my @fourletters = split(/\n/,`$grepstring`); 
- 	my $word = $fourletters[rand(@fourletters)];
-         $word = &tangle($word) if ($p<5);
-@@ -46,7 +46,7 @@
- }
- 
- sub threeletterword {
--	my $grepstring = 'egrep "^...$" /usr/dict/words';
-+	my $grepstring = 'egrep "^...$" @GENTOO_PORTAGE_EPREFIX@/usr/share/dict/words';
- 	my @threeletters = split(/\n/,`$grepstring`);
- 	my $word = $threeletters[rand(@threeletters)];
- 	$word = &tangle($word) if ($p<5);
diff --git a/app-admin/passook/metadata.xml b/app-admin/passook/metadata.xml
deleted file mode 100644
index f7a29ccaa787..000000000000
--- a/app-admin/passook/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>Passook is a perl script that generates passwords. You can
-	customize the security of the password generated.</longdescription>
-	<upstream>
-		<remote-id type="github">mackers/passook</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/passook/passook-20121001.ebuild b/app-admin/passook/passook-20121001.ebuild
deleted file mode 100644
index 4cbd2bae4926..000000000000
--- a/app-admin/passook/passook-20121001.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils prefix
-
-DESCRIPTION="Password generator capable of generating pronounceable and/or secure passwords"
-HOMEPAGE="https://github.com/mackers/passook"
-# snapshot of https://github.com/mackers/passook.git
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="dev-lang/perl
-	sys-apps/miscfiles"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/passook.patch
-	eprefixify passook
-}
-
-src_install() {
-	dobin passook
-	dodoc README passook.cgi
-}
diff --git a/app-admin/ps_mem/Manifest b/app-admin/ps_mem/Manifest
index 38029526ad06..aa62cdfba854 100644
--- a/app-admin/ps_mem/Manifest
+++ b/app-admin/ps_mem/Manifest
@@ -1,5 +1,5 @@
 DIST ps_mem-3.13.tar.gz 18331 BLAKE2B a0689a98597e02a63cc83188e717421bf873b9202c0f524165ffc838fd438c539209c2f4e6561226bda8c6f85364707d29d13519d6d3e53a6d34cb39378d2de1 SHA512 bf5affaede5f052cc878d46ef81186511a1e8f5939cd7e8560ab2df9faf4dc31566cb4172d956cdcf1e6fc5586ba3458ba1011aee3720f6b7eeb3cf40b4f90dc
 DIST ps_mem-3.13_p20200417.tar.gz 18472 BLAKE2B 43e04d0357458107fb25600024243baaec703124fc58a819c011c847a52ad6fb7384ef38a5aa965e3ae88288cca6c76a15819466839eb729a63c4492eaa4ec0d SHA512 9694cec5d696a42dfe2f60dd024f541283e2f52aafb499ee2e551574133262bb0fc4bf6eb0e7075fb1b129aff6cd8fe6968f411f56ee1d31eb6f9aebff2d9852
 EBUILD ps_mem-3.13-r1.ebuild 676 BLAKE2B 2921f9ecbcec6bf8e3251362eefebdf0a3c9a36d150463a3104c1637adf876dd451e3aa742aa002955aeedc3536836fb963a78f0066d43362aae4cbbb62abd14 SHA512 95dbdfbd232d6a0415f8f825cb750ba6cf40facce0ead984de057063f045215746f3cc7f7d1f5ac0cfed1e01a0930d9d711c5f0639de7cc4244e1a2a98319ff4
-EBUILD ps_mem-3.13_p20200417.ebuild 713 BLAKE2B e5b9a9999946695f5bc467038d147f16b3c0042207414f0b0a6eb82bf0bc65ac209c00bac6b90581e240ed6ed557ebc2f82964106de1ffe3bc8fc6654844c4a1 SHA512 bb9d22c33131fc982aaa63f1328863b14c8ec2543a677de69a4275f176ff043fb246cf7f694602d54c1e58b9b6ccca96743da970520de2d4e9ec291520157770
+EBUILD ps_mem-3.13_p20200417.ebuild 710 BLAKE2B e8edf41454c83751c272b1ea69c0606c8aef4e20da522dfa83733c4f90735ea9f94ed785b8d0e863578356ae99c58e2c0d428fc6b0d9224b0ebbd51941152e66 SHA512 9458978de046dc70ec8a3f6e44ada401b1a079fcea5afaee5247f0a6ff2919d50dfabd74a5c4284a2902e5e4f43f466e6e112b728cfe163b50a7147b79168fc6
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild b/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild
index 738db1ad89cc..91108a61195a 100644
--- a/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild
+++ b/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pixelb/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 sparc x86"
 IUSE=""
 
 python_install() {
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 33b606d2c9af..da9c48fe284b 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -3,9 +3,7 @@ AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_6.15.0-1stretch_amd64.deb 22581842 BLAKE2B 19c45427e56a41f6030836129a7fb2824ea47f1000745a8c74b0968c61f719d3cef9a0e02f51009b8e91c4ad66445c074ccc203754bb13d82007316a3d053c60 SHA512 4ec7e04fb6bab697bfccd369740a57f735476a4614dbfa1f7c893901f5ffb9d6ce3d79886b6e035805b1a8f2c3de3e0b9b468b08909881df6022c9700c7a2768
 DIST puppet-agent_6.15.0-1stretch_i386.deb 22917002 BLAKE2B 5bab2b6cdde11a46e64996074e8db50d48d004b601c0d08ddfde9c8dec0c0f62da1176b9148d084f0250b582460606b7cd0a97291d157a186b7a97dee4184c51 SHA512 89e676491f7b7b44c9c747b129166db7b025adf76d9911d12d7d026aa8d04de293d3d1c638ca309ee8ed45a37c49b4ab0076ea0c711ac0e43f4297084446784f
-DIST puppet-agent_6.17.0-1focal_amd64.deb 22317432 BLAKE2B 570ef37c8e170ab1d615782322c895b0eba3193ac51dd221a8f9597c34c923c36874a5add1cf1074160c86dd4c4acc3ff1b65709cee2c0cddd84abe57c300faf SHA512 541010d896c891040154b22eed3f2e39b026cfef5669c95016ba1aa5b919002fcf2b8d2a15cde8efd104fc2e0699a8cb5cc3914bc039a27280f97f7f67d7b153
 DIST puppet-agent_6.18.0-1focal_amd64.deb 22258752 BLAKE2B 547d06b16b2c95ec9be72bd82e1aa0a4a4b511075da73f29ebecdef32ca4ed9b965a38a7c071d9bcc8c444b6974159df97f020878c0e4a20d1f50ff23d4c1129 SHA512 00f0cfd96176f5311f0bab14016ab88da03ecc10fd9e2bf28fc2d9a399600c56a97e23095694be5382005fef0df1c4fe3ff0d1aec3a46d85f74c729a3c62476a
 EBUILD puppet-agent-6.15.0.ebuild 2016 BLAKE2B 4f4382314410a9401868382b65e5ce627e9c706120dc21a537b71b390bd56480988b36e51f000303542d8711f2aebd47860605e8f52087c895e9453d2992a84a SHA512 45a7eaf2fbd6c66b672943192a92826ee10da6f0ba3a4d8cdc6c9ad2103d2fa534587dc31f5505bc8c9a23474e604ac58af0b328723668cd772a1e75fe6d0d5f
-EBUILD puppet-agent-6.17.0.ebuild 2067 BLAKE2B fbaa5ddfc2c3085a877a0adb546a8ced6242fcfeffa180cee4588dd6ac0f35ef15b58869f1b22dbc4d92b2344780ad64ae9ef41fa6a46f71bc50fd2f89031ea5 SHA512 154315c97b9ec493d6923e066df73d58a33e6f0c7bc33162d8fcb5b5eb86df3ebd7af93d9cc8a0463d6d19f7650209610fe391a5b530b7b57e147738cc567d9e
-EBUILD puppet-agent-6.18.0.ebuild 2068 BLAKE2B fa894f7b4b85afe9cb403d17617ae13ef9bdd566c6ff5e70edfeec2fd3733c3f5b93c2cc08f4f7b35112d2f8d3af0f3ce8e99abf865f345b3e3bea46ac788de1 SHA512 55eaa06a91b994cd4422f0a7c3f67cd25317729a96110e28a291bf2965855f1cd53aa731fc920ad424d27a80ad210aac2f9e6046c44116b363729193791032f8
+EBUILD puppet-agent-6.18.0.ebuild 2067 BLAKE2B fbaa5ddfc2c3085a877a0adb546a8ced6242fcfeffa180cee4588dd6ac0f35ef15b58869f1b22dbc4d92b2344780ad64ae9ef41fa6a46f71bc50fd2f89031ea5 SHA512 154315c97b9ec493d6923e066df73d58a33e6f0c7bc33162d8fcb5b5eb86df3ebd7af93d9cc8a0463d6d19f7650209610fe391a5b530b7b57e147738cc567d9e
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-6.17.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.17.0.ebuild
deleted file mode 100644
index c33a9ee73c47..000000000000
--- a/app-admin/puppet-agent/puppet-agent-6.17.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what
-	acct-user/puppet
-	acct-group/puppet"
-
-DEPEND="
-	${CDEPEND}
-	app-admin/augeas"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/libselinux
-	sys-libs/glibc
-	sys-libs/readline:0/8
-	sys-libs/libxcrypt
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
-}
diff --git a/app-admin/puppet-agent/puppet-agent-6.18.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.18.0.ebuild
index d2a6b4ff967b..c33a9ee73c47 100644
--- a/app-admin/puppet-agent/puppet-agent-6.18.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.18.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 5e28f97a52b5..e5cd955308c3 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,10 +6,8 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd SHA512 996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3
 DIST puppet-5.5.21.tar.gz 2997149 BLAKE2B b42fd79132ce0aab02724c7aa38fc39a216df38266b9ee8078b433860b675f36b3c4da0d13d8fb456069250e6cb6470686c83581bc6b57801a44375f829be195 SHA512 b33191c104cb58fc842d065c3cf7dec8ce723ddc9b273c930f56692e252eb6c51bc3b0442db6500cf015fe24ec3eb133428aa09d845ca92b05de2da39bce8bfd
-DIST puppet-6.17.0.tar.gz 2901101 BLAKE2B 59e75d1b2a8d02285ab867d3b63b1656e29c418f4844b21100e135b306e16f82284690565e5354f515499ec7bc0e2ff688308e077cc4656076a38f49bb1bedf9 SHA512 2ebf31cce1dcc4ce0bf9403f56d3f97a41a4014111be1f27e340de8e4db157549bc4609068ee6396be3c88ff1a93b40792692a5b01140fa66a1f5a82453ba1d1
 DIST puppet-6.18.0.tar.gz 2911742 BLAKE2B 75ecb14a0cf96c1c54d09f88f91984805834288a166e74c5b9648d5f9ad60a6c279100f32f148659772a22fc01d21345bf765ed47518bfa9bd81d06c17587efd SHA512 a14994aea502fbc78219967e2d711952b580df1e7befeab2d254a73f28036c6c7923d167a20bc61c9abe76000f93dcd3cba92b3353540e2a26fc27b10b06efe1
 EBUILD puppet-5.5.19-r1.ebuild 3692 BLAKE2B 7aa03944368b7395b4c587230a39536db28d0a46352bd5c6f7ec457ca29a3e6d9a3672a9b74591d3382909dc4f9ecf6ec73853ad5722b26becafb5c1a1264912 SHA512 6012739c4d92cf576ea482f99e9d560633103116b40be7df8cc3a9e89f9efeef3e02317dbbed1207a91c5372ef7702d723c37207488ecd6ececad5d0df6de9a2
 EBUILD puppet-5.5.21.ebuild 3757 BLAKE2B 84bc423625d9ec703ef345fd0bbc44241e5abcd4c964290778a84a636e30a7b87153bb5c450a7b9e61f488279f28553969eb777deebb6ef22c923929b28f3b2c SHA512 cd1be53da064ad5641de2d4566f36f9733201c92ea68b3d36b416a8f786075d148a9a7f48eb1a67eca3567016f381bbc86c2a4dd6f4e3919befed2ae0bb75196
-EBUILD puppet-6.17.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
-EBUILD puppet-6.18.0.ebuild 3639 BLAKE2B 818e60019ca433e92b51946d2ad453c16a844820a5edbd91d3acd1a08b654dfdeb441dffd52ea4ef1418b1e4e0194df2391aae93a9d959b4f9dbb4121182bb2c SHA512 85bc153ff019d9db4cbb5eb334662b2c39e293abb646480122d141fe1f84b49fbc98b3f255e8877b421d1274c7fc3946dc6cf28a3ff8dfda437e7b7661243678
+EBUILD puppet-6.18.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-6.17.0.ebuild b/app-admin/puppet/puppet-6.17.0.ebuild
deleted file mode 100644
index 11fd2d3c5085..000000000000
--- a/app-admin/puppet/puppet-6.17.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	dev-ruby/concurrent-ruby
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppet/puppet-6.18.0.ebuild b/app-admin/puppet/puppet-6.18.0.ebuild
index f50ee1410b08..11fd2d3c5085 100644
--- a/app-admin/puppet/puppet-6.18.0.ebuild
+++ b/app-admin/puppet/puppet-6.18.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 384693ac6705..2916e3f75536 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,7 +1,5 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-6.11.2.tar.gz 44799680 BLAKE2B c40048d1fe6cf62371f2adb1a5361b34b1f46e6b344a7565ad9565f2ec4ae3cf1bd4927904c797be92c223dcc98e2302359af753228d09424372ea894cd5d5aa SHA512 af5d5f61147e8b67812af405b3b087897925869a62eb0749a5a59ae72e76bdcfe95879b0cb6d993ee85a00c44c6867e1864c0d22ceac7b854bca248ae1a00ccc
 DIST puppetdb-6.12.0.tar.gz 46375914 BLAKE2B 7d1a884881e9aa324b0d2a8cd49bf47e4014ff6bc23e94c76c27b3736c75f3cdcead76aea159de17ce1255381e32bb126f9cbf55297f64454fcca6ffd7f28b46 SHA512 040f8653c422e312857f82a8f040a33128f49c7900978a22b9ae672172ec41d2037e323de5aad3c50a630058b6b95c025bae05b3ea923e2321e94f97390998dc
-EBUILD puppetdb-6.11.2.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
-EBUILD puppetdb-6.12.0.ebuild 2649 BLAKE2B 61c2280603f62775d7e3c06142c0bad6d28795dfd396c45c73680e7d33b034e8f656994a21b304e438f89fc9d700e722bdbbc94dec544cda0f6abbe560c9d1e1 SHA512 1dbf062b0f95659020fcd4ec207aeb658a62e35e74f868d95c91ccabf1115b22536be505fb2de84427a6506c47ecd7cbb3ca0164f618e4d297b921a629065b6c
+EBUILD puppetdb-6.12.0.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.11.2.ebuild b/app-admin/puppetdb/puppetdb-6.11.2.ebuild
deleted file mode 100644
index 784885ac312f..000000000000
--- a/app-admin/puppetdb/puppetdb-6.11.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+="acct-user/puppetdb
-	acct-group/puppetdb"
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-6.12.0.ebuild b/app-admin/puppetdb/puppetdb-6.12.0.ebuild
index 5a7a32bcf49c..784885ac312f 100644
--- a/app-admin/puppetdb/puppetdb-6.12.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+="acct-user/puppetdb
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index b964471ce60a..8d8a9e6d7bc2 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,7 +1,5 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
-DIST puppetserver-6.12.1.tar.gz 60422470 BLAKE2B fd3fa33262a5ae83fb6889079a85c262d74d55b0ffb9ed297d60399c442d7a1676cfc54afd3e25721d6e4a4ad926c43a1f8f1a9db206ee6145280601c501fe09 SHA512 9ad5d3e266f91b8a1ef09302a1f8889f139909fb20268f714fb894dcff2379a01c78baafdab1102a26c26903cefe92ac833c2b20e9ea6f8d379af2dd11c20407
 DIST puppetserver-6.13.0.tar.gz 61890579 BLAKE2B be514b3c41dcc018715e949f1f1c86317499baa22fa70e5f7e8df89211b566651ab4de469afadf14fcd1dbc9b1d0b0c21452c313f74052eb8d65bbd591231194 SHA512 ab67ebf94c37a50999a5597e1ceeadf606296c2b6e557bd6ee2bb99ac44b7c8fe8df892f4e3bccb9f0e3822fc480f61a27d6799b7dfc8df12e058c7074d589f9
-EBUILD puppetserver-6.12.1.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
-EBUILD puppetserver-6.13.0.ebuild 5329 BLAKE2B 5c95f3bb71eec4b03add549fb79d3217d8d27011039aa0cf4aa41e7e405713dbfe42134f1b4f28926d41acb2d8766c5b648c7ce508bd5141e6bbd409460c9aa8 SHA512 79e7cac0efab3c480be57f739c17bda61cc74d05cd8541de20be5d2ab64524c33ebf5793e9369d69fc65f55d6c46b8a6501163bd6e2ee4ffb78263094018e58a
+EBUILD puppetserver-6.13.0.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
 MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-6.12.1.ebuild b/app-admin/puppetserver/puppetserver-6.12.1.ebuild
deleted file mode 100644
index 5385eacc0c94..000000000000
--- a/app-admin/puppetserver/puppetserver-6.12.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
-	acct-group/puppet"
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	dodir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-	insopts -m 0644
-	insinto /usr/lib/tmpfiles.d
-	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-6.13.0.ebuild b/app-admin/puppetserver/puppetserver-6.13.0.ebuild
index 94b63776bb90..5385eacc0c94 100644
--- a/app-admin/puppetserver/puppetserver-6.13.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.13.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest
index 9658b9a2beb7..ddbdac998aa5 100644
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@@ -3,10 +3,7 @@ AUX sagan-1.0.0-liblognorm-json-c.patch 2840 BLAKE2B 569957ec95bf5fc5bb1e844ba1d
 AUX sagan.confd 239 BLAKE2B 2ca76c1bd5bdb7b29f007a4d93602f020f76b10d6e4313e138e09b49de0b0c6796bc729f32e88831881bdcd52637bfb3a8e42481d89a09648a2833a000570ace SHA512 7ee746984d3bb3361e3155860d54e307f9b94b9e3f98c09c29b4259cd37d7aefe969b5b942c04048328ec23265a2689b22403c32e3552b8062201aca2ef3ac34
 AUX sagan.init 432 BLAKE2B 561344909a8f6610504f91bf72ba6fa89ac03fdacacd3189372f466b690b3421c3f1a8ce4750b747c53613c75f9b61696ec7b3c490597eb0eca36ebece23a26e SHA512 c5ec82e48ac33785a0e63deb6b2079e97a2f9b5f96682ccbf646b4deae5782cbceb5756b17fdff7af8cafd4e561e298d842c4c4f4aa5229ccc58f5f0fc06e6f7
 AUX sagan.init-r1 424 BLAKE2B e6fdd676e772d2abfca02215026a95321edecb41fcbeec3aa45afe15abd667e323ec2f21375d41c692b9648017002c0b410d551034dcbd3f060f5bb1e2f95026 SHA512 341754a9b18fa4b4082a852cec2eaa5ea78be33eb9d8cdef5b7ec61a9d67d3b264b2c6a2aef030bd85d3644539447345c88fd23ebe99145e40f990f565706809
-DIST sagan-0.2.3.tar.gz 231774 BLAKE2B b385a4b22f2fe7567dbb0c52ec022794eacf057a0dc797daa0432ef4bdfc344473a500298825f56a32513025e9c7cee3ff70fc577d7a9454e87022510a71edb4 SHA512 2110f3d34db69cb5c453b8e37d06debeea7531ebf15a9b78954ac1657ddce34feaaff87d14695759c3deb2eed5ecc0e6fec5881fb5037af8efa6c3c9600242cc
 DIST sagan-1.0.0RC3.tar.gz 285207 BLAKE2B 7322ffc73a8e86f07ef106b04feb9140ba94a51b9e286ef0c0b0d3fa609e8e03cef4c75e1d32502c1b70a4c078d8601d2a1c58058137bb793c8a52cecc4be20b SHA512 29388a339b290bb4de2359c0c54b9e1d43ef207b223a499a1a4faa36de4d9590a777a796dd773948e995d052b71f3ef47ca5bad5c133116c4dbb53b4fe336123
-EBUILD sagan-0.2.3-r1.ebuild 2036 BLAKE2B e6c21884fdcfb2facbd58710bf392a8f1035fa1b618a0e681b36ae8cbe5c15c4f4a7bcd23688b78ec54741bc0cdd7f20c3be49f20b0f9b9f5c847ee85944941f SHA512 480306cf980503d7be31af758a4ea1f9e4b7d8179b9aa0f2fc4bcbf3be78b5d16c9cf900b07daf3bb1c5fb94ce73e4c78ed6da8ac0f423d5339d9d334786ade8
-EBUILD sagan-0.2.3.ebuild 2024 BLAKE2B c3d9db48c8aa738f812ce22b5c3c1ab4ed436b8130480a30f7daad2f64dca7d425fccfec0668c96bcd18ee2fd5a4f3b49b8c1f785eaa9d4030c8865f0327cc69 SHA512 892c84a08c01258e6cafb52c8e5b12fcd38b4644c9160645baf39cf37dd1e270b951e9dcdc8aa1c720445b89f9848fb3905cbe7b806ad4e292be3f0f1d72be40
 EBUILD sagan-1.0.0_rc3-r1.ebuild 2248 BLAKE2B 602ea4352f8a83d55c53e26136d44613f6fce83bb8adfd40d58a1bd5c0da57b3dbadecb723f37680b7def468729c30fec1e9fad28801ca5b322a14a5dd814115 SHA512 0739f9f740e3468b848a1e446ad22f2bf1e0fe988a0a0a56873ec26284fc3cde41eba8aacc2233679706b2d9730a4fe2c1588be5f456ee0a52eb15fe96528732
 EBUILD sagan-1.0.0_rc3.ebuild 2080 BLAKE2B a82272fc36cbd9eafa62cf7da9bd0b412c06f4d235861be44be21fd811fddcbe299e75dcdd56370787a3f9f35c47592a3dcc2d9608457e532ce1c0ee3dc68c44 SHA512 3dcc104b0f36a134cc0217c7c5f6373d13a6b479f8f97545953b8c551d28c330515176914c9f3447211a5c6882c68b90e656e53d61a9221489e1229f6302344f
 MISC metadata.xml 711 BLAKE2B 19677ce6a88bd62ae22cc1383a8f671082c0f2b844d3e75344e5ff3aa01bc51e4826b3c02f30221af0f9b2b620e9bc9ccb2a6c55944d1b34de072c7f985531eb SHA512 0ddee4d50afea4e3813b9ffc57d444b95c56773f58a469e28d99a85bda787143a23f4adae995632283b2ec5269cbe38e3ffecd294448c675169c4ef10033afb6
diff --git a/app-admin/sagan/sagan-0.2.3-r1.ebuild b/app-admin/sagan/sagan-0.2.3-r1.ebuild
deleted file mode 100644
index 99142b741816..000000000000
--- a/app-admin/sagan/sagan-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils user
-
-DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
-HOMEPAGE="http://sagan.quadrantsec.com/"
-SRC_URI="http://sagan.quadrantsec.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+libdnet +lognorm mysql +pcap postgres smtp snort"
-
-RDEPEND="dev-libs/libpcre
-	app-admin/sagan-rules[lognorm?]
-	smtp? ( net-libs/libesmtp )
-	pcap? ( net-libs/libpcap )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	lognorm? ( dev-libs/liblognorm )
-	libdnet? ( dev-libs/libdnet )
-	snort? ( >=net-analyzer/snortsam-2.50 )
-	"
-
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
-PATCHES=( "${FILESDIR}"/mysql_check.patch )
-
-pkg_setup() {
-	enewgroup sagan
-	enewuser sagan -1 -1 /dev/null sagan
-}
-
-src_configure() {
-	 local myeconfargs=(
-		$(use_enable mysql)
-		$(use_enable postgres postgresql)
-		$(use_enable smtp esmtp)
-		$(use_enable lognorm)
-		$(use_enable libdnet)
-		$(use_enable pcap libpcap)
-		$(use_enable snort snortsam)
-		--disable-prelude
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	diropts -g sagan -o sagan -m 775
-
-	dodir /var/log/sagan
-
-	keepdir /var/log/sagan
-
-	touch "${ED}"/var/log/sagan/sagan.log
-	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
-
-	newinitd "${FILESDIR}"/sagan.init sagan
-	newconfd "${FILESDIR}"/sagan.confd sagan
-
-	insinto /usr/share/doc/${PF}/examples
-	doins -r extra/*
-}
-
-pkg_postinst() {
-	if use smtp; then
-		ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
-		ewarn "email, create valid writable home directory for user 'sagan'"
-		ewarn "For security reasons it was created with /dev/null home directory"
-	fi
-
-	einfo "For configuration assistance see"
-	einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
-}
diff --git a/app-admin/sagan/sagan-0.2.3.ebuild b/app-admin/sagan/sagan-0.2.3.ebuild
deleted file mode 100644
index 64c6a49c8ba3..000000000000
--- a/app-admin/sagan/sagan-0.2.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils user
-
-DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
-HOMEPAGE="http://sagan.quadrantsec.com/"
-SRC_URI="http://sagan.quadrantsec.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+libdnet +lognorm mysql +pcap postgres smtp snort"
-
-RDEPEND="dev-libs/libpcre
-	app-admin/sagan-rules[lognorm?]
-	smtp? ( net-libs/libesmtp )
-	pcap? ( net-libs/libpcap )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:* )
-	lognorm? ( dev-libs/liblognorm )
-	libdnet? ( dev-libs/libdnet )
-	snort? ( >=net-analyzer/snortsam-2.50 )
-	"
-
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
-PATCHES=( "${FILESDIR}"/mysql_check.patch )
-
-pkg_setup() {
-	enewgroup sagan
-	enewuser sagan -1 -1 /dev/null sagan
-}
-
-src_configure() {
-	 local myeconfargs=(
-		$(use_enable mysql)
-		$(use_enable postgres postgresql)
-		$(use_enable smtp esmtp)
-		$(use_enable lognorm)
-		$(use_enable libdnet)
-		$(use_enable pcap libpcap)
-		$(use_enable snort snortsam)
-		--disable-prelude
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	diropts -g sagan -o sagan -m 775
-
-	dodir /var/log/sagan
-
-	keepdir /var/log/sagan
-
-	touch "${ED}"/var/log/sagan/sagan.log
-	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
-
-	newinitd "${FILESDIR}"/sagan.init sagan
-	newconfd "${FILESDIR}"/sagan.confd sagan
-
-	insinto /usr/share/doc/${PF}/examples
-	doins -r extra/*
-}
-
-pkg_postinst() {
-	if use smtp; then
-		ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
-		ewarn "email, create valid writable home directory for user 'sagan'"
-		ewarn "For security reasons it was created with /dev/null home directory"
-	fi
-
-	einfo "For configuration assistance see"
-	einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
-}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index d26b326a5386..a79bac69264f 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,8 @@
 AUX sudo-1.9.2-glibc-2.32.patch 10057 BLAKE2B 2027bbef7db5f4a523959e9456ebe625028f55607a22869bcc7deb9ec3787d28d3955fc0a0670976c557f070fa31a56bb167d1c6618f955163a240f852c5a4f6 SHA512 de7147130e923ce083637231f5e5a6dcf41cdd1a2bf901754b573239898d144938ebaaa55a8b1cd44138f313bfa59de6b8eac5d18ecb7c61e501dc0213f144b6
 DIST sudo-1.9.2.tar.gz 3890859 BLAKE2B 879917b8045c999a17ef36006732509aa546ee6bb04de77191fb637aa0420d54f9e51ec69b697c22119d638393e9c84efcc1ca5e6e8ee5f0c08bb1ca07f3acea SHA512 20afdf2604b1c93395157382b24f225cd1ff88d3a892362e2d69fecd240c4e7171f05032c08be1778cd1dea6e460025e4241f57272fac0ea3550e220b6d73d21
-DIST sudo-1.9.3.tar.gz 3956793 BLAKE2B 9bfd486806513ee9163c0904dac790a88b11ac8cf620ef08563984454fa51a9fab945300c8040f83a2a5a9264faa521deda7b76efa0b15e5f28374db8d5a26aa SHA512 21b59aa20240ea45dc7211ca7851cce104da462dd237081f9a79bcb8362280f6ea264c1c54d59de58d1375d45d8e10827848591bcfd3ec889c66126bee438544
+DIST sudo-1.9.3p1.tar.gz 3958071 BLAKE2B b681c120faa5dc7f25e27c1be423d68cea70f63dcdfea2183fd386a34dec0376555453399d3f8886c66c6507343648d40b59a058710432154061b210df2a704c SHA512 3ad13fd03e5b371fd6bf7909731ffc11431d2182a744b654f7e5d4b810e47955d49bc78f551afe13ec56acbce694139c33a15bc022cea41b17af5496b8b7f89f
 EBUILD sudo-1.9.2-r1.ebuild 7013 BLAKE2B db8445fef0e42c472efeae9210c773b89145b2a578a6705ab77b8dcfe56ce976e5f0a747bb3884dbd8741facc6ba7051517315a644cfbfc01a90958b271e336e SHA512 e76ff722a7dea45b23f7144fce001c05ce1fa12348ca8ec0e586160b69dacc99e9bc8b877962b525b94255517f7d1d862590e1a73cd436791f7b8985dc17a7a8
 EBUILD sudo-1.9.2.ebuild 6922 BLAKE2B ca1543dde3d569c92ea36d494ac8c11eb9c6fccfaf1c34696cbf7e37e8f88009c9805fccf658423fe6898493289383d3dfb1562a6a99e8f17fab9b4d7e84c76c SHA512 8559891753c2ee5679edefffb878a21be2c861fd07427a760d79e6aecbfa0cabba3a8ab8a1bcd56b5c1e1ca5d454c657360ef00ad1de9f0c868d32627a3a9ddc
-EBUILD sudo-1.9.3.ebuild 6931 BLAKE2B 3e606d2d8186da9b882969e864f90c34bb0b473589abd9e114550fe945a60076e159262085cb3766d14ba061806334ceba3665b2fc37f22e2f589c819335c9f6 SHA512 ff619dd0a8d6842a2bae2cf564cf58797c3ce63bb3acd1fbfe14ebfd511018ea8c3fe993002ed1278fda4403f9e413198c19a69623f0e6548dfb6597c554f357
+EBUILD sudo-1.9.3_p1.ebuild 6931 BLAKE2B 3e606d2d8186da9b882969e864f90c34bb0b473589abd9e114550fe945a60076e159262085cb3766d14ba061806334ceba3665b2fc37f22e2f589c819335c9f6 SHA512 ff619dd0a8d6842a2bae2cf564cf58797c3ce63bb3acd1fbfe14ebfd511018ea8c3fe993002ed1278fda4403f9e413198c19a69623f0e6548dfb6597c554f357
 EBUILD sudo-9999.ebuild 6821 BLAKE2B 6ec4c8325e4275d902df02e971ca9b3e87a24b312cabcec7909c8ce94c4662aabada79fe550305603ad92151483bb3ba02a92b1ac49807ed0ba6fa7b14da0f12 SHA512 92536adcffa6e1c62e701d7a00a9032a60d559aa114d196e9851f198321ea8d027e9f7caf598f9d0eae2182362520a3c1ba62117d13b8e8b8ed6c5d9f212e7ac
 MISC metadata.xml 1161 BLAKE2B 0c501bf06edca82993ece857f9f7565f99da15df36c916bc9dc57e78bccf2b247c382e97dd6c97cc7f5375e1a0513c1a30ecbf097516e96319fd1797257fb117 SHA512 d6bc9cf11ea1bd28c19bfe167580556af517d92c958d63cd7872ab5076840eca39a7ab3d1f56e84fc0fcfb675d7a89c23ccdd3629f665c45232be1140eb950ac
diff --git a/app-admin/sudo/sudo-1.9.3.ebuild b/app-admin/sudo/sudo-1.9.3_p1.ebuild
index d0873828489a..d0873828489a 100644
--- a/app-admin/sudo/sudo-1.9.3.ebuild
+++ b/app-admin/sudo/sudo-1.9.3_p1.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
commit	f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree	e907cb121b30e3c1df1710719c0ddf4029597a47 /app-admin
parent	db063b515939ab15261136b24e4bc44386335c0c (diff)