gentoo resync : 31.10.2017

23 files changed, 140 insertions, 228 deletions

diff --git a/net-misc/dnetstats/Manifest b/net-misc/dnetstats/Manifest
deleted file mode 100644
index 9d6928308225..000000000000
--- a/net-misc/dnetstats/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX org.gentoo.pkexec.dnetstats.policy 737 SHA256 05a0854a3f33f3e3b1bce070ad8e32a37fe2038f1b626f3a08e054dce68ac113 SHA512 93eb8f683f666fbe9044efa8651594d963b418a374a57c7ac5a83ae4ceaa81d6a91f517520adea0f7ae24a2f246f1263ff5fe955eeafff02b1c2ede8f56b01dc WHIRLPOOL 2c311d05ac23bc26e5d9cb0da84abbb2217fb1c50fb643315648ec0080f93fe38d13f1996295c4e260bd9b9d34f99038926342b05890fba331ea74105ee58e8a
-DIST 107467-DNetStats-v1.2.6-release.tar.bz2 213492 SHA256 590521d60731e7066855151c4a9545322c8f6031aaec766fae4ad19a6a95cb57 SHA512 80fd7c296fba6921d23b22524de3a05e19f44113c57a43b615f963c84d7587ef7c187c3d7d410b3919f536e2bf9708aec6022e63c298bbc8790d5577bb783b68 WHIRLPOOL 1c82da70668f47af2db0f5901805966bf3e7972dd8a2a7a45daa1e37f757bb64521482132eef7d3fbd3d194fc05cd59d44e6b04446b09b05d3c54d5533c5af37
-EBUILD dnetstats-1.2.6-r3.ebuild 1049 SHA256 593d7b1ccebc7d09accdd7f945fdd76e2304151ef6025fa828be6f3c967fca9b SHA512 b3af9b2b81549361dd8306744e88c40f14fdbff73bbf951981a88ab741b4580b24fec1583d9cf0f65dad9ae61e3f76c3794324e58655f71a7035287dbcb2c2cc WHIRLPOOL cc30adaab51b57bd91b29bd27a33e1fbafb468a14297b1c6b9fda33ebaa894ef17ad8122c34392af43169474d46dc8ad3924e8e2aa74ac2eb45ba675a2cad00b
-MISC ChangeLog 2877 SHA256 f6c27a46c0f0146b6a8da6545db4ecba3e047167e14e45513c66765df15e924f SHA512 e110214346a8ed048be43ba4e6ddec1c8e5a83bfad2ae22109bcb3753fff2fbb3e93d2301674bc625edfeb107d71eec568b60a5cea762e1fd1f68fcdf31c72f9 WHIRLPOOL 0d7abf8567bb3dc712153d487235a296fea03692c72f9ab30a85007e075109bdd41950eaff1c078776e20d7818fb239962537c77bcd6ed17fd48a8a2d162351c
-MISC ChangeLog-2015 2672 SHA256 6eb6a66f0e65cf740abfcfa16bb71fadbf8901eeae537baf6293eae00d5cac65 SHA512 4db9f9851758a3205659c695ef5b385104a8196f31a9e6db6778e350c9218090592bf6116157b2e08a9b985185e4eb9e97ab0367c9f367c278abf2a7e15ce74e WHIRLPOOL 66351bdaec7d7b213d37c9fbc90799174b8e8b99495bffd81c6d0ac74811ff576f94f1342ef737a7fea577e9ad54d8135da5562cd23d0195d6a03c9eab63c372
-MISC metadata.xml 243 SHA256 40d70720dcef790c8b2af5864ea1d289f0a661e0db1e89d2c6a8a5c0d2ea971e SHA512 fc40891d1d0c8526f7ac87f25fbdb63e927494f972894e0006fe85eab8eef60ae79761cbc42febd202172da040283a2daa432908bf02ef83d27454660f20e72b WHIRLPOOL 0c09ba0a23280f3d5b0bd26ca7e3f3fe8e43302780afbcb20218599b9b8f426485b8aba8c97f1507f9adab1688d78cb132792cb4d13e130454c393b69fc662f4
diff --git a/net-misc/dnetstats/dnetstats-1.2.6-r3.ebuild b/net-misc/dnetstats/dnetstats-1.2.6-r3.ebuild
deleted file mode 100644
index fee04bad42e8..000000000000
--- a/net-misc/dnetstats/dnetstats-1.2.6-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-MY_PN="DNetStats"
-MY_P="${MY_PN}-v${PV}-release"
-
-DESCRIPTION="Qt4 network monitor utility"
-HOMEPAGE="http://qt-apps.org/content/show.php/DNetStats?content=107467"
-SRC_URI="http://qt-apps.org/CONTENT/content-files/107467-${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="policykit"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}
-	policykit? ( sys-auth/polkit )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# clueless upstream ships generated files...
-	rm -rf moc_* qrc_* || die
-}
-
-src_install() {
-	newbin mythread ${PN}
-	dodoc ReadMe
-
-	newicon resource/energy.png ${PN}.png
-	make_desktop_entry ${PN} DNetStats ${PN} 'Qt;Network;Dialup'
-
-	if use policykit; then
-		insinto /usr/share/polkit-1/actions
-		doins "${FILESDIR}/org.gentoo.pkexec.${PN}.policy"
-		sed -i -e 's/^Exec=/&pkexec /' \
-			"${ED}"usr/share/applications/${PN}*.desktop \
-			|| die
-	fi
-}
diff --git a/net-misc/dnetstats/files/org.gentoo.pkexec.dnetstats.policy b/net-misc/dnetstats/files/org.gentoo.pkexec.dnetstats.policy
deleted file mode 100644
index c910a6c3610b..000000000000
--- a/net-misc/dnetstats/files/org.gentoo.pkexec.dnetstats.policy
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD polkit Policy Configuration 1.0//EN"
-    "http://www.freedesktop.org/software/polkit/policyconfig-1.dtd">
-<policyconfig>
-	<vendor>Gentoo</vendor>
-	<vendor_url>http://www.gentoo.org/</vendor_url>
-	<action id="org.gentoo.pkexec.dnetstats">
-		<message>Authentication is required to run the DNetStats</message>
-		<defaults>
-			<allow_any>auth_admin</allow_any>
-			<allow_inactive>auth_admin</allow_inactive>
-			<allow_active>auth_admin</allow_active>
-		</defaults>
-		<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/dnetstats</annotate>
-		<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
-	</action>
-</policyconfig>
diff --git a/net-misc/dnetstats/metadata.xml b/net-misc/dnetstats/metadata.xml
deleted file mode 100644
index 32fe1293e9a9..000000000000
--- a/net-misc/dnetstats/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>qt@gentoo.org</email>
-	<name>Gentoo Qt Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index cc9c45a5024d..d68122d0a5a5 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -11,7 +11,7 @@ DIST freerdp-2.0.0_pre20161219.tar.gz 6425913 SHA256 b71aa5e99624f7bd4c28e69cb2b
 EBUILD freerdp-1.2.1_pre20150326-r1.ebuild 2786 SHA256 a7d5d3266839d0064003a7af8d56f2be0edb386da45c96267e6cbef2ccc54732 SHA512 57788c008c8d32a69ae90ce741cca7b12d7b8d0808fd4e151bd99febb70b7d7d016dc6d586eaf9dfc3ef888cec0b752c0eb9805610ac6910dbd0808914bb5900 WHIRLPOOL 80c393052b9d482dd5ecd94460b416110abdb4a62a44044594fc4c18c93fc489de7f3d7aacc4f4468e788a51ec81f7cb1ba064ddd2ecf0de866b2860756738d9
 EBUILD freerdp-2.0.0_pre20160722.ebuild 2618 SHA256 f8c2359f54efa6ba9b33210ce67be89268dcc7872113d897a2f307e6f7cec6a3 SHA512 0b287c9c0aa5cc661077aba27d19b66e7df14286b026e096a8bc6caf29089130af8e8a8c07972157698ed6e2718d7c4ec2e98771688c49084d4ae9157913df25 WHIRLPOOL e11a14ae7d10cc1ff1b8b9915956c98333017d73e533dfe67d1d4f9ccdf22d03cb30f417b7d99e919140f3b4156b73e08ff25c686f9eb3ab4374406ff5c203a1
 EBUILD freerdp-2.0.0_pre20161219.ebuild 2717 SHA256 79f4ed394816e0d62cd3577519e973a89b61e4bfa0ee464d83a60e13c41ce7be SHA512 9b9c7c9183248983953e9dd654c804809f9c0be94eff4738d2d302e139e54aebdc76cadec90cd5fe0f54d3f687b1c68eb129316eb16e50df513fd343136570c2 WHIRLPOOL 73bc2054bf69a909accb11e58da82ecd47dbcd6b39d4cdc6612149bce93b4466d88cec2252019a0793ce798582437e1c90213841721c8ddbfaa5cfdef04f9219
-EBUILD freerdp-2.0.0_rc0.ebuild 2858 SHA256 ea9f428a5f81f427a66e8d0cf0d75d84f1fdd0e036772e4ae2c8b793f55d7a6f SHA512 7615ad8cefa50ef9120d7f0121736cb8fda6668cec404391c45c4c843715863df745d762dbbd2f01cb0239933e76aea0a192b11f054c68b6f44200f71517c61b WHIRLPOOL 56f3957d6157a63357064c3d944f18d2c6f0178ae9e714908df67eee32f1d607c1af0a57ad8e78d4e69c8fd6611378dd330e62dbe2db4ec152dafb9e2a689e88
+EBUILD freerdp-2.0.0_rc0.ebuild 2855 SHA256 087000636fe52ac54ad711a41325dab3b91984a1f092fd9d1e9374f9ba447a94 SHA512 b93dd28b469e7af4478b4755456041db865cffe4bba19816148c544401643c7a086a5a4a071e7f76eb27d2729b40d0c1ee0b44381750a531eaab53d02dcf9943 WHIRLPOOL 8bb1400f6d08a55063fa483e0024f06a148abb70ffbb5acb370eef3442ddc34cc94be5585bb7816ef93aa8fd926852f177a83b7f4564c9076de72b3d37c718e7
 EBUILD freerdp-9999.ebuild 2750 SHA256 920ece2f9682ee7f2596683a2a066582a0a1d13e438349b1523d227bfa7cb3de SHA512 67262976d2f1e4b990aa02347c81bd91f916425ba3ef1963800ee98632c5f9cb54121f1548125d83b0c83222508fdf8788f566d37cfbcdf9fc8d58543cb2ade4 WHIRLPOOL 906978a8f4303c093134f8126de0391d412e11065ec5b06c352d72e443b81dd884cb9bb843e9ad5171a4b7460d8141f3dcdd9275461e85cdf310dbdbf05f41d6
 MISC ChangeLog 6836 SHA256 3c7bef6d4b666b0d2a39418b1b3782a2f08bcc3dfdd844251cbd4af9552581d6 SHA512 67939aa2da6a6846b44cd211c85536bed311e43ea3177bc13599fffacccf7de0559ea3c01b2f7ea0477542bc33a265c8631060286770385132bc09f9c647d763 WHIRLPOOL a79bc36cf9dca2cee4f7a3eb0bef7f41c8357d8c5ebfe01c4dbbe601f8451ac713e8aa983d17c25c5557ad76a21b1bc89a42fdaeb60d97cd0c4ed6e05b027927
 MISC ChangeLog-2015 15438 SHA256 441eb5b5de512e3a69e2d6534e6df2887eac0dc47442bbae9d9d38da4c8e6418 SHA512 860511c1522ab39ac87790071dcf3d184b482747c95c26262a0dda8e169c27ea543132f342e24f706acd4149e2e974070313244a900b457c6b9c8b083a7a34bf WHIRLPOOL a66bd0559152bb47bec372a8e90e5877d863f3fcf25ed22a04bf5bc87a45bdbb5b909dea6e3fcc25b11b301ee3857c609d6c15749c955cfd80da65cef532b01b
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
index 7d33504d37ca..2e61b45ffa98 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} != 9999 ]]; then
 	MY_P="FreeRDP-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86"
 else
 	inherit git-r3
 	SRC_URI=""
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index a1761c69506b..4494c19f9a5d 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -1,7 +1,9 @@
 DIST geoipupdate-2.3.1.tar.gz 362497 SHA256 4f71e911774c4fd32e217889c242d2c311fa5ffd3df56be48a2d1aedfe2e671c SHA512 98537e17ea03dbc0e377bf3fd045a96cbcf2f36f1fbcdf494f0a60d15f9ea5d2f0cd5e127245c6425e0ff8b77028147a2a6316034752298c8e9671007b7245a1 WHIRLPOOL 315a5d99cef9d7d36c4353f57c455549a3bf33787aa6669c72b0f13068f247d7301e1399b029f32675c557d855db424a60a6c2e310cc99b6da439a2ca4606ac5
 DIST geoipupdate-2.4.0.tar.gz 369949 SHA256 8b4e88ce8d84e9c75bc681704d19ec5c63c54f01e945f7669f97fb0df7e13952 SHA512 6285810380a12ce34c90798fe31954959c9b462060e9b49348b5dbca3af7f3b1798384cf958de3b213ac7d03d42688c6744365d91efc4ad1fe76330bd893d4b1 WHIRLPOOL 759b42c747037bc3b1918c8f2dd5636ee33dc337f35221fca4057efeaacd1762063265b1607bd37040a83c6721338030fae05ec0f674ee9feef7e2677065546a
+DIST geoipupdate-2.5.0.tar.gz 371882 SHA256 5119fd0e338cd083e886228b26679c64bcbaade8a815be092aecf865a610ab26 SHA512 2733c06b77634cf80e161168ff452aa7a4ade21e33260bd7dd01167b4edb5b88d62d2ef15cf014e5d059699e5a9b9ba3f265a324f4c91cec8f935fba3d5c243f WHIRLPOOL 9be8e2a2e5873c822be7daf13d8bfd715d354a91ae7fe19e1f6f168af4d31107bbf888050a45c354e316d330230be011a9ef2fcfd14baba4b166bcf3be2b0d67
 EBUILD geoipupdate-2.3.1.ebuild 573 SHA256 e03802d9e4acb36b2bbdef5437def78a73bc7a40b546f944bfad7301421a8fa6 SHA512 add023538fe12026667cf0feba8c1ebf1157609ba2ac9622466920d2ed7c128bec10ba7ac1a12acb358067e0ec757996ad0eec63c91c7b4a7c9d75984b06bcff WHIRLPOOL b3257963c5bf41a80ffdcdcceaf69198f5b1d15aaf3152ebac550c6f8d87729c48c82549b2580c2906957a5e8e015e332df08e5758345ca1a6cd344a917e6e38
 EBUILD geoipupdate-2.4.0.ebuild 582 SHA256 eacfef2e48f19597edfb72482712decfd6cf0a370e8763ea14b44398cde9ac06 SHA512 f96dbf26af4c15369a5fce9b2a0a9e5571b7940304031e98c201231cc662b8ddf179a55b5454d6cd91855b68653eda03bf078043eb55edffb4e7992a8d5815f8 WHIRLPOOL 6fec9f32272e68f22c66c6b66f9504f6f67900aa5448d86ddecc3c20e57485445da43a846fed45b2f4058853af47b34230a13cbb4772d9fe468da9fe0dfec17c
+EBUILD geoipupdate-2.5.0.ebuild 582 SHA256 eacfef2e48f19597edfb72482712decfd6cf0a370e8763ea14b44398cde9ac06 SHA512 f96dbf26af4c15369a5fce9b2a0a9e5571b7940304031e98c201231cc662b8ddf179a55b5454d6cd91855b68653eda03bf078043eb55edffb4e7992a8d5815f8 WHIRLPOOL 6fec9f32272e68f22c66c6b66f9504f6f67900aa5448d86ddecc3c20e57485445da43a846fed45b2f4058853af47b34230a13cbb4772d9fe468da9fe0dfec17c
 MISC ChangeLog 3838 SHA256 065302db05c0219821ff086fc82b26d76f84df814143c2bd1c0cc8db3dded505 SHA512 47a6e0f0c5724c5c1d939156dff5e89ddf377fa8df2a6fe3ebdec63dc9035254b0ce5539b48ea9b0d54e1fa6edc721d49301c5c89efdbf7c4cfc9f81a9742a92 WHIRLPOOL da3588458de471a2d1ad341946a5db14be05d21fb4252771e058c2b50681b1adbae061679b151ae7e44c81b39f3432c71454c85bf73260a715ac833a2c80efcd
 MISC ChangeLog-2015 5645 SHA256 04ff36a3debb9d1a6f9422495a569718c73b84772ee94e89025ecba0d240f8e0 SHA512 691ff97d4145087ea588ef62d04ad46fbe62639d31382f8494e62d0d32f84a5e8cdf1cf24794a8ef791cab420339ad9ce0f254fe3ae1b2319720fe99185ca472 WHIRLPOOL a7fd626a05466d901eddce0ed5d4b61901bde5880d11bf665f154eaba1c996fbc5c12a01f09e08ea100019b24e28fc1babff8734dfc396c5142115ec0d89fc9d
 MISC metadata.xml 364 SHA256 2b655fd82941862b31cd1b67868d029a7afab3dcd3bfd081b5a3e3b3d17b49e1 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc WHIRLPOOL 2c652b96413ffd7f7fb7115e7ecc7e537f8197b035bf0f4e276d44ee876c583c285dc974e7810695b18f9c7dda5dcd961dbb41342299b3d24f08557d67edb14d
diff --git a/net-misc/geoipupdate/geoipupdate-2.5.0.ebuild b/net-misc/geoipupdate/geoipupdate-2.5.0.ebuild
new file mode 100644
index 000000000000..c853ab96cf0b
--- /dev/null
+++ b/net-misc/geoipupdate/geoipupdate-2.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
+SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+
+DEPEND="
+	net-misc/curl
+	sys-libs/zlib
+"
+RDEPEND="
+	${DEPEND}
+	!<dev-libs/geoip-1.6.0
+"
+
+src_install() {
+	default
+	keepdir /usr/share/GeoIP
+}
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 98544fe1b5cd..226cff659b88 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -11,6 +11,7 @@ AUX iputils-20121221-strtod.patch 1133 SHA256 461a883439a09854b483bce02187aa78eb
 AUX iputils-20121221-tftpd-setid.patch 815 SHA256 8b1351b43b69a9147b93a0744e57d2634c1fd2abf99856a7447d633bde9cbce4 SHA512 55f7fe0d7312429dd1ec3a9232a4e6436b1115b1b555d5af52f5ee04fe54fdf782dbb018d0dbae1c2e38913057bfa42261a2e57d90c0063b8259029adfa08123 WHIRLPOOL df55138a63fb1b1998e5957eb33f8dfd008dbf9d0701f89dc1bb56a9841b4b9e66ec8d76b83652409655e9b4a953f858eec005fe19463283437a2e477f4ac448
 AUX iputils-20121221-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df
 AUX iputils-20150815-nonroot-floodping.patch 406 SHA256 0a2409e1dd040620adc88720f1bb3955d2121762dc600865167332f9b90f3f57 SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34 WHIRLPOOL 56d86953105832e589e2b75ea6a806c09ae21d8b9f82e6734cd0b5522b7dfb0291c6f65fdd4baffa120281dc176dd6a5d0bf6f730bd35147a6e654feb02eb5cf
+AUX iputils-99999999-musl.patch 1799 SHA256 56bd6ade67b3625e0363a62146a5321669f82781b07c6702e2e72ba60d0664d1 SHA512 d3e4cd51591d1c1bb96b58aedd131bbadf6c4f523ce6ec0aebd991d4396fcd516a1aa3af180510efd8484852caf5301cfe4b0936a449b62caffb251d78794c54 WHIRLPOOL 9ef98966ee94abf2eb7a353d4396ae87472aa01caacd509ef16cf0480bc87dafc2c849688b45ba172e52a50a000d270be19eff175b9a14c8fe97654267259b2f
 AUX iputils-99999999-openssl.patch 2532 SHA256 0ffcce81badea00e84bdaf49929bc657ab574e98824a65ea3cd9015421372644 SHA512 2f782d93466d2db7d01295c7ec7c24fdb529e28f76c703c112d5dc8b4600402a68d4caf3c1df4f8879149e6fa52bb208dd14879cb01741544ccd49552e017afb WHIRLPOOL f51c56cbf23076f3db504a008e1eb732c9f961c86f815af57dfde96627fd2f15cc9fccae26481bb39a4365d3333e9080984f46bbd9370b9cfbfaf52625b5dfe3
 AUX iputils-99999999-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df
 AUX iputils-99999999-tracepath46.patch 824 SHA256 883504e64394506473e48943fdafa60c2d90e267ff61b89cf78a824f62b7084f SHA512 65638246a73334640b02a136aa55a4a709d7c4639c57b7634d5595ec40d4bc9c41068a1469a76d22d0a216e9a2c8a52f7840432c435f40ee7035981494d0a443 WHIRLPOOL dabc88ec500a54418b999697e21ca9d0b570c05df8f289b8f518af81e0c547588c406741e78f0a1a6d6384f01121d28d90b69413d5cae7d68361d551af1a641e
@@ -31,8 +32,8 @@ EBUILD iputils-20121221-r2.ebuild 4051 SHA256 0a64b2b06d19398aeb897343331a6726c1
 EBUILD iputils-20151218.ebuild 3977 SHA256 9624dd416733b58c1a9815304144fbcb0de07940dc6e471ea9e8f26555660752 SHA512 b07ffea44d85ea3aa0a92ab606386d7d1a917eed700c421aabb4af6ae4b46b1fc5e9ef1f942a441441ec4171548b9dc04f7bd73b75804568579ec044b297dbc0 WHIRLPOOL 7b34b8d257060570c7d837c6ed055e7e2c5a56c312b3e9ff00254268ec52bdf77511dd7fee0501f2a39dd11d3c12df67331c901655491165c9bd8104fa36a701
 EBUILD iputils-20160308.ebuild 3838 SHA256 7d5e1ea302cb909cad75f3caae438cec9c7b9d98170a13972d9d284da363fb5b SHA512 596ab450370cb8883d3480e8e0a21cc27ecaa19ba7499296a0c67e84fa8bce3c085f66d87eea03be19d54b780a8933f752999196b13d2b3d0a66faec2f756d08 WHIRLPOOL 39f3b25e0ebbde84a1935aced624b3c4004c40d992bb84542cd214003fdd2d6169a0c5374a11e8116177d4fd9b27ac0437547b3fc1ab9fcf2b2b9a411730bc20
 EBUILD iputils-20161105.ebuild 3870 SHA256 2a735d03e5d5e68917eff814f785ece65814b796ad7c82fb995bb0510fb05fd2 SHA512 64f9077c8e69b02db0560a1213293d27cfebbd5a02d62f75b53f6ee3d76b46c64ce2995ca1c6e7b3fb22185f33fd40a0da4a1796307883adcbbb47ed123b9611 WHIRLPOOL 0ce5472affdeec7294d315f446bb4ea44cb645c11af82a6e2b9278d4b5cbe41162eb2c98d36bf8e325153c8c390b17f7fc65f9cec2a54e11b3d95d8458c071a1
-EBUILD iputils-20171016_pre.ebuild 4047 SHA256 f59e918116747eb88f5302d8114cdda78298ea6b871aa4a30d533c9ca40abba3 SHA512 3880b66f83d0fd16264d33bdf921a20dbfeb36aba0e0bfb4f66edf7263f2073d1b11b640c767fff7e2b942e579b169a84635fc39d663b7dfc23391e7a9fbb3dd WHIRLPOOL 4e82c0eda67cf89c736f90e91404cb7ea131ab6e15bd1911a65883adc737c0a2ca1d3ade2772fbedeb2693d91358f8b2ce182cb198456b24202e1fde6bdef930
-EBUILD iputils-99999999.ebuild 3952 SHA256 83b873e1928ceeb5395b548036eb45fe69bcc32408f30b2e6dbc036a6d35fe5f SHA512 6a8b9785e417e02b7bc197971e83a7f548e5881a13308ffdb91dbb0f57931eb602761d9282323700272e03ff1f622af2fca4cda8553fc65b4f864bad81af91de WHIRLPOOL 682db8620f2543227d73c87c3c8800f4c46cdfaec91275e16af1bb777e9042af5c6686b460b30b1d04498b7ef20c11667ba1b128fac7fc34d0f88fc293c9ff41
+EBUILD iputils-20171016_pre.ebuild 4089 SHA256 b07ead8924f0dc5f46e04e58dc4c56c49f3fb5e8a00ddd94a5ea344983f596bc SHA512 41b570b7aca636f33fc434cb6ec93f7ab9022398dec0562b20b9b82cff0bda52066e58cb55f3c0d68ab54de78ee2354e35e3ac9d4c1e3403726ae3c0997a52e3 WHIRLPOOL 803246123babe8e70e2e3a5cfea6d51174364c3fd689f58f90fd975cd50654f4ffc7eedfb25714caecdbb88bc3b6290067f54441b8981e759fe203b820d392fe
+EBUILD iputils-99999999.ebuild 3905 SHA256 00dd0fb54899b4d7c906fc560c687896808fa648c2414b0862365cd06eede7b5 SHA512 a7f056364c5394b6b9845930ba721492f1d8a4dc2a0231fbca9b5cdae14d8fa5d2f47460a85d2c6189c4f4288c26798b4c475c515cd441ed80114c510b82a437 WHIRLPOOL a62f4a3a8bd77c8c3d2e8bddb381557ccf7094e47e66b2d583f406191cef15e3528360cf66378b66cb86f08cf8657a4b519952e379ac6ec1deca89c7f1b3805b
 MISC ChangeLog 9602 SHA256 b860b10f98c5ce47173ef3e78599cc524579114a8fcfb2a0ea4e3938cc42244e SHA512 7824d23cb1249c0008aa507cea0d30be9d2dcce0053bf1a20a12df3527357530120c9559c7f4ac353e880ca1c3d07c4c56a29301e59ed43ca3a5362e552f7015 WHIRLPOOL 63cde37c69f443e03196145b99456ebf254d766988272002c38484e1139bf42efd57b7d976ce2064a41398346fe67d3a27b275ec84a998f300422b528782d2a9
 MISC ChangeLog-2015 22418 SHA256 9558c8a0c5143189ef51deae9371d71bd200f5f08a8aff2de94786c42a06b400 SHA512 01a5bbc5d9f4cadd403c4a455d029792278e23c5d78c830fcc685e5706bc19ec240e3807e48da80d0ed84e103e7ddf465f7b9500af42b31bd6fb8d22465e76cb WHIRLPOOL 3aa152858f0cca507036021355ce50823635655e932d51c3f4e7915b1239385931f07385d19a0e04e6795b628f356cdf8a7e6b39b20280c9de7eaf7e4cf6fade
 MISC metadata.xml 1698 SHA256 f42c67ff65e69eecd35829e42ad6f7ecddc6a92c79996557146f1c2099eaedf4 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc WHIRLPOOL 745fa143c468727485be53de43f4748f170588a9d2f36a2d5aff4681c1e1a484866b7e59e91db724fb5948d383f61ff232791966fe112bd6a2e34d4d671d521e
diff --git a/net-misc/iputils/files/iputils-99999999-musl.patch b/net-misc/iputils/files/iputils-99999999-musl.patch
new file mode 100644
index 000000000000..167e7fabca70
--- /dev/null
+++ b/net-misc/iputils/files/iputils-99999999-musl.patch
@@ -0,0 +1,92 @@
+From 58ed671d1003caf32f3c35260531e8e1cd7efb80 Mon Sep 17 00:00:00 2001
+From: Aric Belsito <lluixhi@gmail.com>
+Date: Sun, 29 Oct 2017 23:17:03 +0100
+Subject: [PATCH] Fix build on MUSL
+
+Add missing AI_IDN and NI_IDN declarations.
+
+Bug: https://bugs.gentoo.org/503914
+---
+ arping.c      |  7 +++++++
+ ping.h        | 11 +++++++++++
+ tracepath.c   |  8 ++++++++
+ traceroute6.c |  4 ++++
+ 4 files changed, 30 insertions(+)
+
+diff --git a/arping.c b/arping.c
+index 0ac18cd..5d2145e 100644
+--- a/arping.c
++++ b/arping.c
+@@ -45,6 +45,13 @@
+ #ifdef USE_IDN
+ #include <idna.h>
+ #include <locale.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef AI_CANONIDN
++#define AI_CANONIDN 0x0080
++#endif
+ #endif
+ 
+ #include "SNAPSHOT.h"
+diff --git a/ping.h b/ping.h
+index c5f0321..0391de0 100644
+--- a/ping.h
++++ b/ping.h
+@@ -38,6 +38,17 @@
+ #include <locale.h>
+ #include <idna.h>
+ #include <stringprep.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef AI_CANONIDN
++#define AI_CANONIDN 0x0080
++#endif
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
+ #define getnameinfo_flags NI_IDN
+ #else
+diff --git a/tracepath.c b/tracepath.c
+index b0eb911..c50e3ec 100644
+--- a/tracepath.c
++++ b/tracepath.c
+@@ -30,6 +30,14 @@
+ #ifdef USE_IDN
+ #include <idna.h>
+ #include <locale.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define getnameinfo_flags	NI_IDN
+ #else
+ #define getnameinfo_flags	0
+diff --git a/traceroute6.c b/traceroute6.c
+index 7807956..c6d868a 100644
+--- a/traceroute6.c
++++ b/traceroute6.c
+@@ -247,6 +247,10 @@
+ #include <idna.h>
+ #include <locale.h>
+ 
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define getnameinfo_flags	NI_IDN
+ #else
+ #define getnameinfo_flags	0
+-- 
+2.14.3
+
diff --git a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild
index 691040d27e10..fb555325457d 100644
--- a/net-misc/iputils/iputils-20171016_pre.ebuild
+++ b/net-misc/iputils/iputils-20171016_pre.ebuild
@@ -13,7 +13,10 @@ inherit flag-o-matic toolchain-funcs fcaps
 
 MY_COMMIT="67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf"
 
-PATCHES=( "${FILESDIR}"/${PN}-99999999-tracepath46.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-99999999-tracepath46.patch
+	"${FILESDIR}"/${PN}-99999999-musl.patch
+)
 
 if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 9731575e02e3..84d809667e59 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -11,7 +11,7 @@ EAPI="6"
 
 inherit flag-o-matic toolchain-funcs fcaps
 
-PATCHES=( "${FILESDIR}"/${PN}-99999999-tracepath46.patch )
+PATCHES=()
 
 if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
@@ -30,7 +30,7 @@ SLOT="0"
 IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn[static-libs(+)] )
+	idn? ( net-dns/libidn2[static-libs(+)] )
 	ipv6? ( ssl? (
 		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
 		nettle? ( dev-libs/nettle[static-libs(+)] )
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 9a314cfcb1f7..0e6f023cef30 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,8 +1,6 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 SHA256 f97f132097feefc39608acf10b6cdc4b161ec6beaba5a0582e54fc1f09721e6d SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460 WHIRLPOOL ac1abd043698ff194869926ae2fa33646fde755ad3c30e8a5642aa4a0117b6809152508ba8cc0dd247d18c4f61e021e80407a1bebb0202ade43647d3d7d80fd1
-DIST ModemManager-1.4.14.tar.xz 1417092 SHA256 abe6cdd515a774bcba3afdcdb1e504569801e79282ccdf26099f33cbb8731ba2 SHA512 2fb5517cd3fbd98cf4048cec326fabf18fb26d88b75e56208d1ed64d70d72d6e826ef30391c86fbcfe4d69661194bcfbb55d545db10ebe8baf8ef16a3c580446 WHIRLPOOL 30c9e1e388c91f8aab73044634e3d122636f526cb9b437a597dc2f35cfd85e61917a568cfa572404f734eb19eb90c2e21bc85e16d6cc9b53518f590981f6efa4
 DIST ModemManager-1.6.4.tar.xz 1464276 SHA256 cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf7926171c668 SHA512 6b31ce186adce445cec8964df751b6146a86271e6c14d860740ae66cfe296ac2ac4df21079357775ac5f7a5837c80a7f8db21a2680bc6b45802f9928565f1c73 WHIRLPOOL 3e3b16299ed5d9179e7d7bd38040d061df21fdde558032c8362110d098d3931f106988a0992a64936d969e008c83d699b85e71211bc0684d9bafb2dbc6b4baa9
-EBUILD modemmanager-1.4.14.ebuild 3051 SHA256 7d79b51e22234608c65c15774169bd29ce67e761c1c9677c5d382b87bc9ac6b3 SHA512 ec62991fdb60a0ca6b6bb3750a509da3fa909bd1b3c8647f7647fe414448eaec5577c0a13a3f58985a8f673004c59b944c5bafc827e29f8b728e2dbbb125919a WHIRLPOOL e3d6a1a0c2414298f10aab07a121cc0f387debc5c61cb29f75bc79b2eda3d6a7b8ee83659fe29755f0c3119d8bae5e4688f0daa5f7bd91a08706ca410145341e
 EBUILD modemmanager-1.6.4.ebuild 3143 SHA256 8bedc8d7a9878d8290d84a4bc99e0a68e3dfcb0e2a100d76c51ef600bade4d83 SHA512 edbe21effd6e22319d1f859d0f8c868725d6574633f2b311c191fd57d33ad6930547b84fbab8cc7a39303748b61dbc990fff63181e1710ca17b02ac72352376d WHIRLPOOL 111d5a46df52a675cffa50594b1ca22f255bdbf844b255832d6f4ebbded82e85f9b4f9e98ee63366bc75db7aa4cf39fb1adb58ffca1830f23e12c838157d3391
 MISC ChangeLog 7083 SHA256 cd1fc50937af9f0f255524437f6d6c3e54259659451ccfd1a8aa294417aaf6f4 SHA512 88e4a9efeb6de5437ae1a773a16de3ce1137c7035feff84d925f2c1a2816d4cb06c314f5539d4c655eb01622bd4fac9b6afd76102a8b0fd52e53e0cfa319fc00 WHIRLPOOL 9381ff17d989a9614e522834c6525b4736b6336f95899477fd1e6f9a1671bcc59edf3a733ae6a6a292466439bf45dc1c828f238181563547c18f75071dcdbff1
 MISC ChangeLog-2015 16358 SHA256 524df33ab8e46a303c95cda7eabc878be919012966e32f6c7c25949f0d109ff2 SHA512 80d112612565b72a5ba242cb66bc6421d3aeb7d2e08ee0e172b4d745d22d3e6825b6bb555b6209d829a7092741e551a690ce328cb261c795e5b2862739d9547f WHIRLPOOL 51f8addd67fd6706007a537c0ffb7e5556aa83db7a3a7228bc8d9cda0beedb2f12e86de9f542195eb522320465ff5a83e4c7261a6ee113e28a034d47974e6ead
-MISC metadata.xml 553 SHA256 1adf832aa4cc1217e02c3d12a96ae2a7207e57f0e128b8e35f43eeb738702e4a SHA512 14c8333f81e15f63452b1eaba2c17ad469bbd00132dcdeb4aeb9dcf25f8ec69d543685a8cd4bca3b2cb4d2e8b2ff9dd0d94e0add4fe7413316d76b2443e231c5 WHIRLPOOL d8f711d81c5b4457271d18d8800c29f8240304e0e1b02a24c9f3e9155710136ca1374a0fae1df20ae21ca9749e19edf66ef3955fd88ab285ce5c93d5ac04a4ef
+MISC metadata.xml 431 SHA256 6712d447d459356b84c0ea2f45f5b6267f7382eae48ae58f7b6ff3bf9cfea11d SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde WHIRLPOOL 08f9133a4c644021e70a8f872d5cb765e3291733bb2108b466783ee48260bee15be5b3b641e6d5879d63a76cea6b145b58283decc2c8069d939efa24ca2723c1
diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml
index 2e8801cb40a8..8d49dd5a7e8d 100644
--- a/net-misc/modemmanager/metadata.xml
+++ b/net-misc/modemmanager/metadata.xml
@@ -9,7 +9,5 @@
 		<flag name="mbim">Enable MBIM modem protocol</flag>
 		<flag name="qmi">Enable support for the QMI modem protocol used by
 			devices with Qualcomm chipsets</flag>
-		<flag name="qmi-newest">Avoid deprecated QMI commands. Warning: may
-			cause incompatibility with older devices.</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/modemmanager/modemmanager-1.4.14.ebuild b/net-misc/modemmanager/modemmanager-1.4.14.ebuild
deleted file mode 100644
index 905986820896..000000000000
--- a/net-misc/modemmanager/modemmanager-1.4.14.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 user readme.gentoo-r1 systemd udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="https://cgit.freedesktop.org/ModemManager/ModemManager/"
-SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="+introspection mbim policykit +qmi qmi-newest vala"
-REQUIRED_USE="
-	qmi-newest? ( qmi )
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	virtual/libgudev:=
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	mbim? ( >=net-libs/libmbim-1.10 )
-	policykit? ( >=sys-auth/polkit-0.106[introspection] )
-	qmi? ( >=net-libs/libqmi-1.12.4:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
-	DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in,
-		You should install sys-apps/usb_modeswitch which will automatically
-		switch it over to USB modem mode whenever you plug it in.\n"
-
-	if use policykit; then
-		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
-			add your user account to the 'plugdev' group."
-	fi
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--with-udev-base-dir="$(get_udevdir)" \
-		--disable-static \
-		--with-dist-version=${PVR} \
-		$(use_enable introspection) \
-		$(use_with mbim) \
-		$(use_with policykit polkit) \
-		$(use_with qmi) \
-		$(use_with qmi-newest newest-qmi-commands) \
-		$(use_enable vala)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Allow users in plugdev group full control over their modem
-	if use policykit; then
-		insinto /usr/share/polkit-1/rules.d/
-		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	use policykit && enewgroup plugdev
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	systemd_reenable ModemManager.service
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/pavuk/Manifest b/net-misc/pavuk/Manifest
index 6c508159bb9c..5d5501924ec0 100644
--- a/net-misc/pavuk/Manifest
+++ b/net-misc/pavuk/Manifest
@@ -6,4 +6,4 @@ DIST pavuk-0.9.36_pre20120215.tar.xz 810516 SHA256 522e07e3163b835f26157f091ad43
 EBUILD pavuk-0.9.36_pre20120215-r2.ebuild 2860 SHA256 386d8ec2f570825351c599838bf57676329f8c81bd9a83509747790875b6fe5f SHA512 4ee860d42309a4e78a0c6f4a041a4aadfb4d74023cce0f4e6a62bf83d0ba1df476ee998251e84f33d17826c1d2662a7c4abf20351fde9e5856e74a150283d166 WHIRLPOOL 230dd264eb50ea90aca6a119ba5d1481f927d54e510f27c1c105034684a4f99354dc367194ec1530abf8f8dc6bb6fe66d28307bf3dc1f5ad24eca92f778a31bf
 MISC ChangeLog 2730 SHA256 4aed880bc1ebebf9751499907e9cfe67db73704b8c265ae2350df8afb65307ea SHA512 ddd52fbc50c47a5d05b4d57e001f47154b58aa7afbf7d99379d50562dac8d190210500ca9043d6b84e660b8e1877853751226fb7061e5219548e49d9e93e5dfd WHIRLPOOL c655c4495e4acf53d7d75fbbcd24ecb349065a353b1123c25798e757caa4af56499c6e5e51d8b154fe25e01d968963fdd7e7c9d0976bba0a89389396dba808e1
 MISC ChangeLog-2015 7553 SHA256 31b55476035695c051eb5b76e2a94cf92c569461ddfd7ccb047d2ae1085dd49d SHA512 939229732ae23edc3593d134c3b484b7db655f75cc35fe7c834206fd4559a3d0affb04c7925d463796a49649ef7860f7cdd6da9e3e6fdc08e080213fe840f966 WHIRLPOOL 958d730d15e9967bc66c908fe0bad7db30cc14c3579d1021b32e8a53e02c960d74cd835089ae264bbe0c4b995b368195b3692fecc51ffd78600e4f37f3ef015b
-MISC metadata.xml 574 SHA256 637787c4062acbe720204857b575e9b4efd852227e3d81ffa343a9c3d43e5c91 SHA512 102c19db3248680b2b917d1e4124d9618f1af443a9634150ece900bf7b01b61d61f2939095744f83bef090b8c09ecd24b91ef59e31fad34572dfdf30d1c8be23 WHIRLPOOL 137b8bb6e4e9a6df7ed9e1c7a3086956d37b9fa77c148c313047fdaa964753dc0e4e789a8effb337d7d14ad2c2353df097d45e82cfd3fbe7ebac15aee55ccd19
+MISC metadata.xml 368 SHA256 bed946154bfe0c2bb692b32b68ca162262d8556be5115262196f7606f3346f1f SHA512 04f9e9750641c5c70c1e0aea59a690dd353156b2cccbc3452e50ef46a185369a89ec6f24a09b2a64576f253c172048ae21cb255f0c7daee279307b0260adf778 WHIRLPOOL 9bd57d306948bd3923a5fa5f37803e3238f76e54aaeb9770be39a2f8cc51b0eb331c402943b19e8bc1b228694d76447e4e96bb1818971ab84f569206f66a4c85
diff --git a/net-misc/pavuk/metadata.xml b/net-misc/pavuk/metadata.xml
index e864265476ed..5dd8ba44d773 100644
--- a/net-misc/pavuk/metadata.xml
+++ b/net-misc/pavuk/metadata.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>pyxlcy@gmail.com</email>
-	<description>Please assign bugs</description>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
-<flag name="hammer">Turn on chunky/hammer mode (DoS) in pavuk: when
+	<flag name="hammer">Turn on chunky/hammer mode (DoS) in pavuk: when
 	specified, pavuk will include features to stress test web sites using an
 	ultrahigh performancereplay mechanism</flag>
 </use>
diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest
index bb942118f094..fb544237ad19 100644
--- a/net-misc/sshpass/Manifest
+++ b/net-misc/sshpass/Manifest
@@ -4,4 +4,4 @@ EBUILD sshpass-1.05.ebuild 408 SHA256 61da734a1225c11e1f442db49c8f963a1cd8fe3355
 EBUILD sshpass-1.06.ebuild 398 SHA256 8b4851427ebd6f8fa4443cb554b3a642d792e2c573ec72110a0e284e01d62253 SHA512 9405313f06d315f04e5d353de12e010dd9b90fda1dd2b7ac8a8c3921039f9088048ddb82415150f08333fe346c4c8b4d2eef743b4e776e630bfa0bb8d1b330b5 WHIRLPOOL 50c09666d991d2011167d984efe932a61fad1b697b4c2fbbe77d40a6a520f857d46d654cc16057ee6334bd0664503bf33fc664d6a70f03169f192afa28de1e56
 MISC ChangeLog 2577 SHA256 b81d887c5275e7047700221c249a689f7132a1af9de461fc1246bb30a5e39ebf SHA512 b23d5086d3c9288fc38cbd082763c21f8cce9b81f4c28adb608cd79a46c1c5d13a2ce290857a7fecd23b4bb19df7f1eb6066756d5e12b7b0db2e906a1a1adbfe WHIRLPOOL 0ed53af170f84b0cde55d3e9cbf90a2006c166ccdb09764f618b43753e0a855427505724ece9462b81260ce41f114d3dc4a35038efcce0a0c6419b83549ac7c0
 MISC ChangeLog-2015 2086 SHA256 7edf478f6d22ecd04243b113a337dc8bd9a0323d82239aeb380a9b2a0ead5e54 SHA512 a5765075cd3157db6646130f461f6c10e47d73ecac6700b6ddc084ceae17aaaf7e8e002c02a33f84922fb822a835a5f2237f1dfa25a25997066807560efa2b8f WHIRLPOOL c00476021390ed91768294ce027b62dda49bcf187f5d828d27f552bb8d5af93ab1b5f5e8af103dae553fd7ad0bb94b11071c4fe9026a8ab1a1312e2e28d5bc00
-MISC metadata.xml 692 SHA256 606234934ad5450f877c853fc7f7ec9416ccc9d5779b24f28332cfc9560529e9 SHA512 7d04016dd742353ea3aec5ed0c8dbffcffa6d3a3980c96132e88080115e23f7fe91c1b4ba86da39d5d8a953a51a19ba7978834de74a7299295ac07252e2721b1 WHIRLPOOL 4bc7865eb3408c56b34afb1c617178d90d9d56dc4e19be6aa162844b0bd7b790e0d1ead88a402aec4f60f9c184866c1b505d4c5133581114ba699a1bfff25f80
+MISC metadata.xml 327 SHA256 955368dbd9a04c2eafb5f80037f0655a76f362d3474a12c3e2d7621225d2e7e4 SHA512 0e867d2b6e48f24f6457b06b06ee5bff469e8d46542d3a4de66a76df53dc38120ca14327543a60c9d578540a3ff2eba0cde4bb8d0b6a5c90b03c1c09bd6318b3 WHIRLPOOL a999a334a15f68863dc25af01eccd38259a426fc2735855352260a5ab1985a6b02de40a88a2621789ac34a6c735de6733ade604c20fbaa1d5c5fd78f855ee596
diff --git a/net-misc/sshpass/metadata.xml b/net-misc/sshpass/metadata.xml
index 8a6b9b82415b..5f237d0e61d1 100644
--- a/net-misc/sshpass/metadata.xml
+++ b/net-misc/sshpass/metadata.xml
@@ -2,18 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jingcheng01@gmail.com</email>
-		<name>Jing, Cheng</name>
-		<description>Proxied maintainer; set to assignee in all bugs</description>
-	</maintainer>
-	<maintainer type="person">
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
-		<description>Proxy maintainer; CC him on bugs</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sshpass</remote-id>
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index aeeda043c571..3f479ce58ae9 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -6,7 +6,7 @@ AUX wget-1.19.1-fix-Python-test-suite.patch 8721 SHA256 d9549cc04352b5efdd8a44c3
 DIST wget-1.19.1.tar.xz 2111756 SHA256 0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5 WHIRLPOOL 2a4bd80f1e7134637227609f532ee3385472a6895ff22efeface42d082072a09abaa5dd2d8653bfdab015de801d31426b01d73ab5dd1a6864b84c29dc8e72462
 DIST wget-1.19.2.tar.gz 4349267 SHA256 4f4a673b6d466efa50fbfba796bd84a46ae24e370fa562ede5b21ab53c11a920 SHA512 a0f8afcc0767a8fd1acd64b1b1b27d177bc938e70cc3709c1b3faa6c1426ec926642cd8e49d292cec0268ee507683539b5152072110106de5a728a03efd8cedd WHIRLPOOL 64398a8fc132a21d81d6fd7c97335739525fb8b31eca4aa4aa7048f251691c05ad1f004c36d6e633abf02d174ffefcb2176213e68fefb76bce505d247940af3a
 EBUILD wget-1.19.1-r1.ebuild 3197 SHA256 29fc6002b0afa09b6b8718ba1e1a77e1329d4b8b58cd9d95644d7f2c09e968f2 SHA512 bf0b1c2275c6252f8f17c630aa9bb89e9276097f1fa74cf9d56d67c3ea099851ae64cd08996653493dadc39e31737fbeed88f5fc8cc0cbf1313b0b23e824befc WHIRLPOOL 4a989f7804950fa9b4bf1890f717e46a3dd64591df82b9627349b8a4bab9dbba4c9b83ade854effd5e8fd445a5f4223aa807dd3134583e831fde890f71e36926
-EBUILD wget-1.19.1-r2.ebuild 3380 SHA256 8f5b2d642003f0ea147b370634579e605c59b775747192181776e52e91d7f016 SHA512 82f4a4baf6755a056cbdc0f43ca6a226f069b51f2ab1a6f7dc5dc9976437011f54fd32261ed6b6c6d972b8bc9be704271b1c1a560fbc37f4b170d81da0702e07 WHIRLPOOL 4690671f26ed2a1b0df20b58119b70850e736f5ddc347d514b5ac9f07ba0bf9d56b3c4fa7abc452f7e5a7018adae2d467b003601b06b8bd00c8c3660a69589b0
+EBUILD wget-1.19.1-r2.ebuild 3377 SHA256 5fdd0894b199510a93d38d0fb7ed3b3a25892ca67272ccdfa3e63cab6a7fe689 SHA512 3696dc7cb093fbcd4dbffe61e981ded608f654a7475ff62e755c8cf3621b66862c6147b689cb779e49ae1ca728a0f501560d2247e1d6c08ff66fcf36c3b7d559 WHIRLPOOL 4c0e670b108bb6f85a9af67af3dc36ef91ddb13c31c0e5fad8b37d5db454ef65aa3b8af871f422d28da5caa9a2c9a3e58d523fff575772bcebd85c4a3248b278
 EBUILD wget-1.19.2.ebuild 3118 SHA256 084c69c9ae1e1a242e85fb6d21d8e8c8643fe047162797500cd268b4b91d37fa SHA512 e4a6f74d9e7feddab9d9849e32f75f8a383e648b592ec0beb79c20a560c9e0156e4494059a3f95afe3135538e460abc0f5966b4002549e2c94ae572f2ef71738 WHIRLPOOL eadbe036d1a37bd4a0cc92d15282728d37a9cfd3d01d280a6782df59b714659c27f9b97c5f266f5b922934cae62bc5aa83fc0e2919d64781028db59be5585c09
 MISC ChangeLog 11759 SHA256 b0200db8aa9205aa6cf590936f1758619e1b56fdb17c76314175d6031c287ccf SHA512 eb9e6c7b1d5cb9f3e550b3c7d89493da0026492b629d3b76c5f096b9ef7de499addb31fcf43dd4cfd01eaf73253ddd10ceef5937a9a1a8d18142f9e5c22b764b WHIRLPOOL 679e53afbcbdadd297e78cfbbbbbb4406d23f993f44d38388c0f55b74ec888ea1f81b29be95e36b19dcc92fe6f350861d59549b28a77eb884eba6bee3d0844a2
 MISC ChangeLog-2015 29939 SHA256 902a2f6576d8c8dd01ee76cad7a689cb260d153139adc04b8d76abe91860d86d SHA512 55c752f56737ab6116057f3c158fcd4ba9b0405d43796e4114076c6fe849f7bdf3f771606c69551d5a1bd8a408ff5099158d461b26c840c6a4fe05824d8ae11e WHIRLPOOL 4b1c46b1c0c25428559442be8e2aef443686e00fd1889c908bf7d28291a5064e2dbe9879f0bd2025a8e0f49e42ed89334198f5dc9ee1122c91e1ba7c317678c7
diff --git a/net-misc/wget/wget-1.19.1-r2.ebuild b/net-misc/wget/wget-1.19.1-r2.ebuild
index 8d84a93dfa73..3d5b65590c4f 100644
--- a/net-misc/wget/wget-1.19.1-r2.ebuild
+++ b/net-misc/wget/wget-1.19.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${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 ~sparc-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 ~sparc-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="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index cb6534b33b79..524b56e1d642 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,9 +1,9 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 SHA256 55df3cbda9cf86e49baf54040340ec74c692bb3d6da3d2f5a1bc1238017dd492 SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c WHIRLPOOL 8345da00074e62ec9a9c244cb9ef64930fbd0e5e9e5bc1709bfcf56517cc6312031a09523c3016db2a1542c16a0297bea9d6883a201ae94e347e358307e92422
-DIST youtube-dl-2017.10.15.1.tar.gz 2820437 SHA256 da6ae68b2fbe81da7cf4ac6b989fa7bf27b3beb214eed551d466cc6e41d7297f SHA512 6093747f732dac4eda4c71d334ed01fc24ba70d29e5660c38ff795861f06c4029441c3a4576e6a5463974488aeb7732687e5634481c8b04127f77499a2405a1c WHIRLPOOL cc8fca27f2a110fde556e6c6506a88715d4e4a03c971b7e74e77a91a5b28916c66146afd6e476a19aca2fff3270719da102d254a05f62dbabb5dc2a10040d839
 DIST youtube-dl-2017.10.20.tar.gz 2824647 SHA256 3e920a573218328a0864ffda5084093ec03108a7d4cd13cea7be85d7c342f95a SHA512 973465ad7d04f9d790fb9d36ca1c2c89c13f64b599ac3ef61f7720cd9d618d01619f76b419044eb716123e8300c1e2b4d881972a8240e0421f396dddd7affef1 WHIRLPOOL 2292bb5bdde62bc94b83d01da7b9a251fa88feaf95d2df703b40db36297cee75e76e776db4e0ca2959873f30655ee93cc52c76731230957a3bbbff0e5e736b0a
+DIST youtube-dl-2017.10.29.tar.gz 2831813 SHA256 8fe003472048113ed6fcc422cc48cc76a49cfdd12f189b832c40a2cc44e452f9 SHA512 50781f792fa01ad64b6f7b6fc05730dff09b10007ef5c23ee558148affb2a126958bd5ed8d1ac4499ddc48a56a5b9df47f20612ae09f41084e6dbac5fc3f3426 WHIRLPOOL 1393943e90c096feaf0d7902408a965ae4fac961cb6cab1bc3f77a1d75478d91e5a0da5a72a3da71c09c44b05778e5b5481a44bd1494112dfe3ec5af3de5f78d
 EBUILD youtube-dl-2017.03.16.ebuild 2381 SHA256 9503230e2716a18498b74f5047095216fa36cdf4801cc6446e6f2075fa5cde50 SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862 WHIRLPOOL ded7fa74a8649db1cc5c16eb98ab557853d264bcc458429374b0bbb29773f993a8621285bcfcbe243cf3892d982f91ff5278c45cb0e50b824b156a0a57786911
-EBUILD youtube-dl-2017.10.15.1.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
 EBUILD youtube-dl-2017.10.20.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
+EBUILD youtube-dl-2017.10.29.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
 EBUILD youtube-dl-99999999.ebuild 2089 SHA256 a46031a2c229d820634b16d31efc904c44bafe1d04c3367b9e40e5e0c8b1c953 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11 WHIRLPOOL a358657c660c533e1b506339c615e781998aa5465408629c51722f6999fc3e5d3fd11b617b89314ada35df0d93aeaa514837ac1a2e3b7573c43657394f6ef4ae
 MISC ChangeLog 32089 SHA256 377c688fd528de367a40230423162256199da2c475ef85d3dc986b622e322fd6 SHA512 955715fa5304b1ee5ab4436e232b4ac5c882e28f4755d2edcd23cc4c760575518dc8c349c20b2e1b41145ca55bbd8df292d12a1b34768acf55ae1d6b80e2f2ca WHIRLPOOL a925103ccb1de53ada47dd94f927a42eff5f97e14b47c607ddfaeda4e719a2eb8be78be8e008e4b3036ab48acb946e283876d646388745288ad5b992e2574104
 MISC ChangeLog-2015 75434 SHA256 71ef7accb3e09eadb601b4541ead4ed3019cbd1e86b56df23130cc0e49572dd5 SHA512 3517da9014199375d7bb8d4841b52ad12eb3a25ca7a225e767dd9b60f8b81848cf7f6763066fb7c7bb7826602711e22f56d710fa319cb8172843a31eb69228e6 WHIRLPOOL 32aee6516cd3e7848eeb08ccd47cb60bc04da646b2e448970ce40fa5d0e8dc591ae5d7c8e1dfe99229b6ee70805e070d8dee2353a41515377083bd7d2f02b073
diff --git a/net-misc/youtube-dl/youtube-dl-2017.10.15.1.ebuild b/net-misc/youtube-dl/youtube-dl-2017.10.29.ebuild
index 975ce26c347e..975ce26c347e 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.10.15.1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.10.29.ebuild