gentoo resync : 18.03.2018

40 files changed, 183 insertions, 488 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 6292680b3c82..1dfd447f286c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/biosdisk/Manifest b/sys-apps/biosdisk/Manifest
index 5df19b351195..aef44fd2f74d 100644
--- a/sys-apps/biosdisk/Manifest
+++ b/sys-apps/biosdisk/Manifest
@@ -1,3 +1,3 @@
-DIST biosdisk-git-06112010.tar.gz 1195889 BLAKE2B 7363402fea58e5709517ec2bc30865b352fa55472a8f4688f371f6080d850ba358f30d6c524a32f0f9df9a82092202814698e3452f4e9862a8f31349a8a3d545 SHA512 ade60e0e1ebb069e7f8d2046eff479cdb5186e54e0408b7fe65ac803476c9e325f9771617bbbcd60471d6b2d637aaef20c68af89c16c4ea26e04cfe501e4a310
-EBUILD biosdisk-0_p20100611-r1.ebuild 1071 BLAKE2B 40415cf98615ab257d5f15434d231646654f069a47232bb5d5ae2349259f6ec47a47a7f75cd09370b4f87cf21334f51f7301ed0f52fcb8808db8b70146135a8b SHA512 2f4acf96a27355c8a9f0c25b825a5e524cd00a255cd86ec778e940ed17f387b413e9fc455954b351032c37963d9c70922b3937188391aa6c84eb6ca57604d46a
+DIST biosdisk-0_p20171116.tar.gz 712587 BLAKE2B f09a8c68f57cddb1949d369cfc18d1216c3e64612a7074c58e6c50c12682fce92a4d6295810d5358fac0340483387f14059811a5681ae4f37c7da8e40c34fec4 SHA512 27d99990d0e92f1295d2ddb949214946db681e7f80c6606b252473fe7b5b0d3254180b54cb26479c9014219f6b989aa6ba29e8a818f3801f9ccce4efd2f1c3b9
+EBUILD biosdisk-0_p20171116.ebuild 971 BLAKE2B 19cc49a6fcf3e44298bf55c46edbe819dcbf1302fb8cbbae83831d6072bd31ecdeaca73695b01138ce42d65e05cfe3930c983a7d226de232c33da2f3f607fa31 SHA512 87024d007d88014c0ac837cbeaaecc24b453e596329f0f2d8a212b0243a79c437e272cd15cabb0afaeb8f2bf06969c1e4f1d92fd0d59ea2433b059aabb112627
 MISC metadata.xml 357 BLAKE2B 5fffc76231bdf56fba8728b3bef780c099b238aff410365f27bc13b408eddcc05259565e08e208522abb2631bc00929b56c8df7ced22e73bc311143bc0c772ec SHA512 dcd11ab94a75f3988677ef2e82929b37ac465764f2f040a0e11083ab3a2e7ef54215cb5628e7b4f65cc166adaec19d5ffb386700e16b5f56a4a68d8c5205b0b4
diff --git a/sys-apps/biosdisk/biosdisk-0_p20100611-r1.ebuild b/sys-apps/biosdisk/biosdisk-0_p20100611-r1.ebuild
deleted file mode 100644
index 7ef0db6c40f9..000000000000
--- a/sys-apps/biosdisk/biosdisk-0_p20100611-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1
-
-MY_PV=$(get_version_component_range 2)
-MY_PV_YEAR=${MY_PV:1:4}
-MY_PV_MONTH=${MY_PV:5:2}
-MY_PV_DAY=${MY_PV:7:2}
-MY_PV="${MY_PV_MONTH}${MY_PV_DAY}${MY_PV_YEAR}"
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="A script that creates floppy boot images to flash Dell BIOSes"
-HOMEPAGE="http://en.community.dell.com/techcenter/os-applications/w/wiki/linux-projects.aspx"
-SRC_URI="http://linux.dell.com/biosdisk/${PN}-git-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="
-	>=app-text/dos2unix-5.0
-	sys-boot/syslinux
-	${PYTHON_DEPS}
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	python_fix_shebang blconf
-
-	dosbin biosdisk blconf
-
-	dodoc AUTHORS README README.dosdisk TODO VERSION
-	doman biosdisk.8.gz
-
-	insinto /usr/share/biosdisk
-	doins dosdisk.img dosdisk{288,8192}.img biosdisk-mkrpm-{fedora,redhat,generic}-template.spec
-
-	insinto /etc
-	doins biosdisk.conf
-}
diff --git a/sys-apps/biosdisk/biosdisk-0_p20171116.ebuild b/sys-apps/biosdisk/biosdisk-0_p20171116.ebuild
new file mode 100644
index 000000000000..87367d63b19d
--- /dev/null
+++ b/sys-apps/biosdisk/biosdisk-0_p20171116.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+EGIT_COMMIT="f534dd22a795dca9c42f44b52f206bf02eadb682"
+DESCRIPTION="A script that creates floppy boot images to flash Dell BIOSes"
+HOMEPAGE="https://github.com/dell/biosdisk"
+SRC_URI="https://github.com/dell/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=app-text/dos2unix-5.0
+	sys-boot/syslinux
+	${PYTHON_DEPS}
+"
+
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+src_install() {
+	python_fix_shebang blconf
+
+	dosbin biosdisk blconf
+
+	dodoc AUTHORS README README.dosdisk TODO VERSION
+	gunzip biosdisk.8.gz || die
+	doman biosdisk.8
+
+	insinto /usr/share/biosdisk
+	doins dosdisk.img dosdisk{288,8192,20480}.img biosdisk-mkrpm-{fedora,redhat,generic}-template.spec
+
+	insinto /etc
+	doins biosdisk.conf
+}
diff --git a/sys-apps/cciss_vol_status/Manifest b/sys-apps/cciss_vol_status/Manifest
index cce05f7f6176..4fe32881b9d7 100644
--- a/sys-apps/cciss_vol_status/Manifest
+++ b/sys-apps/cciss_vol_status/Manifest
@@ -10,5 +10,5 @@ EBUILD cciss_vol_status-1.09-r1.ebuild 573 BLAKE2B 59a4128b1dd9114eed16b9c9cec19
 EBUILD cciss_vol_status-1.09.ebuild 489 BLAKE2B 4a0d7a341d5e59c298ff0e6c7d627d65b67a7c9362f037a904dbe1a83385eafc870cb0d3a6890173cf211521f842f1618fa81d3c9ac04f118ede2763d272a35d SHA512 89900c2cbdb5475bd58ae18aecfd18004399d23377e651eb2cc2e9fed5978990c55491a1522d2b07bbc48bc6223a64613e988f474e51f1d884897b0ca2e97caf
 EBUILD cciss_vol_status-1.10.ebuild 580 BLAKE2B 25a445ad4eb8a6ecd9680205ce939ea0d907c4143d28471b245a2d457c496a163dc303a13a77885643e4d95cb62d21dd5fc66cb51460d2ce933cb73a33a2af26 SHA512 dac844657219934fe6e1928c635864ae76e52eadc225e2c7792baa355efbd7d74c036fe8b687ab99261ec49cbb813479b3f3125aed98a45f4605a5e459c4b508
 EBUILD cciss_vol_status-1.11.ebuild 579 BLAKE2B 224134235b02c8307d90796dcdf527e948253f5cb12d69013c0f88f5e81b13451b6e367c45978bcec0378485ac1d81ef8d711f584db834e8fa08fd7b6ea51922 SHA512 f3369ced663b6d538842dc4423da3917d7ee2d97dd0bd7395dcf843f30bef1a5d661a5ab2ede8c9fccecc7e1082c860a48f470fc407d79ed3b2af6ac80d3f164
-EBUILD cciss_vol_status-1.12.ebuild 583 BLAKE2B 301a6ad7192723561c7630e0a89a65b88e07b50b113779d268cf3cd839ac24f039d505e916c1a98ec0e7eb9779335834349840fb5ae4df5220c78364290b4a4c SHA512 833dd7f13ca2b8bbe39afc33e2e009e66ddd245d339301399dfcf4d5499dd362ee31a82b3eaa497fd41d1fbff6bfdfe8ac06ab1e22dacdde4d72de8ddb84f4fc
+EBUILD cciss_vol_status-1.12.ebuild 582 BLAKE2B bfb83c047f31a65cfaca2f85a1ae4ec7a9ea87bb7b7c0e8c77e17e2da9d56866114c249adccff8320c89d516458f37885f2189152f0d47f7d568b8b988340bc6 SHA512 fb1f53577f9aa8df12d530832221989a2684c2d55f512296f91128d795a2feeb05729c14e8284b76bccfb59a9314311dd4df5154256c0937746668fe58b9b59a
 MISC metadata.xml 402 BLAKE2B e69409b303a34d9e6ac1f7ddf96eb9cda2a9d233adf718ec546f723714d78a0960ad4b43eb1945a56aba6af12b5934f0a45693b23a8914c491a67fb2f2c2eb00 SHA512 346a18ccc25fd45f14252b81a275cc1d3b18568d9a2b8404a7b80c53f05a36d8af0926ef50fca2b92b693d38deec31419f1a1d284a8f4b8506ea8f8cc149062d
diff --git a/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild b/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild
index b70b2f6a0b91..ecf7efc2f4b7 100644
--- a/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild
+++ b/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ DESCRIPTION="Shows status of logical drives attached to HP SmartArray controller
 HOMEPAGE="http://cciss.sourceforge.net/#cciss_utils"
 LICENSE="GPL-2"
 SRC_URI="mirror://sourceforge/cciss/${P}.tar.gz"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ia64 ~x86"
 SLOT="0"
 RDEPEND=""
 DEPEND=""
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 2a64930eaee1..d523fca8e8d8 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -6,7 +6,7 @@ DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5
 DIST dbus-1.12.4.tar.gz 2067402 BLAKE2B 621a9223c9d20a76415935d421a506100bbdf4852dc3c2a4f221750f739757a4945d60cb4a1f9032602f2993b868b502e7eb1835c8d2764666902c01daa01ba5 SHA512 ca9f7c76f705aca0f71366627fadf8b5c68992d5bcb6fae1746a8c14e9dc93c4492e80c63b6fd522b8753ec264df046e33482a5ce20be82adf181a6dd69b36a5
 DIST dbus-1.12.6.tar.gz 2068612 BLAKE2B 3dbb05e899e511a636816393ebc28548cc2ecaabaa0c04737189a0812791da195708ee455d7b0439fc81eea113f4bd8fc64b1b9b93e9dac84664b9c51049e75c SHA512 a0599329190e90d5982215138a19031028ed825f54c76c1ae13b54c2e4ddf14c949eacaac05c667db11bca13fb4bbdf8855fc9e15641cece55be1efde00c41ab
 EBUILD dbus-1.10.18.ebuild 7511 BLAKE2B 723c6e71e73b4ed5c3b2a664da5b00fd37efca9103e96e19ca0e0a58482e3e60ddc3325c1ad50b2cf58862ea2f1f1ea9944c3a7093a729f3a712b3e4e42255a3 SHA512 1623a683105edaf9f495b18ca770ff788e528302a50235fe584b9eab2b91cd655a5ed0eb3b3e60ca810382a7637a7bdfa736b8b1129a86e56e4040bb16a4d81b
-EBUILD dbus-1.10.24.ebuild 7393 BLAKE2B 35ef55bb33062bebbd00fb69a2399e5a170708b66aca3d99a6977d217f2c35afa80bad1afe31f9d2482ca496ed2ce14c9a5a291e3f32fa63a7acbec718e3e6bc SHA512 09b0a0f9bc3729c6833b068211ca76332a65bf47a28a50d3bfdaa386adfab41004c4cff81cf8cc677a7a72521cffca03092d858819d9fc7acb633b5cedcc463c
+EBUILD dbus-1.10.24.ebuild 7392 BLAKE2B 9f0cf4327c2616a2ca2526a3b77d85b56403a416ca1856391634b7d3f127515b5928dd5b7c1272f430fa8433f28f76cdbde99b911d55e77b8e2575727a017e2f SHA512 675777548c2ad38c8eecab8218716702a45aec79490a6026ba45c63bf171425e7658779dff2d731871d149c6c04491ef23ca9c4c69545797bd3a9cdb90df7b10
 EBUILD dbus-1.12.4.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 EBUILD dbus-1.12.6.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.10.24.ebuild b/sys-apps/dbus/dbus-1.10.24.ebuild
index a7c2766ec442..ef2edc5aeaf9 100644
--- a/sys-apps/dbus/dbus-1.10.24.ebuild
+++ b/sys-apps/dbus/dbus-1.10.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc elogind selinux static-libs systemd test user-session X"
 
 #RESTRICT="test"
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 6b6cdcabb3eb..1414d757d34f 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,5 +1,5 @@
 DIST dmidecode-3.0.tar.xz 58704 BLAKE2B d3e22cfeb8f537f461523d0927cc5eb5fa6214638b8a9360b2159abff1b9f60c8a8753f24a233a77f7c413b074f9a910f000a0c49ca166ebf3297ad673e9fb93 SHA512 fa31190e43ae7a0b61f6313b45f5eba3ab66390accd587129419e48fca931b631cbb331d6893cf0c1bfca94c86ff8c557215166e0881dee93b3af10a86878eb1
 DIST dmidecode-3.1.tar.xz 61204 BLAKE2B 439e265dd3f7b225d61b5d4228c0a77b25dd44b5d3672fdd9bbe432f5ae59ac23d2abd80e40621cda934643c9819b05f34d4f5befc8a75b93ae1840caf717cea SHA512 226557ad5747a2a2eb54a938543373b9ddcff032d330ca3b9a066cc81c0e137028f606ffedc042e0220b523346e2f2f7abb0e4b8b34a8bd173719aa858519de9
 EBUILD dmidecode-3.0.ebuild 1145 BLAKE2B 874b9c55f5e927b9418f7f4a41bdc97cb8c461c279007052a3bb7f182154ad7602508eb406a20c5d4e786662e1aec90d01536f5727cf0bc4e172e9f441729433 SHA512 9a361a7c80194bb062b6d27d9f06bb8446298da1a09801223ab9c52e275904486945229a769b8441c51eb0c508982ee6eae116027ef3b22bded76b9f132edada
-EBUILD dmidecode-3.1.ebuild 1150 BLAKE2B ddcc97a6acecf8eb5ba62ab5793c2e409ee89da09218c2b1d5c7bb9ac52265b4cf7971e8e01d78b28004105e63a3c4c4d99a7aa27d5df93a93e27801b4edf1c7 SHA512 650cfd9c23c74bd350ee72d08ce53c9179d93b215539e5f1d168a944ef090eb32281e9448b90a93d2892d286320cf2f0cbee6bf8b7eae4ee3520bcbd3fce563a
+EBUILD dmidecode-3.1.ebuild 1146 BLAKE2B 276c7369480310f754f4326227f85a49c34b6e9438b326efce710372b56c73f7435c5c2842e720c4ff2ace3591cfbe7d17e2700c521a30e7a775a587c2b50dd4 SHA512 495447b41de16bf2ce1b84c4afe76d47f93393a27b7a7e0e224bcb1469bc4888b450bc6fe9e7bea5d6ec5237d2a3aabff42672be2aafd66d9ce90071a4fb477c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmidecode/dmidecode-3.1.ebuild b/sys-apps/dmidecode/dmidecode-3.1.ebuild
index 1982039343e9..55312c80fbf6 100644
--- a/sys-apps/dmidecode/dmidecode-3.1.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
+KEYWORDS="-* amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 00a97e9311e6..5d6b112b55bb 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -4,10 +4,10 @@ AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
 DIST hdparm-9.51.tar.gz 133725 BLAKE2B a507046d1026e901fb0feb9c61dac60d8bf8427f7ac62cbde58c8aeaed1f317b3d6a71c1de039516bf9b9b5dd221d87f1e52dc318b1f3b551bb1f40fbb26830c SHA512 144d073d697d05058e0240ff46e5517803baa8475e1d381a31c25179ceb1564bbb561ba7f9dee8654d80a3510e3bf2f2d2f4a267618f0ab27967f37626aef91c
 DIST hdparm-9.52.tar.gz 140737 BLAKE2B 0614bfb0844f088b533951c4636bf92879c4ff7e9bb4d150965e936eaa2a4e0ffd350689fc359757a2f9e80a6c93cd111a25b8e2824737e01b4deb6e543b2868 SHA512 7c37d1381c1dd2d46762a8cdcaba2015b0b051ee7bd135dbcf6346def51b085cc2f9ecd7e1ebdc67e12ab4b765df548d4757b3700ed6e7514c2b13ed40661c59
-DIST hdparm-9.53.tar.gz 137009 BLAKE2B 934cec5d88033c14e7f2d182f2e1dc9f9dc63583208720fb748fd29b99cd54253fdcf7379443043787457c3fdabb83ddb55295f9f4abe0635ae2e4fd7e296bd1 SHA512 7d293d603c6bda5fa8ce389b69e6738c4ba920846a1f7443c89edd2f5085b056541afb1824921da4b38be43f992ee9a8cb7006bcc3156d3e5224823276c4d0c7
 DIST hdparm-9.54.tar.gz 136764 BLAKE2B 8f57831f2f6e4594bfe56ac03079c8e6fad628c7518372bbfc1f0af707ee1842139cad1e0daa129a197625b4f3d389b7000c51354207047b1b19e5f1c312820d SHA512 d0c21fb01959f4afc846279d73bc19c80492b1ceda3effec33e87f74e06a02222e724ad06e5627bcd9847165684b4815272d760486b03f5ac75843edd0e1ae01
+DIST hdparm-9.55.tar.gz 136805 BLAKE2B 0739295dcc80a2b774b2edd8c447ee739476e5fe55695e22f867de2c8352746ac8dcbef220554a36bcb9417317f44c433cbbd807629ef7514b5e1d93be56c280 SHA512 a9b5be38fda9db7f125ecc5a174668e81464266493672184d214ea9b50437e089482799fb5c817c433f897eac8741fe3dc052658969bb1ebac158606dee51196
 EBUILD hdparm-9.51.ebuild 1068 BLAKE2B da518c793f37b34bed3ba283e7152d4fd4ebca37548090db5dac52c14141b513f47e16ae06c89e0dafbeaf92af76728d158c8c7539cad5f91f2c623f865e8dcb SHA512 af88b4d68dbb6c844b170a0313bb0ba98b6a0b2e36b3b2b6e45a5e6f6f6129f2a2aafb6b0fa63177b2af717cac5c0e322f3ed00f7ffe6a6c941dfa8145d3d7bb
 EBUILD hdparm-9.52.ebuild 1069 BLAKE2B 44e14593c204fdce97aaa1d29d6b9e46f64e84489e897fada71990fd75fc0b0d16b00fa968ae4f1052eb145a290fa89c8874b71a5382a9b5cae1c2d2a319b4b0 SHA512 c680a4798671fae975b9efef13246fba2c18f0b61a4fbd436c5693295ba4cd33880651ad8982508e83ba9de1b54799ba2e20c93e904e912aa942f8804c7cc67d
-EBUILD hdparm-9.53.ebuild 1056 BLAKE2B 2bb3d67c186613200c7f17e6f13bfc058bf8c1d2c340e898ed687621a5e3f0e803f53a7d01f076551c96ad7b987453758bdda5d19fcb4aba1b541a53f5459c70 SHA512 d19fbe544788be2a9705938eddee7fe27178a9c282f75061c1fc20f11c7200a676b34586351c6b330258d71abef3c90d3c1f94251343a14c01e90adeb60bcf3c
 EBUILD hdparm-9.54.ebuild 1056 BLAKE2B 2bb3d67c186613200c7f17e6f13bfc058bf8c1d2c340e898ed687621a5e3f0e803f53a7d01f076551c96ad7b987453758bdda5d19fcb4aba1b541a53f5459c70 SHA512 d19fbe544788be2a9705938eddee7fe27178a9c282f75061c1fc20f11c7200a676b34586351c6b330258d71abef3c90d3c1f94251343a14c01e90adeb60bcf3c
+EBUILD hdparm-9.55.ebuild 1006 BLAKE2B 360e7286447cbdeb2c2550f020ec7a6f4fe84dbd1416e4a1d1777d2efb7644a4f4897ae6735d11a395f6eba17e3f6e46fdbec28e4c995a6d0f5a04f57e87a0ca SHA512 a80757a40a1c52bb9d5167ba143c1ae10f718b34cc3790fad7b88b5301fda1cf8721120ecf4f1a785e2312c948eedfccdaaf408a46a9b17f5aae75429f50fbfa
 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287
diff --git a/sys-apps/hdparm/hdparm-9.53.ebuild b/sys-apps/hdparm/hdparm-9.55.ebuild
index 51d242156c52..5c52393e7064 100644
--- a/sys-apps/hdparm/hdparm-9.53.ebuild
+++ b/sys-apps/hdparm/hdparm-9.55.ebuild
@@ -15,7 +15,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="static"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-9.48-sysmacros.patch #580052
 	"${FILESDIR}"/${PN}-9.51-build.patch
 )
 
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 857e2e3b2950..b8d199c91568 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,8 +1,10 @@
 DIST hwids-20170328.tar.gz 2049249 BLAKE2B b9dd6dc98c9eafd4f1eb1e129a53bf10ebc4b3b718c9bc134cb5b3f5c2dfaa9626607b4f6edc8f35b811e3a7404cc967d5e9732398880dd5b96a76ca6e97cd37 SHA512 ffccbcda78f856b93026102d1d7f62f4639910671c63e30471c990b1029db94b542c555b6ad69820f8a91a45ef9d52c320b9767d38ff08b6e72c041a28e6f0f3
 DIST hwids-20170715.tar.gz 2091853 BLAKE2B 66e930346176d3501ba0e5f802b7e44fe327a4bbfcd250ac3b96259b3c2eefbade8b0555fcffeafc35e46ce07551bdc6d26d25d9913d7a584945b52f7e744dfe SHA512 6f1d2e3d7b7fc260f02b3cc87b46385292503dda2a46dea4e69b02915e9d411e9682fb98ca921eb45289e416320a8ef46a3df0753f8f820d20c719663076bd88
 DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b4975a02e5735c1b8483214193bcd45a606145a7709f0b9021dd69e0757361bd568f4ba2d66a52641f691aa7f50a SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a
+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 1714 BLAKE2B d8c2621a5ec45c78524cae29c468e359b5650103f8863f6c86cdbbb7b9da34879a48b1af58eed4e75026164a514b37750b517a3b70bc5dc480467268a74ead67 SHA512 1ac2e10d3376b2068a26e5e64874b459169b985c843e18ee66fb71eae2a80d132b5d91ace3c6f6daf369333f71c1200c7b9bb8232dc649134145325e53aba06b
+EBUILD hwids-20171003.ebuild 1711 BLAKE2B 5460b21c9c3bf36e4677c11696a2356fa5123ddce0821908aab1ff01199da03712acb7f3ea73bd48ebfd4e4b70fd8bb652875dea1083dc4f6899afbce39ff8f8 SHA512 30f648a9d079ddcb5b33eff7e62a25fffcf9e2ed2c05b406af02c19e4b440026067717979f3ddd01fa829b1b056381b6c42bc18969f0960974f532fc1284f9af
+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 03b4277f6447..cb20b17a18f9 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/hwids/hwids-20180315.ebuild b/sys-apps/hwids/hwids-20180315.ebuild
new file mode 100644
index 000000000000..3b0cebed2957
--- /dev/null
+++ b/sys-apps/hwids/hwids-20180315.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit udev
+
+DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
+HOMEPAGE="https://github.com/gentoo/hwids"
+if [[ ${PV} == "99999999" ]]; then
+	PYTHON_COMPAT=( python3_6 )
+	inherit git-r3 python-any-r1
+	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"
+fi
+
+LICENSE="|| ( GPL-2 BSD ) public-domain"
+SLOT="0"
+IUSE="+net +pci +udev +usb"
+
+DEPEND=""
+RDEPEND="
+	udev? ( virtual/udev )
+	!<sys-apps/pciutils-3.1.9-r2
+	!<sys-apps/usbutils-005-r1
+"
+
+if [[ ${PV} == 99999999 ]]; then
+	DEPEND+="
+		net-misc/curl
+		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
+	"
+	python_check_deps() {
+		if use udev; then
+			has_version --host-root "dev-python/pyparsing[${PYTHON_USEDEP}]"
+		fi
+	}
+else
+	S=${WORKDIR}/hwids-${P}
+fi
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999 ]]; then
+		git-r3_src_unpack
+		cd "${S}" || die
+		emake fetch
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e '/udevadm hwdb/d' Makefile || die
+}
+
+_emake() {
+	emake \
+		NET=$(usex net) \
+		PCI=$(usex pci) \
+		UDEV=$(usex udev) \
+		USB=$(usex usb) \
+		"$@"
+}
+
+src_compile() {
+	if [[ ${PV} == 99999999 ]] && use udev; then
+		python_setup
+		_emake udev-hwdb
+	fi
+	_emake
+}
+
+src_install() {
+	_emake install \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		MISCDIR="${EPREFIX}/usr/share/misc" \
+		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
+		DESTDIR="${D}"
+}
+
+pkg_postinst() {
+	if use udev; then
+		udevadm hwdb --update --root="${ROOT%/}"
+	fi
+}
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index a4f9b48ac9c2..9b0980373c34 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,7 +3,7 @@ DIST kmod-23.tar.xz 450376 BLAKE2B dd38b6d8853e40cb8c9939cd3c68bfe3b36e58445cac9
 DIST kmod-24.tar.xz 536864 BLAKE2B 2d61a4a5e598c864cc1bae4f3d2dc5e434e1df8685ceb2462315c0e5dc955b58f02ffd0504a77859b7030c3619f1b5f6a7fa3fb25ec99d90ac67f0167b1eb889 SHA512 58c8da100418b6325de1595bceee4115cbdd7151d03a028c0b1f6d5d3e6611c667e27f3a0245d29781125581849fd1e854fa8d87b63c4b8fa3f196d0a97e1779
 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
 EBUILD kmod-23.ebuild 4902 BLAKE2B 22ef9ed75e115712545c6923ba982d5e1a271b4a61576760a2af471885a32727d70c5e44542d68b545e333440e417052c16f069b50efe92c54b3d480ae1e09ae SHA512 b38be77d4f89ffda2551a3c5ef2b85146ba27254d0c109425b7ad0fbfdc1528381f605a1e354a06f3321eb5b63bba6d6ec955245135f54a3a2a5d131667360e5
-EBUILD kmod-24.ebuild 4911 BLAKE2B 2d6cb2b2c3203e4a9d566e558920571b855ab20cc51f2bf2d40965d0251b31eb77b9af49631f82ad842737437140f51fefa8b406f4deaa0923cefae3ded0aff3 SHA512 beb2aa405bd1731ad8d453e7e74fc8ee29fe23d71eb28d2a03906458665daa64bb63f419afa79c3a7373554d270ac19e4c723529a0e2dbe53b20ade47750a9d7
+EBUILD kmod-24.ebuild 4910 BLAKE2B ccaa8819652563584c97cae09895973ff45b66685745edc08af245344d434a6736b7fe1004042c794462c0beba2910c3d87400166a1f6a4dbb98103ef5d2f4e4 SHA512 0651359e60d4e6ca0fd5f571ae05ac82b0d8669d5023b46205e5a22e650e7f261cf839967451888990ea3bebebab29e2ee159d1b6cb792b52cb134b4625e854e
 EBUILD kmod-25.ebuild 4931 BLAKE2B 99cf8a56f86668414041e08c2d07664d55696d70bdf7c6230a9e5fa0dcf0080aac13308c13c201ba4687fd66cff78f130192ce07cf6f8fa5a2033d57c5199027 SHA512 27aa9d2c5e85af98778df261cda4e5aae65a6490f2f28b72dd9475e22eb0b75a5ad1bd4207462b21c60a04265cab91027d628a0dee12d8444fa450318514e6d6
 EBUILD kmod-9999.ebuild 4931 BLAKE2B 99cf8a56f86668414041e08c2d07664d55696d70bdf7c6230a9e5fa0dcf0080aac13308c13c201ba4687fd66cff78f130192ce07cf6f8fa5a2033d57c5199027 SHA512 27aa9d2c5e85af98778df261cda4e5aae65a6490f2f28b72dd9475e22eb0b75a5ad1bd4207462b21c60a04265cab91027d628a0dee12d8444fa450318514e6d6
 MISC metadata.xml 540 BLAKE2B ec5ee262fe76215688d99e32778848e71de5825f488eea2219e076290e020aa86de6138ab8366d5e077d44797789a27c22fea1c64f9c6e2713cf315b4b891455 SHA512 c4f47a77dfa7bc4cbaa61744fc46c5547763b51b48521cd229ac89680325ecbf415bd9e1ce9c71982ea721d0d5c4cf3677a0f70e8dad65235f523840cd14de94
diff --git a/sys-apps/kmod/kmod-24.ebuild b/sys-apps/kmod/kmod-24.ebuild
index 1900a8141e06..84344d1fa573 100644
--- a/sys-apps/kmod/kmod-24.ebuild
+++ b/sys-apps/kmod/kmod-24.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
-	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"
 	inherit libtool
 fi
 
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index 88b38d59aeae..e8d0db243939 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -10,5 +10,5 @@ AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc0
 DIST lm_sensors-3.4.0_p20160725.tar.gz 206868 BLAKE2B ba79935e1acb62d5f31fc53975904ab7fd19f619fdc5edc342bcfa1f8d2e16e3ac41711ad33bc9766ece89325236887d722b06c9d6698c420e9506d77dca7ef6 SHA512 abae5c4ba2ed0b763fda918e2ededb2148a3edd1d33709a34b91a33398a64e8988d14c5d16a5c756bf55beaa383e661c76e1acccc7b5ef858aa772e96878131b
 DIST lm_sensors-3.4.0_p20170901.tar.gz 208487 BLAKE2B b6d2eb6efee25891fbd655738ba25e91d8ec5d97f07e24ee217ab1a59c51a8ab59e042a90ed6fa1de4459992adc740252588419c0f74ce02f9ad7c1f4f9750da SHA512 5c4a750efdff2ef086a5ed1b6a8a03278872ca077255eae91d0696af229f37b09216e2f53d1d6e4602596fd8b978e0b9c27327357621486c5d7b1d39ecd16fea
 EBUILD lm_sensors-3.4.0_p20160725.ebuild 6228 BLAKE2B ecc79b6e0477eaf39f433818c60fdf5c2a432d91083bc8a0a7129c1faace0ebc37dae69131a54f4b42f8b8edc2a374602cad98bb1b925a6ddae70c20bbfdaf34 SHA512 70cea8ee4f232d5121340e681443af417cf7d6f550fe9611985801a69963537283dc4a597df36abcd9862e23b7ba5d03e9a5de804180a587de89ad391795f963
-EBUILD lm_sensors-3.4.0_p20170901.ebuild 6322 BLAKE2B a7a9b3ede2ab03eb048b6712518f7470fdb5ceeee50b893fa8d02e40630849536ff4c2b453b7863479dbf28fed9eee9201e320702130e88de3cb00cf9010d1a2 SHA512 a02ffabba4bfeb2488527a8041ae4d57fe41f3f24af65e535279765bd248f21e3e3d699df2f7e5725fafaadb01ff258c335733fc6cd07df504cd93d20e963f28
+EBUILD lm_sensors-3.4.0_p20170901.ebuild 6321 BLAKE2B db550945d3ddd0723e435d3218865266ee9190001808269302f61056d8b362f805912b3dd2835c9c35c63eb819c960bd8660fcdd8b856de984b514eaf943d637 SHA512 b811dc032227f3d224c14522a65d2e671844ba7aca980dd932b7651d597e6c554e57d7c7b741a2cc1b414b67458140de41899eddcee871446dcb00186ec34cb5
 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
index b0878aa3d0d9..bd41a3e2dda3 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/4.4.0"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 55ee17b3b044..f24d8b4b9611 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -13,6 +13,6 @@ AUX man-1.6g-echo-escape.patch 630 BLAKE2B add028d6c6bd11590b3f69f989aac874e6695
 AUX man-1.6g-fbsd.patch 366 BLAKE2B 882b3b3048e3dcb4f64f38e94d7603ae577038dce6636d6b2cbcb76a96b1c54427ddff737429e9e464fc50d0956cf9a9da86c0689bb6ebd8ae84d5d8f15727a6 SHA512 4019267584b1350b2c9da9aa1851a2e4e96f271265d189ecd677206be20dac67cd212b2887f844f43c10d96076a76613a12e53f3b29a185ec62ed4bff4c5a502
 AUX man-1.6g-xz.patch 1848 BLAKE2B 6a0855eda72386a0f48e715e9ba620b3473b3aa854c42fabd93bc02b7c9cd44fbd07f2608257fe953bdfa9b02e8fa35876d651ba5aab99937fe42325fcfb7b69 SHA512 6a883fa800a6d3b11c76a70e1a31c0736d380271c9f21315863ddaca9529e3d613b587724287fb94bab2b0d97215f6ccb3f1438a5c5e339e5a2edf872c92515c
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man-1.6g-r1.ebuild 3687 BLAKE2B 1178f521251f5d65b758dea160ff5c69818352c3c9dce3d77c16a8a03b836bef97c9e982e82caceddf4665249452179dd55b3d9edb398e956b3fe46ab53557ec SHA512 0dd81787324de844e6ee5790c37bd13137933eaa4a0636875d48a332803f6e955396498aa45a2e1eb9ac35045a5161baab0d6b65b0c5eceb5fba178ab396cd06
+EBUILD man-1.6g-r1.ebuild 3685 BLAKE2B dc2a66f2b800ff50e9afb24381377925ca52487477432c2e13088b32c377d25315fd1de7368144faca8e40eb1ab9929b19170ff0757574b7f89ac4c677e776f4 SHA512 dde53299c1a2199b06b4bdc53e80b4bb38d9b0d7493ff5e7e666d6c7ddbf50d87b55b1896b151556c4e651cbe90c1695edae6eb10758547938ca90103460d40a
 EBUILD man-1.6g.ebuild 3615 BLAKE2B a5b54b2f72e9051b61143984dbfd2f876b0529b6d7885ce9f1e546e0342a2378e165421d701a7b15644badcff56cb38dd9ad6267f772879b55c2360e062f5fb4 SHA512 bab63322d55c19177916326f8958a60ba1bc0c1310302cab38b4d92fad54b6e8c0d49d66594a572151c2b3c33402998388ffdeab4aaa48912557cd7d675965f3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man/man-1.6g-r1.ebuild b/sys-apps/man/man-1.6g-r1.ebuild
index f6e2568e709a..7d91bb1345a0 100644
--- a/sys-apps/man/man-1.6g-r1.ebuild
+++ b/sys-apps/man/man-1.6g-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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="+lzma nls selinux"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 075c187860de..f8230c350d87 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,10 +1,8 @@
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
-DIST openrc-0.35.2.tar.gz 241600 BLAKE2B 09517a33ea7faf2e59d3a194876a3bb55a2477dde5f7f30915f77c24104531a27e752a59a049929878a115710ecbe1ed116e4283357f88c65cbe130787b88220 SHA512 61282509bae087a6c94a1947a30eddfa633cd2dbc91392511daa7240318d9f0c0a231005e329b6e46eece194fe497071f40387bea46d27ef09db9eb6e92f07d6
-DIST openrc-0.35.3.tar.gz 241587 BLAKE2B e8560243adb6ba4e6e463ad8906f203282ee9e0d16a22c0cf28e3ac7fe22321bb90f5292998745a70c269cee2a82bc6c899cba9ecf07a2e28bd4dc02c0fc737a SHA512 2f247241fb6a7abb972efbd308c47f5621b7a10b11fce2fbbffe6ccb73c6d054bd2d1b860bf9d7bc38f6e2f0ed204a60eecad312347f394efb85b096a513eff1
+DIST openrc-0.35.5.tar.gz 241784 BLAKE2B 6f63dcf30c430949f25108b0ca808f2317b2e58440419fa5c2aac04ed614c5b22105bfa38d51d54ee0d293be8b11f15b756b00d805ab71f9a2e92f44b98ce6e1 SHA512 655a0a32650ed46998ae84473e8a82aadd9de09904c5173cd9b9e2500fc8935e96539672b513a883c077ae862ece12ab768d4f379dbeb4389a7067ce7121dc0d
 EBUILD openrc-0.34.11.ebuild 10145 BLAKE2B 44747f052ca54517722e08a8877b36bb12985ef703ccd7608faecc7b9f6727e6f9157aad51f563ccd1b9346945f56cb553e47fc77dd369c5e635a80da5f2a4dc SHA512 6f71094d74e5ea02e87427619a6b55883ef5de3e8d581447c9662a46f0c1b0a6f49cdb00737a7a0ed8ca9d3ce23418f1d0068832ab58a268398781d4aabccd15
-EBUILD openrc-0.35.2.ebuild 9966 BLAKE2B b931796a166d874bcb7a74b1a05cc8480b43657458e9b60377e133d440f9b0089a97cf7525265c6e420840abc614a57b4c3bc029a4d32423b1091deaca568c7e SHA512 959cc20911fbf11799ef85923fb74275969131680a3fe6a570b53fd0e965647a209af4765f5f13ab50c82b3b87907affce999fc4bcdf99f936ca08b83a6c2a22
-EBUILD openrc-0.35.3.ebuild 9963 BLAKE2B e820565f8be3bbcf21ed330e3b1ea02f8590372614c7d6ac5a001636cc6d56708cae5ba181e1ecfa521deaed8996de0edee602579e28719d810e3830e9eb0d3b SHA512 da4193b443398edcf3f7da57e370127236b504078cdd685952d2aa65b0c4e60d82b130f5ecd0f1bcfb2d4eee89ba414b59f82c4ce5f5dbe9cfc7fbe9c5beda94
-EBUILD openrc-9999.ebuild 9953 BLAKE2B cbcdcf1ccfd81c1e060a64b686f8aed344cb99723a4e04326438c5e23c11b980b6700be60dc7e34fc7efbc9ad26513a28df3bbfd06e7018b4b0e27a8bba282e8 SHA512 6d25ad312e4526bb82efa5754914a57e8cd8b222455aa7b8ec434106eb04746b4aa3a90afc760fd1b1a1c3b5858bb7dc052acf2d48843c0789bd4bd208b65560
+EBUILD openrc-0.35.5.ebuild 9963 BLAKE2B e820565f8be3bbcf21ed330e3b1ea02f8590372614c7d6ac5a001636cc6d56708cae5ba181e1ecfa521deaed8996de0edee602579e28719d810e3830e9eb0d3b SHA512 da4193b443398edcf3f7da57e370127236b504078cdd685952d2aa65b0c4e60d82b130f5ecd0f1bcfb2d4eee89ba414b59f82c4ce5f5dbe9cfc7fbe9c5beda94
+EBUILD openrc-9999.ebuild 9963 BLAKE2B e820565f8be3bbcf21ed330e3b1ea02f8590372614c7d6ac5a001636cc6d56708cae5ba181e1ecfa521deaed8996de0edee602579e28719d810e3830e9eb0d3b SHA512 da4193b443398edcf3f7da57e370127236b504078cdd685952d2aa65b0c4e60d82b130f5ecd0f1bcfb2d4eee89ba414b59f82c4ce5f5dbe9cfc7fbe9c5beda94
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-0.35.2.ebuild b/sys-apps/openrc/openrc-0.35.2.ebuild
deleted file mode 100644
index 8c7c2151f6b3..000000000000
--- a/sys-apps/openrc/openrc-0.35.2.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-	unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-	)
-	audit? ( sys-process/audit )
-	kernel_linux? (
-		sys-process/psmisc
-		!<sys-process/procps-3.3.9-r2
-	)
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	!prefix? (
-		kernel_linux? (
-			>=sys-apps/sysvinit-2.86-r6[selinux?]
-			virtual/tmpfiles
-		)
-		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-	!<app-shells/gentoo-bashcomp-20140911-r1
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-	default
-
-	sed -i 's:0444:0644:' mk/sys.mk || die
-
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-}
-
-src_compile() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/lib/rc
-		MKBASHCOMP=yes
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)
-		MKZSHCOMP=yes"
-
-	local brand="Unknown"
-	if use kernel_linux ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-		brand="Linux"
-	elif use kernel_FreeBSD ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-		brand="FreeBSD"
-	fi
-	export BRANDING="Gentoo ${brand}"
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-	# move the shared libs back to /usr so ldscript can install
-	# more of a minimal set of files
-	# disabled for now due to #270646
-	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-	#gen_usr_ldscript -a einfo rc
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
-	if ! use kernel_linux; then
-		keepdir /lib/rc/init.d
-	fi
-	keepdir /lib/rc/tmp
-
-	# Backup our default runlevels
-	dodir /usr/share/"${PN}"
-	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-	rm -rf "${ED}"/etc/runlevels
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	# install gentoo pam.d files
-	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-	# install documentation
-	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
-}
-
-add_boot_init() {
-	local initd=$1
-	local runlevel=${2:-boot}
-	# if the initscript is not going to be installed and is not
-	# currently installed, return
-	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-		|| return
-	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-	# if runlevels dont exist just yet, then create it but still flag
-	# to pkg_postinst that it needs real setup #277323
-	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-		touch "${EROOT}"etc/runlevels/.add_boot_init.created
-	fi
-
-	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-	local config=$1 initd=$2
-	if [[ -e ${EROOT}${config} ]] ; then
-		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-			add_boot_init ${initd}
-		fi
-	fi
-}
-
-pkg_preinst() {
-	local f LIBDIR=$(get_libdir)
-
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-	# termencoding was added in 0.2.1 and needed in boot
-	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
-	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-	if ! has_version ">=sys-apps/openrc-0.11"; then
-		add_boot_init sysfs sysinit
-	fi
-
-	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-		migrate_udev_mount_script
-		add_boot_init tmpfiles.setup boot
-	fi
-
-	# these were added in 0.12.
-	if ! has_version ">=sys-apps/openrc-0.12"; then
-		add_boot_init loopback
-		add_boot_init tmpfiles.dev sysinit
-
-		# ensure existing /etc/conf.d/net is not removed
-		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-		# this needs to stay in openrc ebuilds for a long time. :(
-		# Added in 0.12.
-		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-			einfo "Modifying conf.d/net to keep it from being removed"
-			cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-		fi
-	fi
-	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-	if ! has_version ">=sys-apps/openrc-0.18.3"; then
-		add_boot_init mtab
-		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-			ewarn "${EROOT}etc/mtab will be replaced with a"
-			ewarn "symbolic link to /proc/self/mounts on the next"
-			ewarn "reboot."
-			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-			ewarn "if you do not want this to happen."
-		fi
-	fi
-
-	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
-
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-		add_boot_init udev-mount sysinit
-	fi
-	return 0
-}
-
-pkg_postinst() {
-	local LIBDIR=$(get_libdir)
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-		einfo "Copying across default runlevels"
-		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-	else
-		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/sysinit
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-				"${EROOT}"etc/runlevels/sysinit
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/shutdown
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-				"${EROOT}"etc/runlevels/shutdown
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-				"${EROOT}"etc/runlevels
-		fi
-	fi
-
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	# Added for 0.35.
-	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	elif ! use kernel_linux; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	fi
-
-	# update the dependency tree after touching all files #224171
-	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/openrc/openrc-0.35.3.ebuild b/sys-apps/openrc/openrc-0.35.5.ebuild
index 3420adf2a4c3..3420adf2a4c3 100644
--- a/sys-apps/openrc/openrc-0.35.3.ebuild
+++ b/sys-apps/openrc/openrc-0.35.5.ebuild
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index eda95f741414..3420adf2a4c3 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -53,7 +53,7 @@ RDEPEND="${COMMON_DEPEND}
 		>=sec-policy/selinux-base-policy-2.20170204-r4
 		>=sec-policy/selinux-openrc-2.20170204-r4
 	)
-	!app-shells/gentoo-bashcomp
+	!<app-shells/gentoo-bashcomp-20180302
 	!<app-shells/gentoo-zsh-completions-20180228
 "
 
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 03974ccf45ca..45d2d09ffb73 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,6 +1,6 @@
 DIST paludis-57881321fa3d5d82a9260db54afd608fd61dd533.tar.xz 1004012 BLAKE2B 0bc65918b277ae4203fb5dc66fe3a84caa142b5e97b9e1f1b9a5f2e1b9c27fb4c60109c0bc1c058e095850bcf488075e21ab080bc5c4f2156e4c901923856ddb SHA512 ed9053b933172dea0122c171a14965b0d183affa8d3f2aa2be5cc2a2cf11f81f8a693b30bee93963dd890ebe41f454cf5ec5ab38f0b7924318b8bd8d1c37f5d9
 DIST paludis-f8e58ee1d02d2476ae92ebc3737e42b8b6a36891.tar.xz 1004024 BLAKE2B 1c34c93815efa41298cc2916c4428971d1f54242cfd759c771972bdcde94986c6af03546372c7eda277a343851b38ee93c0a103e519457b42e48cc7bed87b755 SHA512 813592b6f164d7994000ff1740e003049e040e7d58832bb1393a1f4facf428806b57bbf97855b830f75acf4b20e963093e9993b110f76f44e25afb9a8a1eaa1e
-EBUILD paludis-3.0.0_pre20170808.ebuild 3781 BLAKE2B 41ada11076e248393068b4c539b89c7a42b6b36c6cdd8d684bc695456e78b07bf80f8155216d508d582d7f6a07a101535e6bbb305c87108f45bc1acd74f5a4f5 SHA512 6947e1a370a606159c0077bdba03d0eca7675e89a19eecc2952a329f460de4e17373d93777c3824699b43fa6074b010b1338643e319b4ee47271e800182af7a7
+EBUILD paludis-3.0.0_pre20170808.ebuild 3780 BLAKE2B 9d3c990aa4f87bb45c3fbef6796fd4c33f373e9475cf78760fa7ad2599faee12adcd015957a5a390ff98dec4bbb37d6622a94356a2c85744d7c3a7c4f87a1d24 SHA512 64abcb3081658b9e4c391559fa1b22aa5729f20b7a7bbf8967819fb760e626bf01e90ed078699e97ad73e700880ce636db2ba472f30039666a219285783d69de
 EBUILD paludis-3.0.0_pre20180214.ebuild 3780 BLAKE2B a60ff73b536770d6d8404e894123f88c32c597b303cf1486de9d4585b42b002eacc7dfe5d48ebdedb7dec9b85329f4967b1834955b95ca51e4f337676e029ea3 SHA512 a994bef998c33e6c90a87b6796ef6b2e3f20635ac945cc1a4455981e70c03cc500d82b35b88a0532ace9c4cd02e44c0393c335fac44d50e800c87974e5ebcf03
 EBUILD paludis-9999.ebuild 3633 BLAKE2B b27ba87915d6a019d6503c97eb23fb5ea87dc85df20e0ce3d29973117a961c7f477bad0b21c660f6689f9c1eebba178b4f2797e5c8e40d8c5fe23f3d46a12e1d SHA512 5ecdff9a67ac467dbc7c925f2ad77eb98344f01d0b6ccfda938a3ee3a6681d4af7f108713d2764154cd5d7b251078fce2c70c6aba0629ab40efbd090e265962d
 MISC metadata.xml 706 BLAKE2B ec2963b467d0fbab598fdf44b021cc10569e9a25305ad22c08d129c17f36db1a0759edb6e89119cd687fc36b2b26c4844086ab1cb8e249b6883df8fb9858b830 SHA512 ab32599364fb289dc43d8dc1574ee472585f014c663d2c80209700596b455e074346ab35e69bd05fee86a451902852790f1bb9dcd37f2118e8e8bc24b90a01ec
diff --git a/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild b/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
index d0801ab01b6d..a373d25270d0 100644
--- a/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
+++ b/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://git.exherbo.org/paludis/paludis.git/snapshot/${MY_P}.tar.xz"
 IUSE="doc pbins pink python ruby ruby_targets_ruby${RUBY_VER/./} search-index test +xml"
 LICENSE="GPL-2 vim"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=app-admin/eselect-1.2.13
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e033bf9ea28f..fd8b203091d6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -9,7 +9,7 @@ EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2
 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 9272 BLAKE2B 6d9c9789fc49280ac9d39904ae77f11ff5479c1b032d687e2c98a84a677aeed3ea9b6abb70ab4309c574f2a2a88b783cc141897d37987afd6fb08d3c88a68778 SHA512 89612299b7791ab44d4f382f42ee195fdcc122338248eec46770d70673e67becab500b004dd2f813fd989eed1760e41a13cc45a342e590a5ae4afc3cdf9036f6
+EBUILD portage-2.3.24-r1.ebuild 9271 BLAKE2B 9599e93719f204f481e40068d1ae240847d980b261a1169cbd241e2a541bd510de57f8a8d49c683b32679d3fae96807b030bbc5366e88bc18897479cfa306416 SHA512 565ca9bcfbb80ee68363ca43d609b44d8a193a1993163d41a3f07fbba8770965ba1c2cdbaec99e80f17e536e50099bd754e6bbfda3ad228075346ddd6568529f
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
 EBUILD portage-9999.ebuild 8795 BLAKE2B 82b5c300a67ef35dc2e57e2680efec39cfe4247e5ae8b6e469bfb022275076056b0ec05f280d4925a4537588d94b471397d8a065c2a80e6e64b5e9c51cff2ec7 SHA512 fadc6f2da2fc363438aee4a04b0c36bad372d724c14591fba943b6f9f7602d820300192dd1ca9d78f32bf2279a27aca0c74364a2563a58a135f684adfbaf1910
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.24-r1.ebuild b/sys-apps/portage/portage-2.3.24-r1.ebuild
index 36b6e0929318..3a614ed0ddeb 100644
--- a/sys-apps/portage/portage-2.3.24-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.24-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 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"
+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"
 
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 5bcd0326b9a9..07d7826528b8 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -8,6 +8,6 @@ DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6
 DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf
 EBUILD sandbox-2.10-r3.ebuild 2156 BLAKE2B fecdef4a769d481e6479c82c341626de5d935f031b33df13eaae51b2041e0793a9854f3726ae90586586dc7d0008230f7ba6ae948c48d145d5c05bd4fd0aa027 SHA512 a08a00c80dcd282c929078c7c3afed16a7c30d710294e1621cf2ca1841f01f95872dd92a0bea1f3d7bb8850c05cffcefb68c58a36c9b1eac1960d1d4b04e3224
 EBUILD sandbox-2.10-r4.ebuild 2222 BLAKE2B 5f0e178bafb0f28dcf320452c64317d9883afee0a68c09190e3293bd857b5ee816e4656b01b5e1dbb7664802d0e13a05540ab4ba61a04c93788dc1d21cee7c95 SHA512 dca8808e22888f5542a1233604a84b0a5e9952bf6e8792b24a716e477b254fc90ac1efc0cff0eccf832f10026cf56341011e227001c70f0d5eaab36c89b5a23c
-EBUILD sandbox-2.12.ebuild 1929 BLAKE2B 90e295a04f6959a175a4c723556c883e3d70cc3130f6c2021df38cfab4367973faa542524400eef573bbda44fc65eade37be53459fd7e24a117a016d10ae76db SHA512 77626c0f7780fb894d8617e5a27fbf6a71f238a190acf79428e296124b76cb895e137b40dcf0ee85574bdf5598b0134b33411ae4ce398329ba2afce4e2ccda4e
+EBUILD sandbox-2.12.ebuild 1928 BLAKE2B a7a78a1e8b6513b88b79ed395caa976601698355fc839004ae132b5a94e33295e4edc9d41e6c8e056c8fa0abee3c2199bc3a5fa09394ab58c5f60133c0b18b1e SHA512 f3e73bc7fb6b73490d395fe109bfbb35986720b8fafbdb3a1d8885a3388e4561b5e7f92a06c19909dca4e985923059743bbc0d060da39d1dc3031a8218a6e48f
 EBUILD sandbox-2.13.ebuild 1938 BLAKE2B 26db9bc8c8334a4a20bcb09765861f6ed6b6a3da6edd02cc9438943fc18271a9ffa90a26d37e2f648cdd5073a22de71decc21417db1ea331833f11d146f5ce4d SHA512 11cd256384d562de308cd579a04c3742dc436a8e3f4e30cc66d837373c2352b99b23bd4fbfee6fa61b74b7e1eaae95b7ffec1f0fb9785979b783c17f420cdbe7
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.12.ebuild b/sys-apps/sandbox/sandbox-2.12.ebuild
index 3d9a586102e5..ba03bd17b0ce 100644
--- a/sys-apps/sandbox/sandbox-2.12.ebuild
+++ b/sys-apps/sandbox/sandbox-2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index da895e67e87d..e072efe1f380 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -20,6 +20,6 @@ EBUILD systemd-233-r6.ebuild 13593 BLAKE2B 82e15d7171054d46049bc9a50a8482bc1ebbe
 EBUILD systemd-236-r5.ebuild 13008 BLAKE2B e3613cb1aeac22a92ba2f8c6ae47acad59281493ffb044d9dcb2417de9db1f00f29cf197b0fca764911edfc6c39ae7a49c56593770dd4fbba23adc35130ad3ac SHA512 259156a807ca41bc2fe36a87fa1b425ea5cd1b8c9a6f648487fcdeb1d8a8b7f607723b2cbdc2a5bf9b7d59f23716ab17b2032e41b214dd2fe71628c3272c96de
 EBUILD systemd-237-r2.ebuild 13075 BLAKE2B ff45dd6aa7ff3c27ad18495eb44a8ff04c67d8dddc80546fafa52e3845f1f3ded10f47f9b4e6c46b46786651d3c387f0e86e87ebf09f52045d62054fd9c5f403 SHA512 8bd6fb56e66284ef26f5ad525a38ce67e74d2b48d57dd15a1c67dfd60805da57745b837342d45c96406bef4c7a26aabf0de0db6f60fafb026268a6a154f457b1
 EBUILD systemd-237-r3.ebuild 13136 BLAKE2B 78e7a0488497d3fd8be87f640a5f9fb7c7547e4c1c95ae21ff36a42998ef5ca75e16e7421335b5a979ef05c273c9b69e1915afc77637d5f5836ca26579627591 SHA512 61522415b4d25c8d83ab2c598a06df60dbf8d545091f304dc86b42378e62da2c5a7eee3113e11e6b5225aa98f7287ba77917c1a2c3468635d0fc2bdf503d3462
-EBUILD systemd-238-r1.ebuild 13058 BLAKE2B 4d3e9d09c8d62a646df76641ceca518744f067d86b05e6d4dc8768d4814aa55cb223f9bec993e2a3b906caa6c08c85ef42b259376b06acb00bc3592a3efb753c SHA512 653a87575a6f57452104ad8f4ba763063568e2aa03ba5349c6559aba5b0113a615848aed06f963721648ba9d4ce85412e8f0eb1c18e2768fc32c3c0adf95a813
-EBUILD systemd-9999.ebuild 12901 BLAKE2B afcf2037823b319f9841a706f261f07d95037af089b78f4867d4d9d57de4e02c938566988072f66146b069ca7301e0859ed37b3eecae8aba5917abf0ea1abb06 SHA512 6708dc71ef3bd713ab158770fac5129c5da98c5613e6ddcc9b3e3c7755ebfb9541abb019ea0ba966260da674d45f07caacb65c5b119d568ed1f5edee82241857
+EBUILD systemd-238-r1.ebuild 13128 BLAKE2B 53dc9f5f6cae2f19e82db0d70003190a6673d0d5acd1c399b0064e6fde5d555033c358a31c784ad3bbba71e58240fad36a253fd94f7f5246f98ec7dfccac76b7 SHA512 ab797e98d3268fc0d7eaf97fa9ce6e5585f8da689204f46168d5746cee4f60f4f133a0aac777b12c47c035a4c21527d99d06209c5194add1fb57ee1dea7b8700
+EBUILD systemd-9999.ebuild 12971 BLAKE2B c8795664313560342f21b633bbab3ffb2e8fa71ef17a80852f542036ec77d72a3bac3127f9b41234014f4e5378459d5c72a4507bbb6316bcfa6fc8efe0a6f579 SHA512 e04558c65b09dc9303da2d5c8d78b502b992344e4f711548a5d400dd343f09e2ce4c5c072173b5d7616cb63943b8d2cb8176be920985f0be5a923e195ef391fd
 MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/systemd-238-r1.ebuild b/sys-apps/systemd/systemd-238-r1.ebuild
index d32d1e9d3d39..1cfd6153c46a 100644
--- a/sys-apps/systemd/systemd-238-r1.ebuild
+++ b/sys-apps/systemd/systemd-238-r1.ebuild
@@ -303,8 +303,9 @@ multilib_src_install_all() {
 	dodoc "${FILESDIR}"/nsswitch.conf
 
 	if ! use sysv-utils; then
-		rm "${ED%/}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rmdir "${ED%/}"/sbin || die
+		local rootprefix=$(usex usrmerge /usr '')
+		rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rmdir "${ED%/}${rootprefix}"/sbin || die
 		rm "${ED%/}"/usr/share/man/man1/init.1 || die
 		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
 	fi
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 6c34c1b92a00..44e359bc511b 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -301,8 +301,9 @@ multilib_src_install_all() {
 	dodoc "${FILESDIR}"/nsswitch.conf
 
 	if ! use sysv-utils; then
-		rm "${ED%/}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rmdir "${ED%/}"/sbin || die
+		local rootprefix=$(usex usrmerge /usr '')
+		rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rmdir "${ED%/}${rootprefix}"/sbin || die
 		rm "${ED%/}"/usr/share/man/man1/init.1 || die
 		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
 	fi
diff --git a/sys-apps/ucspi-proxy/Manifest b/sys-apps/ucspi-proxy/Manifest
index 5b44d06c3c47..aec031642a7e 100644
--- a/sys-apps/ucspi-proxy/Manifest
+++ b/sys-apps/ucspi-proxy/Manifest
@@ -1,7 +1,3 @@
-DIST ucspi-proxy-0.97.tar.gz 26717 BLAKE2B 5c3b677cb5dbc97f70f4b70a8b9b3ea20fad228f5ee6fa801435202a6d98835dae4ddbf2f2dd815732ce9c906171f90e7eb3d87eda32080d2454faca36cb5c25 SHA512 92adb00ee6af43c12a89cfb22b00f140fd222bc42b3faa8e6d660278344a9dacd9e24280a3e2769bd7e15787e1be028ee33dd670e627e46ed92065f5c37e08e0
-DIST ucspi-proxy-0.98.tar.gz 35278 BLAKE2B c8153c30926d9d4b6f00a41de3000f4c7814af5d1eda8193e208ea81ec4d2aa04af6831d4bd5e1fa5ae73113a3ebd7b112e718a9b206888ac47b81276daa6233 SHA512 db767fd19825753107965a3f8a7e8c588e053fb911b3cbe1060684e6100244f9ce720f73e97bdfb26a3af00f6dda2a011866f7e5008ff7edca71b0fe3319da1b
 DIST ucspi-proxy-0.99.tar.gz 35537 BLAKE2B 0b3f809b027dae6d83a39aa7b83d0747e2046409b97ba2de678d49a3611ea08f82ea9f30f13a3cd67dbc06de881551d282b14aba67addcf294e64156d2d6d5bc SHA512 5bed82bd0db2501c3de8b38e23a07c39bf9937b9ce95166cf1822a6bd5551aec945dc01d6ba716d7ce35f4aa7f2a126d860d31f7df2d807f1f4eb5e355e93164
-EBUILD ucspi-proxy-0.97.ebuild 755 BLAKE2B 9ff1c929b49b7ad0c72a5106d6e6014910e94ecd4ce661759c7b7818018618c247ebbc780b06ec84ab95d5c61d60370224f3d6d10856c729beebef64b12d9db2 SHA512 6089b38d3c801fedfb3d287a75b8410954210381711168c752853f86c696ebf0274c29b757bda50f134fd2225bec155d8fc9036620e4390dfadcaf28dd0b009c
-EBUILD ucspi-proxy-0.98.ebuild 865 BLAKE2B 49ca75579d46ecf6f9bb0650a892f3b01c284d5f9eeb36e345ec770c970b1b46af6b19bc2abc5a4c36770b9a89d019aa05e8a1c40a9a1ed306a3334f97cb14db SHA512 31e67ceb2cedc179f475e8a4178fec3d103b0143cd6f48769f5e5443cd98239f78dfe70849655acaa39fd24ea446c6d281c4253bd292b8467879b3d203179b30
-EBUILD ucspi-proxy-0.99.ebuild 796 BLAKE2B afcebb1a736a72dee5e5880485f22fa733595139c53c9612ef164f6fab3289963a13b17a11e4f0e969a244f287d7c786bc527c6ffcac1c331d6d9ce52f465b18 SHA512 2c5cdcbdc2609035fd34cc42e0d5ebbe5941ec3acd112f4f179e0401fb4d2b5278691a0c0bac0e1b0e67cc07b56f5a2d111223779a25444751f30d91ffc18268
+EBUILD ucspi-proxy-0.99.ebuild 795 BLAKE2B 1fe311503f626e092ca81fd2a0d9e76bf460df87181112d3ef5c15804a85627d7ea974bdafa2c487b5611bcbc998fd82bdb456f303876426686bc96b055b2d94 SHA512 390de9c8aa461015cd08f9354aebee5bb7579ed17f33ea5b6b4d35cea4d9fd377c897bd4f0e142542a2047f610144e240a33da3ab05b935634f4d43474522eff
 MISC metadata.xml 439 BLAKE2B 0765793e54cdc093b3d94ffb0c3f938bb12d53e99a21f091ad05e1f23ee599c77d0b6af04e1f33a92ea5916131718e97e7ad7a48921e3622682ead4eb35992b7 SHA512 86623b17b403875797df6844dd2fe579cd1eddfd0c859e785a9140ebee91c9e35ad3ee9de001ee5b9887f46d4a08e6bf459fdbe1984c4666993c9c4ccbbb3a40
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-0.97.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-0.97.ebuild
deleted file mode 100644
index 5eeb9dcf1f2c..000000000000
--- a/sys-apps/ucspi-proxy/ucspi-proxy-0.97.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="A proxy program for two connections set up by a UCSPI server and a UCSPI client"
-HOMEPAGE="http://untroubled.org/ucspi-proxy/"
-SRC_URI="${HOMEPAGE}archive/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-DEPEND=">=dev-libs/bglibs-1.025"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "${D}/usr/bin" > conf-bin
-	echo "${D}/usr/share/man/" > conf-man
-	echo "/usr/include/bglibs/" > conf-bgincs
-	echo "/usr/lib/bglibs/" > conf-bglibs
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc ANNOUNCEMENT NEWS README TODO
-}
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-0.98.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-0.98.ebuild
deleted file mode 100644
index 7a54182bf1ba..000000000000
--- a/sys-apps/ucspi-proxy/ucspi-proxy-0.98.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="proxy program for two connections set up by a UCSPI server and a UCSPI client"
-HOMEPAGE="http://untroubled.org/ucspi-proxy/"
-SRC_URI="http://untroubled.org/ucspi-proxy/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/bglibs-1.106"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e '/^>bin$/ac:::755::ucspi-proxy' INSTHIER
-}
-
-src_configure() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "${D}/usr/bin" > conf-bin
-	echo "${D}/usr/share/man" > conf-man
-	echo "/usr/include/bglibs" > conf-bgincs
-	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs
-}
-
-src_install() {
-	einstall || die
-	dodoc ANNOUNCEMENT NEWS README TODO
-}
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
index 78e0543f0e25..28b9fea119e4 100644
--- a/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
+++ b/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/ucspi-proxy/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/bglibs-1.106"
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index d6a4e06745f2..0c2c3bc0d950 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -6,4 +6,4 @@ DIST udevil-0.4.4.tar.gz 477254 BLAKE2B 16a1980da8b3b98e36921c8e2fe6490c49506617
 EBUILD udevil-0.4.4-r1.ebuild 1922 BLAKE2B fdecab7535d5e4abce85d8ff584f825ba19879dd5470261f8954b311df119cfeb247760e4c5b3d7cf5195a4241ca6310b926af780e585ca3240df14093190bb0 SHA512 9ccb1b2e9fd377c02cedea8ee3e8bc7ee0b0ccf1647b733d34122969d24a284e40d251c3d0e294aeab1b830589d60621e793071e46d523bfe34ef12b5deacad9
 EBUILD udevil-0.4.4-r2.ebuild 1988 BLAKE2B 6e2cfb15a2a7d80fb125aae5577b166295f54aa770f7149b4153f34bd55b7b3f4577c91368de493265caea0df8fa4f935a7790210e013cd74d8ef72093552643 SHA512 6802bb465b172e4a42fad2366bcb4ae1ae05b0c48f772e0ca545df5ef8409ad21c1dad721a9838fea188e6ba4bb7e693d03f18fa73895d60074641ca1050ab8a
 EBUILD udevil-0.4.4-r3.ebuild 1989 BLAKE2B 4f021d1b6e6c63d3f3b2b66273116f1dee686116cc36018228976ae8e007dea465ebea76403eff70c584680b74539e57abcf6c76cf7b4a302bdaf76db68144e4 SHA512 dc1d1d46004a1633ecab5096383caa64e12df393ca79cc0688dbbbfbdb6bb55712435e3703d0970e387c494157bfe6085dc50b73f5ae7f440629f553d348c797
-MISC metadata.xml 347 BLAKE2B 0b64f860e96ddf20c1d28627228191ed4a3798c973577a48c0cc71e4db14afac769bfbf25a7176e9cf39b30b5503453f651c1c2656be4c74296d251e0fc807d9 SHA512 c4533e63e73b7f4156a234b4ddf6d9ec5849af219586bbb8a0a63cd5bfb89bd072b5eeb4184bedc4adb400ee81ec552720407cc4599e0197e4b1fb7a5fd73cdc
+MISC metadata.xml 464 BLAKE2B 0de226849a44b40e604638931073efd8ee15bacee1cb6c1d846f1653d945148ec4741e4c6272490de3fccfad802cffda0698d57ec430cb205a06413c4a1e362f SHA512 2ccec02caaa19626537a34923d6e9d87541c9f33cdd53b138a791025613b5d27ff2f3d3e05eeae23e5e4bc60c040d31c4e776171cdb82d9312de01d562e7cb90
diff --git a/sys-apps/udevil/metadata.xml b/sys-apps/udevil/metadata.xml
index 124764d8351c..9fe353059626 100644
--- a/sys-apps/udevil/metadata.xml
+++ b/sys-apps/udevil/metadata.xml
@@ -5,6 +5,10 @@
 		<email>ThyArmageddon+Gentoo@Gmail.com</email>
 		<name>Elijah El Lazkani</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">IgnorantGuru/udevil</remote-id>
 	</upstream>