gentoo resync : 15.05.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-05-15 13:19:56 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-05-15 13:19:56 +0100
commit: d302a5d7fc9caafba5c8a404f2891bb6ccdec311 (patch)
tree: 2a3ee43f080d1d0086964de8c29ccf1021fdfda7 /sys-apps
parent: ea31ad0ed5501d0bf92267c35beaf06ac016bad2 (diff)
44 files changed, 582 insertions, 1444 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index aedbc48f2f57..a88de9e26e08 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 8a411cbcd7fc..8f889dcb750d 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -18,6 +18,6 @@ DIST busybox-1.28.1.tar.bz2 2260551 BLAKE2B 5dbe7d4fe63ff187bb1458368891c570016c
 DIST busybox-1.28.3.tar.bz2 2260586 BLAKE2B f2fec31ab1c6e6b865cea20a2819f58cb8e4c789051a8fdc8c8ca43367049fa9038e07f3fe806ba7abd90cb6a6aefdb0d095afb68119c11e94240647da6d48ce SHA512 0e87019d9d1179bc072a5ef9752d7342747e311db13c0b0dfa9f380a1e3ad1c265cca118d41f86829629ec5c8eb3e83985421c6f3ea6c8a9991b92ed301a4982
 EBUILD busybox-1.28.0.ebuild 9293 BLAKE2B 619fd35a6388d82930505fba9b7dbd9788b088ee287274676342f9e36d9f6e283cc56447a278dc0730d2b230a76445a7f4624f9d03c7bae95321fbe9f5695333 SHA512 77c30310b1716c1b7eb1246c134aecdd50cc5516f9b9f83b987c7246f82e06e4fa9e8f168cc5f70750af7125c6b562d7776b48d43d0f636b52cc895a0b0f51d0
 EBUILD busybox-1.28.1.ebuild 9303 BLAKE2B 3f794930b716599ab002d5f5bc08021ac316024385fc5386ced878229572d0d2c39afa497308a90943d56a1896656be57fa79e00d0a3a3a9bdd54f747f0ccc8b SHA512 b252fa2fa58a345d89cf63f706072c58a5fdcc4377b0d2a5e3c07de21d00751928649100cf8309fa66c9bf07423d129236d69882173c85beef4c90603a8226a2
-EBUILD busybox-1.28.3.ebuild 9294 BLAKE2B 1e9c519db0bdcec53e4e549a680848a8b8aa0dc6db299c423a818c3d89d74f50bf2326dadb05b457a6b8e0cde3d026400c53d166f1dc2c5ccf7a56053a5953ca SHA512 7decf36018c8281b7433ef233458906c6e453ef61969b24380283ce782d6a7cf3a71d5f80bab92def11f6a4d8919e5f89b917071b8ea70789c7fe0b5449ef1d0
-EBUILD busybox-9999.ebuild 9294 BLAKE2B 1e9c519db0bdcec53e4e549a680848a8b8aa0dc6db299c423a818c3d89d74f50bf2326dadb05b457a6b8e0cde3d026400c53d166f1dc2c5ccf7a56053a5953ca SHA512 7decf36018c8281b7433ef233458906c6e453ef61969b24380283ce782d6a7cf3a71d5f80bab92def11f6a4d8919e5f89b917071b8ea70789c7fe0b5449ef1d0
+EBUILD busybox-1.28.3.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
+EBUILD busybox-9999.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.28.3.ebuild b/sys-apps/busybox/busybox-1.28.3.ebuild
index f28bf04dfd72..ea0b4ce81fb0 100644
--- a/sys-apps/busybox/busybox-1.28.3.ebuild
+++ b/sys-apps/busybox/busybox-1.28.3.ebuild
@@ -285,7 +285,8 @@ src_install() {
 	dodoc *.txt
 	docinto pod
 	dodoc *.pod
-	dohtml *.html
+	docinto html
+	dodoc *.html
 
 	cd ../examples
 	docinto examples
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index f28bf04dfd72..ea0b4ce81fb0 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -285,7 +285,8 @@ src_install() {
 	dodoc *.txt
 	docinto pod
 	dodoc *.pod
-	dohtml *.html
+	docinto html
+	dodoc *.html
 
 	cd ../examples
 	docinto examples
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 59a606fd459f..a918aad621bf 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -2,9 +2,11 @@ DIST checkpolicy-2.6.tar.gz 69748 BLAKE2B d3cb4580a553b211c483eefb9437d81398a30c
 DIST checkpolicy-2.7.tar.gz 65967 BLAKE2B 6918187363cd74a1a23df41f0af23a2231c7087c696d3935db65db4c6750cf7dfa7613b1d569dc76b80f9781fed9f58ef8d41e6ed4325086a10fb322f7f8f754 SHA512 fba8a4132f90c98f8222de563dc15aac1b739d3a6207779b6a4715d2813e7553081351c54f42371a1b704a1f5038d40821b61213c4ad53eb705823975858cf7f
 DIST checkpolicy-2.8-rc1.tar.gz 66260 BLAKE2B 8b9d02c07ad51afd1db81bb0679c9a9729c0f1457c36c3f53d58b8927a6ee488fc0884c853f252fc871e54b5b3300798a8adf5c6770ceef63fa69cbfa4668d80 SHA512 a13d8abba9a10257d7b9b917754fecf21518d2cdf094508dca1028d24f19763f6ba71cf7dd8a654633152316a6ec618a488598d8ba6cda2960039f101745b57c
 DIST checkpolicy-2.8-rc2.tar.gz 66262 BLAKE2B 88be634685ddd3d299184c95337f78995420b1440e55dfd529936dd8eae84a7e3b48374f67ffe13895e6e17af435b790ad441f5b02bd8e26a11c4e520956ef57 SHA512 5a5f1023f5f8f35d4a1e4921826c2e3cc4a3259340e62a3f554a8ea073d9c6807e8bffc4d4278fdfd5f21a69b7e23ad4aa7ef058298e69edb1d33e5930d75adf
+DIST checkpolicy-2.8-rc3.tar.gz 66261 BLAKE2B ade05091ccd641e3c92e5f1fd8dfe54f7c419aa64c78deb729c7dbd6a70876d71611ff7d8143eb4ab6b6e46a40ad88654d041e1fc61c3e25073df8d265f98bfa SHA512 6e59c08704bd658e507ff1738caa0c810cb2b21677d6aa8d43d84b9411647e0f9a1f876ebe4ccbeef9d97a343e1b2bdd0e8a42b83d9c70fcd49dcdb8381a5696
 EBUILD checkpolicy-2.6.ebuild 1170 BLAKE2B 0bead9d12eddedfc9972ff41ceae1027e4d6d8451630146a9ff93dbaeb2217fbe1121b41bd1e46bf47d30f39a481d2b133f1529b50969dffece1e88e3451fd31 SHA512 756f3191add673f5ae35e27997f88584d026a663ef12c943f3bdc57a1c0679c18cf0f26300d0e568b8c2f707fd7e3001f5c79cbe6fcfda0f509cee200660cf84
 EBUILD checkpolicy-2.7.ebuild 1232 BLAKE2B a2375ca69a96de38a648904261277d54222ef50fcef3722deaa9430995c62a8adcd24cc06a9b86b868f932d95b5acb27e076115ad73b0e76f6e9630f37e3e38f SHA512 b671810da7baedcd74e6456f53cdd63afdf73cbedab7d5f942023534d863aef4d536ff8e6acf370964352707a86c0b72bd3530601025aa27f96395b29ff3c1f8
 EBUILD checkpolicy-2.8_rc1.ebuild 1189 BLAKE2B 58de5b771ec9c5098a343bf861ffa159faef221c8a1305f7cabe3d1463cf80b2a00f6f74d60ad46a14deb00251142eeaa787f5034663f37fa42bc15caa42698a SHA512 d5585a561cc0075db28577190f6478b1f99f9722212d5909b506643527eac1aea1a890b0be8ae567f2768542b90cc038409312b9aff275d7e14eb9dcdf52b6e1
 EBUILD checkpolicy-2.8_rc2.ebuild 1189 BLAKE2B 4e914607831d4438ddbbc074aff38dd6c72d98b7eee130ed78d8595e7407abb86657fa3ce1d974efcab32f987284bfb060393600aff9baecd48e257477dd2d77 SHA512 463b138c13b6ca03056aa3c98289356df96ed6a6f5ecceaf1c227b4d8d84b83058db4cfec0ea25562440629da5ae97b64536c1ced7082b61fa54bb7281bc1090
-EBUILD checkpolicy-9999.ebuild 1189 BLAKE2B 4e914607831d4438ddbbc074aff38dd6c72d98b7eee130ed78d8595e7407abb86657fa3ce1d974efcab32f987284bfb060393600aff9baecd48e257477dd2d77 SHA512 463b138c13b6ca03056aa3c98289356df96ed6a6f5ecceaf1c227b4d8d84b83058db4cfec0ea25562440629da5ae97b64536c1ced7082b61fa54bb7281bc1090
+EBUILD checkpolicy-2.8_rc3.ebuild 1189 BLAKE2B bc063ece296eb8bf7e179d779d22ac5cb15a095f819e520cadeee8ee384e4ccb553871ffec176aee56914c0473d426afaa5246d64f98db2e2c5c773d0ec272aa SHA512 60b96b571d46fe7a32077f5b82963ac5a4138e98d4ecb7ad4f29de2861a8872267f2a3fad443de5df0468d1573ba6f3c484d5e553e80725e99ec6f68d1245f34
+EBUILD checkpolicy-9999.ebuild 1189 BLAKE2B bc063ece296eb8bf7e179d779d22ac5cb15a095f819e520cadeee8ee384e4ccb553871ffec176aee56914c0473d426afaa5246d64f98db2e2c5c773d0ec272aa SHA512 60b96b571d46fe7a32077f5b82963ac5a4138e98d4ecb7ad4f29de2861a8872267f2a3fad443de5df0468d1573ba6f3c484d5e553e80725e99ec6f68d1245f34
 MISC metadata.xml 308 BLAKE2B 9147e4199ebd94dc7cb5d04986bae70ecc5bedf765fa6295546b894df249fa074c66e96a7d788295d912f49e9b0c5c305eb404c98d9b04646ab12a7597d4877f SHA512 e07f79eaa348cc35ebb4eac966f6b59ff87cde6c2b9694ac996da971c45aed834f34b8a9325b205fdfe590d7add0d46013cc551af166a9ca2ca59e0feffbc9bb
diff --git a/sys-apps/checkpolicy/checkpolicy-2.8_rc3.ebuild b/sys-apps/checkpolicy/checkpolicy-2.8_rc3.ebuild
new file mode 100644
index 000000000000..2a50f93eeeb3
--- /dev/null
+++ b/sys-apps/checkpolicy/checkpolicy-2.8_rc3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_P="${P//_/-}"
+MY_RELEASEDATE="20180510"
+
+SEPOL_VER="${PV}"
+SEMNG_VER="${PV}"
+
+DESCRIPTION="SELinux policy compiler"
+HOMEPAGE="http://userspace.selinuxproject.org"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
+	>=sys-libs/libsemanage-${SEMNG_VER}
+	sys-devel/flex
+	sys-devel/bison"
+
+RDEPEND=">=sys-libs/libsemanage-${SEMNG_VER}"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		YACC="bison -y" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		install
+
+	if use debug; then
+		dobin "${S}/test/dismod"
+		dobin "${S}/test/dispol"
+	fi
+}
+
+pkg_postinst() {
+	einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
+}
diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
index 6dc34b79d2e9..2a50f93eeeb3 100644
--- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20180426"
+MY_RELEASEDATE="20180510"
 
 SEPOL_VER="${PV}"
 SEMNG_VER="${PV}"
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index cb1690691077..5789d6aa9954 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -4,7 +4,7 @@ DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b
 DIST hwids-20180315.tar.gz 3117949 BLAKE2B 34b6349d7adf38da8591a0f75e98ce09f0217bb284d1bdc70d7c1bd0a13f0c21b46b2a40ea363dfcdb7524e2a06e94d8ca3a63f5dce6f4afac2b20d05229e944 SHA512 2c52b88b74d231f7c563079b02fdbe29ff70c4df5aae64f1241ab0e1bd3ab9c3ca925e102474e32d3dc8dcb833e3451f0698024a8fff808a987ce468af281898
 EBUILD hwids-20170328.ebuild 1442 BLAKE2B de4a2b9d8395ce3c5c0a09f3f735519b0fea7166faf60439d67da84952027fb47fc2aebcb9c0ba5960d0b6c42874bc4833371596ceb99fe394a49c4af8df54af SHA512 3dbde4bd8f65b1822da919b5cea69e20d9173e2e14f26054dfaf08ee0a24839d867a699a3950de2249a88cb17848747983c3bd38e86f2deed14615c844ea6c29
 EBUILD hwids-20170715.ebuild 1455 BLAKE2B 48b2ba621d627158d3cee3c1e96cdae5327620431e894314677ea3c0341282d41d87cabf045c1dca24a1c1c7055dd3365d700b5fea973eaab5f18ee0dc7c13c0 SHA512 3460a0646dcb649b10d7c02b98f50719d298a00f224df3aa06dd79235ea1107c914b20f07a53d675ee9bed3f76fdf30befcb5b33fc61c1d10b952122a2e9430c
-EBUILD hwids-20171003.ebuild 1709 BLAKE2B 35f5ab9cb6d9dc304f866ac0fe087e91c3d7a02fa83ed19a8bcfd0905f4e369cc99a299c833a4749ca9b4bd74e12a687e9c1893770f2048dcb2a59cdfd4c0ec9 SHA512 eead13c9cbf4f33a94d4ce8a4f864880f6cd61db1ffc005e2b43dabe22401e8d2f81d882f69b1a54e7c76b05426e756914692d44a4cda02626070b5fb00a4a1a
+EBUILD hwids-20171003.ebuild 1706 BLAKE2B 9e5ca6bef971a2b88fd85470abfc24742b809a225640ca777990780a2fbc598ac26125d4b3ad51e7b02fecf668b3d648bc9d02d68f3818a7bcc438c7e1c83227 SHA512 ff3c5693b5d81a0d486d269b14c54e9489ae9e959f5c57d9268d2fb2b17723bc764b41ec62660eb7483efd91e8a28fa47a56bb67cdac4fd09ec3e947ead0b5a0
 EBUILD hwids-20180315.ebuild 1750 BLAKE2B df4293882c37bd67f31031e6f57a4f530b219e79ed97a588176adb363f789cce5df1d639a4a16cbba346db05fef0d5449733d6ebf0054f9501d4b4791f56ad97 SHA512 be1425858d953975464bd1131741b791778d0399249ae2bde4d71ca92db32bab4d188a46fe5ba1fbeac1dd1d9a1351d74a377dd5a19fbbb9cbc108b116181857
 EBUILD hwids-99999999.ebuild 1750 BLAKE2B 37d13e56d50016ec2ec0d02c6c9aa5975036ab904f3e5e8b74cc13d888d73164e92b85b1e68dd82140b1fb662c1c0b5a68429c90cf4a2be2e6b48204772d3a16 SHA512 84fcacd98a96fd5c1f6ef2f13dec9ce46a6e3a0bb942eeb3c041d6bbb8ce0d4c63bf392f747f0e6473fe15420143170aee147b52941fac40b903c375b43bdda8
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20171003.ebuild b/sys-apps/hwids/hwids-20171003.ebuild
index df8110104ce3..9b824ab36d13 100644
--- a/sys-apps/hwids/hwids-20171003.ebuild
+++ b/sys-apps/hwids/hwids-20171003.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index 5e6ab9786878..f75908b5d4ab 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -2,8 +2,10 @@ AUX mcstransd.init 659 BLAKE2B ef74c438407efa47a066a18a1ba8d7cad2b13240fbf39d838
 DIST mcstrans-2.7.tar.gz 41137 BLAKE2B 83f195dee4bf61c36f65b009cf40dd58459e01d75222fbd7fe15c61ae7942315373a4a0e9a1cd0a654efcf471c3c7166f76c87837085ef6a4136567d4b52fc73 SHA512 2e59f26fad3423a0c8e2ea49d619f99022c72e1aebb00e842defb4fad56f187f9ed0f069ef78d3b209ba76f5ebdcba1668f51ff881b753dada5716ee942519b3
 DIST mcstrans-2.8-rc1.tar.gz 41385 BLAKE2B 7aa05d9ec7230e5a2c0b5555368c46af31a5f92318300a07db3242ae18c7855225dd399f2874c2ba09ecbbebcdec686c20f604c2a86e104900b1eaaf50460a44 SHA512 6927d3b06012fb351d04558f26e602c084058911ca095891d49286976cc9f96446476057c09c044564eba25aca920bc99f2218182551a957d0dac6ce1a9bc2db
 DIST mcstrans-2.8-rc2.tar.gz 41387 BLAKE2B ddded091b0167ae6c465d7459a70da3e5567e1a548992c206785dc99f8c23568dfd00575ecdc5518d2825a88a8199fca42798a912a0f506a51c6919b2dca865d SHA512 3b4cb62eece6db434272a3d0c30b2b8b982793008aad6f02b73dd88822ae50e91aa422d972c92f58d3e132a1bc6f871924ba144078d26c72a2f95098cf3a20f9
+DIST mcstrans-2.8-rc3.tar.gz 41392 BLAKE2B 31c08eea9f9866da2fc16d734f8ced6a1acc6c0b0d5294cc3cfb07085535d7ed6202662f45b43b42aaa28642194c19b1d26fb5b98dda42e259562b6729e2956d SHA512 d25ab36b9b764abf8805764a457f870659e92ef440990d8b442caf64eaff082d7717b9b5c0b731fc1fd2ab4def9ea9ac82090b5cc5c0a63631418c6831ea2c72
 EBUILD mcstrans-2.7.ebuild 1217 BLAKE2B 3b6414b7e668a2d7ec5c7ee5bb0c5d0b859f2360ab88fc88db0c1c4a7f06f539e5b881b02035aea89cd4e75e98e7bd6a42d035d1bd3dfb0f810b1191477b454b SHA512 d26037fd0d2f2ef722a21da5ba974410a5441608e32fb35d8674ebae48dd2eb485b30af50d7f54a3d3181b8c7af838e03d744336181f8bd3b8d8b8a47a906250
 EBUILD mcstrans-2.8_rc1.ebuild 1134 BLAKE2B b3b2532f024a638a7438db44a94a4da3627b769a748f5e288422a75abf88757b4812da9d4baf3a5ae84c7d68cc53cf7e9670e2942bc34359fe5bdaf85601b294 SHA512 9e94454233c349e043e4a3260b01e08de119e4b9f8d45a5bc3e8d4fe26778e75d38d41ee493e9bd44aeae65fcd0f8bb57b18245e45ae9412d58b2d85308fff4a
 EBUILD mcstrans-2.8_rc2.ebuild 1134 BLAKE2B cdafa28f1c27df99217f2a019b56a29b7f7539a6da269573026d28a3fa422b8b256831423e3f5c9010a102c52b5694cec998905ab9e88fc777b7d1993a26edb8 SHA512 3f3d0f2a3ca3d07fc54529860e2c3dee67d32f289d8d561d12e4d2257921163b1f002634458d8f73d577e7f0d417af69c5a20c0e8c3a2c97626ea3f4785d038b
-EBUILD mcstrans-9999.ebuild 1134 BLAKE2B cdafa28f1c27df99217f2a019b56a29b7f7539a6da269573026d28a3fa422b8b256831423e3f5c9010a102c52b5694cec998905ab9e88fc777b7d1993a26edb8 SHA512 3f3d0f2a3ca3d07fc54529860e2c3dee67d32f289d8d561d12e4d2257921163b1f002634458d8f73d577e7f0d417af69c5a20c0e8c3a2c97626ea3f4785d038b
+EBUILD mcstrans-2.8_rc3.ebuild 1134 BLAKE2B 1b604db83926701f5a9cecbba920a6483bf27ebfb6965816799c524bf0e37bd04d8ddcf9aefd13f0ca28cad3b48932423c0a93dd19ee156fc8daa283c9091862 SHA512 7bb101517f94e66259d64af47a1f636ebd11365130d736f3e36a9308c164357c5e433bc3286ed03069f32fabea8aa522072be603395f833e08111009fe39f2b0
+EBUILD mcstrans-9999.ebuild 1134 BLAKE2B 1b604db83926701f5a9cecbba920a6483bf27ebfb6965816799c524bf0e37bd04d8ddcf9aefd13f0ca28cad3b48932423c0a93dd19ee156fc8daa283c9091862 SHA512 7bb101517f94e66259d64af47a1f636ebd11365130d736f3e36a9308c164357c5e433bc3286ed03069f32fabea8aa522072be603395f833e08111009fe39f2b0
 MISC metadata.xml 451 BLAKE2B bf8e87dcdd8c3dfbb33728600b986bf96e2243a9e9916db87ae4b4d69508f6397915929b24c4b7381d711a7754987402f0abd8ee8217621479d6970c91922189 SHA512 9d1f5669661c1fe232b18517a954640350c8f0c606d3ca91e429f53790532bfc9b73d7c18e575c4055d3ea7ba4a5ade632d1814700ed1d3d000fe5ebfa065744
diff --git a/sys-apps/mcstrans/mcstrans-2.8_rc3.ebuild b/sys-apps/mcstrans/mcstrans-2.8_rc3.ebuild
new file mode 100644
index 000000000000..16d98aa73012
--- /dev/null
+++ b/sys-apps/mcstrans/mcstrans-2.8_rc3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_RELEASEDATE="20180510"
+
+MY_P="${P//_/-}"
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="SELinux context translation to human readable names"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:=
+	dev-libs/libpcre:=
+	>=sys-libs/libcap-1.10-r10:="
+
+RDEPEND="${DEPEND}
+	!<sys-apps/policycoreutils-2.7_pre"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/mcstransd.init" mcstransd
+}
diff --git a/sys-apps/mcstrans/mcstrans-9999.ebuild b/sys-apps/mcstrans/mcstrans-9999.ebuild
index 79dc30ee803c..16d98aa73012 100644
--- a/sys-apps/mcstrans/mcstrans-9999.ebuild
+++ b/sys-apps/mcstrans/mcstrans-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20180426"
+MY_RELEASEDATE="20180510"
 
 MY_P="${P//_/-}"
 IUSE=""
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 97b609026d88..748f92069168 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -2,9 +2,11 @@ AUX policycoreutils-2.7-0001-newrole-not-suid.patch 351 BLAKE2B 84a67799662e6df3
 DIST policycoreutils-2.7.tar.gz 2796707 BLAKE2B 4b1c03f2d12252b453950c3d6bcde75780926a1b91263d3881f741399c5630c707f0429b9b144c657b017b7b0c1500b63b6463610dea3caaef8c2f7c3f69fd8f SHA512 ce97d659f72058fd23d8dab8db98fc7c0003806a636c521fa15da465d7358d40ccc8e3eaa9675f00a9b0b8aaa1465d3fb650bc0ebbbf00164e121230673256fb
 DIST policycoreutils-2.8-rc1.tar.gz 2797172 BLAKE2B f75549e05af02038481807e78267b0af2df4d2c8ab5568e9f4be853c742e358ce3c6fd4a4f2f56e022aa76235b41a80676eee342cd79f43be2270b5753151a71 SHA512 252b1a2784221cd1b960d584e17c3c116b46a36ef4900510f8caf34908784dd1d19d2a5d2c394aaa4d920485183365af2ab23056eb5867ccbaf284e2ca8612cd
 DIST policycoreutils-2.8-rc2.tar.gz 2796955 BLAKE2B 9a62c08b6fe4e53b1338d671d3fd51600e9fac18ca036a48bab7445b86883a7fb093cde0a99023e8fb9c8579f69075e0b3032217b4cdfa254ca3bab143150deb SHA512 ce807e6175c92649cb4218444ff49d4f70ba1feb99ca01412f05a3d713a0a5f3c5dae0cd284b077a8c8e03a68d4dd023302863f3922f7748798205c5d5d73021
+DIST policycoreutils-2.8-rc3.tar.gz 2797294 BLAKE2B 74be15f5a189c310570d64215e900885924a82cc2ae47e585ed093e36300614fc36b43bd391a72a45eeb4e814b29a6f11bc86cdd16ed2b2d3cbb0647d9f07686 SHA512 6100fdde5eb492a21028c470712dccffd25caf1cf2cabe5653df02126c19c7173cfd293b1e1ce3215bf7c59c32fed36e053348b1d5fb5916a24547d8e9c8794c
 DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 6d98e41ea379d3e95221a6e53d8a8b144e4e15ca5581381e76a529dbbaca304d5587b30419797c8c70cbd7c2b2588e5ecd62adcf97294e429950899c1c318346 SHA512 c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3
 EBUILD policycoreutils-2.7.ebuild 4966 BLAKE2B 1e252c86aa33e9ac68c14d859ced7e277fc0cf5f5ad6aa335ae7b334b5ff56417ed8ff973a57e2858bae832dde946a7080d1d9eb72e7b2ed0e583b1badf8ccc9 SHA512 f068c7fb1d918bcf305b8f8a72433774e5dcc23e8b5a22fee2e64fbb54cd4e14d897da33c893b948247600350bf4f54ab64f6d81be405d2c6930ea40176dc729
 EBUILD policycoreutils-2.8_rc1.ebuild 4897 BLAKE2B 4c0c156f179ff00bb15b50512ba2085c69385bc4cdd3c33779ea66405198d315662f7dfdc359bdb68e12faced56743ea60bc2c6e1f3c0299d0591ce4f8b46c30 SHA512 a700c9ab01edd4219ca70ed571dcfdc63be9c7f4248be53a58f3680baba690a3a71d017e11861c87e32b055656e8d65d3206fc692cbe2ad4c51b7039342688f6
 EBUILD policycoreutils-2.8_rc2.ebuild 4897 BLAKE2B ebb8a9a8cb960ee4b7ef5a96ebbbfeeb804870e853bc448ce59724c029280ff67ce48f17c55605a8e529a7003afa88fc0c01890e03e7ccfe5c1ef97a5d26ddc7 SHA512 6b65d82b5e59e19137450b589f02351206104266f5a79ae28a7b3da1810e8b6048fafeec27aeb84784f74e6dc5890b9fcd3912fa200f58a75fd8dadf526e72c7
-EBUILD policycoreutils-9999.ebuild 4897 BLAKE2B ebb8a9a8cb960ee4b7ef5a96ebbbfeeb804870e853bc448ce59724c029280ff67ce48f17c55605a8e529a7003afa88fc0c01890e03e7ccfe5c1ef97a5d26ddc7 SHA512 6b65d82b5e59e19137450b589f02351206104266f5a79ae28a7b3da1810e8b6048fafeec27aeb84784f74e6dc5890b9fcd3912fa200f58a75fd8dadf526e72c7
+EBUILD policycoreutils-2.8_rc3.ebuild 4897 BLAKE2B 3dccfa5e1f27a1642a8705a62415309a48e4e119b0aa39722250ce8c069dc00214934ab5a03ffefe19b8e724dd46b3f4d3706c983f428beb65fd5aec1d5604dd SHA512 4a0337b168a541bf400473ecc400a83f24883c16b4a007eae53094859b9c00272cce5d5d79bc9d5a86547f8bafe5659be8beea27799e7f0b9c877580afee4b0b
+EBUILD policycoreutils-9999.ebuild 4897 BLAKE2B 3dccfa5e1f27a1642a8705a62415309a48e4e119b0aa39722250ce8c069dc00214934ab5a03ffefe19b8e724dd46b3f4d3706c983f428beb65fd5aec1d5604dd SHA512 4a0337b168a541bf400473ecc400a83f24883c16b4a007eae53094859b9c00272cce5d5d79bc9d5a86547f8bafe5659be8beea27799e7f0b9c877580afee4b0b
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/policycoreutils-2.8_rc3.ebuild b/sys-apps/policycoreutils/policycoreutils-2.8_rc3.ebuild
new file mode 100644
index 000000000000..869c231e4972
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.8_rc3.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit multilib python-r1 toolchain-funcs bash-completion-r1
+
+MY_P="${P//_/-}"
+
+MY_RELEASEDATE="20180510"
+EXTRAS_VER="1.36"
+SEMNG_VER="${PV}"
+SELNX_VER="${PV}"
+SEPOL_VER="${PV}"
+
+IUSE="audit pam dbus"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	S1="${WORKDIR}/${MY_P}/${PN}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
+		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	S1="${WORKDIR}/${MY_P}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
+	>=sys-libs/glibc-2.4
+	>=sys-libs/libcap-1.10-r10:=
+	>=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}]
+	sys-libs/libcap-ng:=
+	>=sys-libs/libsepol-${SEPOL_VER}:=
+	>=app-admin/setools-4.1.1[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	dev-python/ipy[${PYTHON_USEDEP}]
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib:=
+	)
+	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
+	pam? ( sys-libs/pam:= )
+	${PYTHON_DEPS}
+	!<sec-policy/selinux-base-policy-2.20151208-r6"
+# 2.20151208-r6 and higher has support for new setfiles
+
+### libcgroup -> seunshare
+### dbus -> restorecond
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${DEPEND}
+	app-misc/pax-utils
+	!<sys-apps/openrc-0.14"
+
+PDEPEND="sys-apps/semodule-utils
+	sys-apps/selinux-python"
+
+src_unpack() {
+	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
+	default
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	S="${S1}"
+	cd "${S}" || die "Failed to switch to ${S}"
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live ebuilds please use /etc/portage/patches
+		eapply "${FILESDIR}/policycoreutils-2.7-0001-newrole-not-suid.patch"
+	fi
+
+	# rlpkg is more useful than fixfiles
+	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 1 failed"
+	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 2 failed"
+
+	eapply_user
+
+	sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+	# Our extra code is outside the regular directory, so set it to the extra
+	# directory. We really should optimize this as it is ugly, but the extra
+	# code is needed for Gentoo at the same time that policycoreutils is present
+	# (so we cannot use an additional package for now).
+	S="${S2}"
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			INOTIFYH="$(usex dbus y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	S="${S1}" # Regular policycoreutils
+	python_foreach_impl building
+	S="${S2}" # Extra set
+	python_foreach_impl building
+}
+
+src_install() {
+	# Python scripts are present in many places. There are no extension modules.
+	installation-policycoreutils() {
+		einfo "Installing policycoreutils"
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			INOTIFYH="$(usex dbus y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+
+	installation-extras() {
+		einfo "Installing policycoreutils-extra"
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			install
+		python_optimize
+	}
+
+	S="${S1}" # policycoreutils
+	python_foreach_impl installation-policycoreutils
+	S="${S2}" # extras
+	python_foreach_impl installation-extras
+	S="${S1}" # back for later
+
+	# remove redhat-style init script
+	rm -fR "${D}/etc/rc.d" || die
+
+	# compatibility symlinks
+	dosym /sbin/setfiles /usr/sbin/setfiles
+	bashcomp_alias setsebool getsebool
+
+	# location for policy definitions
+	dodir /var/lib/selinux
+	keepdir /var/lib/selinux
+
+	# Set version-specific scripts
+	for pyscript in rlpkg; do
+	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+}
+
+pkg_postinst() {
+	for POLICY_TYPE in ${POLICY_TYPES} ; do
+		# There have been some changes to the policy store, rebuilding now.
+		# https://marc.info/?l=selinux&m=143757277819717&w=2
+		einfo "Rebuilding store ${POLICY_TYPE} (without re-loading)."
+		semodule -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
+	done
+}
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index bdd5ccc8ac34..869c231e4972 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -9,7 +9,7 @@ inherit multilib python-r1 toolchain-funcs bash-completion-r1
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20180426"
+MY_RELEASEDATE="20180510"
 EXTRAS_VER="1.36"
 SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9c218d969240..98aa17e514b6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,23 +1,14 @@
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed6b6d0aef1d070650d82133c05e161eaa9fd1e208b3078c513ccf6f73136b8bf865542f0dc9396de9142bad1d32c SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3
-DIST portage-2.3.16.tar.bz2 949134 BLAKE2B f8e7b6f13dfbf9aecdec444705042c6584c324522c0d131bf3c10f8fbfd5f6eeb97134afa42ed23da37f36ad4e2a0fc27129aebeb100aed2e3fd650c360ed060 SHA512 5847904b3262adcef04c7d6781cf2d03130480a49c5343a3a2d5cc36ddc7245ac30b1ba152329f96e2e4ca8d62ef387554cb228798db60f6f8141830d147dfaf
 DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d
 DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9c5211e9cafd4f1a35de1d77e655d99df0ceb352fd431a8cefd40c733064422d8f41099edf7263aa36ef8cfd2ba8 SHA512 fca250d4afc1819a27b67daff770132ed4e88fb067038992a6b3f8aac63604536366ea628dd30c24f93db19ae55e88da372598ccc489bcf445038dfe860ce0ec
-DIST portage-2.3.26.tar.bz2 970245 BLAKE2B b854bef894327b9e4beabca55d70368d326548d96efdc5b63e47f77971da195d041c8e8412bbb308ef6922be02964727c99f9dcc92a2a4b0a7372e0a1c774ffe SHA512 5acb8a00fdbc72a8c3e79f8b1c2ba17c9b469205edf1e56592db9ccfeb54b4dc83a98548ff0e01c408456a1c962262377967f6d70510c8d1b0e7ab15eab51079
-DIST portage-2.3.27.tar.bz2 970480 BLAKE2B dc46362773544102d9a07e686759d454a37177e9ac6e88d664c1aeb1676b9fb4e12662500f1de63644ad5eaf69d58bf85f38339c18d695cdc42930746dedb731 SHA512 791c87ffe958e883fe16562e69e606dd7ff860c13b2262b3eaa665f78acacdcb547c5e124b69d2c0faa36147fdc7c1d60669dee43b7401ea4f89784a619f81fe
-DIST portage-2.3.28.tar.bz2 975684 BLAKE2B 70f944700bba66e369877ffdb76c829d6521d429c65ded482482058639478c1c6e27366cb509252e59a4c3d2d295211f4efc2cecd84f7790674429a42a399a72 SHA512 208237faeee844bca829adc42b0407c246e09e91d5c5850c27696eb201f1009a87dce0b28cbbca4a27f2c9d58c0c102387a41483c976642acade83679a980777
 DIST portage-2.3.31.tar.bz2 986684 BLAKE2B dc2a6e7da211da98320b872b26af46138791e2600d261fbff21823576804ea04dc77bc69c5f64d94a9bc3d0ec9cba0630b9093c12c426ae0561471092c837080 SHA512 7cca6aa6e8e6ce7ee3902686b437ea09c398630f46926d568a35f94b95be3c6ecc53a4ab6ee99d52c04755d5144900cc3aa84be24a49533518f8c50a9301ffb8
 DIST portage-2.3.36.tar.bz2 992242 BLAKE2B 44b414495ab156214bfd27d10894a6b1ae020f503639f41d408670b440b5e389bd56c801138907992982db8964aaa2664e9f7f0aa99647d4eab1aa81167157ba SHA512 765bb60fce2b6b84c5fde7b19c5abeeed0ba8036ea311c7f57dfcb2ed11395cafe7bdd07a2b46adce95792f4bf9f5401643e88780c90e792a8a4e4d1f2886167
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
-EBUILD portage-2.3.13.ebuild 8197 BLAKE2B 0d4dc660b6169ea2c69c35ff9d44ce8ae3d25d18f15f529bca80140e20fae2905598cc2668c5b9fdc9bac042144bdbf7c8ccffb0e2680cff28ceef13123ac228 SHA512 1dea3d8545bdb72b4b0acbaf7377404be97630335ec1d22430e2a872c550a45abde63b03cc2105cac70627e0c5b5481448bcedfa0b7702e11ed79f29c2f4b3a2
-EBUILD portage-2.3.16.ebuild 8360 BLAKE2B e86eb44b2dd331f52d308a63d3db0f94dd2873ba1fba84d9f3a2d0420a18ee656765238c4da0025ebc329a1b42025ab2f665b9374f757e3b7a40b67af2391564 SHA512 993dca2cc7a1b1d102507f11945922cc403771055dc273c10e92b62c55b9f47e9b32136a8d958f66de32476b2c60ce4d211e69cbb1fa7de7003ca0c658944025
 EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20
 EBUILD portage-2.3.24-r1.ebuild 9269 BLAKE2B ba60aee1fba595b80a91ee183275cd0b29d13fb78281c8d62a5b5509a557f8ddbfbd6a641fb2b7c6bc7459f35bd12574e396355363574fc1463081a8e42d22fc SHA512 a2938faf430e68a03bdf42bdfc00ee08392e18bb07ecb9b43dafca26572c0e64b3e74e55fdc8b63d85b3f2cca686df431714ddebac78163586c36be620eee1ea
-EBUILD portage-2.3.26.ebuild 9279 BLAKE2B 3d8fd9527d24aed70be755af64e7b782eafda0172bf7e12a31be3660d435d687d0e834077a76128350a8275679d7084ca4e18c9c1593d2f8da53274ceb6b4b28 SHA512 0a9b7d938952ce2f3c8856310d211f7eb6e0bfc996b11a26954c1efa9604409a627d8aa83cc4800480a77685c004af2c1d0c49113c0b6bedc1bad9c46be093ea
-EBUILD portage-2.3.27.ebuild 9279 BLAKE2B 3d8fd9527d24aed70be755af64e7b782eafda0172bf7e12a31be3660d435d687d0e834077a76128350a8275679d7084ca4e18c9c1593d2f8da53274ceb6b4b28 SHA512 0a9b7d938952ce2f3c8856310d211f7eb6e0bfc996b11a26954c1efa9604409a627d8aa83cc4800480a77685c004af2c1d0c49113c0b6bedc1bad9c46be093ea
-EBUILD portage-2.3.28.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d
 EBUILD portage-2.3.31.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d
 EBUILD portage-2.3.36.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
diff --git a/sys-apps/portage/portage-2.3.13.ebuild b/sys-apps/portage/portage-2.3.13.ebuild
deleted file mode 100644
index a3f111a6dd3b..000000000000
--- a/sys-apps/portage/portage-2.3.13.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_4 python3_5 python3_6
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=( install_docbook )
-	use epydoc && targets+=( install_epydoc )
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
-}
-
-pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/sys-apps/portage/portage-2.3.16.ebuild b/sys-apps/portage/portage-2.3.16.ebuild
deleted file mode 100644
index 0487401d2d72..000000000000
--- a/sys-apps/portage/portage-2.3.16.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_4 python3_5 python3_6
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
-}
-
-pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/sys-apps/portage/portage-2.3.26.ebuild b/sys-apps/portage/portage-2.3.26.ebuild
deleted file mode 100644
index c2e3ea64cbb6..000000000000
--- a/sys-apps/portage/portage-2.3.26.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_4 python3_5 python3_6
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-10
-			app-crypt/gentoo-keys
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i pym/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
-}
-
-pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/sys-apps/portage/portage-2.3.27.ebuild b/sys-apps/portage/portage-2.3.27.ebuild
deleted file mode 100644
index c2e3ea64cbb6..000000000000
--- a/sys-apps/portage/portage-2.3.27.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_4 python3_5 python3_6
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-10
-			app-crypt/gentoo-keys
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i pym/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
-}
-
-pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/sys-apps/portage/portage-2.3.28.ebuild b/sys-apps/portage/portage-2.3.28.ebuild
deleted file mode 100644
index 376030121e07..000000000000
--- a/sys-apps/portage/portage-2.3.28.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_4 python3_5 python3_6
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-12.1
-			app-crypt/gentoo-keys
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i pym/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
-}
-
-pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/sys-apps/rename/Manifest b/sys-apps/rename/Manifest
index ccc048968bdc..3c844d44a48b 100644
--- a/sys-apps/rename/Manifest
+++ b/sys-apps/rename/Manifest
@@ -2,7 +2,6 @@ AUX rename-1.3-build.patch 172 BLAKE2B 47ae1d23ce99ad6ef2099bd6484cfad23a7aa46cd
 AUX rename-1.3-gcc44.patch 330 BLAKE2B c574203c3df6d984de18dda43512ac3f91165789ee6a7525824d2ac0a11403a53e33a31dc843eb295b31c8119ced7bc3f0393482e60003673c9cf83d43d78b80 SHA512 5a40ab4c81b4c197af051e01682f4fbb580b3fea9287539f601b4c07c6155c3aba802e38752566f9d2a41239cf2d20d748bfd64d2f7007eff578344cd12852c9
 AUX rename-1.3-rename.patch 2345 BLAKE2B 7c7e513726d482c8243e64d1f414c242f8f3b49e2a028567fcee0ae2acf65af4e50f63ffb1a3b6b9740544970e2b648e3c5795e5d60224103a776b6f8bd1b08a SHA512 6d0d757c3991448a1937480bb5c1cd219b681e7cbb9b1fbdb27097715cac04b2d2c0bb0b9c77ab2b131f6bbb8e0774f4da5845e815918d4de6faf96f218adb47
 DIST rename-1.3.tar.gz 83854 BLAKE2B 2dedb5f7765f9f44da1efe61b2152c56b2d3731a2787a89677792434663252f4a0f22c3c2703211fd1c7f0017e98a7e566e369c13a4affeeea62843278d9e940 SHA512 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd
-EBUILD rename-1.3-r1.ebuild 909 BLAKE2B f19745cd4b9de20bd1cb205c85931fba29c41cf8045acb6891769bb2a723bb0a2cd96e0ed96ebe5c77ef31ba6265716ec47b5c567b96c2b77f48c37309b6f45d SHA512 cf894e062fb1d57cd665a688e89dcc9c8d18e67c1eea970137399e9926d43dc61731b48acd930cb9f0f54979fc0ccb52c4a55839bb861dfe83f793bc6529e3a7
 EBUILD rename-1.3-r2.ebuild 904 BLAKE2B c622dd555b9ca55842551f472d8f58e889ea075e2bed2ed8ec98e05efaa4ff787c62e5a3eeb76d96dde06b00280d1edf0a54eb866fbaed2679686d53aa8033d6 SHA512 a219a73bae81d3edbb11aa389f621c7d371c8395124eab360ead04bae52a1e3e8cbfd19f7286cb503ea23b2d1957bd6e62cc2aebe07399c4c19cbe81c8b70bd1
 EBUILD rename-1.3.ebuild 909 BLAKE2B 0a2c9bec5c6a7c76e7fc5a8a188b60bfd65738d91c738db2abf56e478269d732c520ffc185f4a67f724286cb99274bf385b9bf6323608e8f8e4cec58a67eea41 SHA512 c7a6f92d25f30982315a46eee0804926d0c65c8f7eba250473ddcdc08935ea2b13b62b4c81fed1a8312156f637d8a1d8418f066f5595bb8e59ccfef3504a61df
 MISC metadata.xml 326 BLAKE2B 0952c4b08788858859a0b53a418f4e2504d8a05ad4623495992fed7983c3f70d7eb40a7e042a6adf2b6785bf1228af302704988dbd715acf2347b67b97701d3c SHA512 5d7e26ff9fa47efcf1728be310c91822d85ef3e521a5903d66c9ae8e6449e72465f5f87a2fecc0a51086edc34a325545a0d40210ed320f56bd34af9db9fa45c0
diff --git a/sys-apps/rename/rename-1.3-r1.ebuild b/sys-apps/rename/rename-1.3-r1.ebuild
deleted file mode 100644
index 56e10c47853f..000000000000
--- a/sys-apps/rename/rename-1.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="tool for easily renaming files"
-HOMEPAGE="http://rename.sourceforge.net/"
-SRC_URI="http://${PN}/sourceforge.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-rename.patch
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-gcc44.patch
-)
-
-src_prepare() {
-	sed -i \
-		-e '/^CFLAGS/s:-O3:@CFLAGS@:' \
-		-e '/strip /s:.*::' \
-		Makefile.in || die
-	epatch "${PATCHES[@]}"
-	tc-export CC
-}
-
-src_install() {
-	newbin rename renamexm
-	newman rename.1 renamexm.1
-	dodoc README ChangeLog
-}
-
-pkg_postinst() {
-	ewarn "This has been renamed to 'renamexm' to avoid"
-	ewarn "a naming conflict with sys-apps/util-linux."
-}
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index d97fe06a60e2..77cdf682e882 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -2,8 +2,10 @@ AUX restorecond.init 650 BLAKE2B 507c65c11f756d5cf11045ba75d40a39a9fb6a527c9e040
 DIST restorecond-2.7.tar.gz 17753 BLAKE2B 793a41dbfd0a33d79e15c62e79f4fbbacc4208a8f2057813d7c3e2d16a3435c12e0c29ca60a3b45cef33ec13b5aacd28c8ad95ddcbf47a812654d3a59fcb6c89 SHA512 c81950e4f748a729c8951b13a4075ab1003530f8ada7a9d3fbe6428f76070df4819a37daaab557b63fc234aa8c8320ec41757fbdb24b76fa2c11747bde0038ad
 DIST restorecond-2.8-rc1.tar.gz 17778 BLAKE2B 7f0c3da54555f1bd015e191ab762d5564e8e40d1aceafa94fc774c0864f9ff720c468679a60869dc94280e89a160369afcdf2172a6aaee1b0ce555dc204cd957 SHA512 9b90485998bbabeb26d1ca197b78dadc2ad4aa15fc3eb30f16809e631009ce07f2a624d8e0c139cb6ea831ff46068de2744168c6ee0414693716b4963c8e3be9
 DIST restorecond-2.8-rc2.tar.gz 17778 BLAKE2B 47bf2f3481dd94b1b63a8d5994f94cbecb99d84835e4c61d133f89e5be42650f69794dae9c80115a73614ec0548e2773c7a03bac33e666ac989badb20d0438cd SHA512 5d35576264b59face6130e97223d815df0f114b3e51d9e5008dddbb31a802763b346bf2f69a8ae8271c5dcacf04235e2ed3de305b036b8108b76f4951ff2d126
+DIST restorecond-2.8-rc3.tar.gz 17773 BLAKE2B 23492c3f2a8aa8b85236e4c4ac4e8f1dad090d7b1585e5ffe26face4f3b689a6a083944f107ca1fc2241a35f5373699ae216828ec8e44f37bd7dd28ad60546a5 SHA512 1e52a2767e497d43125202ba66799c556b6a2d521ec6d747f96208e3b1d2c4bc8f7f28b3ca86fe47c0e0a2daac1de811a0630f02196a4c9502868a8c5e571dfc
 EBUILD restorecond-2.7.ebuild 1250 BLAKE2B 7ae1b18d0eb9906ace64c5e2191c894fe424e69fe4f38f14238b3706c426a8272ea7f35ba5237a3375f7329d2140b78c02161cc855460e70f09d7c3f4850a51a SHA512 c5bbc404f56d756897433561485a6c90d5bdfb70958181cf5b670bb4a3dc9b428f91b8960e0960251d7acdd35f0e9b6141c5f4056f90d934a913b5b5ebfc6af8
 EBUILD restorecond-2.8_rc1.ebuild 1167 BLAKE2B 448e2bef9436bf28d3f77496845a7a7dd4a814528f6c06fb69710c5005483da5c6d509904b2ca1dd74c60b8926db9a1b5ece0e10e28fd32bb394b91d616f6ae0 SHA512 1024de33914bebbffe48aa5870d076ea76e6afa4abfabd2d3afd813977f3add30cf0efd29b2e360ca7a4bc26b9d13c445c81c23a5fc3ba9963ff195ef2174be5
 EBUILD restorecond-2.8_rc2.ebuild 1167 BLAKE2B bfcf47b777ded91dff77cb9beed7e627f87162a896ccc498d5ced9bae693bb3c8c6c748d8808f89bfbda11224f7fe5f046f50d0f75ff0a86c9097d148429bba1 SHA512 81b6880c7d16cc31b066930cb0c23f27454d10c558169fe1963339629f26a0718f1534f0780200053932e8df4b45c2e6460664e124a054a25c8570e7376f605e
-EBUILD restorecond-9999.ebuild 1167 BLAKE2B bfcf47b777ded91dff77cb9beed7e627f87162a896ccc498d5ced9bae693bb3c8c6c748d8808f89bfbda11224f7fe5f046f50d0f75ff0a86c9097d148429bba1 SHA512 81b6880c7d16cc31b066930cb0c23f27454d10c558169fe1963339629f26a0718f1534f0780200053932e8df4b45c2e6460664e124a054a25c8570e7376f605e
+EBUILD restorecond-2.8_rc3.ebuild 1167 BLAKE2B 806ca12e275725aece6b45965c46b9c8307b7b1515e7f08d69759c433917b2c3062b0dd5aa04c4004abb62876fa80ac7e90b3759566d7d8ea24660517eb1f65e SHA512 1569e398dc18c06e86630fb5a1959214898b08368868cd08f79c7afb3c7ba8a749cf3ae179018b6d7a01deb1aad5c160df3db2446758556eea31b5e136811469
+EBUILD restorecond-9999.ebuild 1167 BLAKE2B 806ca12e275725aece6b45965c46b9c8307b7b1515e7f08d69759c433917b2c3062b0dd5aa04c4004abb62876fa80ac7e90b3759566d7d8ea24660517eb1f65e SHA512 1569e398dc18c06e86630fb5a1959214898b08368868cd08f79c7afb3c7ba8a749cf3ae179018b6d7a01deb1aad5c160df3db2446758556eea31b5e136811469
 MISC metadata.xml 460 BLAKE2B d0de63ca5ac8e0c1c061f418ea9dba5472644626bbc5799499ce70ff0c2d1c7e49b023e3855cc7c767e78f5fb6f62429f5aab59dd272d9a906dbe026895e2e46 SHA512 0e4910de5e3932eb2914ddf4ef3250ae919885428337b1939f6827037a4dc5a75b13c97531c7b81748b1c90e3eb2b10a4671c76ede69749dbd1955bc67b5ca0a
diff --git a/sys-apps/restorecond/restorecond-2.8_rc3.ebuild b/sys-apps/restorecond/restorecond-2.8_rc3.ebuild
new file mode 100644
index 000000000000..968d6b3de58b
--- /dev/null
+++ b/sys-apps/restorecond/restorecond-2.8_rc3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_RELEASEDATE="20180510"
+
+MY_P="${P//_/-}"
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:=
+	dev-libs/dbus-glib
+	dev-libs/libpcre:=
+	>=sys-libs/libcap-1.10-r10:="
+
+RDEPEND="${DEPEND}
+	!<sys-apps/policycoreutils-2.7_pre"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/restorecond.init" restorecond
+}
diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild
index 1f417fd9bef1..968d6b3de58b 100644
--- a/sys-apps/restorecond/restorecond-9999.ebuild
+++ b/sys-apps/restorecond/restorecond-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20180426"
+MY_RELEASEDATE="20180510"
 
 MY_P="${P//_/-}"
 IUSE=""
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index 4fddc972de90..9445eed2fa81 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -2,9 +2,11 @@ DIST secilc-2.6.tar.gz 174543 BLAKE2B a540fc1b0e1821bb5177be57904602280ec8808c1c
 DIST secilc-2.7.tar.gz 175733 BLAKE2B dfad83618f3dd14f4a710d27b6ff3dbe188c9e1eecabe29dd16d9b0ba35a2aa2c5777d999fb378159624f7b7af9af152592e69f9212d2ae6dc6e52dbefcba056 SHA512 cd828ad34e80151951f94414d27246b480cd4831d1d57cb35d5958ce23c30fe74f26ec1c4b29b51fe382bf03ec3144311b35ca645ffc6b914b7abfe677684c06
 DIST secilc-2.8-rc1.tar.gz 175892 BLAKE2B e919e7a519c02e4ff467aa086e1112d26fe2e32d30406ca34859703158d51b473353cd8b6c9825dc824f6fc09774993ab6386390ae2f9262f5afc80a19ca08fa SHA512 c4ed860b4a35bbd4d2e9f20810deea8f8158825e24d55d97c122a8ffda0a7c8c16d84f966e923b371359c807620308e2c7fc10bccb384a94216a7b92d756ac13
 DIST secilc-2.8-rc2.tar.gz 175891 BLAKE2B 15874f9de10c9cfcd063e9b3aa1c75427e3953fbb1b21127a5af3f1e49b34de59b01e5a813c6b82eaf38a4443b5aeb7d9669018c09c7a2d7a3552ee7a3a6be80 SHA512 b08990900817ac0c334ab59c70d88acd491e8203cbdb8a0fedd2c044be61fbafd8ae86fda1d32a87e605676c6f8cd123b2716de2920b8ed0efb8b05b4fdd0eff
+DIST secilc-2.8-rc3.tar.gz 175888 BLAKE2B 4121c26b1d3f9479aa1fa2a5fbdc54944ff2040864bd65160b78c4e0b0e3f9e1a48c2903a5273e767ac7389152b46c5c65d94ccac5fb2b4f0f17ed63f74c2939 SHA512 ff457379e21362e102596a1619f77b42570634871427134e380d004b6711b327693339dfa52dda777b984f8019f56b4c056bf0f84f76173119b2ecedb03f73fb
 EBUILD secilc-2.6.ebuild 856 BLAKE2B 4366abf0099faf79a5daaa7966c59c6d42b4bfb4728bcffa6ae584bb9b3e22dfc5cde71e47080c3e9ff4ff534612264edb690877892bfce83feecc370b5fa417 SHA512 062650227a2625af512e415b5f9f85f74f3045962637ae543bfa0657312ae655532deb86932952d025517cdee7b350d294896addcdea55c55f559c23391afbf7
 EBUILD secilc-2.7.ebuild 922 BLAKE2B 0316d98a09d332cc1781f25776e6408fcac8cc4b3d3fa76ed0f1e897a7aa1bd7dcde16ac55f200a04e941d5dec63e6cc8f6c319ae0f2f96d6b828e5ea63b898b SHA512 dc913463e0a5d9c3367712c4e4d7a096b0ae84d0e188086f3328a66d081a92e45f2f12df86e8d5e7e175e9196ac6c3a3acbcf29870ca04f5e23aa8aa46715b28
 EBUILD secilc-2.8_rc1.ebuild 924 BLAKE2B 302d7ca0c5797aca16b8007e4002c75cf0802970c46d801a4b9302ffec74c886883ddf92f40971c5817fd6d6b5e679ac82a743220554df78c4536160c1893362 SHA512 06b5ccac475056c11f8281a48f1ae280bb61798c68d3a6242406da12b810a9cca912af0e76dba17236f7b68f1581650b325f34352db6d07a3ce335f45d5c1a66
 EBUILD secilc-2.8_rc2.ebuild 924 BLAKE2B 9be7580bdd9e1e6068d59411005b774b41e83c52225c3b7be206b0e0b8f548f69347886f11bb7b746a1a4db92f9dcd41aa293daf17a201f6f9852414b37dc125 SHA512 ad506e4a58ebee554ce62ec740c2f6b99b7bb105596895edcff702773ff1ee7fdb3ea999863e308c354c360cf20942c4ceb6a235811adf1d3dfaeba2f22fd7d1
-EBUILD secilc-9999.ebuild 924 BLAKE2B 9be7580bdd9e1e6068d59411005b774b41e83c52225c3b7be206b0e0b8f548f69347886f11bb7b746a1a4db92f9dcd41aa293daf17a201f6f9852414b37dc125 SHA512 ad506e4a58ebee554ce62ec740c2f6b99b7bb105596895edcff702773ff1ee7fdb3ea999863e308c354c360cf20942c4ceb6a235811adf1d3dfaeba2f22fd7d1
+EBUILD secilc-2.8_rc3.ebuild 924 BLAKE2B e6180aea71db97e89bb322be9e6e7ae4574554d61188e085fd686a8272ca41a0816bfc243952395d75d791df54df1cd06ff1bdf6c19c04551d9689ddf7be7b0e SHA512 bff408e870e17227dc055c865131dccc46628e0d1115135ae1ca3f5ae16c5073a2e6322b5ac4321aa7e2525319a6ba5a1cedf8fe746985b9ae0b1b70a7258dc1
+EBUILD secilc-9999.ebuild 924 BLAKE2B e6180aea71db97e89bb322be9e6e7ae4574554d61188e085fd686a8272ca41a0816bfc243952395d75d791df54df1cd06ff1bdf6c19c04551d9689ddf7be7b0e SHA512 bff408e870e17227dc055c865131dccc46628e0d1115135ae1ca3f5ae16c5073a2e6322b5ac4321aa7e2525319a6ba5a1cedf8fe746985b9ae0b1b70a7258dc1
 MISC metadata.xml 517 BLAKE2B 69224c0360ff5acd98dcd493463266090ad17693588e91a434e412460352594673563388b52eba5313c7a9aa3b745d916f089805fe88ba8270cef1528f1fe13c SHA512 457ff97de6f9c6992a025588a5af5692abfc38a7df8537de2006ac841989a9b7e566b796b16d304252ad03cf66f205dd3a4fb0218281fd551c430c58b9039310
diff --git a/sys-apps/secilc/secilc-2.8_rc3.ebuild b/sys-apps/secilc/secilc-2.8_rc3.ebuild
new file mode 100644
index 000000000000..6587d7e6b168
--- /dev/null
+++ b/sys-apps/secilc/secilc-2.8_rc3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit toolchain-funcs
+
+MY_P="${P//_/-}"
+MY_RELEASEDATE="20180510"
+
+SEPOL_VER="${PV}"
+
+DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	app-text/xmlto
+	>=sys-libs/libsepol-${SEPOL_VER}
+	"
+RDEPEND="
+	>=sys-libs/libsepol-${SEPOL_VER}
+	"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_compile() {
+	tc-export CC
+	default
+}
diff --git a/sys-apps/secilc/secilc-9999.ebuild b/sys-apps/secilc/secilc-9999.ebuild
index cbce8f70e767..6587d7e6b168 100644
--- a/sys-apps/secilc/secilc-9999.ebuild
+++ b/sys-apps/secilc/secilc-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20180426"
+MY_RELEASEDATE="20180510"
 
 SEPOL_VER="${PV}"
 
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 63680d1ccd99..9d6d2a6574e8 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,8 +1,10 @@
 DIST selinux-python-2.7.tar.gz 2068004 BLAKE2B 57c7f324a8faddf57a576f9ec5c46c8dbbd085a3aff4355df645b0f391a0c2db718e8adb2719515cc4a9c386e11c3df053b5303d3f91ff4958fb91e80d440b51 SHA512 df8645e7ac9ca568f0c9d81c42b93d0abadc43c22f14d38451ab262b52132cfb7abd7742e3a00ab9c153f95dd5b23b3a496d84875debcd9787f75d940eb45c28
 DIST selinux-python-2.8-rc1.tar.gz 2068420 BLAKE2B 7c00bd05cb692ae31e11c5d415641f5ceafd032882a329984a495b353e8e7272a87045c732e10a563cd0d33faca81fb373cee3d0671bc6699b6f007148f13d7d SHA512 bce5823ac4c24f1bceae9219a07fc9e6192d703e044711f9dfc170946dde411b833cb7a6d0c175e569efcd878a75a8df33dda0498e3da888f60b7adf9d5448a1
 DIST selinux-python-2.8-rc2.tar.gz 2068421 BLAKE2B 1c1564f9eb281f896a794a5086ef09e91486f8ba7d404de14b0de78f3ec4aa9c3a8293b24988b80289e4e9e186b06184e8016a1ec936d6d76f17db0c3ef22a40 SHA512 5a3fb2131a12850bfe5beb794083c97507fd3f43d87674cb7050fd33ea181607077a9e004cf983918bb5b349ed22b02f3c681f2a1f72a64ee93bd49fbf40bd32
+DIST selinux-python-2.8-rc3.tar.gz 2068452 BLAKE2B 37e25ac52ea157f5bb360d1391ad17c59c9dd74eb3cab4053bef0aef98b38d2e0eb2c79bb468591b91462494788e11b0b445ca123a291e4875bbf4af9ef326a0 SHA512 0481891563df1872688d881d11bb498cbd402f7b31eb674fb83526e9fa391907b424be3df5da0cef17e053e3aca3200333bf90acfe42f7f58929f322ad447ab3
 EBUILD selinux-python-2.7.ebuild 2673 BLAKE2B 14692ea38d55be1eb9b17dde7b4f1c7195139543347314896527c442931812bdac4524cd75c66b654d9b778ed4d6d213d21f2b8b1f3dc424b4bf8101da08bb07 SHA512 ad6d6047b551c82464d58de569cbe7c4137d0e5c87125164690bab4aac5bb48fa01059e31e1cb6de99a0abfd942c7294fefecced7e4b19d8dc4715b398c788c6
 EBUILD selinux-python-2.8_rc1.ebuild 2585 BLAKE2B 5493f174730a4905b9110f7eafc0c1e3bcaac09ca592725fccd4624aa47649ec013043828707a290f7cd39ce261fb91200b0a1fa21cdd014213f111bfdfa5d62 SHA512 ed7617917eb838f0a40cff44b996e3f2de5760ad8aa199cb710eb7d5e145de4b27cf056911da424dd9944c64b44c24beb599b6d1c07793d0df888b61afa5dfad
 EBUILD selinux-python-2.8_rc2.ebuild 2585 BLAKE2B b2707890a99d88550aef69c068f1fe50f645770d856540470bce968cad32ad777e118486cc16a8c6e7bd00b6dc5b0c02ea4f751ad599c76cfe8061d5eb138368 SHA512 27c8b1171fd5d40e5cbd8ba417e6927cffdba8228cb362f7df9c95c22e6f55a0e8d2e8a3b743c05bd3eb66eecea68a056a5c8f055d4f6bf52968e23138af00e7
-EBUILD selinux-python-9999.ebuild 2585 BLAKE2B b2707890a99d88550aef69c068f1fe50f645770d856540470bce968cad32ad777e118486cc16a8c6e7bd00b6dc5b0c02ea4f751ad599c76cfe8061d5eb138368 SHA512 27c8b1171fd5d40e5cbd8ba417e6927cffdba8228cb362f7df9c95c22e6f55a0e8d2e8a3b743c05bd3eb66eecea68a056a5c8f055d4f6bf52968e23138af00e7
+EBUILD selinux-python-2.8_rc3.ebuild 2585 BLAKE2B a431576fa2251512fa4722238d40a7226ba7e448bc558cd1eb4b59415815796d6c9a10cf95b3ecf88831b25c2585b3dedf4cf7da76b1bea6fd43b2c7e151834c SHA512 cc6c35e9a3118f49545d19a319c38ac9469c0a7516dada311c6fc4ef4ced05199540528e0b3a84997c4c09a4a87ff34c98e30355bbd80f6ef5bb5f485c7f57aa
+EBUILD selinux-python-9999.ebuild 2585 BLAKE2B a431576fa2251512fa4722238d40a7226ba7e448bc558cd1eb4b59415815796d6c9a10cf95b3ecf88831b25c2585b3dedf4cf7da76b1bea6fd43b2c7e151834c SHA512 cc6c35e9a3118f49545d19a319c38ac9469c0a7516dada311c6fc4ef4ced05199540528e0b3a84997c4c09a4a87ff34c98e30355bbd80f6ef5bb5f485c7f57aa
 MISC metadata.xml 718 BLAKE2B ca11527a8722aa1c1f74f1731409e950f866094492f15e9345c117622da63f06bb5681e806545083200a494d3b65f0c4f31e1454aea5fed923f438ef01aa91af SHA512 a45a1c3e516dd956e60be67ddce632d055a98ff0fb45b920adfb5d1253da77822286f9742865027a47e94386dad2a1478a5b51f2bf9a97e2c2571470fdb34e04
diff --git a/sys-apps/selinux-python/selinux-python-2.8_rc3.ebuild b/sys-apps/selinux-python/selinux-python-2.8_rc3.ebuild
new file mode 100644
index 000000000000..6fc19d34339a
--- /dev/null
+++ b/sys-apps/selinux-python/selinux-python-2.8_rc3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit python-r1 toolchain-funcs
+
+MY_P="${P//_/-}"
+
+MY_RELEASEDATE="20180510"
+SEPOL_VER="${PV}"
+SELNX_VER="${PV}"
+SEMNG_VER="${PV}"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN#selinux-}"
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
+	>=sys-libs/libsemanage-${SEMNG_VER}:=[python]
+	>=sys-libs/libsepol-${SEPOL_VER}:=
+	>=app-admin/setools-4.1.1[${PYTHON_USEDEP}]
+	dev-python/ipy[${PYTHON_USEDEP}]
+	!dev-python/sepolgen
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	python_foreach_impl building
+}
+
+src_install() {
+	installation() {
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	# Set version-specific scripts
+	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
+		python_replicate_script "${ED}/usr/bin/${pyscript}"
+	done
+	for pyscript in semanage; do
+		python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+
+	# Create sepolgen.conf with different devel location definition
+	if [[ -f /etc/selinux/config ]];
+	then
+		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+	else
+		local selinuxtype="${POLICY_TYPES%% *}";
+		if [[ -n "${selinuxtype}" ]];
+		then
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+		else
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
+		fi
+	fi
+}
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index 73a4652fbf63..6fc19d34339a 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -9,7 +9,7 @@ inherit python-r1 toolchain-funcs
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20180426"
+MY_RELEASEDATE="20180510"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 SEMNG_VER="${PV}"
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 63cc0854909f..c05570b8607e 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,8 +1,10 @@
 DIST semodule-utils-2.7.tar.gz 15447 BLAKE2B 44c28ad634ef2ab9e478edb58020547c217a01be0aa75cf3a2432be419efb626f0a5742ba1bcec50ba11c132c207a42c05836eb2749e1f80d4a8142fb9e34a9e SHA512 5c7c2a2224949f50c1119edba90d937363e22af52a38f06525e957b29f5310a3e3444d03980b2f808ce995de0f9fc0a9dca8b6167bbfde29c1a33b9bc786d3c8
 DIST semodule-utils-2.8-rc1.tar.gz 12543 BLAKE2B 99dc8fed5df4a285435aa9c27a38fe2de15d02ea037f0c53b1402940ef7c84c0b6d28237f87adc4482125fc8e7a454042fac62a3a4811de38b55665ec90d9a3d SHA512 489ee453a5c0f6bac754f8056f738c32a815fc055daa2c1fc93c63a5e8a4c5cf017e3d687a4ba432bef0a789ed972c1a90bc56487b4014b486c0bf7ca079c565
 DIST semodule-utils-2.8-rc2.tar.gz 12547 BLAKE2B 68ca9dd5afc640070f6a5b6e7a30049e7802aeb7bf5239e59ff8a9aaa9825dc04ccf131022d604f858cd8f7adefa63715dbd95ceda95ca40765556b916b282db SHA512 31844fcf4389cd20b9164c6a11fdf914e51dc27170e5e083929376840e1135c3193e00a4abdcc24f99b98b815371f63167ade9d6de483f3ae3fdf7b04f76cb2b
+DIST semodule-utils-2.8-rc3.tar.gz 12546 BLAKE2B 67b28736793ee52bbb6fd3a7ed416d80878d9e276c2467699822ada5039a443a3f54d84aea7a663bbfa1e9632fd46e47b4558d710bc8b9ff8e8633273dba1ddb SHA512 8fd81a3785c6e47c6a4639850954603edd6f4a364928eb706f37a9f1164f8b2f7e8af5b640647bdb0c1e961a973b9dc5c3020edb870a6b4b5f9d079d718bcd52
 EBUILD semodule-utils-2.7.ebuild 1123 BLAKE2B b94f20dedd85eabdb4cc9ea37ed8060ce68f044e3a463f1d255cdbcda0e0187686d8d3c2b6be0f0339eb034a04e2c42050eb1633ac0e9546f4436e4585a34e4d SHA512 66d018f1a8a2c16f6083972fb80d14806cd2671ab8150fd676fd164d21bfef12d43eb70b1f1e99a972f15cc19ed0c78d518788a79ca8805f9ce31dae9d10a38d
 EBUILD semodule-utils-2.8_rc1.ebuild 999 BLAKE2B aa472a9c8c3c0d38578e26dfeaabb08147a2dedd2de3be97689c97a287d0146de69affaeb84c5b01489c9825e3b66712d741db2f949f8807141ad3128bb703bf SHA512 099d9b7c0b2b5c98b0ddfbb6b9e4191b3cb84664291e3c639b231de3b2d17718b82e8e0cd7ed7016b7255a8df60976213124cf868665c10369945b76b4dcd150
 EBUILD semodule-utils-2.8_rc2.ebuild 999 BLAKE2B 20b0b55cb4b059c56a3ecf1c3e48af61f1b0cb069fd26432d09f6e32c529eb25b5b9bdd80101ce151cd7763f27b788df112255b48f4471aa184d6b88e486367c SHA512 9420041471418f1ee38ec8c2e854010b6856d0bdb9eee79e43406a9bd882bd89062e6eb8d3e44d588d48b2ac6f71d8a50831c803726e7c5715ca1d7608b1bf19
-EBUILD semodule-utils-9999.ebuild 999 BLAKE2B 20b0b55cb4b059c56a3ecf1c3e48af61f1b0cb069fd26432d09f6e32c529eb25b5b9bdd80101ce151cd7763f27b788df112255b48f4471aa184d6b88e486367c SHA512 9420041471418f1ee38ec8c2e854010b6856d0bdb9eee79e43406a9bd882bd89062e6eb8d3e44d588d48b2ac6f71d8a50831c803726e7c5715ca1d7608b1bf19
+EBUILD semodule-utils-2.8_rc3.ebuild 999 BLAKE2B 83ddb3c2961e56067dfbf6c51ac00d2ff08904f1f86aae0cdd455dc548fa2d252ce8637b777fb7120a4313731bf7e48b5980864a6972678c083447d0cc6bf08a SHA512 79b73c77385ef2c3a726b58f141ddd7f72c3d6d244379690f5d60afa767b83ba91ae906545206d3c786a58a2d6533b6c3681b2c231683a28fb65e1f8cf5842fe
+EBUILD semodule-utils-9999.ebuild 999 BLAKE2B 83ddb3c2961e56067dfbf6c51ac00d2ff08904f1f86aae0cdd455dc548fa2d252ce8637b777fb7120a4313731bf7e48b5980864a6972678c083447d0cc6bf08a SHA512 79b73c77385ef2c3a726b58f141ddd7f72c3d6d244379690f5d60afa767b83ba91ae906545206d3c786a58a2d6533b6c3681b2c231683a28fb65e1f8cf5842fe
 MISC metadata.xml 521 BLAKE2B 5785152e6b947a78aa09c12816bdee5f0c93e718d0a3cb9244b1b769dab19bb057db91c49179990d06e8cfc6bac692b5223ddf2137ea043a13ee58c41b2ade1d SHA512 e15b382ddf7059ff9c82887d636522dcc993e580e715d4a822106ed27c7fdb75b32e96c8c32a34cbdbbef4ad0f9c49bfb7c7420ea97852fa82e7740c4044a689
diff --git a/sys-apps/semodule-utils/semodule-utils-2.8_rc3.ebuild b/sys-apps/semodule-utils/semodule-utils-2.8_rc3.ebuild
new file mode 100644
index 000000000000..d209000bef66
--- /dev/null
+++ b/sys-apps/semodule-utils/semodule-utils-2.8_rc3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_RELEASEDATE="20180510"
+SEPOL_VER="${PV}"
+SELNX_VER="${PV}"
+
+MY_P="${P//_/-}"
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="SELinux policy module utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${SEPOL_VER}:="
+
+RDEPEND="${DEPEND}
+	!<sys-apps/policycoreutils-2.7_pre"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		install
+}
diff --git a/sys-apps/semodule-utils/semodule-utils-9999.ebuild b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
index d814b41b424d..d209000bef66 100644
--- a/sys-apps/semodule-utils/semodule-utils-9999.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20180426"
+MY_RELEASEDATE="20180510"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index e293a8e3bce1..8308c4e88541 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -7,5 +7,5 @@ DIST shadow-4.5.tar.gz 3804933 BLAKE2B c4714b7fe9a1af5a5751d4274e70e7fb31994cc40
 DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714
 EBUILD shadow-4.5-r1.ebuild 5405 BLAKE2B 7518b3700adf543a619413066415f64959a50efbbe669b28622e8d2d4cd749705b256c62e3ba73a88e6f3c0d6c195c87c377e7541e165ccbf4328ec5f4b1b0df SHA512 a50352c9b189d5265e921e977acff5c96dedef2634b046f66b376e6d6e2fdab40b629e453695a3153dd1edb13740e94d6d205daed544b3bba885fd35dbb7251e
 EBUILD shadow-4.5.ebuild 5324 BLAKE2B 7e31b15f14edc3434fa1acca45a5c4955f78e5794d342d09834a0f9dbccb16c1d71e83952fa971a71f03844f6868fa81b16da7b473383156f10cebb2432b0ea8 SHA512 baa289b709d84f9b056d2415ed147d0bf80bed3e3645ab7738617693d7b8ada235410cf95c1d944044125bbab79f9feb101bcb1cd2d74eb33fc709346711107d
-EBUILD shadow-4.6.ebuild 5355 BLAKE2B 4d5a033afd28deb0c705baa314d41ef83a5fa81e5df9c8adf842147afba4cca5d53391e586931466152a64975beb297a89ed113d2cdc8e6eafd236db3b8a0271 SHA512 95459990bfc11ee4f6ed0566b690d83c6e54f15a348689507a8ad702ef542f4aa9013fbc810ef2ec6976b6e6061f34ce2f8403616d2cb6f195d82cbb5cf7f7e6
+EBUILD shadow-4.6.ebuild 5354 BLAKE2B eb7ac514ef34198192ccb8f9a2a173d1e26859fe1c329fbe396cfae6cd9944d0956efa03ab1997d9dbdac11e3e7671c302832fe32ed0f9b3e1cf015dfa80dfd7 SHA512 a7d03338be86a296886340a33f90342c5c1f996947ae05ef7c3bfee9cdf5c5e4951b3918c0a44b4b555bc809b10b5f26b2829df081e8b1e274e21d96a0dae4bf
 MISC metadata.xml 565 BLAKE2B bdd91116c16f590eabb6f18f05a4f72b55651383431c78fb07c27b23e7152b25816895e2ae3e2afd1ecd6e2b9fa9dd0005d198f2ab7ee2061583b586e4c44b01 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469
diff --git a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild
index c59105cb1638..2332de5703a5 100644
--- a/sys-apps/shadow/shadow-4.6.ebuild
+++ b/sys-apps/shadow/shadow-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="acl audit +cracklib nls pam selinux skey xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 79554f871d0c..e26c79986d33 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -18,6 +18,6 @@ DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b
 EBUILD systemd-236-r5.ebuild 12921 BLAKE2B 4b8df5c5939fe8fe9dd814228eebb7d9419564ed91643353955edfb95290d2423c7291564c690a75fc48035de1c45fb5441a0455beecc3964f3fa187d4b8a4eb SHA512 d0cd0b8c31b40322227db7f4a5621d0e1ae73e1bea30e5ee0b88de14c0b1bad2d05c53a3c86c77bfbe16325556e5108198514974a428dd5c0cd56f4583663c18
 EBUILD systemd-238-r2.ebuild 13145 BLAKE2B 026520104d0f8fc395bf19b1f04d0a5f46a22dcbbc02dab148469f8c88ec7ab9c80a2d8416d594cc3161c71f794c755db37ee71bbe0d51061a7f1b9df3dcc22f SHA512 8183c0bc11f9385721f02fbc6da07eefdacb84f18eae71fd01bbddd8f6c4aab8f7c9f015fc3bd8a54acc6394c2c9c77656360e2986712c2c899bc54cb977cdc4
 EBUILD systemd-238-r4.ebuild 13047 BLAKE2B fe8bf96af2b3e665151c4118721ffd60e2b84991883d06fd75134e49ab92b455c7c190a9424228769000addb8d2998530037e15938e5f8669a90844150b59b5d SHA512 e384cee4eeb6ae614725131c2a61f75950060ebfc04f970c19583b093d1ad93fe95d7084cc9014e68a557fe5869ed7706f2addc7a5badab7af8927fa0174d4b6
-EBUILD systemd-238-r6.ebuild 13050 BLAKE2B cde2f02fe5711d80e4caabcc93cb5cbb76987305116f0dc4676b9433d0d3bc7fc4292f210e0ab9023351cc060c7fee6bd59f8b7ff23ef7c0662f22f61b87ca52 SHA512 ad8b56b5d219b03f0a73adcc132fff250d59428b914f32b8c3d47bd982a6ff81d920bcd81edbca537d2397e575bab94812f69cf71fc316e1ae045217a32bf0eb
-EBUILD systemd-9999.ebuild 13059 BLAKE2B da423d06afdca5e08107850f4579d903560d39617d580d883cdef8655b474491e13b9b93d4e4e336b579f0a2d0f7ac7814c87b002bc561903b9b5f0695ca01f9 SHA512 446f62913818c097c2da05e641d174295e59542ce83a76423f41a3118343877e8e9b56b3f6ad3faf7144847f35e07ca6c766f216ef3805a8130eed15355c084f
+EBUILD systemd-238-r6.ebuild 13048 BLAKE2B 036f9063aae1a4603dd1d0f0c9912f6825f9e91fe0b66eb3e59dd8a32f36c34354b85c589d0ecdb48b951ad6d1c500f006ee74cfee0d92e9bf035883e036da15 SHA512 6b399cd79e6ba975fb62645a559c07e3bfe85c4cfd46f69a7dee421ea6ba1f0a5c9f87c0495761bce41a0eadba8d1d9a32baba47eb5757e3128b6be1d2c837ce
+EBUILD systemd-9999.ebuild 13063 BLAKE2B 326c2e60a6edbf8b30759c3fedeb339e35acd6a091611a7725f31fe4f0efa011ee142bf6cfb16a8f11bb2de90628d505ddc1ceebc433d6ddff0cdd70f89b7913 SHA512 9878d1d0291cc31115f41ba134b839bf9e1e2334f11a73f9286b44114f0cb9e9c1f3f1d291856068c6cf610ef384b5de82e8c1825111e1f7e564110bc095d84b
 MISC metadata.xml 2036 BLAKE2B c2f3d74c0cdcf1a5d850c31d43085ab441523e025369c9ad07d9e518d01c7c585c2019c4365892dd6b395c1b4eebc3c7f31c8948c13cab78acf6a2f9528f614c SHA512 72d9f1db3a9cf681a7971d9ded4d73b8b56bf7c467e453f7599293bf3761c66daa7e80716b5c70adcd18a181521f6710267b92df78e8e9a3430a340f8d33fd47
diff --git a/sys-apps/systemd/systemd-238-r6.ebuild b/sys-apps/systemd/systemd-238-r6.ebuild
index fdb75ee3a4f3..9766434cbd96 100644
--- a/sys-apps/systemd/systemd-238-r6.ebuild
+++ b/sys-apps/systemd/systemd-238-r6.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz
 		https://dev.gentoo.org/~floppym/dist/${P}-patches-1.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 ~arm arm64 ia64 ~mips ~ppc ppc64 ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
@@ -43,8 +43,8 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 		ssl? ( >=net-libs/gnutls-3.1.4:0= )
 	)
 	idn? (
-		libidn2? ( net-dns/libidn2 )
-		!libidn2? ( net-dns/libidn )
+		libidn2? ( net-dns/libidn2:= )
+		!libidn2? ( net-dns/libidn:= )
 	)
 	importd? (
 		app-arch/bzip2:0=
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index dd80472a4804..999d766f966c 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -42,8 +42,8 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 		ssl? ( >=net-libs/gnutls-3.1.4:0= )
 	)
 	idn? (
-		libidn2? ( net-dns/libidn2 )
-		!libidn2? ( net-dns/libidn )
+		libidn2? ( net-dns/libidn2:= )
+		!libidn2? ( net-dns/libidn:= )
 	)
 	importd? (
 		app-arch/bzip2:0=
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index fb19d832692d..cd0b81124685 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -2,5 +2,5 @@ AUX usbutils-006-stdint.patch 701 BLAKE2B 511a0466d35f452c48bf6490415f1fdc3925fc
 DIST usbutils-008.tar.xz 287052 BLAKE2B eb9b998adb69938d004828585f782840e34f453327de54a32c563268db22a870fd7298cf839692e58ae42148e63037260e09bc2f1d5700ff96bcc451aff626ba SHA512 ab1ad36467ff79ff5ab0b924620001612cae44def58c05ade01a4e58d8a4d48df61c09faba49a20497b7d6314045bbaf137b51a9f4e6b65ed0ea3bb339bf1c45
 DIST usbutils-009.tar.xz 309608 BLAKE2B bb5d7f756241377e81aa8f5b074bb0ba36bc778698afaebf7054cdb153149e4f3808a7b172019434756cae8b33410643cd6a03a36277f80ead9b0f4446385fd9 SHA512 e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a
 EBUILD usbutils-008-r1.ebuild 1244 BLAKE2B 65d0f771202bf1e39d243c6f46d3f45d818033b7bd40ba198e834038416498a68e329c7182ec0ba756479ee6bd54aac11556e4513b44baa98c0dcee320b1801a SHA512 5384707b65c9801744ec1838e94396ee421ea007ec25c5afc1503134c2d7bf0231fdd1d9dce8b6af9892177b1dbe16b30303c810bb4e1d82b2082c2f32fe5964
-EBUILD usbutils-009.ebuild 1152 BLAKE2B cc7459375d513b95711458d9b85ff4795d44ac8df0ab69d2a7ae438024df8a921d7cff088f7605206948114755aba77ec975e803cc0deabfc7bef54217510a35 SHA512 368e9dd1dd676714e02c5642b432c02ea1001f9922e3f88b1a576ad84d3e8b226b0cc4b197091f09502f2b31b3c184feba86e40e4b7174b4c69861932cf29010
+EBUILD usbutils-009.ebuild 1150 BLAKE2B 6d32e478cf57e97d44f352c785c5f2d2690de91b99566024d455a63cd8e36d762fc63516b2fddcbfdfc05044c7627550224a631a253e02535089bab34bd7351b SHA512 5c8a91a7d257b5dd8a9fc04fe52a4138756ea203d53b7912710cad0ccb8ce81a031e6306ed11d55daef0a7257641f54b6ad33e6a59662d9db7fa3420f16d5765
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-009.ebuild b/sys-apps/usbutils/usbutils-009.ebuild
index 346aad85a663..6f8799ca0b5c 100644
--- a/sys-apps/usbutils/usbutils-009.ebuild
+++ b/sys-apps/usbutils/usbutils-009.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index e4ceec3b5bea..a8e2b0cc975c 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -10,5 +10,5 @@ DIST xinetd-2.3.15.3.tar.xz 383204 BLAKE2B dada7e1efb8c70d9b47efbb33de54e643e195
 DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
 EBUILD xinetd-2.3.15-r2.ebuild 1489 BLAKE2B 0e692389c82eaa474c6068ef4b2f3d96713dc3c9c5174c2265632f3904d6021ba966c23d0a7f7eaa7ce50ae026bf954407764351c62298556311f705949cbbf9 SHA512 552f0cda59c778ba6a576df1cba0befa55ff909e1f9fdec092dc7ea666be8371e956f2d34fdc1364c997db9eed36dd9c38ebcc10db0d5dfe8fbd576ed8ea0d8d
 EBUILD xinetd-2.3.15-r3.ebuild 1584 BLAKE2B b50232148f4aa38bd767715958ee7da6b0a4a8b35f17138f9422ad98546edb301aa87e1182b6feef7fb491fbd84c5072ec5ca4df213065f78b098820d47d921b SHA512 2ed014285abf51f3c745f94c0dda14233f0ca7e971c94fa4bcffc8ecf83265f9bc48388639e7caaebc2b24bbb07b87e4e672c30ea3bea209ef38258718a11c85
-EBUILD xinetd-2.3.15.3.ebuild 1088 BLAKE2B 8cc6f5fe916f8c2c8da1d0ba2f5b1e5c3c0048263d46c6fea625e135157ac98ca565a6a908befa6b96734a253465df55a915cab81b3d1b0b213977818c591b54 SHA512 ad62ef3022ac2b51dfd325e84c44e5c3f80a8858df5fd4e72f5930f749266ac6851603d2aebd07f86c6b514a47cecb671c51cb58603a6b06ecbedb7544693b77
+EBUILD xinetd-2.3.15.3.ebuild 1087 BLAKE2B 27e91f406a10f647bbd37ec8b991b566bb168c3458af1756ca5698a308a2ce1b9cb22c4c88476346a6122d32dda6f5d506df0a7587dbce82b04668d7d498a8e0 SHA512 17d9e267bc473bb9dadcc4d196232cf1c06223bbf019dd84b4cb556c663174eb7b59aa5d3ec11408204ba1909f0d8696ba27fdda91b9a7ec401c563e8e9c8d85
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
index 1928a1efd57f..6b4ff3e3a591 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="perl selinux tcpd"
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2018-05-15 13:19:56 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-05-15 13:19:56 +0100
commit	d302a5d7fc9caafba5c8a404f2891bb6ccdec311 (patch)
tree	2a3ee43f080d1d0086964de8c29ccf1021fdfda7 /sys-apps
parent	ea31ad0ed5501d0bf92267c35beaf06ac016bad2 (diff)