gentoo resync : 31.12.2018

57 files changed, 133 insertions, 2500 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 61af9717f328..fd847feb20ce 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/cgmanager/Manifest b/app-admin/cgmanager/Manifest
index 170d6c0850d3..66140657eaae 100644
--- a/app-admin/cgmanager/Manifest
+++ b/app-admin/cgmanager/Manifest
@@ -1,5 +1,5 @@
 AUX cgmanager.initd-r1 331 BLAKE2B 725b5044fa567e7f7146bd62cc63a0674873d6fcb022eda77b7296dbe1af76645815b67b113a41eec8f83898aba90be3706a10f672a2565c7af26967c196fb54 SHA512 f50afaf471f9e9d500cbc909da1185c1342481699eb1887f694ef91bd49c7cd727d21871ff5d6c0b6046601cfa72a4ac167926c62920b2f3a4902ec817401948
 AUX cgproxy.initd-r1 661 BLAKE2B f84189b5fe16b6327cd1a6a2cd1805f1bbd75791d0f6f75a601ea58fa51d5a490d655371355205c499a51628b4e9cdf21f98431adcb3000397508cdacef2928b SHA512 7f43ea6369428d71d122a191c6a1718987ed09eafe2217ae326606ddf2a50f0500d0de0520fe21e5d2edefb8ddd4c3a85623d2aac1212e821ea922cb8256fffc
 DIST cgmanager-0.41.tar.gz 461805 BLAKE2B 22c779953d637012694c19490da9d3707b9e2a935f910d192fd1e6a44c27e933e93b6ae516399991924175a9e8e05fd650cf3117d3e7bde034a20bc083ebaa09 SHA512 e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd
-EBUILD cgmanager-0.41.ebuild 1234 BLAKE2B 3c69ccac261321f47b0064422a55541023efe27dcd902a94d0a9dc4e5c4c3f13a4d846b244903cbbec616196fb41a4294a4e4684bcf3ac9300b2138517439c9b SHA512 b5236eeb934b5a8679a965783ef187b4b3f603b69d37d1a572ea1c8a0f22bbd78c7339cad4aba8f4ffdf3970dc647cf46c1b132e18f19c4fd7057031fd06ba41
+EBUILD cgmanager-0.41.ebuild 1236 BLAKE2B e28b1efcfa1d57fe5702891906e34f5720e71a3a8eba5af4ca5f0a5fb1139e466b2f298d76cf845a39e9b9f82d3220e54ba4880bb6757f51d5052ebdca2d14fd SHA512 84c8030e5f7f08a94e4786be92b9b5d89c8a2d21faeaa964d8009ec85b676c2ce4b06dbcf63e3dc9fb2962962cda3dff2f03fd34bfaeff2790ac6bc9d4e74311
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/app-admin/cgmanager/cgmanager-0.41.ebuild b/app-admin/cgmanager/cgmanager-0.41.ebuild
index 88b2a849915a..0c71191244f1 100644
--- a/app-admin/cgmanager/cgmanager-0.41.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE="pam selinux"
 
 RDEPEND="sys-libs/libnih[dbus]
diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index 84fdbb498bdd..d235e4d1645f 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -3,16 +3,10 @@ AUX fluentd-1.2.6.initd 421 BLAKE2B c245bfe6fb30a699616f503cd5e2f09f1d84c2a6b605
 AUX fluentd.confd 85 BLAKE2B 742ae368e0a8dd99f2f697c9438fc0ae4814693ee547be39b3bd8c9956fcb9acd5b6cffcf2a033e987b9a6eb7557a628f360fdd3f0053d055faeb62cad3f1d6a SHA512 9774f8fb0c9db7a501011558ac0c6222bed42501be90ac1c70ae0333cb3dd5ee5bc38417cd5ec3d1e0d8769d7f90bcc230746aed3fd30f28ea643c97d54d1f09
 AUX fluentd.initd 420 BLAKE2B 4498ab59ed5cd542d4a760fdb324c27849680a41df9a8b696381f796a6712fe89caedfd1c038119640621093d4dcad3b67b70092101bbf36370d9824cb9ff199 SHA512 d039c1a7854b7f5f3088b8d4ff38d3357fb13eb4d00cb5e80bf1c8999637a750ffd9299957c64657ce9f62a2ef28ff8bf8f5e95fc493dd5d7934f7b8e3ed328f
 AUX fluentd.logrotate 191 BLAKE2B da3f35ab90d627f35aba5a1b5e51ec54d649c725bb50ca2e5cc66561c94bedb2eaa83e6489051dbf2c1ea209fe35f0b77be1228f1b8e46d61aa00775e65abfbd SHA512 f74c0ef04f479adb7c11074ddd803c2574fadb7ce90022f3efc28c1d44d0b77b1483c7bb217652decf22f879a69c7ba1ee7bdc78e5b153762a4f535ea5faa404
-DIST fluentd-1.1.3.gem 413184 BLAKE2B facda41a26f9fe4f55a4ae6f97336acaa818534b6ac8740badcb132a18497e8767723e931bb2506843b56208deaf41cdaf9ac81821618cb223b8035527d355d7 SHA512 0d17668c06e515219a39ddc7ecda6b5ec5d29e7d4d3799e3447034ad731568d870ac3d36d468be21b6ef7a4198353c3045872902c41a54c0c2eacad8ec12f357
-DIST fluentd-1.2.0.gem 430592 BLAKE2B 698666a5c1dfc3f90b6b1f5b9e58070b71caef859f5d41472185a6f9f1d1d2b1c3631ca0ad01fbac4b4f333484a539aedc70a90a4381fef90c5c4130ffd61b61 SHA512 928ad81381c024efa2ad1e5b0f3d3a74f4bf8e3373c8f835925e89739c6536048a8a16e6b59accf4719192118b86b2fb49b3e9536611381a8a236997fcc96651
-DIST fluentd-1.2.2.gem 431616 BLAKE2B 854f23908f10d0bbae1a48392f439ce33e1e3619eb887235b2018bc30166faec8c40d05b9fc1b4aac44befd7afea87b3547a7d458c6e471bde65616e92f41951 SHA512 2a582bfd54f290612cdfee5e3ff9e5adc894bc02639991ccfd551c90070167837288d33fecf1e4975165b6f6758d124ff0b0fed715c9276ef9def566057d9e57
 DIST fluentd-1.2.6.gem 434176 BLAKE2B 05fb0a29def48b673f458a19eb2662b0e447d949284af3a2aa28694e0cef8177c5a584d9f475ff71a548d7acdde504e8843a312ed0dc85e892b0f2dd59cdf8ef SHA512 9faeef818195d0014f9fffc29222d031a819ef8af323700b26290d5b394bec6815e86699ab89ba4e8d428321e10d3463c297d6c9046dbb46fdc061777206f8ae
 DIST fluentd-1.3.1.gem 437760 BLAKE2B 59afdadc2d67e30d35df2f33c169e9f2cbfd44ac6b7497b025fd9229921f91ac37ce8b6f80f37df26a03e5062ce2f5187156a70302ca11f9a7d9db9cfccebf9c SHA512 84351148809332c9a703243416004f18d0470cafc04cf63de7c52d9b6da18f1c6f2de0682ff1d5283f28013707fcfe24cbcf67aebc3be91090c4d5cca80ec2cc
 DIST fluentd-1.3.2.gem 438272 BLAKE2B c7a239928e251b84217cba4181e81f58dda42065c07c254ec5ed1012f8ebd98323cfbd671d5e9f940025d049c67b6dedd4f0feb9a079291e83f465e107e105d3 SHA512 8357ae88ed028778f6c7ae3dca051b32840bcf8cd344292e1fd3d203dae85e32d8263dea72d657010d803bb36d78d27a8441a8a7edf49439609041acac39f967
-EBUILD fluentd-1.1.3-r1.ebuild 1173 BLAKE2B ba1b38a72d8830ad9b2b8232274929a21d645b2a3a6f3ce1f0c6e3c793a06d7d52bc0c9b6bade0850502bd0c72ec08e1ef15356183725d5d377c6b41404acd9f SHA512 5c1f89f3394bbfbf6a9de90a7d666eb288c055a0c0c2d605207083b9a1511b774729e24a96b20644265cdac884ef40967278cfae2fbf3e2d13c8c35e7d29f099
-EBUILD fluentd-1.2.0.ebuild 1175 BLAKE2B 89bdf7cbf46df0894f653b0de9064aed66d0d8fbe566dee7087ff431b3ee86884a017ba6199c3991187c30c9074257c22b606b0d5c7c880b030dd577a4a46dff SHA512 2b12a2adc48b4189006adc5ebdd34e99d7e5ddab4e65c8991aafe040cde4e72eb112971db180f390e19f35335d44ceb1eaca34c65647b22e377114912c002e31
-EBUILD fluentd-1.2.2.ebuild 1239 BLAKE2B 2e50f7ac980ca902390e2b5bdb63e48d8b95ac3a732f6cf3dee9d2489b2f6f370500781a0a51d380973f312cb5ca9f13aa6a9722ee903c2a758c33eea9e87f65 SHA512 775d02b67182d4fa78889c14ad4c45e702da064996623998822058ebaa5fe459f5c5668237b3f4fae631d6a37060429552ff477250b0947ad2dcb37059f654f0
-EBUILD fluentd-1.2.6-r1.ebuild 1321 BLAKE2B 61dc1451550625f564ca392cfaf85e55041f9cda108ac62f60f8cf83a4d6af1d1583dd2c031e07076fa87520d9b868870faceb38854ac2aff0551c3ff2f1ecc1 SHA512 e0b1b558b84f71af90c3d05484e1ea740a71a2f8f07ac6cd971aa2389a8c396c25a9b5005095d9c402603f8e952c921ddecc34acf0a2de4997c4280d19fa6c91
-EBUILD fluentd-1.3.1.ebuild 1292 BLAKE2B 96937096ac662d8c61f03cd98d7042ef4485f881512768b989f5674b632b77d94c60934a87db2b5080dad9e1b4e30c7dcae4b5a7a3cb4d457c93dcbf4ed98554 SHA512 c01132839e15fe58d6c48b6d6b9885b11fbb8d1f2ac193c377d9e107548f72e1742d7134e8ab85d3c91563c79a458563ae5696a830f1efef0175c261355e6961
+EBUILD fluentd-1.2.6-r1.ebuild 1353 BLAKE2B da8e47f5f09abf639374137691b7329767e3bc0febbdb58299811456f168e9d6b3a8ab00758a2a1dd8654d0a60bb97b47842e249728d99ef1c9886a87759d7da SHA512 bc101637c4a80853b7b7403debb7d25069508020e75d1e3ca597f327e615bf60fe0793ebd8a437c3bc3734fe2556756589525959a40625fb979dc698ba3bc320
+EBUILD fluentd-1.3.1.ebuild 1324 BLAKE2B b790236e46c31cbd53337cdf38ce51d8184f1bcca6fd7b5722b39afa1b6218f0e94a79a551495c6355ec18ce600ff362c4741e27427c9608bf8ef4436c162395 SHA512 bdd1ee61c01eda0f9e38ecf3467461f3afb2bba08615680aaf8e7139e94af08e87f8c17bd98499ef55f93da2a6ad2a607bfd590f6e70d21e4b4b4ebb8154b7fb
 EBUILD fluentd-1.3.2.ebuild 1324 BLAKE2B b790236e46c31cbd53337cdf38ce51d8184f1bcca6fd7b5722b39afa1b6218f0e94a79a551495c6355ec18ce600ff362c4741e27427c9608bf8ef4436c162395 SHA512 bdd1ee61c01eda0f9e38ecf3467461f3afb2bba08615680aaf8e7139e94af08e87f8c17bd98499ef55f93da2a6ad2a607bfd590f6e70d21e4b4b4ebb8154b7fb
 MISC metadata.xml 665 BLAKE2B b2487570d210ca695ec87ff2643128d9b7ccd84820efc9de8c3785298c0462ec1eb93abd3a9c481264aa564ceab8371db370b2b5d78975ecbcf8d812c6652ea4 SHA512 8b2888a9b821c0629750471fb3304e399122652a36e605adf3c11b8340ceafae5467035737d9c13a55aeab3b6dda79bb623b524fbb8fa6a1bbe0c576f32b2407
diff --git a/app-admin/fluentd/fluentd-1.1.3-r1.ebuild b/app-admin/fluentd/fluentd-1.1.3-r1.ebuild
deleted file mode 100644
index 68a253aeeff6..000000000000
--- a/app-admin/fluentd/fluentd-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit ruby-fakegem user
-
-DESCRIPTION="data collector and unified logging layer (project under CNCF)"
-HOMEPAGE="https://www.fluentd.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-ruby_add_rdepend "
-	>=dev-ruby/msgpack-0.7.0
-	>=dev-ruby/yajl-ruby-1.0
-	>=dev-ruby/coolio-1.4.5
-	>=dev-ruby/serverengine-2.0.4
-	>=dev-ruby/http_parser_rb-0.5.1
-	>=dev-ruby/sigdump-0.2.2
-	>=dev-ruby/tzinfo-1.0
-	>=dev-ruby/strptime-0.2.2"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tzinfo-data/d' \
-		-e '/dig_rb/d' \
-		"${PN}".gemspec || die "'sed failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-	insinto /etc/fluent
-	doins "${FILESDIR}"/fluent.conf
-newconfd "${FILESDIR}"/${PN}.confd ${PN}
-newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "A default configuration file has been installed in"
-		elog "${EROOT}etc/fluent/fluent.conf. You will need to edit"
-		elog "this file to match your configuration."
-	fi
-}
diff --git a/app-admin/fluentd/fluentd-1.2.0.ebuild b/app-admin/fluentd/fluentd-1.2.0.ebuild
deleted file mode 100644
index 997c6fefa335..000000000000
--- a/app-admin/fluentd/fluentd-1.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit ruby-fakegem user
-
-DESCRIPTION="data collector and unified logging layer (project under CNCF)"
-HOMEPAGE="https://www.fluentd.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-ruby_add_rdepend "
-	>=dev-ruby/msgpack-0.7.0
-	>=dev-ruby/yajl-ruby-1.0
-	>=dev-ruby/coolio-1.4.5
-	>=dev-ruby/serverengine-2.0.4
-	>=dev-ruby/http_parser_rb-0.5.1
-	>=dev-ruby/sigdump-0.2.2
-	>=dev-ruby/tzinfo-1.0
-	>=dev-ruby/strptime-0.2.2"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tzinfo-data/d' \
-		-e '/dig_rb/d' \
-		"${PN}".gemspec || die "'sed failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-	insinto /etc/fluent
-	doins "${FILESDIR}"/fluent.conf
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "A default configuration file has been installed in"
-		elog "${EROOT}etc/fluent/fluent.conf. You will need to edit"
-		elog "this file to match your configuration."
-	fi
-}
diff --git a/app-admin/fluentd/fluentd-1.2.2.ebuild b/app-admin/fluentd/fluentd-1.2.2.ebuild
deleted file mode 100644
index 5394c440e799..000000000000
--- a/app-admin/fluentd/fluentd-1.2.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit ruby-fakegem user
-
-DESCRIPTION="data collector and unified logging layer (project under CNCF)"
-HOMEPAGE="https://www.fluentd.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-ruby_add_rdepend "
-	>=dev-ruby/msgpack-0.7.0
-	>=dev-ruby/yajl-ruby-1.0
-	>=dev-ruby/coolio-1.4.5
-	>=dev-ruby/serverengine-2.0.4
-	>=dev-ruby/http_parser_rb-0.5.1
-	>=dev-ruby/sigdump-0.2.2
-	>=dev-ruby/tzinfo-1.0
-	>=dev-ruby/strptime-0.2.2"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tzinfo-data/d' \
-		-e '/dig_rb/d' \
-		"${PN}".gemspec || die "'sed failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-	keepdir /var/log/fluentd
-	fowners fluentd:adm /var/log/fluentd
-	insinto /etc/fluent
-	doins "${FILESDIR}"/fluent.conf
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "A default configuration file has been installed in"
-		elog "${EROOT}etc/fluent/fluent.conf. You will need to edit"
-		elog "this file to match your configuration."
-	fi
-}
diff --git a/app-admin/fluentd/fluentd-1.2.6-r1.ebuild b/app-admin/fluentd/fluentd-1.2.6-r1.ebuild
index 2f672eb94762..bf014e7f678f 100644
--- a/app-admin/fluentd/fluentd-1.2.6-r1.ebuild
+++ b/app-admin/fluentd/fluentd-1.2.6-r1.ebuild
@@ -4,6 +4,8 @@
 EAPI=6
 USE_RUBY="ruby23 ruby24 ruby25"
 
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
 inherit ruby-fakegem user
 
 DESCRIPTION="data collector and unified logging layer (project under CNCF)"
diff --git a/app-admin/fluentd/fluentd-1.3.1.ebuild b/app-admin/fluentd/fluentd-1.3.1.ebuild
index 5e5149235966..03f9259d8a00 100644
--- a/app-admin/fluentd/fluentd-1.3.1.ebuild
+++ b/app-admin/fluentd/fluentd-1.3.1.ebuild
@@ -4,6 +4,8 @@
 EAPI=6
 USE_RUBY="ruby23 ruby24 ruby25"
 
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
 inherit ruby-fakegem user
 
 DESCRIPTION="data collector and unified logging layer (project under CNCF)"
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index 5a2e7b591b58..526327fa546f 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,8 +1,7 @@
 AUX lnav-0.8.3-disable-tests.patch 673 BLAKE2B f966d6d2bb2f0a4e888b0a286c01d898cfa07c848d39f6d74c865dd489b4a4a3dd36f177873cf41d1f63ac6f4d25956fab54d4b932b170adc795bce4da1fd174 SHA512 fba61b037e01d4bc91101b24ff706b51f0fd3541756add7f7e3f4240a803c76eca808073423531a70c2700359fe36b360a79de3766a8fea7e2ef276db2ef4930
-DIST lnav-0.8.1.tar.gz 616105 BLAKE2B fe37599426c606ec186cd3feac5f9b1023d939a13a03f51a53f64db681c2c42a68152895d3afe17c02804d18735310d48d63338e301732fe3228465dd1d20b3b SHA512 b3514834f42ed647f40c501ad22b68a52755b0c8a558d29305c357b39e598c1386ec9e37d71e8b7e2b5833df41e5f7f398b50b84611d3e6accfb2feb2cdba952
-DIST lnav-0.8.2.tar.gz 693219 BLAKE2B b58133cc54e8c1cdbaa461bef96a87b7d991de2c6d8b626243181d42719ed16c7c10f26a86fafa9aa30cc8b52982af233deb387a19a8442b426462189ffc95c0 SHA512 75c7014e013567e9a0ee78e28a6648d756de7cba3c103b10ddb974c61066db3a1c2efbd14636cb3729bd7c6a4ab534d1999d44e127b8a6728d12bd5be23f30c4
+AUX lnav-0.8.4-disable-tests.patch 385 BLAKE2B b00a7e4af717a567bf9a7bbecc77500afc22ccab48caaa3781a3d786f4487bcedc59db06b01bfbdcf7871b08cc3b8841582341bec1d707ccf3c94e180a3e59f6 SHA512 f199ec2e9b9a87b8665705051c2a833b8643b18f4793f00587b27eebf0fd455e3d09cbe40613c4e87db58fb91d1f491893d6d9eae38d81de4bb96452e1fb8489
 DIST lnav-0.8.3.tar.gz 785911 BLAKE2B 47800f27de0ad585082abaa2af3139d79506bc74d86c175040792eeaa89268711d8fd4b3737412a3dc59a566bb880f9c9fa248e48d665d25f24e1f139f9a1375 SHA512 21d0229abf9b572dcc426b6a5e87b8c84f4eb0a7f37ed62d0c08b7bd7c88868a13262f9c78b6af3f3a492b5853b68c8cf8f09ca8d24e77aaa2f2ad0f0f128022
-EBUILD lnav-0.8.1.ebuild 715 BLAKE2B 867408f0093ba8f81cf1315675d8c04c0315d3715627401063b63787e6a42a87a14a43b6f18d200e885ba4c342338fb01e2b97fe3717a104993c149fdaf54053 SHA512 27fefba75e2149e09668f807e6978556b12842c8b20e2bad505ce382898a3deac21e74ab47604635cc289e85b6ee4552947d5e54460eade962e78bccb52752a0
-EBUILD lnav-0.8.2.ebuild 672 BLAKE2B 311c8148acc03de25836f0830b4bcd5db5969ccb562db3cabd14992064088590dc126082677a2a05cdf432f9e94ae41e48bc102901ffa291afc310c43822c363 SHA512 58bbf5568efc25df9be91dbc7a233e5b5ec47ed35a1688438f05ae3d489d5f3aa39223a9c49053dc2151ff1e5680a475a1489d738f0792e8106f1176b0c45c03
+DIST lnav-0.8.4.tar.gz 840718 BLAKE2B 3efa958bf8c8031a7c53db1a5277cf5cd17acfcc50583f0a9c5097ee7aa679bc3d9b8346e5fdecf91d053aba6ca320e5e9bcb827e0b0bf5c1a12d4d03c307b87 SHA512 79ef5712dbeea941f7d0a80652d25394ca4e278c983eef0b3ad9f22ddddb90dee13dc50ae475632673575ace795f793bbb8e14b85ac4df786b94743e7a7596fb
 EBUILD lnav-0.8.3.ebuild 774 BLAKE2B f34a27225f2ecd9716a27de2d231a8c25df5bb70aec763803980c2c54a573867265667eb2b0b84fc3aaca6d124f5fb6eccf1af4677c2fdb2699702a29c27fa43 SHA512 6fa91129af3860d4b47ebf342d633048aae4395558ea81173fbd86c5313b19eec3cf94addc9e131ce0f03c2b9a0a75c479ae314dabc29cd2a9237243ef8120fd
+EBUILD lnav-0.8.4.ebuild 777 BLAKE2B 4c6c25f873afbbddb8b29b9538301c1d271a0ccb89207e68b09a6e9a023531f3646534adf1fe1f1727fea864488cb0432e9f3e679748d8b23cb967a33bc378db SHA512 6b0c41b16a1fb4c7c5bc8de66474507ddc19f22f95d506fb63c5314672316d970cdf747b8d4adf461ec2a896d6a9edce38487829f119fcc35a79bf8d34f96b29
 MISC metadata.xml 332 BLAKE2B 2c99546c3e0f0ed5241279bcb00e56c7104b70b28991c50763ad3664d1d7ea2441a1b3f973c44f267c80dbc98eb3593579fa49092a0ed77d34d04503942338ac SHA512 38280dd0af700835f8fdb73eb9085f5c0a027ba9111377253a29f174bc63547f59ddb2025d35a72faeee7f1e9ee3c57f2411242df1c46c5d07d3a8b5211cf9b7
diff --git a/app-admin/lnav/files/lnav-0.8.4-disable-tests.patch b/app-admin/lnav/files/lnav-0.8.4-disable-tests.patch
new file mode 100644
index 000000000000..6b431c33b133
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.8.4-disable-tests.patch
@@ -0,0 +1,18 @@
+--- lnav-0.8.4/test/Makefile.am
++++ lnav-0.8.4/test/Makefile.am
+@@ -373,7 +373,6 @@
+ 	test_concise \
+ 	test_line_buffer2 \
+ 	test_line_buffer.sh \
+-	test_listview.sh \
+ 	test_meta.sh \
+ 	test_grep_proc.sh \
+ 	test_grep_proc2 \
+@@ -381,7 +380,6 @@
+ 	test_json_op.sh \
+ 	test_json_ptr_walk.sh \
+ 	test_log_accel \
+-	test_logfile.sh \
+ 	test_pcrepp \
+ 	test_reltime \
+ 	test_scripts.sh \
diff --git a/app-admin/lnav/lnav-0.8.2.ebuild b/app-admin/lnav/lnav-0.8.2.ebuild
deleted file mode 100644
index c7ce22bb4de3..000000000000
--- a/app-admin/lnav/lnav-0.8.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A curses-based tool for viewing and analyzing log files"
-HOMEPAGE="http://lnav.org"
-SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="unicode"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-db/sqlite:3
-	dev-libs/libpcre[cxx]
-	>=net-misc/curl-7.23.0
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/readline:0=
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with unicode ncursesw)
-}
diff --git a/app-admin/lnav/lnav-0.8.1.ebuild b/app-admin/lnav/lnav-0.8.4.ebuild
index c11649613fee..0d788cfb2991 100644
--- a/app-admin/lnav/lnav-0.8.1.ebuild
+++ b/app-admin/lnav/lnav-0.8.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs
+inherit toolchain-funcs autotools
 
 DESCRIPTION="A curses-based tool for viewing and analyzing log files"
 HOMEPAGE="http://lnav.org"
@@ -15,23 +15,25 @@ KEYWORDS="~amd64 ~x86"
 IUSE="unicode"
 
 RDEPEND="
-	app-arch/bzip2
+	app-arch/bzip2:0=
 	dev-db/sqlite:3
 	dev-libs/libpcre[cxx]
 	>=net-misc/curl-7.23.0
 	sys-libs/ncurses:0=[unicode?]
 	sys-libs/readline:0=
-	sys-libs/zlib"
+	sys-libs/zlib:0="
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS NEWS README )
+PATCHES=( "${FILESDIR}"/${P}-disable-tests.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf \
 		--disable-static \
 		$(use_with unicode ncursesw)
 }
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 2ac66fa9e46d..ecf5bea9de4c 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -15,5 +15,5 @@ DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd1
 DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f
 EBUILD rsyslog-8.38.0-r2.ebuild 12351 BLAKE2B 61f501e1ee0370308f0bda0ef8dacdf51ddedf38854fbe5ae20824f4880956e0fa953404134f251fba05edce3e13fc235a77f85696d567a5ebeccc133ae4a0e1 SHA512 ca3a5ba39f12a3e65c6b8b37bdebcaf8b816a2da1b4b59a2fe6aa7b4ecfb58b8d286ef371ee220209754a936ecb6fd8c9bc91762ebdb3aac9af2ada7c8edc4af
 EBUILD rsyslog-8.39.0-r1.ebuild 12427 BLAKE2B edb9228220f76b252fac4af418d45942b3bd632d9b70536c1c45ae5c85f9d6b9f93d4af534ed8e1ec9055d4d8d63e4e623e5a075409ffe7e03103c931233547e SHA512 ee07560398ee1c08e5c78910f1f12ada99da30dfa48d0bf4728987ec401dd2f0df6c251bb9e8bc0215471728f569175b180191c97b7d0f604ed1ece36e60d8bf
-EBUILD rsyslog-8.40.0-r1.ebuild 12365 BLAKE2B 42ed5ce3711c1c6a938b8e04c1bc268ace156558e80f622eb9fc9c422735d33f37e700c029df9b4ab3ac2225da2b648a82061fca6edcceae0f414733f64b8157 SHA512 1e54fbddaabe60b97f83239e3b19b25add36ee90b84ffe5c603cbd7a87e8df01c0ff010472250970179335f959f47bc01dc66ffef26ce3d25b608a1756c10276
+EBUILD rsyslog-8.40.0-r1.ebuild 12408 BLAKE2B 07cf16b09fb73674ef04cbb223a8dd0afb85efa1a45af7f690fad2ffca4792ab03dd4cf333e4e16291405b6e2bcad1faa2f07ac99078b58042de443a0a1ff1c3 SHA512 db27530a5f24f75926bc1582029889f4b343fa0930b5188c36b5a9fef3f20581208d1b20bab5406e2abe77a861f483b7ed65232cf059a648d8fa5596ed776d72
 MISC metadata.xml 3863 BLAKE2B b6b20eda59279463db8ced1764012aad3197c67cdaee5993294181ac7cd956485f16e9e557664af35ac65adc725f028cb68225e5419af4fa289d2d363f1bd9ea SHA512 3a382d17acaf29b1787c2b351ee5fc2a830738ecf6dc7967462ee5ae15596058123f933c7380feafd956fef4c375fa50b26cf68a21d9cce60003dc9de1712138
diff --git a/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
index b471841628fc..fe2cba9b115c 100644
--- a/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
@@ -81,6 +81,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-archive-2015.02.24
 	virtual/pkgconfig
+	elibc_musl? ( sys-libs/queue-standalone )
 	test? (
 		>=dev-libs/liblogging-1.0.1[stdlog]
 		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 15cc7097321a..db8618261711 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,6 +1,9 @@
 AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff848000c3181e590e557413011ebd5db650f79dfad270f6506128ef9971975ec2b26323b18f793bb914759449679bc34f388c SHA512 c30d7fa3624164d3ec5574b1ae36cc896fb5132ed875f232e9e84cf080e7081dadce61f6d88b55aefa45e417a081622acf7aa2d9f10406d23be7646905dfb3e6
+AUX setools-4.2.0-remove-gui.patch 988 BLAKE2B 8ba64a764292e2309fc27bdd8595bbe10c644642bb59b66b4423f50a077aac372c63da31a231a27940eb624bfea7de2f5ca305f9cc9b162d56d40f9f4ff4bab9 SHA512 e1f2216b14523a7033ebf3293646909df3be2756280186c5d8e6b1c01c7246663732c0f27c949bdac218749bb9631b47bdd82b7457a051df2380254021df4b95
 DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
+DIST setools-4.2.0.tar.gz 363802 BLAKE2B a57a7d565bb6e91f67cba0516434d8a0d3635d0717e878d8ac43b6cf7de0884ea74152ec50e93554f7d1a75a4098db2241668e1765e7b069d23b6cc13d4b712e SHA512 b51f458f7f2d1b569f63478f53709268615f711104915cc2d5031b2049435e4f43a103ebe50c9797ebe4b2645bf1974c73c2f53e7f602ae03c47221edb89d680
 EBUILD setools-4.1.1-r1.ebuild 1460 BLAKE2B 3f1b952af9d7151a1729106e23f22f1e5c5a863afe6c84124429989ccba5d2e46abbaffac809dfee51b0876332dc70242d971016bd7af4b90ae9b3d903c1a0af SHA512 ea755596d4924c9e959cd37c6815f981af107fdac766285c36148b4dca32a6ec24f1e0688a4589e732b70374ce2f6ab0ff637da11979d13526717b585b89c0d5
 EBUILD setools-4.1.1.ebuild 1488 BLAKE2B 462d30b33838dc2c548baff9bb32ca2f978df8a62d5a6e936dfc3bab4dd2522513a90635d64244c6750587cb061380a92a4158bc8e38bddcd2065987463ce9ca SHA512 074263f51282f81cd723ad261c286d46a93a8e13be2fec152adf61a8618685ad43460751d152077d22f395ed854d3362d49c47476ff1fc8b92fe1b62d7351fe5
-EBUILD setools-9999.ebuild 1460 BLAKE2B 3f1b952af9d7151a1729106e23f22f1e5c5a863afe6c84124429989ccba5d2e46abbaffac809dfee51b0876332dc70242d971016bd7af4b90ae9b3d903c1a0af SHA512 ea755596d4924c9e959cd37c6815f981af107fdac766285c36148b4dca32a6ec24f1e0688a4589e732b70374ce2f6ab0ff637da11979d13526717b585b89c0d5
-MISC metadata.xml 403 BLAKE2B 954bfb344e48933f43c746ed626da3851b9e887b9d1c68541fa97356992c2e80f0626198d2170b431d32489347bb6e5ee46d2577a5d672940892ec5d5fd87e4e SHA512 be645abfaf1149e2f2a9b7f0613b61f015df81a16bc6dde593513aa2ba7b4a9a8fba65520b53a2511ba65c022258f48bcd2aed3f85c273a35c94359e358a8fa6
+EBUILD setools-4.2.0.ebuild 1201 BLAKE2B 36b9bab96ee7db94c4627a4d0579dc7b8ece8979515d15f83e002c8048d9da5577a0574777b9ecd13df62f112486c901d2312464437d64e42ce16ccc1c82c513 SHA512 fb723880d5473e437636774909cb5c98910aa3a3764f87c4ee8a4049377dad98f38163e314d5b08851ac75332d967c529329b291aba1e375806c39af4607739c
+EBUILD setools-9999.ebuild 1201 BLAKE2B 36b9bab96ee7db94c4627a4d0579dc7b8ece8979515d15f83e002c8048d9da5577a0574777b9ecd13df62f112486c901d2312464437d64e42ce16ccc1c82c513 SHA512 fb723880d5473e437636774909cb5c98910aa3a3764f87c4ee8a4049377dad98f38163e314d5b08851ac75332d967c529329b291aba1e375806c39af4607739c
+MISC metadata.xml 401 BLAKE2B dc411a73d59193727d72889e4e5f3840aa9cf7b1b6ef55f28ab6a6beee533276954e27fe105a60c392c49ac761745304865c221ff9417464112eb866f35bf6e9 SHA512 354eb8fc14e5673dfd6ad2781a784cd6d77442bf879a96c206b758615c1612397c09c20161efb9e37bc56a588e97a74a20939773dec0b1f137eb6ac353234d2f
diff --git a/app-admin/setools/files/setools-4.2.0-remove-gui.patch b/app-admin/setools/files/setools-4.2.0-remove-gui.patch
new file mode 100644
index 000000000000..748b33c9a5d1
--- /dev/null
+++ b/app-admin/setools/files/setools-4.2.0-remove-gui.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index e075a00..3f8f959 100644
+--- a/setup.py
++++ b/setup.py
+@@ -134,10 +134,10 @@ setup(name='setools',
+       author_email='pebenito@ieee.org',
+       url='https://github.com/SELinuxProject/setools',
+       cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
+-      packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
+-      scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
++      packages=['setools', 'setools.diff'],
++      scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+       data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))],
+-      package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
++      package_data={'setools': ['perm_map']},
+       ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],
+                             annotate=cython_annotate,
+                             compiler_directives={"language_level": 3,
diff --git a/app-admin/setools/metadata.xml b/app-admin/setools/metadata.xml
index 8e9f11ed8b4c..fdc3261aeec3 100644
--- a/app-admin/setools/metadata.xml
+++ b/app-admin/setools/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<longdescription>SELinux policy analysis tools.</longdescription>
 	<upstream>
-		<remote-id type="github">TresysTechnology/setools</remote-id>
+		<remote-id type="github">SELinuxProject/setools</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/setools/setools-4.2.0.ebuild b/app-admin/setools/setools-4.2.0.ebuild
new file mode 100644
index 000000000000..70e0fb4bed29
--- /dev/null
+++ b/app-admin/setools/setools-4.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
+else
+	SRC_URI="https://github.com/SELinuxProject/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="X test"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-2.8:=
+	>=sys-libs/libselinux-2.8:=
+	X? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.27
+	test? (
+		sys-apps/checkpolicy
+	)"
+
+python_prepare_all() {
+	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
+		die "failed to set lib_dirs"
+
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch )
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 13b8cb7389c8..70e0fb4bed29 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,52 +1,46 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_5 python3_6 )
 
 inherit distutils-r1
 
 DESCRIPTION="Policy Analysis Tools for SELinux"
-HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
+HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
+	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
 else
-	SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/SELinuxProject/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="X debug test"
+IUSE="X test"
 
 RDEPEND="${PYTHON_DEPS}
-	>=sys-libs/libsepol-2.7:=
-	>=sys-libs/libselinux-2.7:=[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.8[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	dev-libs/libpcre:=
+	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-2.8:=
+	>=sys-libs/libselinux-2.8:=
 	X? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)"
 
 DEPEND="${RDEPEND}
-	>=dev-lang/swig-2.0.12:0
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-libs/libsepol-2.5
+	>=dev-python/cython-0.27
 	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
 		sys-apps/checkpolicy
 	)"
 
 python_prepare_all() {
 	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
-	sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@g" "${S}"/setup.py || \
-		die "failed to set base_lib_dirs"
+	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
+		die "failed to set lib_dirs"
 
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 4a8fd17fee29..1a25b9e65d6a 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,6 @@
-DIST sudo-1.8.23.tar.gz 3150674 BLAKE2B 11b1c7bfa372005cda8baf651c4662f6fd15e94ca77f7705b23ca6573424796d5c1f8e47e2874c4b54017141d01a632885ac60c92346d932537048373cad0ede SHA512 a9d61850a4857bfd075547a13efb13b054e4736e3ebe3c8a98a90a090b1d9b9688354ec9725fc99d1d256999b6f9c6ae6215ce9770fcdebd7f24731107b48342
 DIST sudo-1.8.25p1.tar.gz 3189951 BLAKE2B ebfedaad62e60f625db8c46a5c8f19977a5ec0a86bab3b34d91096c08e8b8ece056ba312f9fecd4cdd704fc17d49a36681b41cd40269df7c67cd66d80c0d8efb SHA512 b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72
 DIST sudo-1.8.26.tar.gz 3286368 BLAKE2B 8df947f3dfa32081020b8a19921ea5daf6f9250c1ae34aa29900e85e80669223f28573217cd7e0a28393c6f30aa2117347014aa0cb554f2b85632e335ae790be SHA512 f5596cdf753ffa54f651bb30126e690640125b2ee54e8022f3740bfbe2e5a23e1bee86ce52879e863b9386babbbcf33d3e2882c573995a7d4612e9eea14d8791
-EBUILD sudo-1.8.23-r2.ebuild 6366 BLAKE2B 54ac988d6be3e7e93dc13a45ada40a627e3ffeff4515d181a18ea9b2ad411d4c2a9e107fe718217668033bedec23e57216d4295d0df12c40ff5871c3ae9f9ec0 SHA512 3e7b3f21c550724a6ed048b0639d2630015c401dbe8c51d31310a26394b1a371ab18e438dc13357ff82b05715443f24f6cb42b1daac7ec5cc9d3776d6cbc96d7
-EBUILD sudo-1.8.25_p1-r1.ebuild 6419 BLAKE2B bca34e2c44cb05413e944fbd404a9eea11437f0bbdd2d19277ce944549139249f35e9035e2e26db166284bfc119c72f0a49e360860b6a97e3436b1f975199dec SHA512 20194f0df5182f0d38d5ce2b021abd1688abb5b7fc86fe1f62c1301880922f4afcea10b5afb83e1a3a116075a311964c81a8b14de72a83e4927ba3d34117062e
+EBUILD sudo-1.8.25_p1-r1.ebuild 6418 BLAKE2B 54b1649420ec20b8f34b4ceb51549d1d04382c42cb31a90c0b3b20fc9f50a8f7bd111eac0702e9d6229c8c908df3030d0fe040c80eab22e52e71574c1ecc011f SHA512 beb5ca170c8e149d550d6c2ee96326af2c63780c4e9ae69493af2e7612dd1458aef187c193acafac16d3b003775f9d2a53ad778254468bc0d68620149a918fe1
 EBUILD sudo-1.8.26.ebuild 6431 BLAKE2B 7fc4cf65f44a71e5d7af3592b594a1453ac35b36d9d78ac34be974331b181ae4819a52fdc5616f501a28c2e14c6b0db999314ed8711fa97984b9eaa73b70aa3a SHA512 f5086673217867bd68ba1af5feacffee0f0c8232502d289fb187f0768ad4044a013b077e647202a1a7e3128e79df1a4d664293663c64afb4ab5a7fd1bb420ddc
 EBUILD sudo-9999.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
 MISC metadata.xml 1060 BLAKE2B 9d18c75cd15621433e2391bceaff27f7bafcf9fe39691b62ee040e894055193eb1d68acef48b467244978dcac79bc1bfb20af11952f641eab75104b2350b3d7c SHA512 e229a2df28f8bb87efb05a2980860fc37f8e324633444e26d9eb303397e16ca12e9e17ed6939e8e8044f03ab45eda4cb0401e38fdb9409229fc99a64c6da007e
diff --git a/app-admin/sudo/sudo-1.8.23-r2.ebuild b/app-admin/sudo/sudo-1.8.23-r2.ebuild
deleted file mode 100644
index 797af1bfd337..000000000000
--- a/app-admin/sudo/sudo-1.8.23-r2.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pam multilib libtool tmpfiles
-if [[ ${PV} == "9999" ]] ; then
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-	inherit mercurial
-fi
-
-MY_P=${P/_/}
-MY_P=${MY_P/beta/b}
-
-uri_prefix=
-case ${P} in
-	*_beta*|*_rc*) uri_prefix=beta/ ;;
-esac
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} != "9999" ]] ; then
-	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
-	fi
-fi
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey"
-
-CDEPEND="
-	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:= )
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1
-		dev-libs/cyrus-sasl
-	)
-	openssl? ( dev-libs/openssl:0= )
-	pam? ( virtual/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-"
-RDEPEND="
-	${CDEPEND}
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	selinux? ( sec-policy/selinux-sudo )
-	sendmail? ( virtual/mta )
-"
-DEPEND="
-	${CDEPEND}
-	sys-devel/bison
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	pam? ( !skey )
-	skey? ( !pam )
-	?? ( gcrypt openssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-set_secure_path() {
-	# FIXME: secure_path is a compile time setting. using PATH or
-	# ROOTPATH is not perfect, env-update may invalidate this, but until it
-	# is available as a sudoers setting this will have to do.
-	einfo "Setting secure_path ..."
-
-	# first extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
-		echo "${ROOTPATH}")
-		case "${SECURE_PATH}" in
-			*/usr/sbin*) ;;
-			*) SECURE_PATH=$(unset PATH;
-				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-				;;
-		esac
-	if [[ -z ${SECURE_PATH} ]] ; then
-		ewarn "	Failed to detect SECURE_PATH, please report this"
-	fi
-
-	# then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:$thisp
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
-	# finally, strip gcc paths #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${SECURE_PATH} ; do
-			for e ; do [[ $thisp == $e ]] && continue 2 ; done
-			newpath+=:$thisp
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-
-	einfo "... done"
-}
-
-src_configure() {
-	local SECURE_PATH
-	set_secure_path
-
-	# audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	myeconfargs=(
-		--enable-zlib=system
-		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/run/sudo
-		--with-secure-path="${SECURE_PATH}"
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable openssl)
-		$(use_enable sasl)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with ldap)
-		$(use_with pam)
-		$(use_with skey)
-		$(use_with selinux)
-		$(use_with sendmail)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins doc/schema.OpenLDAP sudo.schema
-	fi
-
-	pamd_mimic system-auth sudo auth account session
-
-	keepdir /var/db/sudo/lectured
-	fperms 0700 /var/db/sudo/lectured
-	fperms 0711 /var/db/sudo #652958
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED%/}"/run
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	#652958
-	local sudo_db="${EROOT}/var/db/sudo"
-	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
-		chmod 711 "${sudo_db}" || die
-	fi
-
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in /etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild b/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild
index c01bd25c66f9..284b319e05fc 100644
--- a/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} != "9999" ]] ; then
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+		KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 	fi
 fi
 
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index 0563c34c0724..d6d3ac047505 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -1,75 +1,11 @@
-DIST systemrescuecd-x86-4.4.1.iso 413272064 BLAKE2B fcac7e428df5a416b406ade8fbec980f2e6fe2b1d3458dd7597949713d8932c23eee85da77e87e129341827f0ac7078b4b8ee43e00b13c86ae52b775d7dbd43b SHA512 5c5045df219181064201dda195961096da9722d3d5758dcb111c2c74ed083b3464f314340c01a5a27a920c33bd5bc95efee2efa1edc2405a0d11d9bc67e4b2a5
-DIST systemrescuecd-x86-4.5.0.iso 439603200 BLAKE2B f435184bd68cd1a5450ebdf87d51c75f950aaaba6e56a96ec802d521b1d4dc53c7b53193682b412e6343c2ce564921a86118b1eb7f1366c5177a7c07f9a2a6fe SHA512 e821876cb6f58d5eaeba35c91c60503e81c04c50b3c496e4144c8dc459c6e78aece9b7e7a3ca35ce427e0965c197758b2267909bcdf95f6a19221898fdbc91b2
-DIST systemrescuecd-x86-4.5.1.iso 443541504 BLAKE2B 9426e392baf0fb2ffb1318b8783541bcf665b7b2ddaadaf52d6a302b89de07fce26148affcc0bf64c7d69ad67a1ad8961a10472c8b9d00412013d9dd1b106c0d SHA512 561fa30404a7a41a1fcb0cc24c1a5eea407de1c2d2f1bd5273e2acd471986ab8587df9f9b3ff364617f81a351cdedd12c6859b53b1f7e430867c654fd136a524
-DIST systemrescuecd-x86-4.5.2.iso 456060928 BLAKE2B 1ea3a9a65a0e2681bfeba2e660d333f96f8535e1048a2b6ac66a2eeb543c2e6a47b3d9293cc58943e61c0f2c5b2585987c6b9bc2188f156dfca653a30fe6df1c SHA512 b27223b08032f0132f81204a244638262cf70348a1a299e5bf63971db556d604e52d8c3408e3943c305eac887c2e38ed6d2b1488633595c9f8c1cc087162f911
-DIST systemrescuecd-x86-4.5.3.iso 458467328 BLAKE2B 787a1195ed2403553d860f2a8e97c86e551b481a0bd65777a587ebb3a4837267875822a98e2bab32b823dbe3ba2a8268c7733d9ce8133f926cb3c0b222998a8d SHA512 14774e9a882d5a505532ab8bee85e81867f5d30674df471eb76cae84678eae00fa3992c894b6c90b85c7eaa20bdc04ffe910a7a432092faf3329c08bf54eff49
-DIST systemrescuecd-x86-4.5.4.iso 459102208 BLAKE2B c27bb5035a71aba423026f2f4dc0b7e6c8c3c3b66525823de537e1f2e6f62cdf923c6a6ddca517404746b0cb0d55f145186913c8966b36dae330783db825011c SHA512 c32904413516af917de3d58b8eaf3b5701b9c49b1249daf1f8eca060497d5278fedbb0c0d86907bf94ddeab716dc8bf014e0baed0aee66141e8967207805d446
-DIST systemrescuecd-x86-4.6.0.iso 467294208 BLAKE2B c6e0f582aca37617058efa30433360ba6c7dc53c2f7d64d433456188245a878118a560f02b9090fe3d387c0df49fbebec7f187d6e97a1b4af9750ba45e64435d SHA512 f90d46adb8ab19b19eae589744808bcbd50aa0b0eac22eca92a09e8407c77e7a2bf573c2c72b37f497a9d287c90b20164b213bf007b538063f758b12b1da11eb
-DIST systemrescuecd-x86-4.6.1.iso 470530048 BLAKE2B 71a0d19d0db74c26e8a6023d135d401547013a028ce74a5540292a7c1d84d58bb4d60762e846f3c160f0fcdc64fca3a9a3ddcaa490da6ddbb48ffbe07aa0b465 SHA512 3ae7c4f3f2196190c8bac44da35878450ef5455240e10f5bf2063a28f0f1c59d35458c7db42a3324e8b963a9e8b250a1b54ffa85e5cb6cf27c9e94ae1fb593d3
-DIST systemrescuecd-x86-4.7.0.iso 479350784 BLAKE2B ebf81de607133ba94ad3c8555ec40c0619d102f44b7a327db5457d89fb049b10d9a802d7394e02c8fe94fc7e25fccecd6d0cf3faa7206cd9355e75ad27909d5a SHA512 c0246dd558186d3436666ef6509eacb2abed82a3205e47eb00b0fa0e98cafbfd6dd8880e83bb7e98b2b019b6f1a0797abcb26c5101eed265a83c37139085dc1d
-DIST systemrescuecd-x86-4.7.1.iso 481220608 BLAKE2B bb5ac00936a3a33b711223ba7a1c7ea494a5c7b74c5e5692d1fa2b5fd11b7862221ea5a38d062362dd2e35d3df0422dcd2c60c95458e80bcfd47a89b3d41485e SHA512 13114a4e4616dfb8f118c07724fcca1fe9dd739a7c2dd8f5553f48dbaa744fe6d211cf6f341159b4ffda090f0101bd96f72d3e11c7c8c77a33a888d3c2859a6c
-DIST systemrescuecd-x86-4.7.2.iso 482217984 BLAKE2B 3e776a7bc2184e30cc1e91cf1147db683bb228512e5f30a6ab287db9fbc6583ce18803f7a18b38dc02679f0858b0f7540e571fa5a7e60a08a75cfca1e4ef3c03 SHA512 2340facff40d8f7eaebf75bba771333d21e8951384c34b04dcc5734de3c18e0c8e50e5cc35b93ab91df48f2ba9dc51ebe97a820fdb322d9f169df7067d6a92d6
-DIST systemrescuecd-x86-4.7.3.iso 482799616 BLAKE2B fbcbc66ddce672971ea89370ce681adf3622c7e7706c18eb779443bdf0156a7c083d68213da8233b6c7f9035734f903fe1ba165b128aa1fae38fe30b27cc893e SHA512 42331496283b981661861e49448b17b0a4fd202f38024990a5aaf2572f300016e67f86ec3ec82adb4dc337a5275da858bf80fbb6a49886682298ffcea6c0d1f0
-DIST systemrescuecd-x86-4.8.0.iso 488042496 BLAKE2B c3535ddd71029591841a844a6c79dfe08c3a6fa7f24df7fb99ed77e2988d54cf6c1c7ea0607a77b30532642940dbd34030a604bcbc26eff3d2a0b29fa6b0e79a SHA512 bfd3142149a9155e35d1add271265ae54074bfe2a8f658ca366dfdecfa893b683adb6206f11738d972df98cf7026c893d17ecebf8635c3cd5cd38cfd4c0b2e0e
-DIST systemrescuecd-x86-4.8.1.iso 483315712 BLAKE2B e83dc2eac645e0b2fe317c29af6269f3d58a20ffbee83d19d493770f15de98d65fa66bd5e1cefb0a7c4e7fc08c155900428ef4417a2b0264d9ed7a5f625efa75 SHA512 0424fab36e2caf7e3e9dd7c334d57b7eb9a090e3d79c52ea8e003e05931558b48be5375ac49eaaa78141d179d7153c91c386a42d7ead8d56ef3113363b8ff692
-DIST systemrescuecd-x86-4.8.2.iso 497338368 BLAKE2B 6e26aaeb1e67d5462db3aa70101134a14ed1038c2cae305283653fa07664d8f7c48dbb57a1593d404556ac9ed569b4c7148de5c41e9b6b80fd11536843ad83b4 SHA512 6467e383382edcd4a92aae60404b0f1451f6941c147dd911296f911a001d0002546d1fe4d4f49dc1eafc688aa53eaa07948b6f7f388fc87830ec1c58093b1135
-DIST systemrescuecd-x86-4.8.3.iso 498751488 BLAKE2B e5cf10b946844e7109ec79a35f0d27cb58ee3e73c12041fc2125b5d5af5e160f0a43f25fc686dbf6ae46c7ccbf082531e0dc80af1762883cb710a55813169040 SHA512 6111ad0b238ece75bef707f40668f6e7d039eeee4e89acf6e975e07ce6084f7d00da3c24e3271d3d75a504849e1799d1155691a0d6f5f1dd82966a41b7f5ec04
-DIST systemrescuecd-x86-4.9.0.iso 504498176 BLAKE2B f788e615472fb94112bf85b3aa3424b999adfd1927dcc287f9ce5144f3f62463241c366e21acd76e87a4fc9d1db50849f54c2b33d19d0b265f81840525aae633 SHA512 04c89f0140245992aac2659b2b0114ae2961bd382ca302a70fe8dc2348286099601011b16c339cb95ca13345aaed94749272a61f86223dec30cb31328565665b
-DIST systemrescuecd-x86-4.9.1.iso 513009664 BLAKE2B 51b98de778e39ec9e6f878d3c6bd88efd9bb0f62c9c09f738a9e5afd359376149050e866e897505b5de50198c6d509c2612eba663f4d982c5fc04ef7a2f01c79 SHA512 ac4c2bc65611a575c2f4d12012e9bcaf8bd94283aa8d8c0ad571352b8f33161dded68de091839c9d8a4d5101a2413864838596eed1aedcf20d9441dd59f96dfa
-DIST systemrescuecd-x86-4.9.2.iso 512159744 BLAKE2B 0b31a1215626a6049c10c42a36eb470b9d941b70c05b6dccef6299073d454e215ef5e4b35079885e95ce0d9d27c05797648433c6a96bd7b981c70a1b7bc7558f SHA512 2d99c0e432ecf5b5635d597d6899518c6ee03bb79911d992d22bda993d38376028407c98ba15f9510c8723c5fba6bf8f0958574542c6035e7cce4c5096ad0a18
-DIST systemrescuecd-x86-4.9.3.iso 515739648 BLAKE2B 7c095dde897ab59e9a6473eff7f49f2c257cf8cd2429c8438fc22f21eecc6b97fad041f107bbe427dc67127ed85053605d3e7c1eb09714606a3b40af6b20ed1e SHA512 d60b3ba1548c98faba24e2c56ffe70be2e271b0946d2dde46cf766e6f206881f1e0450998af05c439f37edbcac67f0649830914c4354c2212518f63faa140254
-DIST systemrescuecd-x86-4.9.4.iso 516374528 BLAKE2B ad80cda36537c4cb4eb6db2a6a064f77f7c4342effd2bd6692a17d40cc9e67b5fcddb6b8787d18f6f540427b82e4979d3a46df8cf111ac65a385315e055006f6 SHA512 7bfe963e7ec04f18efbeac5d40a016b56ae7bc8fe8913d8cfd0ea9fbe0f3833d2b86d1a00f30f6587b91338416884af6a65249121609ce2f58a6efa50486e139
-DIST systemrescuecd-x86-4.9.5.iso 520032256 BLAKE2B 19c14273c51b7f95d9ecac74ffb43ead7c2b8f704b6b8badf2e32a59f3d4ef5779e625a7410e8e1d62d16c3ece2b9f849c657220463d0bacd4e0292618bb64e2 SHA512 6f9a3497c809c8cf1dcec114221d5d992fa2735b3fa1cc992e46a8e9c793ef7019c37c4a61f8abddafbac0cf7ce03c6fc9a3a2a750d7a82e69db3bdc6791e7fc
-DIST systemrescuecd-x86-4.9.6.iso 566126592 BLAKE2B 8ce2464c63cba82706d8cca6f5248691d01cf198ac83b0b1e228ef9093f1f6e03d2eb9d1a224d3b88b7d8e72bab07394629ba6b92a424842cc85d3753081260f SHA512 89f6fdc89f91e515d2d84543998ce2c4629c88d290d4aa16f9ad42e194ad7720ec02155a30e19a4744e5d68db0bb476fc86cafe64ec9eb62ff809c32504841b5
-DIST systemrescuecd-x86-5.0.0.iso 484790272 BLAKE2B e26c145ca2c00d606eab9497efee48f1c45d7aa04c91c6524ba61c7e5abc32af975164c599bfd213b758aed7afe5ce9f650788ed5552a89cccd2aa6107aeb698 SHA512 67e442f229c55d16a13a46619134afee14fd7cf71e9d5e3d6f54a7b2ce3646e9ff89a17605c05f7a255b251c3bc56004aa9a59bd06f3ed69f7f4b9057ea6ea6c
-DIST systemrescuecd-x86-5.0.1.iso 485711872 BLAKE2B 010d2bd0161cafd0907d46cffd5f79011d4677e2ed7810a9dc14c121b8dd281d465c9c9d061a28d3d8708f1e258b6ddcbdcaf4aa9f9f37f7fca5923413167b26 SHA512 b18663574e54f1b6b5a147aa947d8faa4ad7eff7d756e8c3cee5397fdf3ac97c1c907f65a61403b2f0a7583fb9ad0fb74c920a8040365f6caad649371deeb1c4
-DIST systemrescuecd-x86-5.0.2.iso 495773696 BLAKE2B 7ca6bfafd38a585c0e520c50fd4adb6ae2dd1dcc49ec932ad119e8679bceeb1c819a3bba57d6a7142db5b15159b0baa3855643f272d0e3336f06bda1757a5a75 SHA512 eaf5c080fbf810c0f966335c1f2f797f8e756c03a6246c8f2e2dd13637a66a160fd0d966095849d16b94664bf973bb9064e1f9f91785f0fd51372820c90b905f
-DIST systemrescuecd-x86-5.0.3.iso 501446656 BLAKE2B 5ef49720c97ea5afb31dc6f30f57985570dcf56dd5d390dfe5d13f24a3503d37a311a720a1859525f0fde13d17e00b2439a0db4934187c1ce1bc35ba7d689c7b SHA512 a6748224f3f8cac5f9751648278bbc06acfc123c64b7c0a3b6e47f00b0a3c255082e9ffc43fd0fd3df26322cf154797ea6a02c6b37087ae832219ec4f3bec673
-DIST systemrescuecd-x86-5.0.4.iso 501141504 BLAKE2B 01acafdb8e7ac8343f0e30ed7be73e6e7ef92ed1d1edc2153e0c192717d25d7b85a163a5444222aee1af57971a871843ef1cec2d264f5a2ca7df32ed2aaff7b6 SHA512 26b624c75f75e181051b164b0a1f24b612d9ac11c2ed8df3e40fd13e48bfa58022be814e4ac608f3fde892eaa99954f10c0e1fb1ef4831a501dc4e1c0c87b764
-DIST systemrescuecd-x86-5.1.0.iso 505047040 BLAKE2B 3653bdd2733cfe214275ab8d3a95a1cab142f72a12da7fa7f76af8faa1801a1ab4da74493efeb2e1b759e871b1ddf8a847825a4f37ae6c3b009fd90e4dcfdd4b SHA512 15d019bbb91019f1b6d1847fc786e6c02f3f768826241e0823842bca9745ff1fa48fe7d32828f899b90845b2f4ce948a1f98e093edf8ca4c0c39cc0da72b4aa8
-DIST systemrescuecd-x86-5.1.1.iso 517359616 BLAKE2B f139a521076f0345a65bddfd999f7dd4479a9fd26e3621f2c419804228922af53f2e6d99a97919db0041e4199a95ea745d674a7b0a61f86dc5d9e10ff562d314 SHA512 a4063305da50ea8b73fb7157f46bf386b80d3ef777adabdcdd944814c801d078fe63778f166b80788b0851549b35bf6ada5940ca5a40a6c1a3e0f4c66efbea91
 DIST systemrescuecd-x86-5.1.2.iso 523479040 BLAKE2B abf6f1e3e05e382b48dcfd4ecde9f70896462418cf36057e3a42dc2366e0b56133deeb6f00363d15d94238c22fb8ac5c88b57ca6c213c9dcc299fa04def5e2cd SHA512 516e60632459dd5408f83035aa265ed4169b13f978a23960a85837c9c8b5bbab70776e22a6e6727184bd9df81cbbeff4a5819d5927ff0ff3a79036bc4c54cfdc
-DIST systemrescuecd-x86-5.2.0.iso 569669632 BLAKE2B fe31a68df650b46bd875b91c643c8f1daaa60042ea6c59ac452bb99a2792dcdcee62f1b60c329a70c95689af22c1a0fc52a966631af347258d665f55d2f6d8c0 SHA512 42da80a419aa27bea891339dc163a62bff8ba34d74c202a7fd0317592e8870a71ddc7fa9e9ded5e9d2f75dc36ec8417673074ffde60ea472815405456e34876c
 DIST systemrescuecd-x86-5.2.1.iso 570523648 BLAKE2B 9bb6b2ff7b9930f658baddbf60ef89e86171febcfb48eb0a6ce1bfea8fd3348773a9da948370f9f310dd0e992c40aa64a4ef1442f5cd7f408f847d147074cf1f SHA512 6820f079c9e97ac0d383ed9096a120e7e31771e1d41465f4cf7f5db36a7cb83ccfaae5c5e561181c3b3cb169d4cc4a9a6904a707ecde06a6de4f2456d2a658e4
 DIST systemrescuecd-x86-5.2.2.iso 572006400 BLAKE2B 2cc95acc529ae8e0525664ffbdfefaf6e4513e8135fa6af120121b0b7930b0203bd17d5d70ccafacfe0064bb8615f45aa22b6e6e3fcee8a005a0315fd9b5cf62 SHA512 7dd1ccd63775e35f6589808416468c4a9314f4a7a5d0cb1f2bc34ffb9eef3a450b0da244dfc9e325d828c39404c0cdcce27cc990eade33762c17a1e32f8db9b5
-DIST systemrescuecd-x86-5.3.0.iso 607547392 BLAKE2B 92aa82e54794adc1705111776b4df21bd39f96bdbed1c6e05bb24b01fd1a12d92fb1209241289f89adca7885fd441ddd61639d5168978b95dd0784faec65f32a SHA512 082a82a2882b62012944184107b2655de6c89f5a6c26145a3edb2b5a54ff6aad6a4ef43edc0468e62895daf4d5365d2722ffa8bf4f2f8e60f1ee7d9a727b013d
 DIST systemrescuecd-x86-5.3.1.iso 573913088 BLAKE2B 3c4da5777d05999e0b3e30b01dc821a4e840bb22d513fa4bfb9fdf601b9811676be8cee7ed9aae0aa7b971916add500b39172964384a2a07b3ed1cf5b946ba04 SHA512 1038622e148995450e61cd27f65af2ecb929ec8d0367fec3dbde01410a33596ec8f183d79ab931595c21deb597d60dae45ad516d8e1f00f32013729bdcd53ec8
 DIST systemrescuecd-x86-5.3.2.iso 585920512 BLAKE2B e68bb4e765359ac0e8124c9cb6090ed2ec9340a09e3ebafbcaa4acc175f8afe3985a57f193cd4be4192dfb23a6042a68328a29bbfb962f73fbe010c32d66e020 SHA512 c9da6a63556836bd38f7072b49a5408f2f9e5fa310dbae3f229c9b7af4fe6e073cdfc95b942bc1a6d9c42d41527fc54e8c6c15379082bc3ee0f025da80b01e5a
-EBUILD systemrescuecd-x86-4.4.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.5.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.5.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.5.2.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.5.3.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.5.4.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.6.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.6.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.7.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.7.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.7.2.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.7.3.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.8.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.8.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.8.2.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.8.3.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.9.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.9.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.9.2.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
-EBUILD systemrescuecd-x86-4.9.3.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
-EBUILD systemrescuecd-x86-4.9.4.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
-EBUILD systemrescuecd-x86-4.9.5.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
-EBUILD systemrescuecd-x86-4.9.6.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
-EBUILD systemrescuecd-x86-5.0.0.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
-EBUILD systemrescuecd-x86-5.0.1.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
-EBUILD systemrescuecd-x86-5.0.2.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
-EBUILD systemrescuecd-x86-5.0.3.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
-EBUILD systemrescuecd-x86-5.0.4.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
-EBUILD systemrescuecd-x86-5.1.0.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
-EBUILD systemrescuecd-x86-5.1.1.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
 EBUILD systemrescuecd-x86-5.1.2.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
-EBUILD systemrescuecd-x86-5.2.0.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6
 EBUILD systemrescuecd-x86-5.2.1.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
 EBUILD systemrescuecd-x86-5.2.2.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
-EBUILD systemrescuecd-x86-5.3.0.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6
 EBUILD systemrescuecd-x86-5.3.1.ebuild 1585 BLAKE2B 2990cf5577fe457ca542e4e1f51125dcde9df4242f13b2ef928a4cf9cb6b3119c27f4c3779aa99e2768c59812dc636492ef61ea0d37d32891907f2a96b6bd49c SHA512 0bab335bdfef131cfc6a8079eda20e85acf81e919811705fdc1dd73b80e1f635e6f061042bab60949a7b295d49c17b4237a049f74ff9cb09a9febd4f6aa125da
-EBUILD systemrescuecd-x86-5.3.2.ebuild 1587 BLAKE2B 60df1cd69bca79848b90f2e0c8ae8d115a19f9c5d4ce79a44dcd091fbfab7c9feef4bd678f54d9a757b739b8773dea217792cc7fda152cd0004d0ce689989e82 SHA512 78bc0a0607bea45b0dbf02c2dd75d23129436d0308d3dd1f87d39c89e7e57cbb48526f3fb6151af02c3d89c54a26aea32995c5efc89cda3f8ce2a05e725a0757
+EBUILD systemrescuecd-x86-5.3.2.ebuild 1585 BLAKE2B 2990cf5577fe457ca542e4e1f51125dcde9df4242f13b2ef928a4cf9cb6b3119c27f4c3779aa99e2768c59812dc636492ef61ea0d37d32891907f2a96b6bd49c SHA512 0bab335bdfef131cfc6a8079eda20e85acf81e919811705fdc1dd73b80e1f635e6f061042bab60949a7b295d49c17b4237a049f74ff9cb09a9febd4f6aa125da
 MISC metadata.xml 610 BLAKE2B 400c26cbce80747fe88b60d34ea0f018b7119ad6ef333e8de931424aaa929db90ba0836a4520fbe62baa0c7aa9992745c4c082e495f318066acf5285e56dcd10 SHA512 5092c69f83df351b3697ab0c83e165eba5c7ceffd197707047bdd4d2e809ff7267e436e91e3035223beb088c48835ae28fd4032a8122687af116fa1405b30b15
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.0.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.0.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.1.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.ebuild
deleted file mode 100644
index cce5e34e9e34..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.3.ebuild
deleted file mode 100644
index a15aecbe41c4..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.4.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.4.ebuild
deleted file mode 100644
index a15aecbe41c4..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.5.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.5.ebuild
deleted file mode 100644
index a15aecbe41c4..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.6.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.6.ebuild
deleted file mode 100644
index a15aecbe41c4..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.0.ebuild
deleted file mode 100644
index a15aecbe41c4..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.1.ebuild
deleted file mode 100644
index a15aecbe41c4..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.2.ebuild
deleted file mode 100644
index a15aecbe41c4..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.3.ebuild
deleted file mode 100644
index a15aecbe41c4..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.4.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.4.ebuild
deleted file mode 100644
index a15aecbe41c4..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.0.ebuild
deleted file mode 100644
index a15aecbe41c4..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.1.ebuild
deleted file mode 100644
index a15aecbe41c4..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.0.ebuild
deleted file mode 100644
index 7bfc35a7dd27..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.0.ebuild
deleted file mode 100644
index 7bfc35a7dd27..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.2.ebuild
index 7ae127d5decc..44c6ac8ae730 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.2.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 
 LICENSE="GPL-2"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+isohybrid"
 
 DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"