gentoo resync : 19.01.2018

19 files changed, 78 insertions, 72 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 93baec1391a3..1f1fbb287d64 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 1645a8054644..9fddd265744a 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,5 +1,5 @@
 DIST baobab-3.22.1.tar.xz 947932 BLAKE2B 820c483964ef44d9ce557253128030044f456986e4c71bc0c2e64436290fd2b9e4aeadb1cb717179de68064faf80df5deaeced91d535eb5ae084abeb897b62fd SHA512 6fae974ef79dc9b61269cc07fcdb4f6d8f043cf3eb8239c2408a7ccb1445800c1beda85da8ae9e0da1a39604e4896a6aab0ab04391286df20c20783d208c6c36
 DIST baobab-3.24.0.tar.xz 970636 BLAKE2B bac7397a0b157723f8341b09b7e00fdaef2a50803ff901be6c307aa733b72478f7b3f62850e3e8445b79d1ad17668c617655aa7268402a487ee6e10267d0a7a2 SHA512 7a16cdc7b4e77e8bad23bccc171b4e552b2eb33a43822579cdf4b1d5ac76526955c0efeadf355fcda3a72b1fd6f8dbf2a6088406b5a21b8ecc4d06ff525baa17
 EBUILD baobab-3.22.1.ebuild 826 BLAKE2B f6eb457e87e64cda16727b3a3f1a54e404f4c0e44102205a0456d0112dfe5346bcacf21fb7738a77ccd862673146250c7ae4bce29e296d5150ee04244ddfca56 SHA512 9f7237475393c82e795a34f2e52bc7104b0200d435643ab54eeca2bde42c059282fbb224c4aa655bda6ffa66dd2c910ce9e5e3519a5c11cea0037443b5424690
-EBUILD baobab-3.24.0.ebuild 828 BLAKE2B 7f51540a53624bca01fc4fd06f29508cb3c8aa997ee6afaf6ef5571b28e670efd9f45cf48ac5a314a3e75e050921c228653c0af1fa57688bc5704b92f03893af SHA512 748a5e5dbb070407baba99f1e555895f425c6e2419eafa4e89c1f1ef80b22609af4f6d994e43c2e15587001c070c61412d0b7950bbe909b876f722d34dce09f2
+EBUILD baobab-3.24.0.ebuild 827 BLAKE2B c4ec6a2609a1e3e017e872811299f8c19d54aed7b5bb10d3673a4937387f4ab447ad50ff515b26a9bddd507d1627d086bde2968f82ab7ab8d80302a19a4b7293 SHA512 9901c6ffb70d93856727e0dc95852069665e47e65953c243141a98dd2c759b457a2931c17218132621e48f832d9878c9a868b84498110f371f241ca8971c6d78
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/baobab/baobab-3.24.0.ebuild b/sys-apps/baobab/baobab-3.24.0.ebuild
index fae7e7cb7c50..c7fc52195c75 100644
--- a/sys-apps/baobab/baobab-3.24.0.ebuild
+++ b/sys-apps/baobab/baobab-3.24.0.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.40:2[dbus]
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 3bed02a23ae7..d305f5a4849a 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-disk-utility-3.22.1.tar.xz 1455508 BLAKE2B 49075e3b6e413a6c69e483004aba7fe4212c2494992f7177ae8ea139bab9f4f657e9ce756ba558b073a09c7c8fe24f58e470bb52811a7bc98fb9c6048ed9b98c SHA512 f8ea64eb5adc3d6d55669bfa85c80a23f91ecb86f8632ae4ef035ad5062375e4fd73581f6ad12f6d83b1d6d98508a046b64a5a6544dea59765da2ff4b42b2d37
 DIST gnome-disk-utility-3.24.1.tar.xz 1947976 BLAKE2B a3b9d02417bed415bf6b9b8d86abcfa857abe316133ce7abfa11db835831e916d879b09d1e1129d12621b0234ffa27c1e246837cb614c51c54ce387a9c73bea4 SHA512 ae6bf83e005733ae985987411a9fe25b0059f64484fc0d613ad54af478130782974607bec53713ee36c2a28de653ceba82b0fb091aee57101773c0eeeaaed2d5
 EBUILD gnome-disk-utility-3.22.1.ebuild 1058 BLAKE2B 93b66145017932d9f09b7b660e4a17486d45311911e67cfbc8a9685078e18725f7a080a0333b8adb57b7650155e2cd3fe015f91a7ab20e3086387ed917f819d4 SHA512 5d521e064f7af967328969c485fe93247560bc9d05396e4096faf470b3b9c09fdcce389a7e50e5340de289e264b4b89d7dfcf5c0ba216e67ac3c5b61a4088671
-EBUILD gnome-disk-utility-3.24.1.ebuild 1067 BLAKE2B 22a3f6aff293ec39e39564df3bb826f32dff15355fb3b61b21d0c32c46fe4ff82ed9fe6c5b41fac2ec2ec980ff77518808b0850c79b60dab5851462db82081e6 SHA512 5a6b2235eef2cacde893982b0744ef695cb9512c097e0fb7bd28a5959dc3eb77a37b4070ab333085f7f31bdb07588b7d8e3c8b2ebd9f81bf9aeae11e3ce1a75b
+EBUILD gnome-disk-utility-3.24.1.ebuild 1066 BLAKE2B 257f6de11937dedbc6db571701aa09e78c586b7f327eb33862719e198b14495528aa66d6384142234d5832c1b44ae34bd2f5c7d8f2725de0dac24d867eb1ee48 SHA512 1aa5919aeb1c3d78fd4d9dbe0132dec49627752e659fc56cb0e162bd5d551dafce76981a3866153e15f73c0c9a5682f1109b0aeabb41acb7a1fbd59ceb1bad7f
 MISC metadata.xml 348 BLAKE2B 78a8cab4d641fbf3a66632f3f22b66f271f39ec44c6afe18b7e2ee3b049f36a5fa1ffc29964cb293125061f4b2be45ac9f09e136f42aef428375bf3630e92643 SHA512 7da9aaf34df822f6f62b606fb00655a4d2a7bf710cb9e265dea98b887365d64536c927caa2810b9b1d92dbeb8c93f9e09b7e529e4304bdc4de5d4f6d61208c24
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.24.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.24.1.ebuild
index bf51a951acf1..c5f6930d605b 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.24.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.24.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=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-disk-utility"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="fat gnome systemd"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=app-arch/xz-utils-5.0.5
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index cd806e69f5db..3990037954e6 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -2,8 +2,10 @@ DIST inxi-2.3.37.tar.gz 454862 BLAKE2B f1eae662a2b33b4c3a50f3a9a0a500c9c3d2055f6
 DIST inxi-2.3.43.tar.gz 457941 BLAKE2B cbcdb3061643ba3516c93dc13e5e0e25d0740e4aa39519643467b03913a10e4ad1eed9cd52f62e7dd344b70f41124f248e48e7d1abacd55dbcb1401b07b1a88b SHA512 33c9ae788ab139f5a2511a3b5bd51276dafb3b847920345b02ad717e1da71f9a78fffc9e55b1085c91d014c2da940b1c64f72db9b59f7bb8d7e442bbbc0bd947
 DIST inxi-2.3.47.tar.gz 462826 BLAKE2B c825b80b5b05fabfad22cbcee685d5c5caa7835493555f1e930dfc11aac35fbe7529fa4738d41dfaae4c6130211d42f576d77ba9f764864bfe89b70a4c0d602a SHA512 be2e0f1880e1b7604acd1f7b8f6595536e12fbe0998f85a195e0892bf1b9942c08f791779f99526a337d097259ea8d3cd0b04da465f8deb1b30bbba9fea4dc4e
 DIST inxi-2.3.50.tar.gz 467912 BLAKE2B e4d42fbcf073c5815451848d55ad24b782a0851d7701ca87f88ec97467a7968577d6ebe3818cd2b5a59017fecc11baa686d23ffaf0f18ab086bdba0393a07fba SHA512 5f32abb56f8466b5c166616680bc7b6ab5d38b76720ecf3d7d065c5ae08de0bdcf14c31b9ab207adaa7c46f4f292c9971022f27aabe5aa14bb3e828a01bff97c
+DIST inxi-2.3.55.tar.gz 471764 BLAKE2B 0615ab13b4d3164ea180b3c34ec6e2d4cacad9712d1c7d3161821398498ee31515db8a84019ac64f7e5c8bfda12473341869432dada4649d4d0e65f411eb0903 SHA512 4b5ca427bfe77bbce95f2889e118cc051c7219328f26c1281d8c4fff5b6de1a34c9813367a79d1a92f5808cbd13c669e463d6a5b965def7c3d4ed29c2aa91148
 EBUILD inxi-2.3.37.ebuild 682 BLAKE2B 04680e7cfe7484c592f47222753684436ee0e15bc8cdcdba1886e11cf25fa39c9b38d6faad71558856554793c29e83a78edb9ea7b6291801d3d59b4a7c8e41dd SHA512 8eb8387e4530484bd717b0449ecba493b0551328789afa5b742b9eec6c67d96fa1a5600385e32bf7521f2e4e9f279bcdafbcfb03e2efa3aae7659e287f9d6044
 EBUILD inxi-2.3.43.ebuild 801 BLAKE2B 5d96bf7434461c805136f71af2f8cbe29455aea670309ef8502a2fda215d2a682532d1bddbcdc720abea7b11e32abb1b6352476dc388dedc0f9ce951dcf4d993 SHA512 d7b716fabac1c5ca6e00fb3baa49c5563a7eade4dd06bd15f87016d41c93caf19903e342bc96284a16d48cf5fb0301e39f65818a9bfaf4b90024ccc8a9720cf3
 EBUILD inxi-2.3.47.ebuild 801 BLAKE2B c4ad47cdced83771be89576fbe0f67f0696335db10111390987c8f690d75027e2bec0ad560b0dea0c88ea0cc4ec142c5ea24aff658597337c4c50cfca4d522aa SHA512 610b8fad3e0c45416edf0b0e313461b7beefcfd8321624209995fec0af9c29c68b0816853931dc665cc7db33d18fe7fec01830bd8d79ad1bd04b074564a5342a
 EBUILD inxi-2.3.50.ebuild 801 BLAKE2B 76fb610a56e89e59f823f63459c8b25f1b1de1e94d20f348b005d3c2100157cb1ee3f952c81facc762950fc9af14dac3cf1da09a944bcd0180cdb3a6a2b5c1cf SHA512 00fb80778b5510756ac782f17c81e57efb6f8aeb35cf30c8cd460b69993a7664795a22ea83954a8fc4775455d10e240878c0896c861f67315198f8ad67b2e616
+EBUILD inxi-2.3.55.ebuild 801 BLAKE2B abb1c53cb6a091142fdc7357a88e1808399c144a131cf1a593fe07961893d7a9d5ccb80583c9cd9624c4c6f50d013e0933b13a3a8c445871b0f4e56dd0b9f62c SHA512 408a987ff2be27b1f0e59a7269cd9b05c4ea60703c9ad385ef75760cf9406ce9f8f11acf8b0d626193b725ce2a3521f877f0723d92d4ca59175f517240b537a3
 MISC metadata.xml 444 BLAKE2B 0b67e0f6a42d8b68edcb1fc907729e80cee8ccb0a77fbf768cb40f62e1d665852bf17897466f76b578e2c4225dd5180ccecce899588be420064c5af4b89e99c8 SHA512 f44e29945d98ff44784623624a9c891942c0b69b6272322bd4665a5d49684cc16ee9b01b7a6f60872286a0a96aa437f7b9605aa6820435016e84d92fc96d6fd0
diff --git a/sys-apps/inxi/inxi-2.3.55.ebuild b/sys-apps/inxi/inxi-2.3.55.ebuild
new file mode 100644
index 000000000000..428e0c646b33
--- /dev/null
+++ b/sys-apps/inxi/inxi-2.3.55.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_COMMIT="f31a6da7acb470813bec507da678d3054c5ff29d"
+# ^^ because upstream refuses to tag commits with version numbers
+
+DESCRIPTION="The CLI inxi collects and prints hardware and system information"
+HOMEPAGE="https://github.com/smxi/inxi"
+SRC_URI="https://github.com/smxi/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="bluetooth hddtemp opengl"
+
+DEPEND=""
+RDEPEND="sys-apps/pciutils
+	sys-apps/usbutils
+	bluetooth? ( net-wireless/bluez )
+	hddtemp? ( app-admin/hddtemp )
+	opengl? ( x11-apps/mesa-progs )
+	"
+
+S="${WORKDIR}/smxi-${PN}-${MY_COMMIT:0:7}"
+
+src_install() {
+	dobin ${PN}
+	unpack ./${PN}.1.gz
+	doman ${PN}.1
+}
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 6f81a7cf5183..a68e137d96a5 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -6,5 +6,5 @@ DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333c
 EBUILD kbd-1.15.5-r1.ebuild 1040 BLAKE2B b0a2cd71950581a1a7bdcf75b4aa29787ef9b5e22cb5e482c885733be799b02b0d4433fd6a47a50a54efecfc0596d98a9cc30f42e67af9fd831414280f2a2039 SHA512 aea6c477a1527e5f38419c2356bf97e52bbfc9473919b182392d1a0bff96af9d0912b2cd132e4d015889a55e9b3a8613937b1d8e0d847b0d794596309ddc9ceb
 EBUILD kbd-2.0.3.ebuild 1360 BLAKE2B 3d285f5816f752701e123fc4441e9991dceb0d80eb9ee5f84f87f4cdb140306d23f7e7d40abca7df0ce372ec79ad55996e37b0fa6dc0bb67030fc5b8fde00cde SHA512 358c6679bea2e0270159fa07a4578f75c8356d1774e6d9f8def085f94225ac733a3e2e9a9e552485e15d763a0835256a9ea238893dd0280b4435f724cf23edba
 EBUILD kbd-2.0.4.ebuild 1353 BLAKE2B 04d05d62ec1e81288d8ed6c1edac17e8e0991bc1147945459493e4b4b7b31a8e47001f8b223c1594f819249428ca9dfa86b1fa91a08a1213d00fbc7069c871aa SHA512 773f75e85efec50dff3a3e1778ba78da3e60b8d3715388b4cc7b4cc6d6f7a8b15e107b99d3027ecf3c1234346ef0c09e6247c8e161c60b6ad1bdee19ec248439
-EBUILD kbd-9999.ebuild 1342 BLAKE2B 0fc684dfac11a57b1833ff835e932414626db000c91151cb36b97a2122fb465882ceab8d2c602d2ea1d96d749f63ffc14fb1a72ac695fcf93311db7d74c666e0 SHA512 93b2ea0888ed50fb4f1bffb063797621767cf09f001361afab2c9c3acda28092ccde61c61f7e740880471c5626fa2c6700d1ada4c63c55d75257c029af8b18e6
+EBUILD kbd-9999.ebuild 1412 BLAKE2B e0ed21760db01f1b81ed5b41225edb1fbc2b7638875fb663b7b4a70edc7a0f8dff5d02aaa289be61d2276035ec56589a4eebd2a3f9bdf2bdcf26a700b8a0020e SHA512 73150ecc4977e06aab03c867d97a9e78cfc749b1261fb099347072a4b07ff6a0fbdfa868c2262ed6d1c8ae2e994c137906aaf70e9a83919ba27025a600594fb7
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild
index 139d12639fd3..df8a5adeb6c8 100644
--- a/sys-apps/kbd/kbd-9999.ebuild
+++ b/sys-apps/kbd/kbd-9999.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 SCM=""
 if [[ ${PV} == "9999" ]] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://git.kernel.org/cgit/linux/kernel/git/legion/kbd.git"
+	SCM="autotools git-r3"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
 	EGIT_BRANCH="master"
 else
 	SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
-inherit autotools eutils ${SCM}
+inherit eutils ${SCM}
 
 DESCRIPTION="Keyboard and console utilities"
 HOMEPAGE="http://kbd-project.org/"
@@ -22,7 +22,8 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls pam test"
 
-RDEPEND="pam? ( virtual/pam )"
+RDEPEND="pam? ( virtual/pam )
+	app-arch/gzip"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( dev-libs/check )"
@@ -44,18 +45,23 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.0-tests.patch
-	eautoreconf
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
 }
 
 src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable pam vlock) \
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_enable pam vlock)
 		$(use_enable test tests)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	dohtml docs/doc/*.html
+	docinto html
+	dodoc docs/doc/*.html
 }
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 652df9d41a7f..80d3bd166913 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,4 +1,4 @@
 AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80d4416743aa2f8f4c2a9246b0037c7cc9fbf23af430af10f69a7bb6c3dbb8f809c9a49cb31cf4 SHA512 81a7082d7f0cdf17d8277af7142aaa98feb8c12cf41bb96c12af53fdd3e436a4d15a57ef76fb90390133cfdb25e1bb1b16e17a39b39b6517afc529b871426331
 DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301
-EBUILD man-db-2.7.6.1-r2.ebuild 3176 BLAKE2B d819d9d41383366f43dad8780c13c839d4fae8b360ac380e014218201b090bad8c716d6f707d5922105538f63b4c9bdeb0ad1d5212b7bc48951bad05b4647f0c SHA512 e9861c885954e45aeacf0ed1ac7fe74fff8056867d4d8ce06f215dbe3b8a7fe071a01c6461d818ebdc0840315a5502c22e39fb51e41c4517cf765b15696c546e
+EBUILD man-db-2.7.6.1-r2.ebuild 3173 BLAKE2B 7fc7db98ce8e00ddd57564cfd72129b3b42e1505e3d0cf0ebe875b8793febd33024245e61f4db184955cdd4d60ed7862af9639874859e317a17996483627240b SHA512 0a51e238d3b399eb8fffbb01f229c614aad6c84691ca9b309c982a2e832a332f01d963f6d3e1da850dc667d6248acd04f564418838692bce98af70cc9d6aabf9
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
index b9db3fb1151e..f3518c712b31 100644
--- a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
+++ b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 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="berkdb +gdbm +manpager nls selinux static-libs zlib"
 
 CDEPEND=">=dev-libs/libpipeline-1.4.0
diff --git a/sys-apps/mtree/Manifest b/sys-apps/mtree/Manifest
index c47eea2ecc22..3f517de06044 100644
--- a/sys-apps/mtree/Manifest
+++ b/sys-apps/mtree/Manifest
@@ -1,5 +1,3 @@
-DIST mtree-1.0.3.tar.gz 32882 BLAKE2B 1c1f89594dd1ac265dbbe49101d1764f24f5b1e97bd627bf06a26baf4400364eef51f719326c687626ae64d60b53305424ccd2735a72c917ff226e098c7d0a21 SHA512 aea1d53ff114446d8e7dca20388f2184e6284f69021079eca4edce22f067b8218aafeabf6d08503fd197de3e4f271af8cb8dc310d87696c03360d42de4cac85a
 DIST mtree-1.0.4.tar.gz 34024 BLAKE2B 932684df56e0403ee3d30e4eee4250824a067cc5467d0f6b1b3ecc46c94c68367dd323221c70e17f08481d93eb0d3278bb6b3f78a930d4ec906a446f99c7a92a SHA512 b0f09d34584315633fd8fcbc6403ba1ec6bade7e5194b59ec168796d23b6f2d4aeda7112ce4b8b5773e2bf50dbda200700637e361214c98f30818a259294ead0
-EBUILD mtree-1.0.3.ebuild 643 BLAKE2B 8915882242a33f2468dbdd91bd142f332d946d5f67b17a224f245720cce7d65d256c8ac798e3fe88942684804523f197ac8f67cc8e44b2aa570f21f551881523 SHA512 ba5a7e4ef18108655bbdf7dc82b4332c6f9053f24843262ce31b20944e10b65c4a4c8359674fb4c8373d8f1926f543043d73d848d0e96e262b070870bfb75cf9
 EBUILD mtree-1.0.4.ebuild 643 BLAKE2B 8915882242a33f2468dbdd91bd142f332d946d5f67b17a224f245720cce7d65d256c8ac798e3fe88942684804523f197ac8f67cc8e44b2aa570f21f551881523 SHA512 ba5a7e4ef18108655bbdf7dc82b4332c6f9053f24843262ce31b20944e10b65c4a4c8359674fb4c8373d8f1926f543043d73d848d0e96e262b070870bfb75cf9
 MISC metadata.xml 337 BLAKE2B a8e33f9dfd1fbe4ef4edf0f5ff96f7f847b3872b350aa425c855c229b3675407157b73c41673a7189042f9db0d38b42dc82e55a8f034927bceb21bcdd76900a6 SHA512 c55add92235705c893b62cfcfc0c56e40bb1720c0140a87274836a0e6a8a1958511170fbb1ed7335d074b0753b59bf797f3302c3bd8ad2333872adf95dee28b4
diff --git a/sys-apps/mtree/mtree-1.0.3.ebuild b/sys-apps/mtree/mtree-1.0.3.ebuild
deleted file mode 100644
index 151c42b2c734..000000000000
--- a/sys-apps/mtree/mtree-1.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Directory hierarchy mapping tool from FreeBSD"
-HOMEPAGE="https://github.com/archiecobbs/mtree-port"
-SRC_URI="https://github.com/archiecobbs/mtree-port/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}-port-${PV}"
-
-src_prepare() {
-	default
-	# don't install unneeded docs
-	sed -i '/doc_DATA=/d' Makefile.am || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	# avoid conflict with app-arch/libarchive
-	rm "${ED%/}/usr/share/man/man5/mtree.5"
-}
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index b2b339255913..20cdd49b0e3e 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,7 +1,7 @@
 AUX net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 968 BLAKE2B 4104f8238ac3758e756b37dd281f1ca66f3f6d6dff9966713ffb108c539fbd19b9bffff94c929b829254c755cd0e1fc4530c74c5b8d6ef85889d7b8f9f54b5f9 SHA512 e732e809a4a17e3535c9ef009519808d5d1a6a792c1249e5cbaedc2aebc0245a16f4cdbc351c6ceaca676e942d909de548b036b8c59a62a68c277093aaa09445
-DIST net-tools-1.60_p20160215155418.tar.xz 227284 BLAKE2B 444820c163ceafaaceb01f0a51f16e564631e11694edd0bef2c3a0dcfc1cc6f2e6de35511c25af476adb7f65ecb738e14d03529432037bf2dbb22abf93f4695d SHA512 3fac6e00f061daf5c9ed1c8038d14635333a6149b09ad1493db35e4f931095915ad47468c42cc10299a4df1b5c946d6609a92a00c326a50a4da166670f6608e4
 DIST net-tools-1.60_p20161110235919.tar.xz 227552 BLAKE2B 0dba75b7b7345be047bd8618811c6ea43f96f0d7c8a2c67cd03138b8f31dc47a641c7ff1e93fb1ad295423f9b82e3d222178c7c97233d4e3698355fed729f723 SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01
-EBUILD net-tools-1.60_p20160215155418.ebuild 2479 BLAKE2B 7639447a5efbe74f2fca4bdba5f22ebcf33a95e08b1d967685be7cecc25d26885b351570abddc8511656d6889730b279e47e7e6ab2ac9e253509caae5f7d43c5 SHA512 da7768af74f99fa957bc459151ebedb4afa51e81ccfd15973b2e6c15d01a084c4bb079537b191fb394526ff9b550d1acb32093b5ed551055525efa0f7b23696a
+DIST net-tools-1.60_p20170221182432.tar.xz 227924 BLAKE2B 2617d99da0fa188163bcade5584038fcf8c9c73c23c5577585c3452f4e7b93b2d0cae06ae6d8e5543e04bdd93c247cf4c555751905406b88dcd16dec26bebeca SHA512 38cf9a0e5a1b2494d1e8f491638f8e35cf04d630e9eae275cb1d0b997f2b73c62bdd40b0420e0f5f2aa212aefa7516ff773b6e3a19c0cbf442e785d2c7dad28e
 EBUILD net-tools-1.60_p20161110235919.ebuild 2567 BLAKE2B fccd81b43d4d47532bb05ce14ca091253fb7323de995ac6e1e90b3b49a7722ecbbfa89d68f57c5c0f3e9afbeef622345e352b0167119cd1c19b48ab2ae2359f5 SHA512 ceb279c3213efc602285788b5a8481cc9f506c1d27c61b0fc7867e3555a6aa179bf13bbffeeedda6c5cff6cb3aecc72bbeccc4d8968e4a78e247641b4eeee380
-EBUILD net-tools-9999.ebuild 2492 BLAKE2B aad0877412c8890d8c5afb6242da3918364aaa1f59ce696aa0e2cd9768ce967738a0d0b2dd92338cb2334bc94f86038f9fcc37fa03f535f94cef60039243e372 SHA512 b45c414ea855d08d24bd0d0fa7ff565017e6d1581962429cb69317ccd20bd9bf821fee6ffd917c5702d5f32299e5bc86b06acacf143971b662ef84936eabe616
+EBUILD net-tools-1.60_p20170221182432.ebuild 2509 BLAKE2B 20497be3f5b40c9db2e5ee7716096ed8bce569b9a109380f81707192d1418e5f8ad3c6dd256274ef470cde25f94049a9a4c68f66e5a048e2cc20c884698e549e SHA512 5d1e204bc170d9f40570af3a5ee7f333680d34b297cda6b90e03517f773135436b1f79185eaada4d588287090748322a28a826b70c8cd0140b3e91915412fd74
+EBUILD net-tools-9999.ebuild 2483 BLAKE2B ed35d31bad5fc36d7b56f18738a28e7b1d565c8147d42a2b465455ef89e0cf820ed2ac19f3e29b5a201cc72783b453470b574bb9c774d455b7984fd0df177464 SHA512 c1c204e0c8b762d1e68b98dbc992bcdc9a9972eb55e85aef3894ccc53dde09caa72941142fad0afc5d2f830a6902397c9c767cc1c72cc4663871e679b02a6f9d
 MISC metadata.xml 687 BLAKE2B 0a0c86a9a234a973e5b16dfaa72fbfd1392f8a89f48e0ee2924e77d49c5160b904fd054c0616957882a4d2be78031989b01493454693607aff0d31dd3931b87a SHA512 ef16e4cde591fcc5815fb7fee106e007bea128f52b05a71d050956df586e8037e58d6eb3bdd00ef4a0b9d55ddaea4c29d6a0ce12409a515e638452fc932e2037
diff --git a/sys-apps/net-tools/net-tools-1.60_p20160215155418.ebuild b/sys-apps/net-tools/net-tools-1.60_p20170221182432.ebuild
index 6853e6c5fd21..4785f0e4205c 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20160215155418.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20170221182432.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 inherit flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.code.sf.net/p/net-tools/code"
-	EGIT_PROJECT="${PN}"
-	inherit git-2
+	inherit git-r3
 else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
@@ -43,7 +42,7 @@ maint_pkg_create() {
 	pushd "${T}" >/dev/null
 	emake -C "${p}/po" dist
 	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
-	tar cf - ${p}/ | xz > ${p}.tar.xz
+	tar --exclude-vcs cf - ${p}/ | xz > ${p}.tar.xz
 	popd >/dev/null
 
 	du -b "${T}"/*.tar.xz
diff --git a/sys-apps/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-9999.ebuild
index 3a87f86eac55..b62bba701282 100644
--- a/sys-apps/net-tools/net-tools-9999.ebuild
+++ b/sys-apps/net-tools/net-tools-9999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 inherit flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.code.sf.net/p/net-tools/code"
-	EGIT_PROJECT="${PN}"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
@@ -43,7 +42,7 @@ maint_pkg_create() {
 	pushd "${T}" >/dev/null
 	emake -C "${p}/po" dist
 	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
-	tar cf - ${p}/ | xz > ${p}.tar.xz
+	tar --exclude-vcs cf - ${p}/ | xz > ${p}.tar.xz
 	popd >/dev/null
 
 	du -b "${T}"/*.tar.xz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5b8ff8a8907f..ac275d7adb6f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,11 +6,11 @@ DIST portage-2.3.16.tar.bz2 949134 BLAKE2B f8e7b6f13dfbf9aecdec444705042c6584c32
 DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d
 DIST portage-2.3.6.tar.bz2 943085 BLAKE2B 5c649ec5f5a82b5f55c71425d13ee3335a773c7f78500d6ec963594c95eba5d9fc49c37ab5ca1bde7621398443d526a8a1485b67748f859726f7f581e2d88091 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
-EBUILD portage-2.3.13-r1.ebuild 8512 BLAKE2B c02a7a2d22b02cacc76a8a517c2edd4cbb779135217783b5be724e6fe3b67b05374b7efc1332dbb8ab387212b91dcc7c0af0b33336a936a37e782c499910bc5c SHA512 40a2e9c4d67064aad6d2691ccd4f1ec283db448fd5718654eaafad6292cad67b001823c24ea919332f4ea5ad3336167dafbf0614902e3b443810548347468f6b
+EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
 EBUILD portage-2.3.13.ebuild 8209 BLAKE2B 1004c283bb2b76242c9abc06664d4370867265c55ba9d62a1f477e769dce602018f6777891ea9f5674f0ae0f86ef52bd13ff5c353f48e7b711a418b2514af776 SHA512 9c190f7b21e34fd33e4d63185cefa011fdd9ced949c8310ea84e959db7834df725fa5d89de22fab958e6942589f44dae2e4b17047c060395ec69f0f7e9bf70b1
 EBUILD portage-2.3.14.ebuild 8512 BLAKE2B e32c3ee1a5828cdbe53aad326c4dc6fbdcd57b7963b196ec4853bcb3cef900711ae50d0776200d8f9b74e7552022435dd7f260266c90e49b7bc0a4319a082673 SHA512 60ec8c92d5a46572945d90b9136f4b2f7e4fdf439beabe2d03563002075fa8cd3edc6fd101694795837de770e0545aa6083e2023f7a1483161f7355e8327215c
 EBUILD portage-2.3.16.ebuild 8360 BLAKE2B e86eb44b2dd331f52d308a63d3db0f94dd2873ba1fba84d9f3a2d0420a18ee656765238c4da0025ebc329a1b42025ab2f665b9374f757e3b7a40b67af2391564 SHA512 993dca2cc7a1b1d102507f11945922cc403771055dc273c10e92b62c55b9f47e9b32136a8d958f66de32476b2c60ce4d211e69cbb1fa7de7003ca0c658944025
-EBUILD portage-2.3.19-r1.ebuild 8417 BLAKE2B 9810d0113d505f17d79427d42b5d065b07495f1ec024bd853d7390ebb6226fc355aec038a7ade04fece97d21e68ad61fa063a238cc379173f5dd02cf4af42b38 SHA512 96e5a26737bfc3e10805fffd07ab7509d1888e96534b0df113fc00e18040671bfca8c0b7d12336d73e972f64862093af2f3b8cabcad2571234599450406be263
+EBUILD portage-2.3.19-r1.ebuild 8413 BLAKE2B 6eda85487fe4fc1c55489ccd224f39f0d319efdfe02ff45a6addc4a1adb18c10233de3eb5939d6c584dd89a50d901d0dd345bf2d6598a8708304a0acedd44ff2 SHA512 fb05c03c4366e0599cc168a78e0467c80e9346f7a02f83aa4d69e9725e64abffc2f117c74239baa4e0195e19e4dfd8784b05aa9fbbc53147e70b783399828e9f
 EBUILD portage-2.3.6.ebuild 8650 BLAKE2B a455ad0c60356d9e27115f20ca098536fe8ba76ec67c44a6244a5cbf1f2aeb3d5700e332a462decd77a78285bf9d2200a41a8487a0c8465b78625f1a9dcfc2fa SHA512 19083847eb304f04dcf63f3362ae6bc6fdb14cdb0f40673841e5155f9c9dd9578734dc93a8b8721cca3546b42a45b838feafc7632b35e916280d55041e5fe1cb
 EBUILD portage-2.3.8.ebuild 8196 BLAKE2B cd4e96948e07dd8f9c055847a6638e95725b8fe49158ebcde1a22b7aac1d23f269160e62786c58e78d6ab0273a555dabc17ff0f2d4560d3b52f5c892f3e7e631 SHA512 6b829c279d6447c6041723e113d71157127bef8d103b9f89a8e0c24b225c599b579f4f6d60b5f207590c79854d035ddc2b4ccf596f8d8f1d9bb93ed2d4dfc49e
 EBUILD portage-9999.ebuild 7951 BLAKE2B a1b82cea5366a9ca1b6291a997328035a5c1d84591028227f3f96f84905ea73b0074ef3e6f90624272ed23b7783971b6425e9609b7e93d77774ec15f6cfa02e7 SHA512 e158702758f00977e4f8f59371ea8025f019cde06aeb2ceb29a2f90a52582fe6a09169ed71da58cf2946d6bd4c8e867aa204141d02bcec7628d24a54bf14365d
diff --git a/sys-apps/portage/portage-2.3.13-r1.ebuild b/sys-apps/portage/portage-2.3.13-r1.ebuild
index ab04b7ce90b3..82326a4eb631 100644
--- a/sys-apps/portage/portage-2.3.13-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.13-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"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
diff --git a/sys-apps/portage/portage-2.3.19-r1.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild
index 777f27ef0d54..0881cef7533e 100644
--- a/sys-apps/portage/portage-2.3.19-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.19-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 SLOT="0"
 IUSE="build doc epydoc +ipc +native-extensions selinux xattr"