gentoo resync : 11.05.2018

13 files changed, 12 insertions, 135 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a874f6d8a8ee..15fd748adc5b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 83697178fce0..66cab1a4f04d 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,5 +1,3 @@
-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 1144 BLAKE2B 453c85be0a196dc2514e0589346d9b8015e5671f496483574ab71c6858b45a1d1599a84a59d727e59d006b61bc5476d0c31b30b9a4107e806affd107ccea33ec SHA512 23a0210cb4291f580f12291afb4c56fbbddd8da9cfa1028804e2826a9374aabe4fd3fdf9c5884ad5071aa44346d7681d9bd3dc60dc81c1b60b2ab3a69f28c94c
+EBUILD dmidecode-3.1.ebuild 1144 BLAKE2B 2aae4c52c90d409639e8317795a8a5cb6c82f29b391fe1ce5fde0a11ffafb426119d0be8fb9208d77311396f032286b8c763cb1e90e89ce137cf5fdb5b80c84b SHA512 f039310d57092eaba3fd1a3ec7ebfe8e195c96e64808789fa8bbf7c7425365d6e6fcec535f5dfdb7b5bd7a0b530f4f0a7b95e12b37237c0f85219a3968476f25
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmidecode/dmidecode-3.0.ebuild b/sys-apps/dmidecode/dmidecode-3.0.ebuild
deleted file mode 100644
index a21456f2e204..000000000000
--- a/sys-apps/dmidecode/dmidecode-3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
-HOMEPAGE="http://www.nongnu.org/dmidecode/"
-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"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
-DEPEND=""
-
-src_prepare() {
-	sed -i \
-		-e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^docdir/s:dmidecode:${PF}:" \
-		-e '/^PROGRAMS !=/d' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		einfo "dmidecode needs root privileges to read /dev/xsvc"
-		einfo "To make dmidecode useful, either run as root, or chown and setuid the binary."
-		einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar"
-		einfo "information without requiring root privileges."
-	fi
-}
diff --git a/sys-apps/dmidecode/dmidecode-3.1.ebuild b/sys-apps/dmidecode/dmidecode-3.1.ebuild
index a128dccc3dfe..7db50407baf5 100644
--- a/sys-apps/dmidecode/dmidecode-3.1.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.1.ebuild
@@ -6,12 +6,12 @@ EAPI=5
 inherit flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
-HOMEPAGE="http://www.nongnu.org/dmidecode/"
+HOMEPAGE="https://www.nongnu.org/dmidecode/"
 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/gawk/Manifest b/sys-apps/gawk/Manifest
index a9e89da34a11..1e45fb425789 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,16 +1,14 @@
 AUX filefuncs/Makefile 1112 BLAKE2B 2aac64b80953a3253730209b9496164cfa2d3e9d18c90547cc7290329e2639ba4499a7d9c9a87b79c05f31a8cea3ace1663de8adaaef5d75d6b25ab8017951a0 SHA512 9bf5acfca439e6589247db3b4b16985765e748bcb66577e7038247830f92137929f139f6ab72ecb9e2b3b03f9406c8ecf7ca349329979ee8d70fbf44b4feb2b8
 AUX filefuncs/filefuncs.c 10875 BLAKE2B 7da403cea52ba69b3822aa892ad8faa12fd59d64d434f35048e34a38273f57fac73a42d74d88e68c33feae015ac241395c2f71c3e7e7e99b526814d9347d8c73 SHA512 48da0dce39759a8d57097b286dcee2ebf1e1799b694a4a7926716df727eb294a7912117c405e1b63a1722fa3a2427cb2139d92fac723ffd8d2e697632719f974
 AUX gawk-4.1.3-bsd_configure_readline.patch 1899 BLAKE2B a7c8ce8aa8fb25ce3adc74fb195bf8c9dbd7b83084f4f901c61758f5a51969510aa3ae8c9f2668266d798d43563f6fcb7e8659ae9f7cf7514f86de2f5443fed6 SHA512 ed3b6c4efe5bcb53bca6eeb50df0e3871eca266dd3d6ea4369f42dce31b771ed0a4f0aac03b09124706539d18c8d1dfe549e43d2ef4cf80a45353e14238ddaec
-DIST gawk-3.1.8.tar.bz2 1984129 BLAKE2B 9e3c130aa246f3dcfc03ce88da644d0fdceff01fc98fb25c1638d3a03e9ad4c435960c41746eced0f7d955c6aeefde68b75c4449bc95be26be59720b267b4f84 SHA512 a8046c1a5a6ffc8bd90cc6062d97ba6301b7a707f4a34a06355a83aaaea2ccdf4c4476563fc6f444b529a2d8d3a2de2126b53434ba50aad8bd898fb3299904dd
 DIST gawk-4.0.2.tar.xz 1626808 BLAKE2B f66ebc3650c7288d46ed4548f07c83cbd591873a5d364965d6768e6455f64334cb03cb91e83a110d5edaa917c7fed714cf66154cea5c0ec22ef982429ad03265 SHA512 069f68b6792521d94d4003764006ad8fbe9a17c60a88212629204d9a5eb3f662903fff6d91dd3c1834597b76c18f9d3231c93a033f456c59c0571ac13eb77b27
 DIST gawk-4.1.3.tar.xz 2311268 BLAKE2B 956872ef3c8bdf27ccf9c3f7f158f161f42bb8607af7f966e843e24cb4e4e89380cd05a3169157cc822ea5ce8d849993b952795ecd0ecf14213f0bdd689d1b16 SHA512 8b9470a1bba397353f10e4e652e8589a637a49e8235fb39ca7681ae662fd27cd140c193d0634179c800f99e19b0e49aef55dfa6612f9695ba80760a36936a1c3
 DIST gawk-4.1.4.tar.xz 2367832 BLAKE2B 67004e2867e4c4f43aac7142a52c83642d8bb3b0a5451293418bc15e575a8ed1d97c0a975e084bf46ffd1c27dc70e48de492cd2e007773622ef14886b9269ee1 SHA512 6a0e9cf086544212f54b54261dcd517b611aaf495ef99c4b7740d07e363bb00c5632f3d7fd5e12a954d5aa9793764162a57453e0e18884b29c6c54b5f444c097
 DIST gawk-4.2.0.tar.xz 2948108 BLAKE2B 6e46b70480184edd3a70bcea2b4e4448b4dfbac317be6e1a6d9225bc6c0b42abe49fe9380231cb3fc87efd449d2c5232ac7099b4c4472c3815a52200ef0013a3 SHA512 3076b2f42e43fff0ce63dcaa3fb749ce421473d0abc3e1e2d9dd375207d3e35c98d5bf91c3179f49156e8a4977424c16bb2d3d662846ad487153729dd4cfeb4c
 DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
-EBUILD gawk-3.1.8.ebuild 1782 BLAKE2B a960ff46bb378cadf1b7125fff29ac6045e403d1052025621fe565145f792a43a79cc4ac540faf217670f69ffc8a0b9b5af4b7a231de624c3c0d6832737c68ac SHA512 747c9f7f32af7469b7359bbaa7e329a84c78aaf0c8c122a0003bb3e32dad47d1470edd30f215504e0305027b40a3e72e8000ee3889e7cbc4c427ebd12bae884c
 EBUILD gawk-4.0.2.ebuild 2076 BLAKE2B 73d9ce392a42ee14556b70be84ed284108212c471d7e31faaaf07305c525ed73d16df7d3bdc12539ca50352c861a4ed7ca291a376e7516c0f4facf1bc1e813c7 SHA512 69f941d2eb134277c70b4e7ea4364a8902d7522903064192c7f306219128fb45f0a2d42ed79c852da918acb0c740e49052d36a5e27d331d239c6e6d811b7cc41
 EBUILD gawk-4.1.3.ebuild 2003 BLAKE2B 55c637567276e73fbb4032c3d297480a769ee0769a354ec491a857da2afb9708ad650d5f70db1224d315dd82675316cff38ef0ac3af83cbcf280dbfbbc24078c SHA512 87b224aa2cd9b231eb088b588242860ef323913ec64cb403f7622504f82e8d4431fc7f0b53d5bfe33df5c2852b5b6390b235870d4a9e3058fd4803dab2eeadd4
-EBUILD gawk-4.1.4.ebuild 2091 BLAKE2B be60bed6d3882d4c879928a513b335a9027a4bdd3679170c5b6e8ecedab5d2d1ecab44b8d48796eaea8de617dbe4f8ecad55ea53a0058a02cc7672a54f4593bc SHA512 6e5491b47841e72d192b7e968d480b9b12ed41d8cbd702dd9d1afe948bf80e98e48c90a9a89d7f6377c9e69c2b0f3e86bfc8fdab6e03d1e50c87307660568d27
+EBUILD gawk-4.1.4.ebuild 2090 BLAKE2B 157b0b2d6eed94587109451db8aeae9b809f16e2adff1735d9111ff486ccacdeb0f0add59cb23f58ef80e72fbd746bdf80ee029bffd1ccba5219f6609b124d00 SHA512 59ba5329f4334688408e6afd9fcc0556f87e46bc5f860ae140197c7b0a2a62dfc6236199a9588c1ee57f4ab946ee924bbba804abbfd0125f8acf4dbecaeb9589
 EBUILD gawk-4.2.0.ebuild 2217 BLAKE2B 7167b9d789eb38036c4ae2d46ee00c8ab29dcf959920e92a3529380fd132126c27ef5125cfa52165551fb6134217230512f98a31259316f4977ff5013df56038 SHA512 8711fd432cb13b920561bf5ced80694c3cfdca84932301bf5ffa505a3fdc0d1d07f108534ba18cb386cc05061afa00466d301d46b69abc5502f315d094a982aa
 EBUILD gawk-4.2.1-r1.ebuild 2574 BLAKE2B 887cc51f129b56ace31986b3718c3ffadb8f19a197aa59427ccc706032e4373d0bb80ac6484405da2f2fd8417e8d7759a07d7b895ad59d415d6d9889ccdb6920 SHA512 4abd41cb11ba0cbbf8ccb2ef9459678af6ac6507a400a8cbd7d96f41045847101ab22721ffc2637e2717bf88f591f04adb817ae91360e8573ded16ea16c4c31b
 EBUILD gawk-4.2.1.ebuild 2204 BLAKE2B 82c60e85badb8d968c796c6aa83ed366b0b399fb32342bfecabc6aeba7dbfce73361b5a7968d9a61269d0c25cfda7c5add6159f62aee7dd6fc35f4f1bf93445b SHA512 b814c89f185cf3086c7a06f2bfe2a1bae616a9b5bfd062ab9c230c043f9072ead65ab438295b5c7abb430bcbc9a5c601ce41eb8ce1a0b8e429fbbb9a3881bb6d
diff --git a/sys-apps/gawk/gawk-3.1.8.ebuild b/sys-apps/gawk/gawk-3.1.8.ebuild
deleted file mode 100644
index 8d9f004395f2..000000000000
--- a/sys-apps/gawk/gawk-3.1.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
-SRC_URI="mirror://gnu/gawk/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND="!>=virtual/awk-1"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-SFFS=${WORKDIR}/filefuncs
-
-src_unpack() {
-	unpack ${A}
-
-	# Copy filefuncs module's source over ...
-	cp -r "${FILESDIR}"/filefuncs "${SFFS}" || die "cp failed"
-}
-
-src_prepare() {
-	# use symlinks rather than hardlinks, and disable version links
-	sed -i \
-		-e '/^LN =/s:=.*:= $(LN_S):' \
-		-e '/install-exec-hook:/s|$|\nfoo:|' \
-		Makefile.in doc/Makefile.in
-}
-
-src_configure() {
-	export ac_cv_libsigsegv=no
-	econf \
-		--libexec='$(libdir)/misc' \
-		$(use_enable nls) \
-		--enable-switch
-}
-
-src_compile() {
-	emake || die
-	emake -C "${SFFS}" CC="$(tc-getCC)" || die "filefuncs emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	emake -C "${SFFS}" LIBDIR="$(get_libdir)" install || die
-
-	# Keep important gawk in /bin
-	if use userland_GNU ; then
-		dodir /bin
-		mv "${D}"/usr/bin/gawk "${D}"/bin/ || die
-		dosym /bin/gawk /usr/bin/gawk
-
-		# Provide canonical `awk`
-		dosym gawk /bin/awk
-		dosym gawk /usr/bin/awk
-		dosym gawk.1 /usr/share/man/man1/awk.1
-	fi
-
-	# Install headers
-	insinto /usr/include/awk
-	doins *.h || die
-	# We do not want 'acconfig.h' in there ...
-	rm -f "${D}"/usr/include/awk/acconfig.h
-
-	dodoc AUTHORS ChangeLog FUTURES LIMITATIONS NEWS PROBLEMS POSIX.STD README README_d/*.*
-	for x in */ChangeLog ; do
-		newdoc ${x} ${x##*/}.${x%%/*}
-	done
-}
diff --git a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild
index 90886233ae56..6798442e0645 100644
--- a/sys-apps/gawk/gawk-4.1.4.ebuild
+++ b/sys-apps/gawk/gawk-4.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="mpfr? ( dev-libs/mpfr:0= )
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 4ad4f2cb5a6b..6ffe7121f90d 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -4,7 +4,7 @@ DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e0
 DIST help2man-1.47.5.tar.xz 186044 BLAKE2B 288eeaab3781293209f4a6aeab570317e5ed9e2e76acf9a1669c767b627e3896936fba775e32f6016b7881b5747a51b5020c0ab4fc77030d1e27c15acab032f1 SHA512 c94f94bbdfb9e288edff2b3181e0f2e858d309aa4fe77cae141571a06b9b5bc2a5c5a4d25ffc1f9108222d56c9040989d63770f5d804323a52d3978059d1eca7
 DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
 EBUILD help2man-1.46.6.ebuild 949 BLAKE2B c1bc74c78bfb78764a17b747e1f16a0d2abb8f78a1e35737f829212f127b0739f97f14dbdfc1dbe465034dd0f603868e35cd02b2fceb15c699946cc93fcbe5b4 SHA512 578767b49b696227dabe944055ceb1afc410382230de113a6a6b898f23a33fab50dc433b670329bd550b61ffd12955e44ea1a8729077d521bac43156f3cc31c9
-EBUILD help2man-1.47.4.ebuild 1084 BLAKE2B abd1b902b76ae6ffa86ea10570bbd7a6bee205058aca557841afdf5ca2de512b88e764272c5d9f1821464882584c777a64af9eaa41f013dcce6260e88ee1bec9 SHA512 4ad10c0dfede919fe044af9970b05f42471eaba5e0b036bc27dce2225aa0385523919d3afe3bf33c5eca89d49ba8ebe4a093755584f43ba17bc50877b95b195f
+EBUILD help2man-1.47.4.ebuild 1083 BLAKE2B 7523e2059116c743bdee30f6fc6a5698f6d899e0c35215b0029195658084ffffc92db6afd02c4b5b3275c1d8d26a899c0afeac5bd8abc16bf1810ba3ed45130b SHA512 964a18c1fae41a4c6f45cca17f8109b0497c5334cb06dc88d5aabccf7337d66c8a53142473cac9b5efbc8d9bb5a9518b665b01f663e96fa7d6a3599ff16f7a65
 EBUILD help2man-1.47.5.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
 EBUILD help2man-1.47.6.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.4.ebuild
index c3def6fa2190..d56029b0fc2a 100644
--- a/sys-apps/help2man/help2man-1.47.4.ebuild
+++ b/sys-apps/help2man/help2man-1.47.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 10dedf51da6d..9c218d969240 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -21,5 +21,5 @@ EBUILD portage-2.3.28.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066de
 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
-EBUILD portage-9999.ebuild 8795 BLAKE2B 82b5c300a67ef35dc2e57e2680efec39cfe4247e5ae8b6e469bfb022275076056b0ec05f280d4925a4537588d94b471397d8a065c2a80e6e64b5e9c51cff2ec7 SHA512 fadc6f2da2fc363438aee4a04b0c36bad372d724c14591fba943b6f9f7602d820300192dd1ca9d78f32bf2279a27aca0c74364a2563a58a135f684adfbaf1910
+EBUILD portage-9999.ebuild 8811 BLAKE2B 2b31ee7001e79f48f4d0e0d8ef131bec99cd2625fd95818e02606b849d4ccdc56a67377a6f4965983ce8933fdf6096a239fd1d86644c9b852e74bc934db130d1 SHA512 9b5fdc9ea17f6f7ccb3358b27a3c16736ed989601c74e69e9168ab44c215dc3ad69710e2e408b4f1d4676f1c5a19abdb93b80fd674051150882f2e5da42106ee
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index b82170153d2a..88afa1be609a 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 			python{2_7,3_4,3_5} pypy)
 		rsync-verify? (
 			>=app-portage/gemato-10
-			app-crypt/gentoo-keys
+			app-crypt/openpgp-keys-gentoo-release
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
 	)
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 1d27d75e99e7..aed8e3b5a8ad 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 1156 BLAKE2B bd9b0d29261bab295cf7535a944d1b236b5e0947e5f06b25d7ee21be7a0b40078bc9ee9dc8c60023f53bfb31d20abda2f56e6ccff378c00a350aa08199610006 SHA512 adfb7a089bf509283257c37279aab40a6b14faec314448df87b2fbd8988ac579acd55e08639a6c3ec998de6c4a88a79a9abbc53b0a523a75e20d5c22a9db491d
+EBUILD usbutils-009.ebuild 1153 BLAKE2B fd5250014bdb4100c967d87046800ebc16085e17bb1fc905418fea5af55c6acbdecfb87ca22d27ce2ddb45009d7785fa58c5a2bcb8a86142290810120ab589c2 SHA512 7eb4c4b29b35da05ab5533eb202fd0c7d9e44ca8c8ce2c86e553dae97f8153306eb3101cde7873f46eb803224307463b734197da409741c426e12a0e85c1e7b0
 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 ee9aba52d6dc..80d6bd97b9f0 100644
--- a/sys-apps/usbutils/usbutils-009.ebuild
+++ b/sys-apps/usbutils/usbutils-009.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
@@ -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} )"