gentoo resync : 02.08.2019

104 files changed, 741 insertions, 1850 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index fade0f3af3fd..e5df6a1b0f50 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest
index 712fbe8d8137..fe8983b95864 100644
--- a/net-misc/adjtimex/Manifest
+++ b/net-misc/adjtimex/Manifest
@@ -2,8 +2,6 @@ AUX adjtimex-1.29-r1-gentoo-utc.patch 1053 BLAKE2B 1f17ac2e1a508a3b54f7a1bb59de0
 AUX adjtimex-1.29-r2-gentoo-utc.patch 1011 BLAKE2B c4e7f951ef316917630cfa122058e44a956b02830c80d3e2edecd5dcff9daacf869ff1f1e3613afb42c222287565a5c296f72d0729e5a928a58180039bc5e282 SHA512 7917ae69ff554c3b7de8be65f3758e9bcf80f5875afeca8d9ff81d1fa4bf4783f65c98b28d4d705fe585fb7a23b7e64af7d9145eb9286c24d7fdf2053a04e5f3
 AUX adjtimex.init 638 BLAKE2B 652bc1dd50a59bec204b669bb72ba3ca68ae65bc450d4ff662ba2af5f7d5f784f184a3cf7156439fdb72608ef46042d606fc4f1e9abb969ff3ce500f3db9cf6f SHA512 4d8caa72076ac8ba2c0f6cabb31a28254e609d2215cc8f830921e729013144fc10cb6a8796fff80ecc4bf1dc611652e81830e46e59c1726d3147cc1680017041
 DIST adjtimex_1.29-10.debian.tar.xz 33008 BLAKE2B b1da53008ef2373d9b450228bdb7f3378516880bf5b0d9b6d2c8aaa25880eea05954923e18497c42bf4e0f541dfa6c119c558b2712c5ed096a9c3e32dd3407c0 SHA512 4be30bdc63446259fe246e4d7fc0cb78fa40f40e9eb1a0b3a9d523d19ba0664be5e04f1803235a268eaae41cf4d88adfdbc6ecec86f8bd03703aca6c25ba9b8b
-DIST adjtimex_1.29-2.diff.gz 51735 BLAKE2B a59efafa03527ca8cb54994bfe49bec3638b2d76dcb505fcbe3be9e112326223c7f6009f7e527b0ff1a265e7af3c190894b8e3c41c6cf4e31dc2832a093bc38a SHA512 cc78cf9fd93cb243019952f877cb9730a5755d87336fc1a956162e957fd579de3770cb6bbba58ac9b6d350ee631ed294303360d0aa4153b12a31eb1bb4e35924
 DIST adjtimex_1.29.orig.tar.gz 85551 BLAKE2B 4e7784c3d3efa1f6ea226a7822de675a27c5be5d048664f8ff215eebe65b493e6dc0d004cc955c2e3b4e314e6283eafd628e92b611504b6ea92f4e5fe7d1a8c7 SHA512 5a48cdc538866c06562f62e369c08d60978c791ed91565262c0179c6fa25dd343963992d00e10f32475fdc00b458f81cf9c61adbfa9e1b7a8d4981ebeeff5649
-EBUILD adjtimex-1.29-r1.ebuild 1433 BLAKE2B ff7df3097d3f56875e11368ee4af2dfae5acc1552e1c7eadcf9acf7b22a5b653ccfdef3facf9c3e79fdd1726d88649086f8f0ce32efc34adc0ec2882aede9b26 SHA512 a2b56c1667fb329513638ed10d99e04ae14f6e374646b9802899f4094da2fe21e8d45e0d61cb422fb12f61cb40b9542d9ebe3ab6429504cd1a710408b9db6b6e
-EBUILD adjtimex-1.29-r2.ebuild 1701 BLAKE2B 9f8a6233fa3f4e0d73a796b453ed5fc98ddd9e644907ceec7857ad3d27e410b47e0c27ffeed7f379a521bfe57fc2d97f16ae9c9bdd3054c4aeb87daee62004f3 SHA512 3509d41b1a781edafd53ec7af7039fd6d680ff22880585e7008bc985c253d764c085da5d01fb9f666af3db702c482a7284d0e4f87a882cb6d1441a86469d9b9b
+EBUILD adjtimex-1.29-r2.ebuild 1697 BLAKE2B 79da53d245763702bd0a776b649c63798ba0fe9f687a22e93135fa71c272998abf3b015ecf48e59596921c7b5872c4d044b0dc51bd44d7c345c97d8603b17d44 SHA512 6ed381643753735baba92be81ea311764305facd4cec1d999171f5281082ac990b64885732d5576a7a4458f053e4527bea6e8d857403a317dd8d35c78e941c9d
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/adjtimex/adjtimex-1.29-r1.ebuild b/net-misc/adjtimex/adjtimex-1.29-r1.ebuild
deleted file mode 100644
index 9f8febb49e45..000000000000
--- a/net-misc/adjtimex/adjtimex-1.29-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils fixheadtails toolchain-funcs
-
-DEBIAN_PV="2"
-MY_P="${P/-/_}"
-DEBIAN_URI="mirror://debian/pool/main/${PN:0:1}/${PN}"
-DEBIAN_PATCH="${MY_P}-${DEBIAN_PV}.diff.gz"
-DEBIAN_SRC="${MY_P}.orig.tar.gz"
-DESCRIPTION="display or set the kernel time variables"
-HOMEPAGE="http://www.ibiblio.org/linsearch/lsms/adjtimex.html"
-SRC_URI="${DEBIAN_URI}/${DEBIAN_PATCH}
-	${DEBIAN_URI}/${DEBIAN_SRC}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${DISTDIR}"/${DEBIAN_PATCH}
-	cd "${S}"
-	for i in debian/adjtimexconfig debian/adjtimexconfig.8 ; do
-		sed -e 's|/etc/default/adjtimex|/etc/conf.d/adjtimex|' \
-			-i.orig ${i}
-		sed -e 's|^/sbin/adjtimex |/usr/sbin/adjtimex |' \
-			-i.orig ${i}
-	done
-	epatch "${FILESDIR}"/${PN}-1.29-r1-gentoo-utc.patch
-	ht_fix_file debian/adjtimexconfig
-	sed -i \
-		-e '/CFLAGS = -Wall -t/,/endif/d' \
-		-e '/$(CC).* -o/s|$(CFLAGS)|& $(LDFLAGS)|g' \
-		Makefile.in || die "sed Makefile.in"
-}
-
-src_configure() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	dodoc README* ChangeLog
-	doman adjtimex.8 debian/adjtimexconfig.8
-	dosbin adjtimex debian/adjtimexconfig
-	newinitd "${FILESDIR}"/adjtimex.init adjtimex
-}
-
-pkg_postinst() {
-	einfo "Please run adjtimexconfig to create the configuration file"
-}
diff --git a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild b/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
index c93afec77daf..30a3debd7a35 100644
--- a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
+++ b/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${DEBIAN_URI}/${DEBIAN_PATCH}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ppc x86"
 IUSE=""
 
 DEPEND="sys-apps/sed"
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 771035fb943b..4aade7c36f3b 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -2,5 +2,5 @@ AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec692
 AUX aria2-1.34.0-mask-headers.patch 1972 BLAKE2B 8efec9b9beeee5c763db29287931869cd69fde9883a7fab1f5f7fe48948ee62ef25df10fe855230fd082ce6a442f3eb00da8bf16b1f443573140868656f21969 SHA512 e81d6cf69652b4a2adb67a13434d3e37f1c69ce2a99a8d4b12f3e056c6c530218d6593aaeb1ca8b2691e4f28a0d53b29319d067c4f89eb0e4b2e8368f1c38319
 DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc
 EBUILD aria2-1.34.0-r1.ebuild 4439 BLAKE2B 95ceeb794a25162f1edaf2910117f093fdb06f4afa956b14a5fe8034440edc6f0ea7a91f18434cbf083505e7effedad47fcf68ee52286c931db73b9be29085b0 SHA512 2a9d7e9c963f3f8158727bafe5fb8895981bb3e81687bdfee36c23be097b7f3d452efb8e560dfaa540aa007368e386e04162c93ca651c405cf1c68386f9a8ff9
-EBUILD aria2-1.34.0-r2.ebuild 5016 BLAKE2B 27a33ac658c9996ef9824493f5ca8db20faa24e407b32935a5f2b206a2194ec86dd0ec5bac3891f7fa137ba7b2160a37c9e7a729601e07c152f1b3c41b548435 SHA512 fa4e6fd3b7d55b894a931a6d9f73a0e8cefdcb4a117d68a52aa3b66741691da8a4f99549804173bbf04b7455eb5d704c087f547fdfbdc773eedf43ae61a45b96
+EBUILD aria2-1.34.0-r2.ebuild 5014 BLAKE2B 11ade715c629821946b28812b7990918f0134093f3bbc374701a0ae196ca46ea569caa2d435f91250c07489603e3a222556a3eee30dc8c052aaf267802942ffd SHA512 ca8aa1ff070bb11b5d542f93e07b573eddbde3286f82101c3b2a2b65eccdb30872e66388185092fa1113bd41542e1645b213960cab5b15eeeab62f1ac9da992e
 MISC metadata.xml 1442 BLAKE2B 82e8426004e56ba96a5f8766a6d04325ea3919ecfa0996da1d767dc4f4fb2b3277d1b3e4b60d369bc7636eb557af336b890c4bde0b49ee39cc3352050a112fe5 SHA512 61da3c1c3cd1535d208e7ae1930fc2af16eb2080f99c923b9bc405decb50f09cf5acfbb1e922c3eb7edbb799f359e8e9762fe2e67ec24ae542613459250c6f7b
diff --git a/net-misc/aria2/aria2-1.34.0-r2.ebuild b/net-misc/aria2/aria2-1.34.0-r2.ebuild
index 025e6d10b737..c7f2ec04cd93 100644
--- a/net-misc/aria2/aria2-1.34.0-r2.ebuild
+++ b/net-misc/aria2/aria2-1.34.0-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://aria2.github.io/"
 SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+-with-openssl-exception"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
 
diff --git a/net-misc/asterisk-moh-opsound/Manifest b/net-misc/asterisk-moh-opsound/Manifest
index 57866026c0a5..c1b81700d625 100644
--- a/net-misc/asterisk-moh-opsound/Manifest
+++ b/net-misc/asterisk-moh-opsound/Manifest
@@ -7,5 +7,5 @@ DIST asterisk-moh-opsound-siren7-2.03.tar.gz 4233366 BLAKE2B b628d092b47997b1cd2
 DIST asterisk-moh-opsound-sln16-2.03.tar.gz 31309094 BLAKE2B 1567b63c6e93ea70a1ff3452ed7a0a457bb118a2605248d5fd9cae11ac72ef53e8bb663fb826031a8c680715194d05bb6c0abc7ff7597e62f61608ab403437ba SHA512 e5555af8f08720c01bff19200efb7f139dcbb9d1ffa168716dbf93bed97009a441bfe63080c9ca7b15db2c98fe5839d311c39cdf8c0a8a40f8dd93a89b8a11b6
 DIST asterisk-moh-opsound-ulaw-2.03.tar.gz 7479839 BLAKE2B 87ae22a72ab6da7358fe887af5562a701bca89bec35d7f72644cb6f691e0619671bfacd02ec0f0f269447dad1cd050f144b22254af3812268fbabb1944056bc5 SHA512 2827b635a61e520bb0efb8c5e77ce0d1319d58c027cd3721819b58e4136918b7767c5776a4ca02f675cdb35d6f40154fc863eb7d7cb702a637fe9ec966fe13c1
 DIST asterisk-moh-opsound-wav-2.03.tar.gz 15359473 BLAKE2B a3e9ddf0d54989f07c581facfe4f157120e2b2ae9dbba84bb2edb85ec4bdb98db5bc4783924af0845920d3736c5a512a7615effdf8c4f0b212ea347193efd115 SHA512 e8fefcac32ac88735519f3f9df766d77d1007c8e98952c396943966dd554d4237177f7fbfbb707a838b5f4d479c13c6b4bfecd62d78ba5ea40b248d1bf007872
-EBUILD asterisk-moh-opsound-2.03.ebuild 1124 BLAKE2B e87f5cabf00a8b1375be232b3addf198ccdbd3fcdb69c1341649e512c216996ab1051b2f3c8cfe47f1abf441266edd43552de7180de3edb15928e2e4cd1a030d SHA512 5db9614a6705b5c5f515b56f497f8074061310140bf6c443c0ef5d1d0b3c62dabfb5ae5b171f8c7b5a644cfee49a32e91f896dfa87d68b4a8fcc568d051ea579
+EBUILD asterisk-moh-opsound-2.03.ebuild 1124 BLAKE2B 101336fb5a67c94daa4685752a66a65bcbe4befa4a533e15a2b2d4d77f68799ded7455eb17af8427d27b8bb617266ef970e4c9a4d09e938e72e7e5ecdf097d31 SHA512 d0b234a7fec579a522dcdf4a135ae26016315d5e9303be045b802348cbd7de700c92e9e923d0c649253872cf8ce055de32f19f50452b2597bfe4c7b1154d256a
 MISC metadata.xml 917 BLAKE2B 267b110b5ef3fea60a4fba48147dc7d47897f0b5854039df6e8a47f3c2ce3ddb94f832926b28853caa6fa3e6dbfd0182cd63cf07c4377e796b9ad467ccec1ff8 SHA512 834aff23b944bdd2ad940458323fee9db3e4b9cf3b2e83265bc59a1c7a1b9d992c244b834fbf465a1f3d135470741b27dfa150193f9371519e19d8550a86742a
diff --git a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
index cbbc2b3aa585..db7bd7d99a96 100644
--- a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
+++ b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI="7"
 
 DESCRIPTION="asterisk moh music"
 HOMEPAGE="http://www.asterisk.org/"
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 5998b2eb4499..d73f2cc908c9 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -13,6 +13,6 @@ DIST chrony-3.5.tar.gz 458226 BLAKE2B 611f21e36c6e745208e00eba988519fcd912c6c0c3
 EBUILD chrony-3.1.ebuild 2825 BLAKE2B c3af56079c3130002499dda974bb5117a2cce988f8a1aaca7cb6f9f11a0aa011fefe3f600262939b72b4f41d7e096a94dd1305572a04aabe96519cff36ec0165 SHA512 f97265a0a7006c1f8fc07f4a25f27ff0f78b123fdeabe2329a0e48ba33409e16a8373d6c114c2d25f463f560b47e8ef5510c140e5e045a02ccfd4eb669f463b3
 EBUILD chrony-3.3.ebuild 2909 BLAKE2B 2d314e96402839948b95e9f8650e8523676f201deab27230ac9d006a0a73c878239c23c7118d0698bec9d7c2796b3a08be9cfa695c21b84ee333c23161d963ad SHA512 0ef1db3668f626dc07057728f7d33d9a200f1e4fcb93e6fb3b69e874b8d5d0e3bbb2d57c21513d7825151b08b0a86a36ef1838c44f27e536aa7abd5b9e973cdf
 EBUILD chrony-3.4.ebuild 2912 BLAKE2B 0b8948414c95862295efec709f2f4467974c2955fc03153d5d2bfa15a74fcee2714f012425b4b1002b90cafe9008fa7ce02f0f40582b7b4b0917d82363cc9c77 SHA512 13c6caf8f3d813e1caa515d1ab00f1e5c1539198ee51913f649ee2ef2562bffee15b0f78c78ff5419728740a867d02a90eb889f2711a32db85f7756c3bdda3b3
-EBUILD chrony-3.5.ebuild 2905 BLAKE2B f218516fa756db6dba879e8e1d2be5ba876941dcefd13c495af36c18eea73f49baadfeb37b91a85f27b5620c1903387340e0ef29f7bd26ce80d11b32b68fa984 SHA512 50f6c59a506ed8ea1de8230ad97de2a1973d8d9ba08877a3344c66dbfdd76a86c3f3dd3c4fa19d1cacdd5bf425bb591e16643a18115ee131cd3639a790bff6c1
-EBUILD chrony-9999.ebuild 2792 BLAKE2B d0e5f86270fd4c82fa94d837e6411322da95a71948b1425cb971b161045cdae325955add908799b07f116df6fd63166307a1029713e80dee18fe6794b41a18a0 SHA512 7cc71ca37d189b4044c8680b00175168705df3b03c8a09600cc294e4a4d351d9d6e21a396bd5591aeb2d1a050006bedc677ccc48f17191203e355925a8d6a080
-MISC metadata.xml 1566 BLAKE2B 94f800f032197823ff746e93dcb8955a273a0712add991415852d5192c09b465aad40aca121f959442b83fd225becacb063f4ac28b8a7bd035ca65aab2ed3ecb SHA512 bc9d33fa4f146feb7b934ffa6cf8e4d235316f23b9e08dbd6bf6d071496508a9c1dfbed2fca686244360ef848acdeec0d3b96992601aeb669c30482f9ca5ee84
+EBUILD chrony-3.5.ebuild 2909 BLAKE2B 7aa6ed3307387d3be48b0f215a1ffa28eafe89cb4856d89f2f2613738e6415c88adc2bc0e384b8cf28fb1ce76fcbab1a553fc3790c2883e21950d648cdd70024 SHA512 e9ebfbb5d22296bad677cb6c1372e6fc866f8eb2c3b3b0fe5166862560d8b9d9f11552271129cafd07e09c7791b64f92b4a0b740aa8d3982f7228e77bbd6afb4
+EBUILD chrony-9999.ebuild 2801 BLAKE2B eb782d5490812e898b6d660cb7b49eaccd610dd3dfc6afba21676effcf9a9ada57b4e2d6fb96ffa4474439215e32e0bcefeff0b5b686d21e63fa95e289d8c59a SHA512 87f76580a6dbd2fa2aa81225f7e0b0262f1b4030a9e2905f5e0e159265808836a6af5081b8461a7f3e7c7c48e5933d0dc192c58a9d334f5dde0ef0ee445ac59e
+MISC metadata.xml 1566 BLAKE2B 88bf43a72fed47580395641d87651a7828fa3fb443a36568bc8ee44f2d09117aa296f8b214f1560279cce2e9bad189a3d941708fe37c1760b053f3669f25ed8e SHA512 acdca169396f72dbbfd3c2ca781024818133ec4af07661a0c8b5a619ca6a43713910aadc28e6d8e5b3d0d8da960ac1bfba05ec5cb5c49d80b17fdf9c1c5d1b1d
diff --git a/net-misc/chrony/chrony-3.5.ebuild b/net-misc/chrony/chrony-3.5.ebuild
index ec8018cd297c..21c96f642157 100644
--- a/net-misc/chrony/chrony-3.5.ebuild
+++ b/net-misc/chrony/chrony-3.5.ebuild
@@ -11,7 +11,10 @@ LICENSE="GPL-2"
 SLOT="0"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc seccomp selinux +adns"
+IUSE="
+	+adns caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc
+	seccomp selinux
+"
 REQUIRED_USE="
 	?? ( libedit readline )
 "
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 2fadb9f5fdb2..a9bf2fae2782 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -11,7 +11,10 @@ LICENSE="GPL-2"
 SLOT="0"
 
 KEYWORDS=""
-IUSE="caps +cmdmon ipv6 libedit +ntp +phc pps readline +refclock +rtc seccomp selinux +adns"
+IUSE="
+	+adns caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc
+	seccomp selinux
+"
 REQUIRED_USE="
 	?? ( libedit readline )
 "
diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml
index fe0c5f66743d..290f9476459b 100644
--- a/net-misc/chrony/metadata.xml
+++ b/net-misc/chrony/metadata.xml
@@ -18,6 +18,7 @@ Chrony ã�¯ã‚³ãƒ³ãƒ”ュータã�®ã‚·ã‚¹ãƒ†ãƒ ãƒ»ã‚¯ãƒ­ãƒƒã‚¯ã�®ç²¾åº¦ã‚’ä¿�ã�¤ã�Ÿã
 �接続�も機能���。
 </longdescription>
 <use>
+<flag name="adns">Support for asynchronous DNS</flag>
 <flag name="cmdmon">Support for command and monitoring</flag>
 <flag name="html">Install HTML documentation</flag>
 <flag name="ntp">Support for the Network Time Protocol (NTP)</flag>
@@ -25,6 +26,5 @@ Chrony ã�¯ã‚³ãƒ³ãƒ”ュータã�®ã‚·ã‚¹ãƒ†ãƒ ãƒ»ã‚¯ãƒ­ãƒƒã‚¯ã�®ç²¾åº¦ã‚’ä¿�ã�¤ã�Ÿã
 <flag name="pps">Support for the Linux Pulse Per Second (PPS) interface</flag>
 <flag name="refclock">Support for reference clocks</flag>
 <flag name="rtc">Support for the Linux Real Time Clock interface</flag>
-<flag name="adns">Support for asynchronous DNS</flag>
 </use>
 </pkgmetadata>
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index b1d7be96c3bd..f01f34057b00 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -6,5 +6,5 @@ AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f5
 DIST connman-1.35.tar.xz 686092 BLAKE2B 706d8333dc2fcbee8d0ef3849325c4975dfe312a7a542ee96859a1724e05b1302c244a0108ab70033b398301c235fb13cb9509e9147dc2bb049e900f3799cd98 SHA512 2234b4d18b038f9a33939035cddebd31c74ce962e5616c2c30b2912476612ef3f7d5b9edca64bf6e69fa358252ed432124e036ac3516b291b86695cb9a96c6a8
 DIST connman-1.37.tar.xz 707752 BLAKE2B ad8993764a444d205b0a8cf1ad38acc249a1a28014e6f4e5a89c8662194ad2e2ee6091b51445b88a885808461413b3aaf88eeb7b75a32f417b578d2da80a2e9f SHA512 5d5363105aedd0c9d609dd5c64eb832d9ff80923a944d9d3738337a61f180ded227f2ae1ff7912bed8826b35f0cfd20488e3ffd3801f0e53e90f98498e19efb6
 EBUILD connman-1.35-r1.ebuild 2555 BLAKE2B 7369ceafa9bd072bd8020da45453bd07ddacb10606bb3d61ceddfd3367b15bdbf890a00aa579536d548b52fd6c6656d79cdb31d290d2ac6301a6f04ffbd0724d SHA512 640be0029a8c6568a47973743f968cc641a579523f4288cc5ac0347b72721f547f608729c2865b2a31e15394e2c85a18b360936e082ac3f7069296e9977870b8
-EBUILD connman-1.37.ebuild 2585 BLAKE2B 2424e663462e696811a50892a495837113fb013f3ae3220763eef2a1794608a3d904f505cb775734eadf69731a965dfe1a0b397162a45e5f306399910e3abd32 SHA512 b946271739eddfa7451d1da1e956a485a9fe201ccd7cc8a90b82751fc0fee9d4ea0285feebd8825a1a3b50780c75533ca53a3e111e9855eeb9f573e95985750d
+EBUILD connman-1.37.ebuild 2584 BLAKE2B a278951c9053eab548ad9cbce35aad331bbef01a1dfa70d6272157122cf7399e640e6a5d87d5f399fb2841255d572bc2a22477f675560377d7a11da358bd6396 SHA512 7aec5a08236f3513b51945ebbe5797985231b6997b38d1e5cb4313294a8addfa5ec376d6c7c8d8377bc2bed486736e88e6382a3f12e285c1f10e77e5fe5a37f1
 MISC metadata.xml 1158 BLAKE2B 57d083417dd0b186b1d45368f1ffab64d6283535ae6f25adfd6cd85d26f535544f0b89d7f731dbb876ba7acd1973abdd26ac7643c050adc9a433d321ffc9fb57 SHA512 2d272d638d9f9f06eb900736815eb0e401520f3ad86082beea541932626c5758e220f692931772ecafffbd60798f0df38e8c9e8a02b58c03743ed984955edb8b
diff --git a/net-misc/connman/connman-1.37.ebuild b/net-misc/connman/connman-1.37.ebuild
index fc81c6e57dfa..3e0953084c96 100644
--- a/net-misc/connman/connman-1.37.ebuild
+++ b/net-misc/connman/connman-1.37.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 IUSE="${IUSE} bluetooth debug doc examples +ethernet iptables iwd l2tp nftables"
 IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index c8cd2a4308c1..31071f474a9c 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,10 +1,7 @@
 AUX dhcp-3.0-fix-perms.patch 417 BLAKE2B 2001859a901ce59c7ff8d5741349ccec44f50e808464290490795fca4c19cb069cd7c4befdab39d9a3878066d377f69f95ca05c51aa7e388b4b5e1ab0d40c27d SHA512 7b5b607f62dae3075c9126ce0055b649a9c1fc5c0d591f40208d0c951c2a921ced63c7a4c7b78e82e463c57cffc90734b23ef51b69fe70ecb8ad366ddca97cc7
-AUX dhcp-4.2.2-bind-parallel-build.patch 304 BLAKE2B 466c88b72c809339b0e9c2cdd6b5e8eb7dc56eee0ecb99f7baa6b29ad81f0cf19553aedbe4d383769c47eda3615fbf6a59807cafcae52089d7f1d58930c126f8 SHA512 3dee3b0ae5bd512bd7be6d5be7b8cfca8077065f6a3463089bf9ff5fcb556b3333fb8d3aeadf25ea7125fb6eff2ef6967b2878c9312046fa378c8acf0c9cf9d2
 AUX dhcp-4.2.2-dhclient-stdin-conf.patch 3017 BLAKE2B 59e2107764d49f7d9099e53d4a178876e0d71243da3c01f487a595e1e309fed5ddacdac6ee4832eaf8f26d785815ea2c571dccd0eb33bb88578dd70928ba96c3 SHA512 1adfa938e5531040008981dd4dcba37219bce0794524d3c3530eff527528ef7b22aa6fd540f9ac175339372e98347c0a91b86b4bb5f2aa93f04217b9902c3388
-AUX dhcp-4.2.4-always-accept-4.patch 907 BLAKE2B 520099c44afbc6156fc4af967888bca93f9c5054f872821705a37b9d79cbd246ecfcd14a2c391137b22fb7ccdaf49fc9eeedc00571120c0f0d313dedca16450d SHA512 682583d3a68b9609b16ba5029fb14a068c5e4ba1134b91e3c5c91f8cfa0d97d68e7b0fec2aa3d4e224bef9e97765971ca423e54f853a74ff6a2e24715ce17a2c
 AUX dhcp-4.2.5-bindtodevice-inet6.patch 826 BLAKE2B 30feafe2b8238743d08c80ea8f376d60dd89b7693a1f7d33dae78cd26635508fbe337e002cbe00228f1ad76979379655e8278374ba1839c541caff285652a0a4 SHA512 74d9d30b4803d10a63843d474dda92f019e4b7b9d7a9f4e32a49a1c261c1bb7238cd13f9b91c2bf8cf7f3ce5a5c665ef1d32998b06ca1439b30785d33827fe67
 AUX dhcp-4.3.3-ldap-ipv6-client-id.patch 2095 BLAKE2B 6f35bfb4ee123d6c0c5ecc56d882404753cc5d8ea6a342cc47bfa795a91712e83cdeee2899a63619f48566ced2edce6e24ae382e2954950cd3be534abb75dad6 SHA512 c8e48bc405d75281790c44c48d89c27b9ec7dd7273c41cacdc0e5e3b08648ae0eda1bd9b308a19667f11703b4bb25fc94911036bcca11f1197f87ec265b0c35a
-AUX dhcp-4.3.4-bind-disable.patch 1300 BLAKE2B 0211233c93caa67288feb31785d0c178f20c253df1011378251babfd59e06672f2ab260b183b9052cd3da7f3fa74ac7d4e136252a3f113d338f67f0dbc887489 SHA512 0684b6150a14d3ed5bbf1282cd22c4a03a761dc5197e5ada713c32fc821014279ddd8bd64e9ba46fef1b333f5a3b52e20b9a349311be49402b0942681f934f1e
 AUX dhcp-4.3.6-dhclient-ntp.patch 6810 BLAKE2B 9cf5ea5d55277e1821f2c97dc807e63a67b7712770f621e95272f58f3ac9cc12e586511114dc3c046a18624fc08caada1dd6bf4c36724219751f330a306071ff SHA512 13e4215c4fe02ea8d17a1559b2653de1bb72675eb72ae7b17707c2cf138fd620406f1d57eea3812f491df475f942e2f44b9b784d5ad5a2f352d455bef3df771e
 AUX dhcp-4.3.6-dhclient-resolvconf.patch 15340 BLAKE2B 57bd2576fa861d866b568e8814f591614167801bd3ef30270f81fd4b25637b255dd455ea8824d291b91a3a084f3aa0e55e1285fced0f8a5c684633f6ebe47a90 SHA512 264a2e073a80109c9dced6a3f7834f958990a15e578dd1435128e7ef9335b0b9751020166fbb0e1b01193c19eb28322648226fc5a1b07dc0b9452b702903cc8d
 AUX dhcp-4.3.6-iproute2-path.patch 451 BLAKE2B dcb948428326f7ca198061b1956f25981441c80d7bb8275a09f7b97c50644ba500966edf9b6483c43b96d88abba348976a0fb23b29032682da58014a9d559415 SHA512 91f20102e41cef81253617c80ba4d8193f35f51419606ab62e01f07153f1f616c70e0c43838c3d83913402f8d02ff333e4e36e08efd50aa8f8fe83939f91ae3e
@@ -25,8 +22,6 @@ AUX dhcrelay4.service.conf 105 BLAKE2B 52ad8018d2b6fd47b5d752a6e6626a8fa6c1d21fa
 AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd53dc30a25aad02f5332f538bc9d6ca65b5d388ff83f0ee30358d56cefa440fe7f5b8a6678521ba6b SHA512 40d3a6bdf8521bf5152cf31b961aea88b2fb0339433d0b6a6360a16c796298620b377bd079c0246e97bc9c0533ddb13bbb58cc5169d0ca598e3a51d1a607a9e9
 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
-DIST dhcp-4.3.6-P1.tar.gz 10189202 BLAKE2B 5dfbda82fa76d1011c552c9d9b5f15296834c2f380795e11fc6419010dd533fa45b9544fc10fc9da45095127f54ffe136b5fd7cc584589150b1b0a9a054e800c SHA512 cb04af2fb0fa8c5621e8b3dcb41e81422475218e1569b0eac6e13c876a21279928a3348f799253d7207517720466523b1cc28005c671542e37b1a391342b1e62
 DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7
-EBUILD dhcp-4.3.6_p1.ebuild 7814 BLAKE2B e3bb178b440b23c39e97fc082af1949dcd3bc9c5b9ba0b778ffbb10cfb8e99e3b8cc3d3c79b1dfa10bb7d924f7b643704a9acfef4289d822b78a71910f632721 SHA512 627121c2f592bdf85e3d1b7b1d98209caa7eda69fa2ca6d9042ed3e6c07b9a4ef2b4b9d985930d21e7275e55ea6bcba816c87b6339f88249d29554d7cf2771b4
-EBUILD dhcp-4.4.1.ebuild 7934 BLAKE2B ee5c645f9cac4042374b5539b76b39f47d3d4bd5a6c0cd70fb71f77543e7e01ec382b4ad4e7fac342b5a5aa7ad36028490eacf8dd16c76f3df19b2342993ea66 SHA512 d3b4c25e3a82d5d7fa4ef2afcf214f111f131b2cbba6780a4797565e7d08396881a369099138927c2c18f7e6886ddee0e19691f64d732396acddf030eaa50be1
+EBUILD dhcp-4.4.1.ebuild 7926 BLAKE2B 37389be9b39e4531834b549b8ba56a38306cf2306f8fca2d7e0547398ae807c6ae0413d064267cb56f73d3d5ae1a81d60b323f93dee0fe20a6507c16d1cdf83c SHA512 3498e0fdfd166201b5505168014f14da93a327a8c8488577d6c6bc850895a910e448fb46f55ac1e54f45f815c73db84dcfa42fd97a8b3760dae2e75f9b19b766
 MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
deleted file mode 100644
index 934d0e56fbb2..000000000000
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
-	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
-
-DEPEND="
-	client? (
-		kernel_linux? (
-			ipv6? ( sys-apps/iproute2 )
-			sys-apps/net-tools
-		)
-	)
-	ldap? (
-		net-nds/openldap
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl )
-		)
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-dhcp )
-	vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	# handle local bind hell
-	cd "${S}"/bind
-	unpack ./bind.tar.gz
-}
-
-PATCHES=(
-	# Gentoo patches - these will probably never be accepted upstream
-	# Fix some permission issues
-	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
-
-	# Enable dhclient to equery NTP servers
-	"${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
-	"${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
-
-	# Enable dhclient to get extra configuration from stdin
-	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
-	"${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531
-	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921
-	"${FILESDIR}/${PN}-4.2.4-always-accept-4.patch" #437108
-	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636
-	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
-	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
-	"${FILESDIR}/${PN}-4.3.6-lmdb-removal.patch" #628598
-)
-
-src_prepare() {
-	default
-
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-
-	# Change the hook script locations of the scripts
-	sed -i \
-		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
-		client/scripts/* || die
-
-	# No need for the linux script to force bash #158540
-	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
-	# Quiet the freebsd logger a little
-	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
-	# Remove these options from the sample config
-	sed -i -r \
-		-e "/(script|host-name|domain-name) /d" \
-		client/dhclient.conf.example || die
-
-	if use client && ! use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
-			Makefile.in || die
-	elif ! use client && use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<client\>::' \
-			Makefile.in || die
-	fi
-
-	# Only install different man pages if we don't have en
-	if [[ " ${LINGUAS} " != *" en "* ]]; then
-		# Install Japanese man pages
-		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
-			einfo "Installing Japanese documention"
-			cp doc/ja_JP.eucJP/dhclient* client || die
-			cp doc/ja_JP.eucJP/dhcp* common || die
-		fi
-	fi
-	# Now remove the non-english docs so there are no errors later
-	rm -r doc/ja_JP.eucJP || die
-
-	# make the bind build work
-	binddir="${S}/bind"
-	cd "${binddir}" || die
-	cat <<-EOF > bindvar.tmp
-	binddir=${binddir}
-	GMAKE=${MAKE:-gmake}
-	EOF
-	eapply -p2 "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
-	cd bind-*/ || die
-	eapply -p2 "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
-}
-
-src_configure() {
-	# bind defaults to stupid `/usr/bin/ar`
-	tc-export AR BUILD_CC
-	export ac_cv_path_AR=${AR}
-
-	# this is tested for by the bind build system, and can cause trouble
-	# when cross-building; since dhcp itself doesn't make use of libcap,
-	# simply disable it.
-	export ac_cv_lib_cap_cap_set_proc=no
-
-	# Use FHS sane paths ... some of these have configure options,
-	# but not all, so just do it all here.
-	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
-	cat <<-EOF >> includes/site.h
-	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
-	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
-	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
-	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
-	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
-	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
-	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
-	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
-	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
-	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
-	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
-	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
-	EOF
-
-	local myeconfargs=(
-		--enable-paranoia
-		--enable-early-chroot
-		--sysconfdir=${e}
-		$(use_enable ipv6 dhcpv6)
-		$(use_with ldap)
-		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-	)
-	econf "${myeconfargs[@]}"
-
-	# configure local bind cruft.  symtable option requires
-	# perl and we don't want to require that #383837.
-	cd bind/bind-*/ || die
-	eval econf \
-		$(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
-		--disable-symtable \
-		--without-make-clean
-}
-
-src_compile() {
-	# build local bind cruft first
-	emake -C bind/bind-*/lib/export install
-	# then build standard dhcp code
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
-	docinto html
-	dodoc doc/References.html
-
-	if [[ -e client/dhclient ]] ; then
-		# move the client to /
-		dodir /sbin
-		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
-		exeinto /sbin
-		if use kernel_linux ; then
-			newexe "${S}"/client/scripts/linux dhclient-script
-		else
-			newexe "${S}"/client/scripts/freebsd dhclient-script
-		fi
-	fi
-
-	if [[ -e server/dhcpd ]] ; then
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins contrib/ldap/dhcp.*
-			dosbin contrib/ldap/dhcpd-conf-to-ldap
-		fi
-
-		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
-		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
-		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
-		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
-		systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
-		systemd_dounit "${FILESDIR}"/dhcpd4.service
-		systemd_dounit "${FILESDIR}"/dhcpd6.service
-		systemd_dounit "${FILESDIR}"/dhcrelay4.service
-		systemd_dounit "${FILESDIR}"/dhcrelay6.service
-		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
-		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
-		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
-	fi
-
-	# the default config files aren't terribly useful #384087
-	local f
-	for f in "${ED}"/etc/dhcp/*.conf.example ; do
-		mv "${f}" "${f%.example}" || die
-	done
-	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
-	enewgroup dhcp
-	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
-	# Keep the user files over the sample ones.  The
-	# hashing is to ignore the crappy defaults #384087.
-	local f h
-	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
-		h=${f#*:}
-		f="/etc/dhcp/${f%:*}.conf"
-		if [ -e "${EROOT}"${f} ] ; then
-			case $(md5sum "${EROOT}"${f}) in
-				${h}*) ;;
-				*) cp -p "${EROOT}"${f} "${ED}"${f};;
-			esac
-		fi
-	done
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
-		ewarn
-		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
-		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
-		ewarn "and dhcp should be removed from the default runlevel"
-		ewarn
-	fi
-}
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index 35ed728fa017..a0bdbf50b4de 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -11,7 +11,7 @@ MY_PV="${MY_PV//_rc/rc}"
 MY_PV="${MY_PV//_p/-P}"
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="http://www.isc.org/products/DHCP"
+HOMEPAGE="https://www.isc.org/dhcp"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
 
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch b/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch
deleted file mode 100644
index 6136154f65a0..000000000000
--- a/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-fix the bind subdir parallel builds
-
-https://bugs.gentoo.org/380717
-
---- a/bind/lib/export/isc/Makefile.in
-+++ b/bind/lib/export/isc/Makefile.in
-@@ -114,6 +114,7 @@
- 		-DLIBAGE=${LIBAGE} \
- 		-c ${srcdir}/version.c
- 
-+${OBJS}: | subdirs
- libisc.@SA@: ${OBJS}
- 	${AR} ${ARFLAGS} $@ ${OBJS}
- 	${RANLIB} $@
diff --git a/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch b/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch
deleted file mode 100644
index 6cec86c9d9c4..000000000000
--- a/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/437108
-
-always accept the -4 option even if we don't have IPv6 support enabled.
-the relay code does this already.
-
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -170,8 +170,8 @@ main(int argc, char **argv) {
- 		if (!strcmp(argv[i], "-r")) {
- 			release_mode = 1;
- 			no_daemon = 1;
--#ifdef DHCPv6
- 		} else if (!strcmp(argv[i], "-4")) {
-+#ifdef DHCPv6
- 			if (local_family_set && local_family != AF_INET)
- 				log_fatal("Client can only do v4 or v6, not "
- 					  "both.");
---- a/server/dhcpd.c
-+++ b/server/dhcpd.c
-@@ -373,8 +373,8 @@ main(int argc, char **argv) {
- 		} else if (!strcmp (argv [i], "-q")) {
- 			quiet = 1;
- 			quiet_interface_discovery = 1;
--#ifdef DHCPv6
- 		} else if (!strcmp(argv[i], "-4")) {
-+#ifdef DHCPv6
- 			if (local_family_set && (local_family != AF_INET)) {
- 				log_fatal("Server cannot run in both IPv4 and "
- 					  "IPv6 mode at the same time.");
diff --git a/net-misc/dhcp/files/dhcp-4.3.4-bind-disable.patch b/net-misc/dhcp/files/dhcp-4.3.4-bind-disable.patch
deleted file mode 100644
index be0c032ae763..000000000000
--- a/net-misc/dhcp/files/dhcp-4.3.4-bind-disable.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- dhcp-4.3.4/bind/Makefile.in
-+++ dhcp-4.3.4/bind/Makefile.in
-@@ -40,6 +40,7 @@
- @BIND_ATF_TRUE@all: bind1 atf bind2
- 
- bind1:
-+disable:
- # Extract the source from the tarball, if it hasn't been already.
- 	@if test -d ${bindsrcdir} ; then                    \
- 		echo ${bindsrcdir} already unpacked... ;    \
-@@ -68,6 +69,7 @@
- 	fi
- 
- atf:
-+disable:
- # Build and copy the ATF support if not yet installed.
- 	@if test -d ./atf ; then				      \
- 		echo ATF support already installed ;		      \
-@@ -82,6 +84,7 @@
- @CROSS_COMPILING_TRUE@bind2: bind2-hostgen
- 
- bind2-noguest:
-+disable:
- # Build and install the export libraries
- # No need to do anything if we already have something installed.
- 	@if test -d ${binddir}/lib ; then                                    \
-@@ -98,6 +101,7 @@
- 	fi
- 
- bind2-hostgen:
-+disable:
- # Build and install the export libraries
- # No need to do anything if we already have something installed.
- 	@if test -d ${binddir}/lib ; then                                    \
---- dhcp-4.3.4/bind/test
-+++ dhcp-4.3.4/bind/test
-@@ -0,0 +1 @@
-+--disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --with-gssapi=no --enable-threads=no @BINDCONFIG@ --with-export-includedir=${binddir}/include --with-export-libdir=${binddir}/lib
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index bc68dcdae283..a3708d2efc93 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,13 +1,8 @@
-AUX dhcpcd-7.1.1-disable_inet6_fix.patch 609 BLAKE2B f69a5465f8750cba0a57b151b70c178e11576d4645d6fdc6c3f943cd2c98131af0742c48505624fb24d9a940dd523f98cb66bae51e38820c49aa9fdc6084bbfc SHA512 66fcf76affa35f2174e7bc0dd9964a67fde07144aedea30dfcd4f7280b841db344872da56a10d7d2474542c840e75d5323f994989bb96b803076e7e3d37d228d
-AUX dhcpcd-7.1.1-overflows.patch 5390 BLAKE2B 4c06a34b2cc5c1753b643987818a1e5d8b2deedacf90e80d9822a03bcf67d25d9f25adcdf6342792073811a428786789edc2b11c97f03df8fd48b697581b4b90 SHA512 2ea96d9faf1abd35345cf10c84f772a2fc56da33e0f0df93346536b1487d840c1d692a7c5118ebb504c30c8ffc0ac9c7792da0287e31584c10f0e9d11c5ffb1a
-AUX dhcpcd-7.1.1-v6_read_overflow.patch 3359 BLAKE2B 665506fa9c9839b66e86af39ffe22446e967e2de746f4e6c5f6157d5be7bf40d1467808205569b2dea293852ff32bf3cbdacbd89f72ef9699abf2f163671fac7 SHA512 153423dc621867f75cec01657e07a16c161f981f6e24aff2be95828c0c6a725804708e69afe083276156fea1dab6d8124cd6ea1e29952698da58f7f0dc07b5d2
 AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
-DIST dhcpcd-7.1.1.tar.xz 211788 BLAKE2B 984ec97ffdcb15883f57f9e2a699a7c8f006b2630e7651ab9d55e7a980045f8891f09d9f7be420969203a59671d097a1ed76621fe4a62ff26a5020fc8becfe69 SHA512 8791e718d65ef8ae23a16b98e82824860fa91914e6eb0a42cdbbca28236c1c38005ada44214bde33aac57152fe675debebdb5d141b67dcfc82012996d8337bb4
-DIST dhcpcd-7.2.2.tar.xz 213600 BLAKE2B ae36cc44d32c034b41f9c970fdb154ef2935b53ae9a81d76dfe8143882170cb8f4ea9c2048ebbfc2d94096061626e93d5890565192115d2953506a7d1e4ee6f2 SHA512 a774c4788efbb9712be04d3f29943b801043f9ec1ea1925282330afa00b9f3db5c29a85969ef004bf85b20045b4cc6ab241ceaae050a18051079d396845845e8
 DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
-EBUILD dhcpcd-7.1.1-r3.ebuild 4641 BLAKE2B 4bf2bc06ab5ad509960e4730a91ac6cedebb2109ffb285cdc3381e3fcdec239e63d1ec26bb5037fbcb745e7532bfbb57673627a0165d197315da97326e8c63d0 SHA512 06fdb570c0f55e13091f6b12b014304b4e9036fb81194944fe7f53fd4809aa6376fa77e0e6d6cdec77d3649336a18363aa13ba4e921247ce20aa5ac37c688c95
-EBUILD dhcpcd-7.2.2.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5
-EBUILD dhcpcd-7.2.3.ebuild 4414 BLAKE2B 62980ec1533101bf751b0d0b32a1280609f641e56f24ad0707739b4d29d52f25e9b9ac2d74d48466cad85b3b97b6c0b073245812159792f4d72cd25ddda9491e SHA512 09cad2c66e2d9250fa6163a12e4412303fea585b11ca6f41634f348b61b9ee085bb87ce30da483409d4d36f90417a2a3eb91d9e381cc19ba799988638e06b95f
-EBUILD dhcpcd-9999.ebuild 4414 BLAKE2B 62980ec1533101bf751b0d0b32a1280609f641e56f24ad0707739b4d29d52f25e9b9ac2d74d48466cad85b3b97b6c0b073245812159792f4d72cd25ddda9491e SHA512 09cad2c66e2d9250fa6163a12e4412303fea585b11ca6f41634f348b61b9ee085bb87ce30da483409d4d36f90417a2a3eb91d9e381cc19ba799988638e06b95f
+DIST dhcpcd-8.0.2.tar.xz 222408 BLAKE2B fb27a33cd64c7aeedb28e05c885c860618d923ac857895b9fdc7daa608f433587bea1e6630fd9897426b371a45b8a336e1edaa804d76eda6e9fc2adc1411aed2 SHA512 a6e3aa66800adc8b209324bae02a6e373e2623735bf0695ffec4a7c972d65c3498f55e4da62f93df0bc6cddb4bee8ab667b3743b5b25cd5f4cc9da4d1f8e15c4
+EBUILD dhcpcd-7.2.3.ebuild 4407 BLAKE2B 6f5df954ec0be66be6a4f4c1b63a1dee87e78d5cab8de8cbe935bd0d2a82caf70c5dc8d513ddc69b6e317a3d44c2a527529420da71ecf1489a71cdc2f4384eb5 SHA512 aa591926ec797c71c9d28d91a64257eaee76e2fae6853925e0b0fdf9001fd6279bdae68bdd2727f500661b8142c96b3c66ab28b055fb8887c4b7d96162d42843
+EBUILD dhcpcd-8.0.2.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
+EBUILD dhcpcd-9999.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-7.1.1-r3.ebuild b/net-misc/dhcpcd/dhcpcd-7.1.1-r3.ebuild
deleted file mode 100644
index 15d28a114040..000000000000
--- a/net-misc/dhcpcd/dhcpcd-7.1.1-r3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-disable_inet6_fix.patch #677508
-	"${FILESDIR}"/${P}-overflows.patch #684430
-	"${FILESDIR}"/${P}-v6_read_overflow.patch #685264
-)
-
-src_configure() {
-	local dev hooks=() rundir
-	use udev || dev="--without-dev --without-udev"
-	hooks=( --with-hook=ntp.conf )
-	use elibc_glibc && hooks+=( --with-hook=yp.conf )
-	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	local myeconfargs=(
-		--prefix="${EPREFIX}"
-		--libexecdir="${EPREFIX}/lib/dhcpcd"
-		--dbdir="${EPREFIX}/var/lib/dhcpcd"
-		--localstatedir="${EPREFIX}/var"
-		${rundir}
-		$(use_enable embedded)
-		$(use_enable ipv6)
-		${dev}
-		CC="$(tc-getCC)"
-		${hooks[@]}
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=()
-
-	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [[ -e "${old_old_duid}" ]] ; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [[ ! -e "${old_duid}" ]] ; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_old_duid}" )
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [[ -e "${old_duid}" ]] ; then
-		if [[ ! -e "${new_duid}" ]] ; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_duid}" )
-	fi
-	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [[ -e "${old_secret}" ]] ; then
-		if [[ ! -e "${new_secret}" ]] ; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files+=( "${old_secret}" )
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [[ -e "${old_rdm}" ]] ; then
-		if [[ ! -e "${new_rdm}" ]] ; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files+=( "${old_rdm}" )
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[[ -f "${lease}" ]] || continue
-		old_files+=( "${lease}" )
-		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-		[[ -e "${dbdir}/${new_lease}" ]] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [[ -n "${old_files[@]}" ]] ; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT%/}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files[@]}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
index 491c778680e3..61659ecfc9be 100644
--- a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-7.2.2.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.2.ebuild
index 48ba26275d0c..d8940210a7b5 100644
--- a/net-misc/dhcpcd/dhcpcd-7.2.2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-8.0.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit systemd toolchain-funcs
 
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -28,22 +28,18 @@ DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
 src_configure() {
-	local dev hooks=() rundir
-	use udev || dev="--without-dev --without-udev"
-	hooks=( --with-hook=ntp.conf )
-	use elibc_glibc && hooks+=( --with-hook=yp.conf )
-	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
 	local myeconfargs=(
-		--prefix="${EPREFIX}"
-		--libexecdir="${EPREFIX}/lib/dhcpcd"
 		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
 		--localstatedir="${EPREFIX}/var"
-		${rundir}
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
 		$(use_enable embedded)
 		$(use_enable ipv6)
-		${dev}
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
+		$(usex udev '' '--without-dev --without-udev')
 		CC="$(tc-getCC)"
-		${hooks[@]}
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -56,10 +52,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=()
+	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
 
-	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT}"/etc/dhcpcd.duid
 	local new_duid="${dbdir}"/duid
 	if [[ -e "${old_old_duid}" ]] ; then
 		# Upgrade the duid file to the new format if needed
@@ -81,7 +77,7 @@ pkg_postinst() {
 		fi
 		old_files+=( "${old_duid}" )
 	fi
-	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local old_secret="${EROOT}"/etc/dhcpcd.secret
 	local new_secret="${dbdir}"/secret
 	if [[ -e "${old_secret}" ]] ; then
 		if [[ ! -e "${new_secret}" ]] ; then
@@ -112,7 +108,7 @@ pkg_postinst() {
 	if [[ -n "${old_files[@]}" ]] ; then
 		elog
 		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "${EROOT}/etc to ${dbdir}"
 		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
 		elog "prefix dropped."
 		elog
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index 491c778680e3..d8940210a7b5 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/files/dhcpcd-7.1.1-disable_inet6_fix.patch b/net-misc/dhcpcd/files/dhcpcd-7.1.1-disable_inet6_fix.patch
deleted file mode 100644
index 2fd3a17428fa..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-7.1.1-disable_inet6_fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6db54edd1427823dcb3924be78c042915a825fb1 Mon Sep 17 00:00:00 2001
-From: Chris Clayton <chris2553@googlemail.com>
-Date: Fri, 8 Feb 2019 16:35:36 +0000
-Subject: fix build with --disable-inet6
-
----
- src/dhcpcd.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/dhcpcd.c b/src/dhcpcd.c
-index a2cd04e..6fe60ea 100644
---- a/src/dhcpcd.c
-+++ b/src/dhcpcd.c
-@@ -54,6 +54,7 @@ const char dhcpcd_copyright[] = "Copyright (c) 2006-2019 Roy Marples";
- #include "dev.h"
- #include "dhcp-common.h"
- #include "dhcpcd.h"
-+#include "dhcp.h"
- #include "dhcp6.h"
- #include "duid.h"
- #include "eloop.h"
--- 
-cgit v1.1
-
diff --git a/net-misc/dhcpcd/files/dhcpcd-7.1.1-overflows.patch b/net-misc/dhcpcd/files/dhcpcd-7.1.1-overflows.patch
deleted file mode 100644
index 6ec780936a83..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-7.1.1-overflows.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-https://roy.marples.name/git/dhcpcd.git/patch/?id=23525884a346ed81c808c1ed90e3c56a8bf0cc68
-
-From 8d11b33f6c60e2db257130fa383ba76b6018bcf6 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 19 Apr 2019 09:45:02 +0100
-Subject: DHCPv6: Fix a potential buffer overflow reading NA/TA addresses
-
-Only copy upto the size of the address option rather than the
-option length.
-
-Found by Maxime Villard <max@m00nbsd.net>
----
- src/dhcp6.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/dhcp6.c b/src/dhcp6.c
-index 99a452b..8fc4f00 100644
---- a/src/dhcp6.c
-+++ b/src/dhcp6.c
-@@ -2029,12 +2029,12 @@ dhcp6_findna(struct interface *ifp, uint16_t ot, const uint8_t *iaid,
- 		nd = o + ol;
- 		l -= (size_t)(nd - d);
- 		d = nd;
--		if (ol < 24) {
-+		if (ol < sizeof(ia)) {
- 			errno = EINVAL;
- 			logerrx("%s: IA Address option truncated", ifp->name);
- 			continue;
- 		}
--		memcpy(&ia, o, ol);
-+		memcpy(&ia, o, sizeof(ia));
- 		ia.pltime = ntohl(ia.pltime);
- 		ia.vltime = ntohl(ia.vltime);
- 		/* RFC 3315 22.6 */
--- 
-cgit v1.1
-
-
-From 4b67f6f1038fd4ad5ca7734eaaeba1b2ec4816b8 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 19 Apr 2019 21:00:19 +0100
-Subject: DHCP: Fix a potential 1 byte read overflow with DHO_OPTSOVERLOADED
-
-This fix basically moves the option length check up and also
-corrects an off by one error with it.
-
-Thanks to Maxime Villard <max@m00nbsd.net>
----
- src/dhcp.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/dhcp.c b/src/dhcp.c
-index f7cdefc..e13d1b4 100644
---- a/src/dhcp.c
-+++ b/src/dhcp.c
-@@ -215,6 +215,12 @@ get_option(struct dhcpcd_ctx *ctx,
- 		}
- 		l = *p++;
- 
-+		/* Check we can read the option data, if present */
-+		if (p + l > e) {
-+			errno = EINVAL;
-+			return NULL;
-+		}
-+
- 		if (o == DHO_OPTSOVERLOADED) {
- 			/* Ensure we only get this option once by setting
- 			 * the last bit as well as the value.
-@@ -249,10 +255,6 @@ get_option(struct dhcpcd_ctx *ctx,
- 				bp += ol;
- 			}
- 			ol = l;
--			if (p + ol >= e) {
--				errno = EINVAL;
--				return NULL;
--			}
- 			op = p;
- 			bl += ol;
- 		}
--- 
-cgit v1.1
-
-
-From 7121040790b611ca3fbc400a1bbcd4364ef57233 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 19 Apr 2019 21:40:14 +0100
-Subject: auth: Use consttime_memequal(3) to compare hashes
-
-This stops any attacker from trying to infer secrets from latency.
-
-Thanks to Maxime Villard <max@m00nbsd.net>
----
- src/auth.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/auth.c b/src/auth.c
-index 9e24998..ce97051 100644
---- a/src/auth.c
-+++ b/src/auth.c
-@@ -354,7 +354,7 @@ gottoken:
- 	}
- 
- 	free(mm);
--	if (memcmp(d, &hmac_code, dlen)) {
-+	if (!consttime_memequal(d, &hmac_code, dlen)) {
- 		errno = EPERM;
- 		return NULL;
- 	}
--- 
-cgit v1.1
-
-
-From cfde89ab66cb4e5957b1c4b68ad6a9449e2784da Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 19 Apr 2019 21:42:07 +0100
-Subject: compat: Provide consttime_memequal if not in libc
-
-Public domain version by Matthias Drochner <drochner@netbsd.org>
----
- configure | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/configure b/configure
-index 570e65f..4f58f0f 100755
---- a/configure
-+++ b/configure
-@@ -13,6 +13,7 @@ IPV4LL=
- INET6=
- ARC4RANDOM=
- CLOSEFROM=
-+CONSTTIME_MEMEQUAL=
- STRLCPY=
- UDEV=
- OS=
-@@ -846,6 +847,27 @@ if [ "$STRTOI" = no ]; then
- 	echo "#include			\"compat/strtoi.h\"" >>$CONFIG_H
- fi
- 
-+if [ -z "$CONSTTIME_MEMEQUAL" ]; then
-+	printf "Testing for consttime_memequal ... "
-+	cat <<EOF >_consttime_memequal.c
-+#include <string.h>
-+int main(void) {
-+	return consttime_memequal("deadbeef", "deadbeef", 8);
-+}
-+EOF
-+	if $XCC _consttime_memequal.c -o _consttime_memequal 2>&3; then
-+		CONSTTIME_MEMEQUAL=yes
-+	else
-+		CONSTTIME_MEMEQUAL=no
-+	fi
-+	echo "$CONSTTIME_MEMEQUAL"
-+	rm -f _consttime_memequal.c _consttime_memequal
-+fi
-+if [ "$CONSTTIME_MEMEQUAL" = no ]; then
-+	echo "#include			\"compat/consttime_memequal.h\"" \
-+	    >>$CONFIG_H
-+fi
-+
- if [ -z "$DPRINTF" ]; then
- 	printf "Testing for dprintf ... "
- 	cat <<EOF >_dprintf.c
--- 
-cgit v1.1
-
-
-From aee631aadeef4283c8a749c1caf77823304acf5e Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 19 Apr 2019 21:47:37 +0100
-Subject: Really add consttime_memequal
-
----
- compat/consttime_memequal.h | 28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
- create mode 100644 compat/consttime_memequal.h
-
-diff --git a/compat/consttime_memequal.h b/compat/consttime_memequal.h
-new file mode 100644
-index 0000000..9830648
---- /dev/null
-+++ b/compat/consttime_memequal.h
-@@ -0,0 +1,28 @@
-+/*
-+ * Written by Matthias Drochner <drochner@NetBSD.org>.
-+ * Public domain.
-+ */
-+
-+#ifndef CONSTTIME_MEMEQUAL_H
-+#define CONSTTIME_MEMEQUAL_H
-+inline static int
-+consttime_memequal(const void *b1, const void *b2, size_t len)
-+{
-+	const unsigned char *c1 = b1, *c2 = b2;
-+	unsigned int res = 0;
-+
-+	while (len--)
-+		res |= *c1++ ^ *c2++;
-+
-+	/*
-+	 * Map 0 to 1 and [1, 256) to 0 using only constant-time
-+	 * arithmetic.
-+	 *
-+	 * This is not simply `!res' because although many CPUs support
-+	 * branchless conditional moves and many compilers will take
-+	 * advantage of them, certain compilers generate branches on
-+	 * certain CPUs for `!res'.
-+	 */
-+	return (1 & ((res - 1) >> 8));
-+}
-+#endif /* CONSTTIME_MEMEQUAL_H */
--- 
-cgit v1.1
-
diff --git a/net-misc/dhcpcd/files/dhcpcd-7.1.1-v6_read_overflow.patch b/net-misc/dhcpcd/files/dhcpcd-7.1.1-v6_read_overflow.patch
deleted file mode 100644
index 54b559fcd87f..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-7.1.1-v6_read_overflow.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From c1ebeaafeb324bac997984abdcee2d4e8b61a8a8 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 3 May 2019 14:44:06 +0100
-Subject: DHCPv6: Fix a potential read overflow with D6_OPTION_PD_EXCLUDE
-
-dhcpcd only checks that the prefix length of the exclusion
-matches the prefix length of the ia and equals the length of the
-data in the option.
-This could potentially overrun the in6_addr structure.
-
-This is fixed by enforcing RFC 6603 section 4.2 option limits
-more clearly.
-
-Thanks to Maxime Villard <max@m00nbsd.net> for finding this.
----
- src/dhcp6.c | 44 +++++++++++++++++++++-----------------------
- 1 file changed, 21 insertions(+), 23 deletions(-)
-
-diff --git a/src/dhcp6.c b/src/dhcp6.c
-index dee8d4b6..583f3b3f 100644
---- a/src/dhcp6.c
-+++ b/src/dhcp6.c
-@@ -2166,40 +2166,38 @@ dhcp6_findpd(struct interface *ifp, const uint8_t *iaid,
- 			state->expire = a->prefix_vltime;
- 		i++;
- 
--		o = dhcp6_findoption(o, ol, D6_OPTION_PD_EXCLUDE, &ol);
- 		a->prefix_exclude_len = 0;
- 		memset(&a->prefix_exclude, 0, sizeof(a->prefix_exclude));
--#if 0
--		if (ex == NULL) {
--			struct dhcp6_option *w;
--			uint8_t *wp;
--
--			w = calloc(1, 128);
--			w->len = htons(2);
--			wp = D6_OPTION_DATA(w);
--			*wp++ = 64;
--			*wp++ = 0x78;
--			ex = w;
--		}
--#endif
-+		o = dhcp6_findoption(o, ol, D6_OPTION_PD_EXCLUDE, &ol);
- 		if (o == NULL)
- 			continue;
--		if (ol < 2) {
--			logerrx("%s: truncated PD Exclude", ifp->name);
-+
-+		/* RFC 6603 4.2 says option length MUST be between 2 and 17.
-+		 * This allows 1 octet for prefix length and 16 for the
-+		 * subnet ID. */
-+		if (ol < 2 || ol > 17) {
-+			logerrx("%s: invalid PD Exclude option", ifp->name);
- 			continue;
- 		}
--		a->prefix_exclude_len = *o++;
--		ol--;
--		if (((a->prefix_exclude_len - a->prefix_len - 1) / NBBY) + 1
--		    != ol)
--		{
-+
-+		/* RFC 6603 4.2 says prefix length MUST be between the
-+		 * length of the IAPREFIX prefix length + 1 and 128. */
-+		if (*o < a->prefix_len + 1 || *o > 128) {
-+			logerrx("%s: invalid PD Exclude length", ifp->name);
-+			continue;
-+		}
-+
-+		/* Check option length matches prefix length. */
-+		if (((*o - a->prefix_len - 1) / NBBY) + 1 != ol) {
- 			logerrx("%s: PD Exclude length mismatch", ifp->name);
--			a->prefix_exclude_len = 0;
- 			continue;
- 		}
--		nb = a->prefix_len % NBBY;
-+
-+		a->prefix_exclude_len = *o++;
-+		ol--;
- 		memcpy(&a->prefix_exclude, &a->prefix,
- 		    sizeof(a->prefix_exclude));
-+		nb = a->prefix_len % NBBY;
- 		if (nb)
- 			ol--;
- 		pw = a->prefix_exclude.s6_addr +
--- 
-cgit v1.2.1
-
-From 896ef4a54b0578985e5e1360b141593f1d62837b Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Sat, 4 May 2019 10:19:02 +0100
-Subject: DHCPv6: Fix exclude prefix length check.
-
----
- src/dhcp6.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/dhcp6.c b/src/dhcp6.c
-index 583f3b3f..7f26129f 100644
---- a/src/dhcp6.c
-+++ b/src/dhcp6.c
-@@ -2187,14 +2187,14 @@ dhcp6_findpd(struct interface *ifp, const uint8_t *iaid,
- 			continue;
- 		}
- 
-+		ol--;
- 		/* Check option length matches prefix length. */
- 		if (((*o - a->prefix_len - 1) / NBBY) + 1 != ol) {
- 			logerrx("%s: PD Exclude length mismatch", ifp->name);
- 			continue;
- 		}
--
- 		a->prefix_exclude_len = *o++;
--		ol--;
-+
- 		memcpy(&a->prefix_exclude, &a->prefix,
- 		    sizeof(a->prefix_exclude));
- 		nb = a->prefix_len % NBBY;
--- 
-cgit v1.2.1
-
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
index 11ac5372df16..9059c97bfab0 100644
--- a/net-misc/econnman/Manifest
+++ b/net-misc/econnman/Manifest
@@ -1,3 +1,3 @@
 DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b
 EBUILD econnman-1.1.ebuild 669 BLAKE2B 67f4294d07535d80c2cab9355fe933e0ddef5261b120ff2ae624f7b9f2541649abc6196d73c7cd892087f7c53047bb6b6259b595a18adc38dc1d88156938582f SHA512 279f4dc4688fc1888b45ba87e6b9981aa56f279b886c9915bd4fc3bcc7a6879d7af187466872b8a83f7d75a0a51784b86ac473a0e76ea13bcccbfe8a3bb943ee
-MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-misc/econnman/metadata.xml b/net-misc/econnman/metadata.xml
index d9a6217dd22d..6b0a0fb3a729 100644
--- a/net-misc/econnman/metadata.xml
+++ b/net-misc/econnman/metadata.xml
@@ -2,10 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
 </pkgmetadata>
diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest
index 320fe6171a75..2fe1343dfd5c 100644
--- a/net-misc/electron-cash/Manifest
+++ b/net-misc/electron-cash/Manifest
@@ -1,6 +1,6 @@
 AUX 3.3.6-no-user-root.patch 1261 BLAKE2B 6035a47b73ce13a92ef66177d6131f5744a498bb4360aa289aca6a09c6ef3e7b663914590f4c9be635078fed0bc82ae706f0cb4c7280acab88bbb1f5211d6473 SHA512 bed6b2108b3a8c8960b43eff854b8292d5e6fbd0fdd8383e43e020cac51767cbd70a1c371a3dffe1bc51145f97f930cb966fd4eee1ecc3ca021cbcfac0ea1a81
 DIST electron-cash-3.3.6.tar.gz 8506610 BLAKE2B 85f61ec0c95e41c5fc170c3419317e077c3e871ee90db7f4e7ebbf6e931950746798efe9b4b6e7c6e0992a52165772a699d8220e1a21ff597f024084929afddc SHA512 993829ce29013e26f219bbd41d13c8d399920ee4c1e5fcae3c4fb298c766228766e93b559db1de3c14bd5add6f651c83655afb32bf173bacdaddf83a8a941f18
 DIST electron-cash-4.0.2.tar.gz 8967992 BLAKE2B 081546d148dbc7da5e192154818831e125437c00093e1fe434ef0a67f8c06ceb1d2b1f44de9e71aac5786f995aeffd8fb6b74c64f6aa249f5cc9c06c9a276845 SHA512 dad17906f1dc2e53d4c6bff15a38d3276d16377f71b4d4e260b7b667f2b045da49f504483606d4515cdf71300b67108301b6cce971d1cca16c3856023b3e3f3a
-EBUILD electron-cash-3.3.6.ebuild 3569 BLAKE2B 4d8ee7e498037ffb9e57cbf5456781c6708040af484a4cffc1b43918cfd3e48948f22c4b2385ebb42c3a962617785bdc8d5c9b9ff15da371f90e203e05951d68 SHA512 5605efc03b31a503be0d69299864615e5d153812180349ca594664933466c1878f006670e0860ae1b4277d2646c14cb99c2a9bb8e458bd05020041f5302e45ab
-EBUILD electron-cash-4.0.2.ebuild 3592 BLAKE2B 4512d46848d34b71e3f39767c189bccb39850c7dff5e794baca27ed14129a25ba71f82c3770cee979c50001b5d78efc475f26a776daf2d84571a3143ab49b69b SHA512 41a547787a5c428e458c6549e8530c7b1a12f2c034750fbfe8f7888ff2c2c351f5a32e5bfb128e286cf142a3fcedc9d423cbc3ecfaff4ae0a75e91bf2569a5bc
+EBUILD electron-cash-3.3.6-r1.ebuild 3565 BLAKE2B f184518ef278c85be726caf3d4c06d72446a36a8d7c57a1412144f78a7b830a57ed3b9f5cfc968b8aa45e2c745f22bdc45270b8892b7ae3fee346e6fac6061ae SHA512 5a09705dc6e0b395d59aa0d03c470164f355ffaf0044b707259975811366dd267d2d2f9e957cc8a40a71bea6931f1a502a2592d57d9282ed268e103cb4ba7a80
+EBUILD electron-cash-4.0.2-r1.ebuild 3588 BLAKE2B e3538f2539fa46816825ad8791916cfbd6a068f2386e3df8db095980e62a9b3e6bc257249626b0890b5e01d1c1c272506a17e689d20dcb723d352fcedf9ae123 SHA512 01bb90258132ab8ae9eefe6f8f2fe85b0a3c3c5b342073425f85506d9b42b9e15417bed2a68b3ff730779ca942689e3273be75a74e61c94e6c56fb1650270d01
 MISC metadata.xml 976 BLAKE2B 991083b0233c11e6e5bbb3d7d560b20587332344fca7d3fad40cde8bc4bce1f3455172b7131451e034d0ab9722913667eb9739fe1bbd214354bf7cde974cecf6 SHA512 38383f6b7809ee97e33a777b5eab2593b22ce99d78442c40e9ff4654f350b6ad17da0c2e309b43fed517e2b384ab5f806a5ef60a71f887d72a4dcf06c9bbdede
diff --git a/net-misc/electron-cash/electron-cash-3.3.6.ebuild b/net-misc/electron-cash/electron-cash-3.3.6-r1.ebuild
index 7c1417f11660..ce2b8f67d146 100644
--- a/net-misc/electron-cash/electron-cash-3.3.6.ebuild
+++ b/net-misc/electron-cash/electron-cash-3.3.6-r1.ebuild
@@ -31,6 +31,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -42,7 +43,6 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tlslite[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
diff --git a/net-misc/electron-cash/electron-cash-4.0.2.ebuild b/net-misc/electron-cash/electron-cash-4.0.2-r1.ebuild
index 3b33abcf4173..39e50d7d405e 100644
--- a/net-misc/electron-cash/electron-cash-4.0.2.ebuild
+++ b/net-misc/electron-cash/electron-cash-4.0.2-r1.ebuild
@@ -31,6 +31,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -42,7 +43,6 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tlslite[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
diff --git a/net-misc/electrum-ltc/Manifest b/net-misc/electrum-ltc/Manifest
index 099205d9d54c..e04474eb319b 100644
--- a/net-misc/electrum-ltc/Manifest
+++ b/net-misc/electrum-ltc/Manifest
@@ -2,5 +2,5 @@ AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694
 AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd
 AUX 3.3.2-desktop.patch 530 BLAKE2B fbf901cfc9133ed45afc1a7859c02926fbb8ad52db9429c10b29a4a5dd75d9e4b1387077ea21f075d6cf176e7b167127a9f344b24b126bde5d9445257ffe5780 SHA512 981f57845811ff3d528fe4ab69d75f547dc0189ebb842260d448407645e19fb16be6ceeb6d4a76e3d491fc98a8773588fbddf9b96b270365da48ed2eb82f8e36
 DIST electrum-ltc-3.3.4.1.tar.gz 3897254 BLAKE2B 113e4175adad0d404f9677913bd24cbda569f20183de75d341d60b954f0423ff13042e0b05f66f7953729368412fc181d2c8da7caee15899f6810cb77c4be241 SHA512 cab85edbe9189fffd2a4b8d57dd89dc55f68cf3f02cd4a7427c53de852ab2001b82b1484126699c8eee36d765a8ca58936eba82e3c153f654bf5629b9cd50745
-EBUILD electrum-ltc-3.3.4.1.ebuild 3810 BLAKE2B c94b29a5314d053d5a6f49a2f8637d434e8787a8c00798fd340cda50edc4fa62a2e939de64302c72e8ab290dfa586afe4af0cd65d4f769272124bf381276f096 SHA512 4263d9f4b3d2267296cfe69d68ed8490b577653bc5012ca3290196de5437bc26a727d742e7b2c07e479a28b26dd40a0d4b9a4cbe0f9c9586a037e3442128d8fe
+EBUILD electrum-ltc-3.3.4.1-r1.ebuild 3806 BLAKE2B 9c27e7a9eedac873b5ec8f974d41f28ad13ec8bb0b83c8d55ed3ee285ed4417f0227ec126c0d36badbed799e1cb775686a2ee7d6f5e240d409a11176419051b5 SHA512 2a2751773dc33cce75c76c2065ae26d2860d8aca3e2c9adbc7eb6bd82896a908343c1034fa28c5ff691e7373fc81dd8f9ef5f38c33a54ea2967df0461791e7a2
 MISC metadata.xml 893 BLAKE2B 285448da111f6431d8fb440fcf040ee2e22a5fb1fdc8b4b93c75ea2165f6d53a7a7b746add11300c06bc43a3243e423ea57aaa4186dc0dbb91ff8d734216c6c5 SHA512 7881df99b246a3f323270790c2d3c789aa402810418662ef35590d03ea5d82f3877ab465b66e2fe52c4be268ea5965735f5de513ea8d41f260a63a40f3dd3dd9
diff --git a/net-misc/electrum-ltc/electrum-ltc-3.3.4.1.ebuild b/net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r1.ebuild
index 1e6465700a4a..8ca11888da6d 100644
--- a/net-misc/electrum-ltc/electrum-ltc-3.3.4.1.ebuild
+++ b/net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r1.ebuild
@@ -34,6 +34,7 @@ REQUIRED_USE="
 RDEPEND="${PYTHON_DEPS}
 	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
 	dev-python/aiorpcX[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -45,7 +46,6 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tlslite[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index c8edcdb6d633..9793aa81d987 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -6,7 +6,10 @@ AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa15
 DIST Electrum-3.1.3.tar.gz 2806178 BLAKE2B e03a6ee8d7b211b26d99adfbaf42a9d43317e5a4ca887f62f5ef0e57d8f990c18ff07e15d4ac8faea33322cd7ae25d7544e59e9ff1fbe883b3b7be138d990421 SHA512 745d00ec944e46040a4ae21d23c5919b943696a85baf84ee553616ca73cd21f2fa95999212a23f9a96ad5606def2890ee057e5f5f18e82591fd4a9e497ba5439
 DIST Electrum-3.3.4.tar.gz 8606286 BLAKE2B a815a577509cc7d31f02347b5ce52d0fe9fd52ddbe4b60200a02423f8e6bf43a6c24d3c1db6ab265a69f6f3891db63886fe6c138d601bc48c0c8fdb66191e941 SHA512 297eb757dccb166d40a652be2c1c058e42f16416b586b69f32223966ff1e92a34e5d01822d71bd063bfa72b7bbbcae4251a63f7373600d0eeb139e923d17a2b3
 DIST Electrum-3.3.6.tar.gz 8789792 BLAKE2B dcac9a317364780a7dc3ae1083e6ba7fd3a4559d0b7f6375197bdf639143ab9da2c5a001605af5a0590fb900de2e98999aea171c6dcec390a47beb610af3b490 SHA512 b25fc67883b7a90bf902f62d07574f283c4c04b3c6dfbb4e890448ddb938d477e036470f82b45e426aa581a1da2425e13e6974a730b18b130fd265b8d01d0d91
-EBUILD electrum-3.1.3.ebuild 4324 BLAKE2B 982bf508f73e8dba14667d04e49c3af84e04c2c84624bfae7698ce265d3b09246db987e1da9e8887266c1d77e0a575104d489de97719ddf71cd3d390f359768a SHA512 8620a4eb41aedc875f3315fad410489b96d9ffbf1477cd91d6ca34385c12719e4fefb56eb9a5d1700d5c99001340a080af96fd3ddfffa3970bd9ff311934c39b
-EBUILD electrum-3.3.4.ebuild 4642 BLAKE2B 02a2f998591557da446f1d9be0db24742764ddb3e22af518460281fde6f6cd8ce1ab0308aaae9f4d6247705e5aa05c21ec7067d7ca8548cf8461da47445b9706 SHA512 770bc4dff7fee5bf2508ab2c58f346f0bdb767fde0d26d8de61ede13b617b96a2d7cf8859925acaf84270dfd00cfe8811adb455519717e35b31f03be4ca48048
-EBUILD electrum-3.3.6.ebuild 4650 BLAKE2B bb191b6005932f5964bc3d8ecf69ab5fd67e1a1751bdbb064731a300fb8ca5b9c70ffbaa3cdbf6973e9bdce6e5e1e04d47cab46f2b47fa5c55646db3c23958e1 SHA512 e0273dab1f9a63e1be93619fa69b5256895ec712d72cab27c45a22be4fc8602f9a087e9176edc7e6c0b957e7a7154e3baa64fc4a8e79b8d535a1bd0d63811d92
-MISC metadata.xml 1464 BLAKE2B 702ecb52f960766ab9cfbf48af6bdec84ffe6374bc0bc7684aefd47aa36b569c2730205bd6bca9ebfbee168abf5478d263be5724e99c896c3a296d85bf3d2075 SHA512 e6142f8a9bb951a6dae009c542597ab47ef2398b8c119824e8e14575f02de2d776b3463035973e2da5f90d896417f00c3fe8533e2894e162e262def472531f02
+DIST Electrum-3.3.8.tar.gz 8911228 BLAKE2B af24f44f5805a5722d0b9500776ae1ea4f70e0869045535ea3bf27d24a61013ba718230e6292061581f55a4fae655cbacae9024a321efe655eb9816bae11ae75 SHA512 5f756da4d2df59c69997925c69f651011def07bfbdbc582f492ecc19386eee7d79b9951732a792e6041da902d776052d6590cbd2d7004bc93c8406bcf9093fe6
+EBUILD electrum-3.1.3-r1.ebuild 4320 BLAKE2B 84d8e4688ac9d9cd5a79aa46f8ba7e52e710dc4e7aa5c6148d01de506e460ca84f6fb9ba6344afc8c276fe60c2c6f5cb143fb61a0908067a15c976ea875bae25 SHA512 778f32e95f0de35aa98b1c82a77264c3fc623c6f03d3c0494ae0da880dd533ad9e9660a5b448326de95c89920996b4b209e920416e11e6958d117fcb66dd0614
+EBUILD electrum-3.3.4.ebuild 4638 BLAKE2B 6c7e2c95d7be76e496d49aea1e2b6ac691c2b72336f155cda5643824ccdb51ee27f7c5c8a15d90fc1d464de0e8e504ffe0efbe1c3c652101efc611bf3fa520ab SHA512 60c252dbb9ac4c8f2f31713c1c4ff7086c6c62193fc59f000ab4a0e7b7ea7523b30587bf78318d80e950d28fd07574f414211e0b126cf0ecb8fc97aaab8d4ee3
+EBUILD electrum-3.3.6-r2.ebuild 4483 BLAKE2B e091135eb705c26e15822a0368d8523464ca973e4822c531c1ac7c1f023b97c365808a685610239add5b6365c4e8ea13664e2451c6f23a4e85be8128bfd9dc5d SHA512 1a2ef4689c4e786e20a56f288778ea6eef9557cdbc4955ca029782cfa67951b0eef8bc1cf9528b60cf23c5a1a9cd802c36f19ed001545deb93a05d1f5624b77d
+EBUILD electrum-3.3.6-r3.ebuild 1985 BLAKE2B 0c7ce770601e51f7acd6486ace1b16391db55837f37bec1efccc5ce9790afa5ef5cf6a4262c3b0775cd5dda6de9f335d44c8e16e27109dff74a59416219955e1 SHA512 e01f79da37cf2050992a21e4ed5c215c2d2bd7cc4074f50e70293fe6c174f0c34816ac2758d7bf2b3554d6fb5c76d779b2cf8b359320d8a1439565455a8ff14c
+EBUILD electrum-3.3.8.ebuild 1984 BLAKE2B 7b21baafee7ecd511fb62cf5966b094b24d1c7ae6bc22d160301c168ce9ad68a539f38f18574f01b7b079d60d102ea6e99feab200e21f361824e2ae697722f8c SHA512 3186355d2502da16753b69d0ad9481b92c9c330ec20dc3199f6be00ec0710eb1a492e114c546418cbf84a855cc67e280fb4069b95373242a13f55db380db1c8f
+MISC metadata.xml 1572 BLAKE2B 4681012dbca54a822c32dcbb5eab12718294c138343ac2469426678a85647dedc892a14e2287d0aaf2291e9d9b029796a29f32f6ae82ac6b56d7a9acb49295f3 SHA512 83bedb1cbb9c5260c7260b7e83c2105742c0403ceafae9857b4491abfd070ec3248f918d3a11bb7c93973714fb46af3864bdd85075d075bfb94f2ec6b9aca82b
diff --git a/net-misc/electrum/electrum-3.1.3.ebuild b/net-misc/electrum/electrum-3.1.3-r1.ebuild
index 93c690ce8a8d..25eee433cc44 100644
--- a/net-misc/electrum/electrum-3.1.3.ebuild
+++ b/net-misc/electrum/electrum-3.1.3-r1.ebuild
@@ -47,6 +47,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="${PYTHON_DEPS}
+	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -58,7 +59,6 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tlslite[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
diff --git a/net-misc/electrum/electrum-3.3.4.ebuild b/net-misc/electrum/electrum-3.3.4.ebuild
index 55e1c6c8c06e..72ad9942454a 100644
--- a/net-misc/electrum/electrum-3.3.4.ebuild
+++ b/net-misc/electrum/electrum-3.3.4.ebuild
@@ -49,6 +49,7 @@ REQUIRED_USE="
 RDEPEND="${PYTHON_DEPS}
 	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
 	dev-python/aiorpcX[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -60,7 +61,6 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tlslite[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
diff --git a/net-misc/electrum/electrum-3.3.6.ebuild b/net-misc/electrum/electrum-3.3.6-r2.ebuild
index b664a9d69b27..a66c1036b967 100644
--- a/net-misc/electrum/electrum-3.3.6.ebuild
+++ b/net-misc/electrum/electrum-3.3.6-r2.ebuild
@@ -3,10 +3,10 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="ncurses?"
 
-inherit desktop distutils-r1 gnome2-utils xdg-utils
+inherit desktop distutils-r1 xdg-utils
 
 MY_P="Electrum-${PV}"
 DESCRIPTION="User friendly Bitcoin client"
@@ -15,7 +15,7 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 MY_LANGS="ar_SA be_BY bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sv_SE ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
 
 my_langs_to_l10n() {
@@ -48,7 +48,8 @@ REQUIRED_USE="
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.17.0[${PYTHON_USEDEP}]
+	~dev-python/aiorpcX-0.17.0[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -58,9 +59,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
@@ -111,13 +110,11 @@ src_prepare() {
 
 	# And install requested ones...
 	for gui in  \
-		$(usex qt5      qt   '')  \
+		$(usex !qt5     qt   '')  \
 	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+		sed -i -e "/electrum\.gui\.${gui}/d" setup.py || die
 	done
 
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
 	local bestgui
 	if use qt5; then
 		bestgui=qt
@@ -163,16 +160,12 @@ src_install() {
 	distutils-r1_src_install
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/net-misc/electrum/electrum-3.3.6-r3.ebuild b/net-misc/electrum/electrum-3.3.6-r3.ebuild
new file mode 100644
index 000000000000..06e13125923f
--- /dev/null
+++ b/net-misc/electrum/electrum-3.3.6-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
+	~dev-python/aiorpcX-0.17.0[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+	eapply "${FILESDIR}/3.3.2-desktop.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons_dirname/d' setup.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 electrum/gui/icons/${PN}.png
+	dodoc RELEASE-NOTES
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/electrum/electrum-3.3.8.ebuild b/net-misc/electrum/electrum-3.3.8.ebuild
new file mode 100644
index 000000000000..3a3dda96aa67
--- /dev/null
+++ b/net-misc/electrum/electrum-3.3.8.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
+	=dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+	eapply "${FILESDIR}/3.3.2-desktop.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons_dirname/d' setup.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 electrum/gui/icons/${PN}.png
+	dodoc RELEASE-NOTES
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index b3234f5ca5c7..4f3345beaed9 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 277dd5e1ba30..a7e96a6aa3b5 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -1,7 +1,10 @@
 DIST geoipupdate-2.3.1.tar.gz 362497 BLAKE2B e07eb22d6b4897d735af0c354f99111931646e8d194d493cf6992ac76a065a02816e5eaf0c974f752aeabb9cde7e7f8ec70d70529402b0b58072c44994e39e53 SHA512 98537e17ea03dbc0e377bf3fd045a96cbcf2f36f1fbcdf494f0a60d15f9ea5d2f0cd5e127245c6425e0ff8b77028147a2a6316034752298c8e9671007b7245a1
 DIST geoipupdate-3.1.0.tar.gz 370293 BLAKE2B 5cd7b4563ca0b6820b863e24b80054f27c49bd9e89898f6b7248d3389a81f9c680f9979293fa2acaab0727b3c915926396404e19e90ffbb0ef6647a64d30c14a SHA512 9efd30593df0a2564f98a0e99d02ac3671e5752034d8c747d84a204cd620845e619bec511b6004d895cdb611a2d98b921eb830192d258c572ac9efd603cd5c99
 DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3f4ee5cea873f2fd3fbcbe7a38f22d2995558f8196f4c4030fb6f24b179104912af3290d3b7ed9bde9fbe5ff37862c SHA512 24e6a9f72449df1a2763314f188828332b5516962dbd75892689e505516af967bece60cc846fe17cfcc1ddb4d6111c9cd7d5c0ebc9d3e8e7af355f8a1c7f1a2f
+DIST geoipupdate-4.0.3.tar.gz 107019 BLAKE2B 55978bb6fc37b02706d4f48b76dc8b85f3aacc86f1192a0d31cee5c55fb4d0feb8d5ddb2b6a13d4a85d80133ccaa318bd9ad3e7d3d5b818fea2a3a0fa09a62d3 SHA512 870f930a54a45f5fe14c8328158ea2c8d2d8e4320a5400abc8ec18ae1e234426e86492a41868ccd3bf649acf0cd347722683326817359fed7d147ab21eb64397
+DIST geoipupdate-vendor-4.0.3.tar 532480 BLAKE2B c619098fa40d6a92743a2847900e7cefe5d61aa9dbd36399e4a26d7c2fda1ea493f91ded8a4b17a76063960c0f8a11cc7b3b7b734e9f3d978da7035799d32956 SHA512 25976c66d775e3e50b422e9f564b9486c7c08d9dba8a11b5ac9faf62f3545673fa94d2ea6ea40750835840c938b686b174de5658236a19e85d592d861eea05b8
 EBUILD geoipupdate-2.3.1.ebuild 573 BLAKE2B 1a4e9421d90bed8da5b4ddb282b53a9bb2cd9d7123007a8c7a207ed807480abf95ec3c2e7cea6a987d399fd73c7148778f6b28b9c66ea0f48f2c1cb4d9ae4435 SHA512 add023538fe12026667cf0feba8c1ebf1157609ba2ac9622466920d2ed7c128bec10ba7ac1a12acb358067e0ec757996ad0eec63c91c7b4a7c9d75984b06bcff
 EBUILD geoipupdate-3.1.0.ebuild 582 BLAKE2B 106db9ba7a0f95104f0728fd820da17c03ed7c1fa79481d3fe09e666594b707b64ec4522b5095c1f19b0afecc0cfa9f5dd6e60829d12cb0887910ddc82e66053 SHA512 b6fddee463197592d4bff439b9ba4e407725895544af9875c9157fad695cc700ce2d3ab293da271fa6d3826b458a1a20c477c1df51daef6367d59798b4ad1392
 EBUILD geoipupdate-3.1.1.ebuild 582 BLAKE2B 106db9ba7a0f95104f0728fd820da17c03ed7c1fa79481d3fe09e666594b707b64ec4522b5095c1f19b0afecc0cfa9f5dd6e60829d12cb0887910ddc82e66053 SHA512 b6fddee463197592d4bff439b9ba4e407725895544af9875c9157fad695cc700ce2d3ab293da271fa6d3826b458a1a20c477c1df51daef6367d59798b4ad1392
+EBUILD geoipupdate-4.0.3.ebuild 1180 BLAKE2B 745d8e001574a0cdc506bf1be797dbfc9a2355b58d3edd47a2c6e986bf4e6fb068e929374db65941250a2c852e4838d5a298c277d474ce410853ca3a4a48778d SHA512 a62e3169aae94068c87d7f776a4b7a60862de2c8f3d2a9ae909b5259d12d0abc3d6a0aeee933ff479990bb02ceec19e05a6e1152d663a63b2517bb8c0ccd7421
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-4.0.3.ebuild b/net-misc/geoipupdate/geoipupdate-4.0.3.ebuild
new file mode 100644
index 000000000000..9e2b124631e5
--- /dev/null
+++ b/net-misc/geoipupdate/geoipupdate-4.0.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/maxmind/${PN}"
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
+HOMEPAGE="https://${EGO_PN}"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://files.adjust.com/${PN}-vendor-${PV}.tar"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( GeoIP.conf.md geoipupdate.md )
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+	tar xf  "${DISTDIR}/${PN}-vendor-${PV}.tar" -C "${S}/src/github.com/maxmind/geoipupdate" || die
+}
+
+src_compile() {
+	cd src/${EGO_PN} || die
+	# requires pandoc but the information is still in the distributed md files
+	sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
+	sed -i -e 's/go build/go build -x/' Makefile || die
+
+	# the horror, the horror ... but it's all automagic
+	export GO111MODULE=on
+	export GOFLAGS=-mod=vendor
+	default
+}
+
+src_install() {
+	mkdir "${D}/usr/bin" -p
+	cd "src/${EGO_PN}/build" || die
+	cp geoipupdate "${D}/usr/bin" || die
+	keepdir /usr/share/GeoIP
+	insinto /etc
+	doins GeoIP.conf
+}
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index 325860b7274b..c71459e6fa68 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -12,5 +12,5 @@ EBUILD gsutil-4.27.ebuild 1783 BLAKE2B 528b5d30dc29765fa28807f4f2ac059dfb5060684
 EBUILD gsutil-4.28.ebuild 1787 BLAKE2B 8f310bf7a9f0f318a2a7a018c27259f76d0d5bebde508880f83fa72932b062d4453a25ea819a183ae439614be57c4d1ee54faa80cb0ef0608b6f7f2fcef7ad31 SHA512 95c1a8b2a379a1efd1ae6cc1816bb799dace33b88bb5983e2c98165df118360e4174a7561a357ca8accec6520f13909ec53b0b7289185f909ce72fe9aabe97ad
 EBUILD gsutil-4.30.ebuild 1789 BLAKE2B 088ae1fa8dccdc6144597d7101517373075b853fce3068d4493af5a840088886f10324f1864e2bc7173b1dbc8cab4324b0c18f3692a14f791b16ccf440480bd8 SHA512 382ac24aa1093c90c64ad3c4d1e059bfe83f37c098810ee93a46325025dae125a3b80a552659b766642fc748a8792944e394dfe8921a73855f201a9727ad85e2
 EBUILD gsutil-4.32.ebuild 2547 BLAKE2B 3a5caf6b54cb38b7d615b20bf1909a289b13c4ec3e632565da07e830a5956e57c8495eed4d55781b4643e2ae199464670fee1efb82513d3dafe93d2a54c2ee14 SHA512 47f01bfce6091f5f7911663fd71fb7cef7e6f0cd5434607cd669c0d7b757003c6f7b1f3dc68b88ff18f00334e14a1b4c18e52136f554260b7f2a62347bc9b3bf
-EBUILD gsutil-4.41.ebuild 2634 BLAKE2B d6d0be415e1b7c0c9c0da6c1117340a536fbcad9bd27d1557e5a4c5e70388e1a0feb2c84b85d168b99eb207b9218e1ba6ef555a1cdd910355475f646095a7cad SHA512 e2f7a9d41fdf862e894b0e91d1c2ee79b5eff57b7026cf394af6757e9e903a95d9c5e8124053c364be6864c93330b3ee11e949aa3baabf50da856188e285f6a3
+EBUILD gsutil-4.41.ebuild 2613 BLAKE2B 2c08175115e2db69fd50b9e1695374ed5feb1df7a0e42ca2366ae67109ed0d13301f229a814497213dd2f9894454a7df068c465b01ecfe98f66fc581c48ac8b5 SHA512 61a9a371ea6aee9f4448a359d6ac9f06ba4c3ae2b0a0c1ade10b0e229256d7cd2e7c48101964d49c17983bea5cdb021c6a88a22568ac6106cf162ca2621e5a7d
 MISC metadata.xml 309 BLAKE2B 2e96100ac1f7d7ec8002836564ada61c1f60527f13dedb03063940bbed304147766406ad2dfe3269385320f1f81d3f7ce0979077c6f43ec49d6e8f99d5913cd7 SHA512 9ef28b80fa82fb11b954bdaf65bb385203f18a44dcfa53f2f8cdf47f62ece37eea0ecec1c83e067485d16fc0dd6b8bfb8a0fe625b5af8e5d07cb48a1e52b3178
diff --git a/net-misc/gsutil/gsutil-4.41.ebuild b/net-misc/gsutil/gsutil-4.41.ebuild
index 1bb18ea172b4..c645f1344db9 100644
--- a/net-misc/gsutil/gsutil-4.41.ebuild
+++ b/net-misc/gsutil/gsutil-4.41.ebuild
@@ -44,7 +44,7 @@ S="${WORKDIR}/${PN}"
 DOCS=( README.md CHANGES.md )
 
 # needs to talk to Google to run tests
-RESTRICT="test? ( network-sandbox )"
+RESTRICT="test"
 
 python_prepare_all() {
 	distutils-r1_python_prepare_all
diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest
index 869c0bca7e89..6168f7cfb2d9 100644
--- a/net-misc/igmpproxy/Manifest
+++ b/net-misc/igmpproxy/Manifest
@@ -1,13 +1,6 @@
-AUX igmpproxy-conf.d 165 BLAKE2B df8526557acd0d88b017298dfd06b636c60537e79bca0fd5a1d6cca2b60ac7b4f917ac60fe5e11d3515890ef50675eb9eb8543bad224b47e785b1782d5298e86 SHA512 c09d4ba3756d5a391b0738c4ef1e83f083a9b9b4f23af66c1378b2f0b4aec6abdd509e48288c1fc96c7f43fe004cdf0c090702d83d2b665ef701a064fc2da80d
-AUX igmpproxy-init.d 514 BLAKE2B 5022b5f458c1a2c4082f591a1f003129453d6d8846ca6976820bb03b980aae7fed81abc29499effa3f96daf84e977c00ec842cc6a3d63b12be86c1e254adf15f SHA512 7bb2812c27556d1355e415eaa8ebe5d3ed5a896e88c6813c4bce686b3268c6f0000507cea59afa37a3f474fa6e2ca20c91bf87a63cf4c8209cef2f5bbb01c1cf
 AUX igmpproxy.confd 199 BLAKE2B 85902275ecd501bb26f37c91cf135cb34efd8dab8a6b5d85b383bcb8e77570f33c2a9f2a52ba3690b9a4a69bf0df82926571326b9720e274f7cbfd8bb39215c9 SHA512 3c95e98d19b88bed32562e64e4e491ac34da3533acb5cfd39032443688bdfe889e4835544bc358ccd5f7a95356c1eb8013462f3bc4a13e8e083717bfaaba4b5f
-AUX igmpproxy.initd 439 BLAKE2B 05673b50c7a055dfaa9011a21ab761a0ed87d142773bbbaa9dff90b35608c31cdd3837bcb575186e098568867499ab660e53a0215ef76bc83b95b3e6d174d174 SHA512 65c2107558ec0402daa1814eb45acdaaed40dcf7d7529ac0e02870fc2826cf770d6d2a54508b44b6a38c19ae58a4db777b2b4bf625df7797d0842cc44fb4559e
 AUX igmpproxy.initd-r1 337 BLAKE2B 44af8071177be905593ea867b23be08a9b51928158f62c7d62bbae33b59edd23c3b873db29f38eac37c42a9385c223e050fb3ed1e8776472f9fb73533d73200e SHA512 1e4e5d73fe9a734ab7898c2defdef8f9b27c3811109ef8819875a65733c72e48feb683d0001ced759c3195ce30bf31c6af9be7cebf30dd1dcd9141ffbbfe3f53
 AUX igmpproxy.service 155 BLAKE2B 7cddd2b54bc632b16ec7ac28665dd752d5e8090741adff7da2d9085b30d7cdd8428d4525bf0ebeabd99663a246a86e45d0958792e04f52e3f798996a5dcabd74 SHA512 e50a6ba9c29e49ff243f3704033a3f4b1167281e6b8270de324a8f8f2646ff063fac0ef90d19196dbf4c8b39e2474e831f1ac2ac35f1a6b85e83e3f9f3d319be
-DIST igmpproxy-0.1.tar.gz 140159 BLAKE2B d4a0fb0f69f1e8c7221ecd2842e95cfa390f54885d5eaaa5c69a32563b318a05540e123d4b19cd63a930d17934c1344fdf6467fad5c1de333d03e0a802e7912b SHA512 1a569814d8984610402313d8c4adb78ff362f82ae28c968a8ba0fb411e12a704d1b51b387111b51517ab8fb2e86952bbd196f27eccd311c11ce288fc6fa25ad4
 DIST igmpproxy-0.2.1.tar.gz 166951 BLAKE2B d47a2b236679c7d05cf453fb5d6dc3a9e4174776845e2a1f71ca28e02c6e6270b5db09eaf5a48581dd85ecca8ff198a3e4b7f84fd61e455fe33c4f60ec079c15 SHA512 17f6891bf49d3e70cdf3930ab1abe6a0ad7b9f12ff2d1cdde3761771988585301f459995ba5ea956c742597de4ce13fbf0ba3c1ae37d13b2eee2a09f16f51ae2
-EBUILD igmpproxy-0.1-r2.ebuild 587 BLAKE2B d96e2871845a21ddbab6a481915a82f5de977ff0e36d2c9c72cfc1d55a5bbf706349079151ada0f7b44a348a3a137c902dce9b4d88ffdfd96f3a1a8936ccf79c SHA512 75036b6de777dd630a89c6d08f729cb6c51c591c9ec9b206f492e081914f6c49ecb93bc9dd6e7026703a72b8adb1a4596d7c9aa326ab72b7e5cf72aa29ab3b86
-EBUILD igmpproxy-0.2.1-r1.ebuild 601 BLAKE2B 5b54a6d5950b0fb740d992eeaf0cea15716025b04b0459f6fc5aa1123cd39b1f107ee4b41d72da48039c48332f5772299351a3e9a7fee2f79959ba5160772ac0 SHA512 0b967134c5d086a82f02e52c51906894dda755fc60d6f34a763696b5212e4aa6d2fdd322f70125bc6fc402e3fc21275fd26cdb94e69c033215a83ab322b6ddfc
 EBUILD igmpproxy-0.2.1-r2.ebuild 602 BLAKE2B a5bef105ee2271b1801692825cb60274a498f91122d684e893ff0f487e3a07ecb6e9d6edf6c1326ae85c4ad178f9a4407e37944470b314561800177f2c5e3afb SHA512 964d744d22b1fcd627c0db393a11e4d5fc088ad442f783735078bac8cc06747dce7480c717e0e429ea4224fb5ff6dc58f0f3faa7cd840a79c581ab6a13e492fc
-EBUILD igmpproxy-0.2.1.ebuild 597 BLAKE2B 1ddba0a3cd604825d5f751986de268a9b26cfb1dde3f0ec03672c0c0452f7a5f3799e097dde6268e1095ec3d92ca7d0c1e31c1783713ae8bf02d66c5ccf0e610 SHA512 b01483610c5cc085a99cb1d1e554745fc71d9cf0b2599a1a9973d90f20547c02c5c7553ac0e9df715ee7194fe750cefbfb284bc6f261a8f559dd490a8e266479
 MISC metadata.xml 712 BLAKE2B 265497a27d79fceb3e2ea9cb44c1ec4b5dfc29876e5816041840c91cd1af9f3302eef4acb5b6499667f0a60c6758e56eb64725553bbbc524906c3796c6703748 SHA512 fde844efe66aef823179827b96541c8242f132bec2b58504848d332872c95b0007133f76806121a6285f305f9d7e773b166e7e4c634681a29d1c17576a843e40
diff --git a/net-misc/igmpproxy/files/igmpproxy-conf.d b/net-misc/igmpproxy/files/igmpproxy-conf.d
deleted file mode 100644
index a7a2b348d2a5..000000000000
--- a/net-misc/igmpproxy/files/igmpproxy-conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-# Specify a configuration file
-IGMPPROXY_CONFIG="/etc/igmpproxy.conf"
-
-# Additional command line options.
-# See igmpproxy(8) for more information.
-IGMPPROXY_OPTS=""
diff --git a/net-misc/igmpproxy/files/igmpproxy-init.d b/net-misc/igmpproxy/files/igmpproxy-init.d
deleted file mode 100644
index ca0b88032713..000000000000
--- a/net-misc/igmpproxy/files/igmpproxy-init.d
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	use logger
-}
-
-start() {
-	ebegin "Starting IGMPproxy"
-	start-stop-daemon --start --background \
-		--make-pidfile --pidfile /var/run/igmpproxy.pid \
-		--exec /usr/sbin/igmpproxy -- \
-		${IGMPPROXY_OPTS} "${IGMPPROXY_CONFIG:-/etc/igmpproxy.conf}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping IGMPproxy"
-	start-stop-daemon --stop --pidfile /var/run/igmpproxy.pid
-	eend $?
-}
-
diff --git a/net-misc/igmpproxy/files/igmpproxy.initd b/net-misc/igmpproxy/files/igmpproxy.initd
deleted file mode 100644
index d8f727ba034c..000000000000
--- a/net-misc/igmpproxy/files/igmpproxy.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-config="/etc/${RC_SVCNAME}.conf"
-name="IGMPproxy"
-pidfile="/run/${RC_SVCNAME}.pid"
-
-command="igmpproxy"
-command_args="${IGMPPROXY_OPTS} ${config}"
-procname="${RC_SVCNAME}"
-
-start_pre() {
-	if [ ! -f "${config}" ]; then
-		eerror "Please create ${config} before starting ${name}!"
-		return 1
-	else
-		return 0
-	fi
-}
diff --git a/net-misc/igmpproxy/igmpproxy-0.1-r2.ebuild b/net-misc/igmpproxy/igmpproxy-0.1-r2.ebuild
deleted file mode 100644
index 3d8447540d82..000000000000
--- a/net-misc/igmpproxy/igmpproxy-0.1-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info systemd
-
-DESCRIPTION="Multicast Routing Daemon using only IGMP signalling"
-HOMEPAGE="https://github.com/pali/igmpproxy"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 Stanford"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newinitd "${FILESDIR}/${PN}-init.d" ${PN}
-	newconfd "${FILESDIR}/${PN}-conf.d" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/net-misc/igmpproxy/igmpproxy-0.2.1-r1.ebuild b/net-misc/igmpproxy/igmpproxy-0.2.1-r1.ebuild
deleted file mode 100644
index 06a8c2699a05..000000000000
--- a/net-misc/igmpproxy/igmpproxy-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info systemd
-
-DESCRIPTION="A multicast routing daemon which uses IGMP forwarding"
-HOMEPAGE="https://github.com/pali/igmpproxy"
-SRC_URI="https://github.com/pali/igmpproxy/releases/download/${PV}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-SLOT="0"
-
-CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE"
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/igmpproxy.initd" igmpproxy
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	newconfd "${FILESDIR}/igmpproxy.confd" igmpproxy
-}
diff --git a/net-misc/igmpproxy/igmpproxy-0.2.1.ebuild b/net-misc/igmpproxy/igmpproxy-0.2.1.ebuild
deleted file mode 100644
index 5afc1befcf1e..000000000000
--- a/net-misc/igmpproxy/igmpproxy-0.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd
-
-CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE"
-
-DESCRIPTION="A multicast routing daemon which uses IGMP forwarding"
-HOMEPAGE="https://github.com/pali/igmpproxy"
-SRC_URI="https://github.com/pali/igmpproxy/releases/download/${PV}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2+"
-SLOT="0"
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/igmpproxy.initd" igmpproxy
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	newconfd "${FILESDIR}/igmpproxy.confd" igmpproxy
-}
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 8a44e7a63af4..279db04ffcc4 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -12,6 +12,6 @@ DIST iputils-manpages-20190515.tar.xz 27556 BLAKE2B adf3eb5c7f3fd71fa24ff48daffd
 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066
 EBUILD iputils-20180629.ebuild 3968 BLAKE2B 34a3f150c222ae7e39771337309a79db140b83f04c6c363a19111c1698ea136e7afcd3c348793e2b51fe0e3d353268cf7bc46a53815568c0bbf8b45ce200b1d9 SHA512 701b6b4fa3fcce5fe59ca72011143bd36744658ed94f15b6cad411115029701efe63798e6e61191d8819daa624a603807509299b9b54e9e46e67dc2c01f1574c
 EBUILD iputils-20190515.ebuild 4916 BLAKE2B c432eba2ed92debe453da5433a91c471cc4efda6ce8540820658421f07fde827a11f9f4efe281c60e9e83741a2823eda1a2bf6354c9d8c3b4be2f75a6e442e66 SHA512 2235ff71f13c2b8be707d2f14f7077adc315b080b6d38dc09d9299f7a398aaf0e7b9f72b7e44a207654619adc9fbf8ac590d2bdcba74c37d3bb1d0273a4e9ac2
-EBUILD iputils-20190709.ebuild 4849 BLAKE2B e15bd9cc372a0512726d6e9f522d0f5738f56e5940f6b4abecbe26e59a6e223c9f3d22c4fef3121b9ece3f7d28f80fca6686e6185ce79122f61c4296857f066e SHA512 56a15483326d13fd4bd5cfdf628f1a7819d2b4d3a927c194c6c5e0f1d3242c5fb976f9dd959f3a20b071c204ae78f227cef7e532d1c9f798317d000a45159f3f
-EBUILD iputils-99999999.ebuild 4856 BLAKE2B a45da5d66dd052fb98d00ee8b15574460178cab2598a8b094683b28c15a8b16fb47e3372f3aaf7f25b099d9940fe52dbef260e0c614c3e345be2365126aadece SHA512 0528921d494b624508f42cd34b792663d8b112f037bbf3caa23304cb4bb6e7f749d9794066350854d24fbab847a4491cf339c4d7e3840a202c2ce1c081d0b901
+EBUILD iputils-20190709.ebuild 4846 BLAKE2B ccd0487139bcc3dc40c2922191e10053fd5248f0bb3419ab7c40b21f3599467754ade3d844803087b7a9b477c5d1c1823d13ae14f7285c3a2814cfed21b6d8a0 SHA512 6e11a646108a6fb73a124ad00d569db2fbb3c6193264a9677ced0a8405bb815fbf442bb13d08a53580ec258857c494d39a50144faa967f4d923fc0b55a7fd3ff
+EBUILD iputils-99999999.ebuild 4853 BLAKE2B acda2cfa73d94e1f5c2e34f716ce27911a26df3acef3138f462af53e2ad230f02ec39b6186b64f5bada03bdb40efa494f6a33eb09350b2dc638375263406ce72 SHA512 a218a45c72883e6fe3165f9b7ac2438b06582d6470ef116c67d9e4e6a2cafe276ca4f05f58938a22e5f5267373fd6670c5456b28a9d6c4f4ff5fd83e2b346cea
 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e
diff --git a/net-misc/iputils/iputils-20190709.ebuild b/net-misc/iputils/iputils-20190709.ebuild
index 31637094b14f..3d4c44ef2ce2 100644
--- a/net-misc/iputils/iputils-20190709.ebuild
+++ b/net-misc/iputils/iputils-20190709.ebuild
@@ -29,10 +29,7 @@ LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
 IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
 
-BDEPEND="
-	virtual/os-headers
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 
 LIB_DEPEND="
 	caps? ( sys-libs/libcap[static-libs(+)] )
@@ -61,6 +58,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
+	virtual/os-headers
 	static? ( ${LIB_DEPEND} )
 "
 
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index ffc2311cad4e..b017e1a7fb9a 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -29,10 +29,7 @@ LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
 IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
 
-BDEPEND="
-	virtual/os-headers
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 
 LIB_DEPEND="
 	caps? ( sys-libs/libcap[static-libs(+)] )
@@ -61,6 +58,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
+	virtual/os-headers
 	static? ( ${LIB_DEPEND} )
 "
 
diff --git a/net-misc/istioctl/Manifest b/net-misc/istioctl/Manifest
index a46a6c5714ff..a6e9fea8cdb8 100644
--- a/net-misc/istioctl/Manifest
+++ b/net-misc/istioctl/Manifest
@@ -1,9 +1,5 @@
-DIST istioctl-1.1.4.tar.gz 20705247 BLAKE2B d3727dafcfa8a630a02040fe452a3a2b6c89d4dc2ede4128b9906adf21d97e68f8b126783d248239416a459357bee72ca0f2af19a6d34039ad59b3ade6f3b6d1 SHA512 e866fcad482ef605e4126fffe421eff7fbc1733e5d949e2ebe846f790d8825bb79d5360fe48d29913f0b015c15bc1aac224ac9f39e4e7d5948f2dcd5042570a8
-DIST istioctl-1.1.6.tar.gz 20707819 BLAKE2B 0ebd34873e6ff1fec2413afed8b4fe80baee8e9bec55bc2fab15b25266b404fb05fce6bfd0e122c5eb3fa661f5633a431aaa3042ad6d12caf2c4feb58bdbaa5e SHA512 62b9b96547af6f8050f934e4d620ab1990afc805c0abbdbc7933220d28676542222b4452f8207dbe5976116bfe8ae557ee7545e1859b0ab22d9c0c2510950fca
-DIST istioctl-1.1.7.tar.gz 20711283 BLAKE2B 5c6d54ab033f0dba19377d0ca1a88a57e319932c91d3c2c1f3ad9fc112f11aec481e4421b958490e5b3c24d3be6ae68dbc7122e17a7463585a052e225f77ae5b SHA512 8a00efd3fea05d3b28225bf6d58d46769aa7576851df849185d62a14ef368980df765d3c5b1d9c59dff7f0034259e62fe57bc119b66cecb220513f7b94500cef
+DIST istioctl-1.1.12.tar.gz 20720842 BLAKE2B c7b70ee162daabcf82cc8cbd8ec61d49b68189fcab43a1f04daa9dee6701075330557d2567cabae7f8fa37a2b3ebac23def53cca43930a9c1bf5079c15198f48 SHA512 a7aa37a2ec12b802d38a27cc4b6131ec604e14f0c64d2a3619f2918cc24cbf7bf0e291d58185e0481d544b28264f8782636abdca5afdacde6c3ad41ae616b90d
 DIST istioctl-1.1.8.tar.gz 20718514 BLAKE2B 20b492932906bab3d8fd2e66452acf42a3b8fc07bb42e95217410b32ede68f2dc4256f4e33b104428996a3cfa2f30c798ccf2cc3794079c8936d353330763c88 SHA512 907bff4a7239e0e615fcc3ea92c98d944916dc88c744d574b5362e622729e8fb5a79e549a7f0beece5235918d7891ef6283e6b1e3f789980450d7eee1e131e2b
-EBUILD istioctl-1.1.4.ebuild 881 BLAKE2B 2469a8a5e01cfd03c46dd36ccea76f55245d0f5c6f4138dd091344d78e6e6bc3012b1865bc8b3544b50e20d2d90b256ea50e49631d5bccea32feaad198e77673 SHA512 42e2248f54be2b555c8b3fb5b889edbb999979b97b75feb0595c9974345c04fab4475d60fc0f237701af8d4001a6c8099db5a0364c684739c891331528b65c5d
-EBUILD istioctl-1.1.6.ebuild 881 BLAKE2B 3d0da6dcd771988cf424595f1909c2801a792aa84077e0d384e6dcc10b090a5551ee9c564fe4478fee21303c46bf2b3d8a777bb992696e8ed8d3a10a98973e6e SHA512 d526bcc73da7aebf102533e6f87e20b59da33a94efefcb218353085a097b2d61cb2cd77e98b208d7bc7212d2439389834678110b0c1c7599af169f959c5aa72c
-EBUILD istioctl-1.1.7.ebuild 881 BLAKE2B 7f43a2eb6cdb29533b604826aa7051c24fd51690afe8972bee6de9bc9ca8605243fbd740b74e550a12cc54db7b4fdc5c754c8f849cfc0156a141d98ac486ce6e SHA512 9f1cb38ffd5cebca846d843f255a419588544ef7afb99c3d1a67816db69dfdd00a0e9d4e4d5c27f66328f21430ef1bdaf6b0ee3d0ffc23002095365aa3f40e04
+EBUILD istioctl-1.1.12.ebuild 848 BLAKE2B e78cd34eb328abb702bdd235049eb7287d094dace9c1c2a14f9a3009ee1bdad67bc873a4028b148ed1503eef79bda4215948d8dca62358617f1457a96a3fc3b4 SHA512 fe327960385a5e1e6c9ca5c76e24ad27eed95e37985f3fefd1c661ba54e8ba3c98cc569b04114afe8658a1cd37acb3174cbce66e6a324dcfa4904d12d10c028c
 EBUILD istioctl-1.1.8.ebuild 848 BLAKE2B 685fd155192b5f99a7f04ecde94b2cc0c019dad6ca36aacd6e427ae56c4df599e3364ea4b1b932ac8b09d3aeab8e506322e163837cc018611fc41bbf2cbaaa65 SHA512 2d7ec1b4e628855aa31efde1db7316ec9bb8829369f91ae0ae95cb0ef593573696332cca5cab2b2bab54fc0d78f32e46219ff10e04eacf9380a18cfe3e50acc1
 MISC metadata.xml 321 BLAKE2B 46078d652e4352893c239c5e6b7d30a160f48b370f932357a5c2940c67ddae2f6c932ca6dd1b0b784b0e2a03a7649936ebe317dc95da5ad7a9acbd2e497a01d1 SHA512 cb45dda3fe092fbc1d18cdd21f44ad5cd89c51fee4e10aee6140bd66b25e46c9253672b8f36fe0ae6a83ff9a76c9b1bd35de59846abb9054b1f5095e33858d88
diff --git a/net-misc/istioctl/istioctl-1.1.6.ebuild b/net-misc/istioctl/istioctl-1.1.12.ebuild
index 3242c5558275..40518fcd4c12 100644
--- a/net-misc/istioctl/istioctl-1.1.6.ebuild
+++ b/net-misc/istioctl/istioctl-1.1.12.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit golang-vcs-snapshot
 
-GIT_COMMIT="04850e14d38a69a38c16c800e237b1108056513e"
+GIT_COMMIT="473d9b3"
 
 KEYWORDS="~amd64"
 DESCRIPTION="Istio configuration command line utility"
diff --git a/net-misc/istioctl/istioctl-1.1.4.ebuild b/net-misc/istioctl/istioctl-1.1.4.ebuild
deleted file mode 100644
index 6ca50e797a3b..000000000000
--- a/net-misc/istioctl/istioctl-1.1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot
-
-GIT_COMMIT="bc7465793cbff4c4189639b3f404e21c517cbdc6"
-
-KEYWORDS="~amd64"
-DESCRIPTION="Istio configuration command line utility"
-EGO_PN="istio.io/istio"
-HOMEPAGE="https://github.com/istio/istio"
-MY_PV=${PV/_/-}
-SRC_URI="https://github.com/istio/istio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	BUILDINFO="istio.io/istio/pkg/version.buildVersion=${PV}
-		istio.io/istio/pkg/version.buildGitRevision=${GIT_COMMIT}
-		istio.io/istio/pkg/version.buildStatus=Clean" \
-	VERBOSE=1 GOPATH="${WORKDIR}/${P}" TAG=${PV} emake istioctl
-	popd || die
-}
-
-src_install() {
-	dobin out/linux_amd64/release/${PN}
-	pushd "src/${EGO_PN}" || die
-	dodoc README.md
-}
diff --git a/net-misc/istioctl/istioctl-1.1.7.ebuild b/net-misc/istioctl/istioctl-1.1.7.ebuild
deleted file mode 100644
index 2d1aca58a468..000000000000
--- a/net-misc/istioctl/istioctl-1.1.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot
-
-GIT_COMMIT="eec7a74473deee98cad0a996f41a32a47dd453c2"
-
-KEYWORDS="~amd64"
-DESCRIPTION="Istio configuration command line utility"
-EGO_PN="istio.io/istio"
-HOMEPAGE="https://github.com/istio/istio"
-MY_PV=${PV/_/-}
-SRC_URI="https://github.com/istio/istio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	BUILDINFO="istio.io/istio/pkg/version.buildVersion=${PV}
-		istio.io/istio/pkg/version.buildGitRevision=${GIT_COMMIT}
-		istio.io/istio/pkg/version.buildStatus=Clean" \
-	VERBOSE=1 GOPATH="${WORKDIR}/${P}" TAG=${PV} emake istioctl
-	popd || die
-}
-
-src_install() {
-	dobin out/linux_amd64/release/${PN}
-	pushd "src/${EGO_PN}" || die
-	dodoc README.md
-}
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index a23b142b8640..a995ee1ad62b 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -3,5 +3,5 @@ AUX lksctp-tools-1.0.8-prefix.patch 332 BLAKE2B a83cc8172bb96f7cade25b049608ef46
 DIST lksctp-tools-1.0.17.tar.gz 795762 BLAKE2B a37b653b1f9effd039c5241669c767d8b0918bf4790d9f017c70eefd4ce1efdbe5d76f6e88e15ddf214308267ee62a6004d2af781ad720ef847e8d99ae5a55f6 SHA512 055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4
 DIST lksctp-tools-1.0.18.tar.gz 560302 BLAKE2B 6151109a0f43044048ff64a6ca021710f28e695017b79513412a44999ec67bdbe7cb0bbba7d5e0deb28b8fdd097379100046ef77508678f726f18944b9799f22 SHA512 1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055
 EBUILD lksctp-tools-1.0.17.ebuild 1258 BLAKE2B dfa2c9b65e53a0eb8d139778206d33183ecfcb4981f9d06fde840e986457499afecc4c8b4c718725962fd4693f514d2d439dfd92cfae0de4393e0a871ecec762 SHA512 e187fe17a57dc5497ad8d89c78e61bdf30ee037071ac69e215b3b28d705d4b6c6ef6e2bfeb434d1a442224059a0be30326af24b446a52a4cbdc383e9f5929ea4
-EBUILD lksctp-tools-1.0.18-r1.ebuild 1394 BLAKE2B 168a0cb546e02c506cc09a555f0127116c3323c4d3b60ced90c054102d9c30fbc1f3035ba65e7692214d046b0751c399cfdb9482aa21a120c54795260ad3b90a SHA512 1f34875e1b056f9dafe6550733ce1e61d09d1672bd4998b482ae98b11a63eeeac6065d187dc2daa317809507955f840cabc5ffad6fdbdf5e6534af2a74fa10af
+EBUILD lksctp-tools-1.0.18-r1.ebuild 1391 BLAKE2B 06b3fb8cb19fa93d277a36e8945de3f8d505be6cfb059410ff9283393dd5d52cedd4a5e837e5ddd9e315bed4b7a9985d75061351cecb7dde72c86bd76a63c48f SHA512 ba6b4eb8fff7eb8185f6a94d1a5e77b647f6617f330a67299c0220dc7d5ce9a82dc2ecef03a2b39f73f14d891aeeda35f8796f678248bbeae62775cf4ac89deb
 MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
index 393bfb7c43c5..a9517584e48b 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sctp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2+ LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc ~x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 IUSE="kernel_linux static-libs"
 
 # This is only supposed to work with Linux to begin with.
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 469bb5e7f78e..7a1e27887d4d 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,12 +1,5 @@
-AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c5d8ba66756349af8e7b9e1d8dc1b1ec585e32c3c783d9d9ecc456383375527f14c1d48bebfb170eabacd SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b
 AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9
-AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
-DIST miniupnpd-2.1.20190502.tar.gz 236052 BLAKE2B 9f2f81769d72fad2191969e0e80b4d2e70619d5674fe6b4ef9f4306e09ac4737577a2146bc04ec9960df092252abe3c9a57e32d5d893a763b85863d1c4892045 SHA512 6423cef89b5af62b6b6a120a3cd13a0e7755d609b33de8f1671f7f9160fb1b5e68b0ebd3f8b7b5758cf05a1c58b416cde253e37bc5ba0bb423c14b5fb44599f1
-DIST miniupnpd-2.1.20190625.tar.gz 240120 BLAKE2B c6cf6b549a1c0c4a411d9487a3dae348d8a37767b9590d29ea763177d876ceb6f521bb7662452e2dff813354fc52f862bcc830079b3ff8af8185de6ee2771e8f SHA512 3b9a14f24c7e753cc71b84622bfbbc0db4a5b5e0fd602ef1129b89b1c729e754c51f5c29b4bf8d1cc37a16f77b33f04cf3f3540afe1ac529105cb91f45fa92c8
 DIST miniupnpd-2.1.20190630.tar.gz 240466 BLAKE2B fe4d4e59a7dad32bef9ed9b4c58b52e378ec9b26ea2439e84284630a7ef7269c6cd53cabdc632ff274cae88aea2552a8808af2ea349138f8b8ed667baf9e87ee SHA512 cd6006e5487652a258f7320e1e28fea7b0790528cc014071109a1abd0f6c249237cf8d0620987c14ee0ce1cca14f4bb4abd439b1d422e0e49a398cd485eaf970
-EBUILD miniupnpd-2.1.20190502.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722
-EBUILD miniupnpd-2.1.20190625-r1.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
-EBUILD miniupnpd-2.1.20190625.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722
 EBUILD miniupnpd-2.1.20190630.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
 MISC metadata.xml 1037 BLAKE2B 9fa42839f13b135ac2b69091b9d0ba1d3749f3b9903bcaa209c0d23ff981615c58df027725a536b4e268c53eb285ab6750bbeb7e0bc8e668dfca61b787ec9c60 SHA512 536ef1fce9d3d76eb33a88707c5750fc0b014cf29b4c20d3459bc0116a68234667689a297e8aae35507f1b6b9fde7590d14b3763f2813c485478e18f396bfeb8
diff --git a/net-misc/miniupnpd/files/miniupnpd-conf.d-r1 b/net-misc/miniupnpd/files/miniupnpd-conf.d-r1
deleted file mode 100644
index 1464bf04bd18..000000000000
--- a/net-misc/miniupnpd/files/miniupnpd-conf.d-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-# /etc/conf.d/miniupnpd: Configuration for miniupnpd init script
-
-# extra arguments to be passed to the command
-#extra_args=""
-
-# the location of the configuration file
-#config_file="/etc/miniupnpd/miniupnpd.conf"
-
-# uncomment to not use included scripts to manipulate iptables
-#no_iptables_scripts=1
diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d-r1 b/net-misc/miniupnpd/files/miniupnpd-init.d-r1
deleted file mode 100644
index 99406106a86d..000000000000
--- a/net-misc/miniupnpd/files/miniupnpd-init.d-r1
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/miniupnpd"
-: "${config_file:=/etc/miniupnpd/miniupnpd.conf}"
-command_args="-f ${config_file:-/etc/miniupnpd/miniupnpd.conf} ${extra_args}"
-: "${pidfile:=/var/run/miniupnpd.pid}"
-
-depend() {
-	need net iptables
-	use minissdpd
-}
-
-start_pre() {
-	local retval=0
-
-	if [[ -z ${no_iptables_scripts} ]]; then
-		/etc/miniupnpd/iptables_init.sh || retval=${?}
-	fi
-	
-	return ${retval}
-}
-
-stop_post() {
-	local retval=0
-
-	if [[ -z ${no_iptables_scripts} ]]; then
-		/etc/miniupnpd/iptables_removeall.sh
-	fi
-
-	return ${retval}
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190502.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190502.ebuild
deleted file mode 100644
index 673b340fb090..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190502.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
-	net-libs/libnfnetlink:=
-	net-libs/libmnl:=
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-	mv Makefile.linux Makefile || die
-
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
deleted file mode 100644
index 07c804f35640..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0=
-	!nftables? (
-		>=net-firewall/iptables-1.4.6:0=[ipv6?]
-		net-libs/libnfnetlink:=
-		net-libs/libmnl:=
-	)
-	nftables? (
-		net-firewall/nftables
-		net-libs/libnftnl:=
-		net-libs/libmnl:=
-	)"
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-
-	# Prevent overriding CFLAGS.
-	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
-
-	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
-
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	local confd_seds=()
-	if use nftables; then
-		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
-	else
-		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
-	fi
-	if ! use ipv6 || use nftables; then
-		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
-	fi
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
-	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
-		"${FILESDIR}"/${PN}-conf.d-r2 || die)
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190625.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190625.ebuild
deleted file mode 100644
index 673b340fb090..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190625.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
-	net-libs/libnfnetlink:=
-	net-libs/libmnl:=
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-	mv Makefile.linux Makefile || die
-
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 7d2a327b200f..a694bfeda162 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -3,5 +3,4 @@ DIST ModemManager-1.10.0.tar.xz 2201468 BLAKE2B 4a572feba7d62269ed9d6066565e1b7d
 DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5
 EBUILD modemmanager-1.10.0.ebuild 3651 BLAKE2B c60944e83a7d6066957eea5bdec781575d546bb163debc0cdfda317e21bf2625aa588e636fe8b0dc13f511605e95c6f742f335958f325733b7faa2e1bd8982db SHA512 cfafb4251886b39bc10eac948f7686bc3540740737624abfc0e469a20e3f74e523b15ce76a159b3216926015fcf6ae1bce9783f7498e8db9899c0b8cea264699
 EBUILD modemmanager-1.8.2-r1.ebuild 3645 BLAKE2B 3f0e68549417041d6f625fb986a32976ecfe66b6ee3364a978fced73dd5573f2a643c6ee4d2c84c555903aad8d4b5e338463a99712d866e5cd6e0e06eef8c63a SHA512 3916fa42c70eb157888cbbd13fdf076148efd7f25ec3168d1947c804d52f74a9b471682ccadfa9a4884d1b50ce72835299d35ca7b9b2277aeb612f3854396e7c
-EBUILD modemmanager-1.8.2.ebuild 3354 BLAKE2B 46f7e3a076cecd6608f2d0c066029533ff0c4ed6afec43380ba3960f6b6077c90bcd5e660e7b65ebe2da8e427fef669c4af16cb269ad6033d804e1d4fb485dd8 SHA512 04ab770e46d2107985b0149f5aa1b86de5cefe0c47785f844bbc8e3cd1893187d04f7de328ec72b68e2b9d42aac8b1c6ecaa0fdedd8152807af3574840374a37
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.8.2.ebuild b/net-misc/modemmanager/modemmanager-1.8.2.ebuild
deleted file mode 100644
index 14bf1bffc8b5..000000000000
--- a/net-misc/modemmanager/modemmanager-1.8.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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://www.freedesktop.org/wiki/Software/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 ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="+introspection mbim policykit +qmi systemd +udev vala"
-REQUIRED_USE="
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.36.0:2
-	udev? ( >=virtual/libgudev-230:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	mbim? ( >=net-libs/libmbim-1.16.0 )
-	policykit? ( >=sys-auth/polkit-0.106[introspection] )
-	qmi? ( >=net-libs/libqmi-1.20.0:= )
-	systemd? ( >=sys-apps/systemd-209 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
-	DOC_CONTENTS="
-		If your USB modem shows up only as a storage device when you plug it in,
-		then 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 \
-		--disable-static \
-		--with-dist-version=${PVR} \
-		--with-udev-base-dir="$(get_udevdir)" \
-		$(use_with udev) \
-		$(use_enable introspection) \
-		$(use_with mbim) \
-		$(use_with policykit polkit) \
-		$(use_with systemd systemd-suspend-resume) \
-		$(use_with systemd systemd-journal) \
-		$(use_with qmi) \
-		$(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
-
-	if ! use udev; then
-		ewarn "You have built ModemManager without udev support. You may have to teach it"
-		ewarn "about your modem port manually."
-	fi
-
-	systemd_reenable ModemManager.service
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 510fd4e9a990..367f985ff30b 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,10 +2,10 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
-DIST NetworkManager-1.14.6.tar.xz 4426540 BLAKE2B 29709005f4143bb4a9ef2348c2da062ea741111bdd54400f199e057317dff12fe9b0d3ab7795b21e93217076a0b338a18d99c7d2c2514d138aaf5bf41aa71c5a SHA512 e5e11eed6366eb185691102c89732a458f3a01aa979e724f7415d237e0ba1a811ac78bb17d9cf1b11181ec6e3f82cb5f1c86b624d3c2b2c7c1b72549653309c9
 DIST NetworkManager-1.16.0.tar.xz 4793620 BLAKE2B 554559eefbfa489cf01067bd2c32e4b06fed076d38920b41f2d0005873ff913c0af2babcc3d9b463a4b636ca82e5c27ee20ab5768fcfb2c6b79e003d7fdc224d SHA512 e9d8365d8e59e5bc7c0bc13482139fb96b1d87183c8884e71e84eaf05fe121f2bcac519edd916bd242be4e9a9e2d2140a1065f529a9a02bda87b6d2bd4192584
 DIST NetworkManager-1.16.2.tar.xz 4820392 BLAKE2B f85fa4ff27cb2f0fc7d58052c810d4c20ca51d6e77e400c44270f941de6b4878b0c645053b9ffb02c3587b6c7b17631f9a6c6c15b630da4747051e1745d1dae8 SHA512 b3e874786d0bce58b967677fe82980aac58023fd4e913345acb63d7a7f253cd8fa6c044e788dd337a52f0fb026ce5fbd333d738dc9c3644d696e85498120f6d2
-EBUILD networkmanager-1.14.6.ebuild 10961 BLAKE2B ba38ca50957abd14cb4b965e72a1a249267d5ded23cc7d766f1cc2ff2bda6ff5583fb66124eddbd45c3f62eca650c6094d7a637196b0c4acf392e576445595f0 SHA512 6dbba3c0a1fa478b5f3599b97101eee08c7d347409235ce49b72d6cf857da064ceee394afd8820e59237f788b2442ab4e7f5bb411b659dbdb495fba190e567ef
-EBUILD networkmanager-1.16.0.ebuild 11116 BLAKE2B 6efd07abfefffa1e3ebc8b559ae37b6b422c809677cbdb970ce0a7ee2e4d36f3d0bfb63c6480424e18fd307c51e683932c51f1ef87be44fdcd7e5ca1431bdffe SHA512 289846ad13e61b095781886cedba698261070cd2091ccd0d6fc5b18d640cc49b6c4772adbd88e82b5fab9a35ee4913006f77094e13279e17433f8337ae13ebbd
-EBUILD networkmanager-1.16.2.ebuild 11141 BLAKE2B ea2d4c1560509c7707599cbd4b8b02d411f56779cc693fe5d9870fa7d2a24c26097d04930baa62174b7a9435cf414e9266151001c72ec437c06d5b893729c81b SHA512 78d82edf41f868f70ff3d74b6452cc3304fd83f679425f1a6bee11aa9a709b1075d2fa9f233282b76a3ee0309991b534169a9048d917691e85f753127371e680
+DIST NetworkManager-1.18.2.tar.xz 4872252 BLAKE2B 8a3fa74837a6cf2a09af807b9bd164c949d31efb81fc212485f49e24f0a215ff06db10c4259712f6c51d7480bda1b53457bf50bda9b2df8330891e8c8ba394c8 SHA512 a220d856632693298af0bd23ae4393ee597684fcae400c8ed35bae5e543bcdbd0b0e879f4a7587b674ae86c5fdfbee955acd0fb6226cb95ed31372cb7c222814
+EBUILD networkmanager-1.16.0.ebuild 11106 BLAKE2B 2ad8ff5ee0069946ed60b644ac8beb24167ba6da6bb5d8ddcef09d7b4187974efb62ef867d98b746b7910005a3dc89ffba5b263ffdcb2260a92463658b4fefcf SHA512 db17cab0f2ae56802f57e5f785ba11f5b3391a6a595c9ff773ace9b75d0d36df260fd5ef1ba6ec5d5f3539645bc2c5c03af628df89cb830861526da078b6e619
+EBUILD networkmanager-1.16.2.ebuild 11131 BLAKE2B 0ce19eba230f3608d09c4a6664e4d877711e683b6fecdabfaf5876ebfe924f6ced3445881f99cd90003e17482f90cd6d8ef24d3c0b1541afe5cc9ee510ec1c47 SHA512 40f15c6ed60d0c931b8b882e99a32a4daf795f40939a8e8b8826ede4fdacfd204efbbc4e3f82ffec4e5ee6d4ad0c54b435e5d3301cf7c6486663ad3ce65b6a62
+EBUILD networkmanager-1.18.2.ebuild 11131 BLAKE2B ace4e19631cf2c5963c7c47669cf8e96fdfe00c6e3152d54a2cce5d1b1cd0822961a55f8d6ec1a9b3c9a2d7bbd0eb15775ed570203b45c3ebe4685e766e8ca5c SHA512 d6a6eb85fc9c30cf434c6ea841f49c4f6adf1fe2b2e6a4a10cc9e225956ff7ab1d0398f66fa21918106296b8880401fe7b4d1b57b7cc09bb04753ae8c34fe191
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.16.0.ebuild b/net-misc/networkmanager/networkmanager-1.16.0.ebuild
index 651553fe4dbb..4ab48bffe5d5 100644
--- a/net-misc/networkmanager/networkmanager-1.16.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.16.0.ebuild
@@ -139,7 +139,7 @@ pkg_pretend() {
 
 pkg_setup() {
 	if use connection-sharing; then
-		CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
 		linux-info_pkg_setup
 	fi
 	enewgroup plugdev
diff --git a/net-misc/networkmanager/networkmanager-1.16.2.ebuild b/net-misc/networkmanager/networkmanager-1.16.2.ebuild
index ba66ce187019..777cf71c6036 100644
--- a/net-misc/networkmanager/networkmanager-1.16.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.16.2.ebuild
@@ -139,7 +139,7 @@ pkg_pretend() {
 
 pkg_setup() {
 	if use connection-sharing; then
-		CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
 		linux-info_pkg_setup
 	fi
 	enewgroup plugdev
diff --git a/net-misc/networkmanager/networkmanager-1.14.6.ebuild b/net-misc/networkmanager/networkmanager-1.18.2.ebuild
index ba1e91e55b72..e90575126d4d 100644
--- a/net-misc/networkmanager/networkmanager-1.14.6.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.2.ebuild
@@ -7,8 +7,7 @@ GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
-	user readme.gentoo-r1 vala virtualx udev multilib-minimal
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd user readme.gentoo-r1 vala virtualx udev multilib-minimal
 
 DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
 HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
@@ -19,15 +18,15 @@ SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname versio
 IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
 
 REQUIRED_USE="
+	bluetooth? ( modemmanager )
 	iwd? ( wifi )
-	modemmanager? ( ppp )
 	vala? ( introspection )
 	wext? ( wifi )
-	^^ ( nss gnutls )
+	|| ( nss gnutls )
 	?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
@@ -51,14 +50,14 @@ COMMON_DEPEND="
 	dhclient? ( >=net-misc/dhcp-4[client] )
 	dhcpcd? ( net-misc/dhcpcd )
 	elogind? ( >=sys-auth/elogind-219 )
-	gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
 	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
 	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
 	ncurses? ( >=dev-libs/newt-0.52.15 )
 	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
 	ofono? ( net-misc/ofono )
 	ovs? ( dev-libs/jansson )
 	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
@@ -86,7 +85,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-2.6.29
+	>=sys-kernel/linux-headers-3.18
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	introspection? (
 		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
@@ -139,7 +138,7 @@ pkg_pretend() {
 
 pkg_setup() {
 	if use connection-sharing; then
-		CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
 		linux-info_pkg_setup
 	fi
 	enewgroup plugdev
@@ -169,13 +168,16 @@ multilib_src_configure() {
 		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
 		# still not ready for removing that lib, bug #665338
 		--with-libnm-glib
-		--with-nmcli=yes
+		$(multilib_native_with nmcli)
 		--with-udev-dir="$(get_udevdir)"
 		--with-config-plugins-default=keyfile
 		--with-iptables=/sbin/iptables
+		--with-ebpf=yes
 		$(multilib_native_enable concheck)
 		--with-crypto=$(usex nss nss gnutls)
 		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		# ConsoleKit has no build-time dependency, so use it as the default case.
+		# There is no off switch, and we do not support upower.
 		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
 		$(multilib_native_use_with audit libaudit)
 		$(multilib_native_use_enable bluetooth bluez5-dun)
@@ -330,7 +332,7 @@ pkg_postinst() {
 		fi
 	fi
 
-	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
 	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
 		ewarn "You have psk-flags=1 setting in above files, you will need to"
 		ewarn "either reconfigure affected networks or, at least, set the flag"
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 0827b5f8c5df..4fb0e1692354 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,6 +1,8 @@
 AUX putty-0.71-no-gssapi.patch 10370 BLAKE2B 785e3710f175f01cde6c236b719d7e7b410036758980ad41e7703dcb169b0ea4518682ba8eb196800ebe04ac68c1ffa12febe407b447f1abf1469bfea226e655 SHA512 c2bd2480605e9a52fc429463eee53c5850cc2e81fbc486f059aa759aee22ba5f18e3e27d052c3b549aa0e6f2ce2a8ef8b4172d8e4d5bb4cde5ec74ef7fd9ddf5
 DIST putty-0.71.tar.gz 2423752 BLAKE2B fa4202d76d3b96e016a62c805db3835a6f61b05e7f63900919ffcd5bbec5159ef0e06b643398ed33aef5cd9ecf04eb9a981828683de7d565b88abbd4552237f6 SHA512 f8791210bd5925b26d51b13f0558eea15dbac40808051165b236d6436226f5c2b0aa7d69288ed9e2bddc1066455678cfd0af73ef6b715a136c42f3b6f754ac07
+DIST putty-0.72.tar.gz 2449516 BLAKE2B 8d5b2e812bb7bb0bfabf210b2bd6f9e0858cb80b9f7edc241a1426f4a520896c9acc214fb732cb169c88914c89461968afdf73a7b9392e85113e6653902f3221 SHA512 a963985e55dcd589c08ef51085808a6364629edd8ce6708ebdf516e0339a41b7f186f91d7d7f26b1fec03d60767f365246e6fa06e9ef042898355c2f90f355dd
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.71-r2.ebuild 1708 BLAKE2B c7521ebc45c975bb5d739697c507aa5ffbcbdc84f1afbbc63dd86f4f6fb6e9489ef919439d6730c2eeef769874416b28f1dbdf20e6fadd2f2ab41f8865b94702 SHA512 82082ad7b56f404719468fe34aa6caf3774f323252d00bf87b437703e38061b33877519f01771641a954465f1ae0b1e23c1824bf3271bf40175b05e989a19525
-EBUILD putty-9999.ebuild 1753 BLAKE2B 5560140aeadcf5dd34a219733808e5ecdbcb5f4204484a8e1d76b2a7856219d768c5dd39969a47efb7c50ebc0f81cc3e3bbe9826c7a1d5fa9e64cdcb8274eb54 SHA512 ec502f12e6fb98cabadbd1c67c017ac227778161174a0151145f3b715e0db61727af8c50d23719fe094d263279bf2674cc857402f795946d1d233237241d0dd8
+EBUILD putty-0.72.ebuild 1589 BLAKE2B eee910bf44a2c60ecfab2b7ca453d3c9dc67685341873efb28c25c80f19a21c0873625b82a85db42fb9937929fce8cd39e2d92c7b41080eb8589719f2c09cde8 SHA512 68d0b707f2af6c3efec730dd65f675d2eaaf95cfdbf9f7b1480e13b051acd326fade352ddfb31fcaad602b9af56136bcded04984348860a3ed5363aacb739925
+EBUILD putty-9999.ebuild 1693 BLAKE2B 7f8e29cb9624afb649639374e42269c5e72dcb9eb329e1c40d0eac20bb7ca4a0d8bd903a2d71412eb81733167745fabe27f0699627f5f125a128fe1ade7107fa SHA512 16c7df06d0309f1d3c3df3119dcb72c842451e188203a67c2fcf7409e781f2faa9dcd76cfb31b40526b3d3a00ed8e6842d84727d264cac0374ac6aa036e9e505
 MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6
diff --git a/net-misc/putty/putty-0.72.ebuild b/net-misc/putty/putty-0.72.ebuild
new file mode 100644
index 000000000000..ca57ab5f550e
--- /dev/null
+++ b/net-misc/putty/putty-0.72.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop toolchain-funcs xdg-utils
+
+DESCRIPTION="A Free Telnet/SSH Client"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +gtk gtk2 ipv6 gssapi"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
+	https://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
+"
+
+RDEPEND="
+	!net-misc/pssh
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/libX11
+		x11-libs/pango
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3[X] )
+	)
+	gssapi? ( virtual/krb5 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|-Werror||g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	cd "${S}"/unix || die
+	econf \
+		$(use_with gssapi) \
+		$(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
+}
+
+src_compile() {
+	emake -C "${S}"/doc
+	emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
+}
+
+src_install() {
+	dodoc doc/puttydoc.txt
+
+	if use doc; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	cd "${S}"/unix || die
+	default
+
+	if use gtk ; then
+		for i in 16 22 24 32 48 64 128 256; do
+			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
+		done
+
+		# install desktop file provided by Gustav Schaffter in #49577
+		make_desktop_entry ${PN} PuTTY ${PN} Network
+	fi
+}
+
+pkg_postinst() {
+	use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && xdg_icon_cache_update
+}
diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild
index 4a4ba0e37764..88def03e4bf1 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils gnome2-utils git-r3 toolchain-funcs
+EAPI=7
+inherit autotools desktop git-r3 toolchain-funcs xdg-utils
 
 DESCRIPTION="A Free Telnet/SSH Client"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
@@ -88,14 +88,10 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
+	use gtk && xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
+	use gtk && xdg_icon_cache_update
 }
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 80ebaac87632..89f1e07f4781 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -8,5 +8,5 @@ DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7
 DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee
 EBUILD rdesktop-1.8.4-r1.ebuild 1736 BLAKE2B 2683cb189864e5895da4d8252a96e6729bdf6484fab692c5b7922e9cfa4d66bbb2885fbcac7d7863d787d5ddd253faa05124bc712450b7a2d7a7f274242a39ae SHA512 16d5d030d96a6a27ef134e6d5f6b6a94a90034042f2dc02c587788f312403c1aaf9c71f0baf1001910053c703b96e009975d5fdc328a4114c0c511821117570c
 EBUILD rdesktop-1.8.4-r2.ebuild 1783 BLAKE2B 94a097e988cb19622eb8165830136f78f7ef6081914d64660974be4b97b861b4a01cd631a45009910cf27a2498c2e6f74e9be48ba0ccf8d4ea67a84eaba0fd93 SHA512 66a9fdc1e5c46fcf09879f482cb1b918614ed012373b776b05622dbc520d60d626a487422cf7ab0161886355fe17b392a64074da357e67a25c780cf625783679
-EBUILD rdesktop-1.8.6.ebuild 1790 BLAKE2B d8baac29890505e8066faf34207f06b0e0ed2c9206efa4049fcf98910ac5c6d95c5b57c82afe7db22a0614f2588727865edab49a720bd578d9c56d59ae48b858 SHA512 6bbe909dc5fecc0339b5610d35b50c3397d2b8537025d2d1483cb77b2c7cffc4ca2d0bf2e285a817e6f60bbbb230f06cdbd709be477fcf8bc5ead1885ba2d44c
+EBUILD rdesktop-1.8.6.ebuild 1789 BLAKE2B a5981d395a82c55f364135084abf114b9dd620a8e6de31dd00f367a7adf56aa1d704472004448828160fcc855689abf8ce09f5b3081afb7871060d1cf1703ddd SHA512 1e868524b008638be1a472f9030bd11c1f6c744e7f40483d8233b5fbb58b734f48030e11c0b99b26049d06215fcd005377eb6e5bb6d5892007d111d67e716f48
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/rdesktop-1.8.6.ebuild b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
index c24c7b2360cc..5fc45188d900 100644
--- a/net-misc/rdesktop/rdesktop-1.8.6.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 2c8c42f0faa5..62351c94c260 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -2,8 +2,10 @@ DIST Remmina-v1.2.31.3.tar.gz 1248295 BLAKE2B da748ceea5aa50702b060075c8e5c4aefe
 DIST Remmina-v1.3.3.tar.gz 1362239 BLAKE2B 8ae5b72293ffe2f627a46aa9354256d84d318819b0d5c236f4d5628764eaa9e3a3d07f3130ae04ee271cbc6ac207ccfaf495533b3fa59ee184d3da19c8738bc8 SHA512 72d0303f922619c3842880365bb68b967eb2134fef7187d0fd83aeec2b50fb499573849f853d509216608eefc02db7ced91cfc65f89154b51d0657e42bd0d637
 DIST Remmina-v1.3.4.tar.gz 1365473 BLAKE2B f71a9c0a0fa9eafa547abf192972da39f0cfe1ca3745a87783d6a9ec5bab0674d93df8815b589b25659990bb345748f8f464f401c7efb934e8e71b207b0dab67 SHA512 212ebc6e08c694861522a05feb51e4efa012ef3361debf079384c07e4354370f6cf7d2880ff442bbe03782421bac7f33343d8049207073d90925d1c894d30e7a
 DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e
+DIST remmina-1.3.5_p20190731.tar.gz 1475593 BLAKE2B 0a2ddb9c45474e65de9a5be28155ad45f06779170dc360f415ed7ce96fd8595d730eb5f89f756075f89ba5e8e124962fdd07f85d4ac90157eb1e0fae99169fbf SHA512 8b25dae17e13812184481d0640f44a253f0b66260e5e41b06d4e65e9d4dd673d0a17fab2453c9a29ba4691d53ac6e49cb35160931c546a7c68bc483e11eab987
 EBUILD remmina-1.2.0_rc24.ebuild 2035 BLAKE2B 7490ba779c88bf0caf7f1de2398dec1484acf428f3f1ddd06b021965d3ef255927d9637e24c56a71a3737707ef6a2df0257dc1a486c60e665e99721aaa5c1092 SHA512 058740deb4f072b8677fcb5bcedf2c870dccf748c166594cdf24cc09574b1fd1b8fb0157b89c82e43bd3dabcc892e72f561ed4db816ea269c40b2da9b73ce3cf
 EBUILD remmina-1.2.31.3.ebuild 2239 BLAKE2B 65e7720bc587f060e1014ea7c35832a4eb3a7c3a618913b35803c56103f814e0d82e65756471cef1e55da3f5d6a2044660b8adb33e7fa82618dba3c376e5fa6d SHA512 f038e0f8242aee5eb86403dc0e4758278f91407b9382b837d248de914037d88f7fac489ce326f5499c4cc548215f924b17ae10e8792955efec868b9e4c00f3f6
 EBUILD remmina-1.3.3.ebuild 2247 BLAKE2B 99065b1b37f957f07f0a16487f2dd4c9dc3f7c60cf9657584b6c0f1ed06b41602f8763d3e88f02234a42ad424080818e35df676e61dde7a6042d4934526ce65b SHA512 f80bf47e941b0c505610f757647c3260c7182d230e2f8067c3ed3781bd37c1ebcdab52aba279e9a51bda2f6faec78a7c0eb4e75c8c85f6fadb965ab0ff9910b3
 EBUILD remmina-1.3.4.ebuild 2247 BLAKE2B 99065b1b37f957f07f0a16487f2dd4c9dc3f7c60cf9657584b6c0f1ed06b41602f8763d3e88f02234a42ad424080818e35df676e61dde7a6042d4934526ce65b SHA512 f80bf47e941b0c505610f757647c3260c7182d230e2f8067c3ed3781bd37c1ebcdab52aba279e9a51bda2f6faec78a7c0eb4e75c8c85f6fadb965ab0ff9910b3
-MISC metadata.xml 1255 BLAKE2B 8567efbc8604b6fa65c44a072f8f49c6b0329de326b6bae638befd74ed0a506985174df29e09ceb391c8aadb3d11ee157137dd7456483b1c49908801831a6099 SHA512 5ce1ab53566158e4d3445e4549f2436bd758a486f39bcd59c732935d0b1f2b4033df616f8e3096632d1053aabfbc5b8602b509bccab676f2a36db637c691eb57
+EBUILD remmina-1.3.5_p20190731.ebuild 2530 BLAKE2B 88ee3101aa2954144e0e633a3a0f3e099b66eeb5451546dae5605176f8a8ae08a6619f51aca1f149ba23f33358eb63d7d958d9da189172183982d9a56ef384ab SHA512 ec5265dcf6489f7d0edd6eb48f2733cfc2b70ff208fb63d39af0e9e5a6b1908f646cfc431f039a53ee4df114265c98b458dc066dcc80e87131f10e5e9735800b
+MISC metadata.xml 1310 BLAKE2B bcf7c45908f6d13c26cbb7564e78d925c34000ed1ba20f793ada10d34e0f5f8b7ca380cb2688029eb4bac52b8afa3ed06cf5e635d8789d64f4cb420d23167cd5 SHA512 8bc4313586204ce7d2e386815599ef8694b8e39816612b0bdc7984676fd17f0a78f94f96677c1a51b5bd8876402c0cfef58a629c60c091ebfed14912e4ca9bff
diff --git a/net-misc/remmina/metadata.xml b/net-misc/remmina/metadata.xml
index f71db79b2675..f55944dc7cbb 100644
--- a/net-misc/remmina/metadata.xml
+++ b/net-misc/remmina/metadata.xml
@@ -22,6 +22,7 @@
 		Currently RDP, VNC, SPICE, NX, XDMCP and SSH are supported.
 	</longdescription>
 	<use>
+		<flag name="kwallet">Enable KDE Wallet plugin</flag>
 		<flag name="spice">Support connecting to SPICE-enabled virtual machines</flag>
 		<flag name="ssh">Enable support for SSH/SFTP protocol</flag>
 		<flag name="telepathy">Enable telepathy support</flag>
diff --git a/net-misc/remmina/remmina-1.3.5_p20190731.ebuild b/net-misc/remmina/remmina-1.3.5_p20190731.ebuild
new file mode 100644
index 000000000000..c2cca7a2478a
--- /dev/null
+++ b/net-misc/remmina/remmina-1.3.5_p20190731.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils vcs-snapshot xdg-utils
+
+MY_P="${PN^}-v${PV}"
+COMMIT="d3cfd641333b45ffb160dab2080fda3f4bbb8d68"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/master/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana crypt examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libsodium:=
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	ayatana? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4 )
+	gnome-keyring? ( app-crypt/libsecret )
+	kwallet? ( kde-frameworks/kwallet )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4 )
+	zeroconf? ( net-dns/avahi[gtk3] )
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${CDEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 7d629b3dc199..5eca703b7535 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,10 +1,10 @@
 AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
 AUX spice-gtk-0.34-openssl11.patch 518 BLAKE2B d9c692996f64ccfb61f16f2c8b620559d1321f35c74072c3e0c51a115f7d40039b7c6dd484cf3beec90c8950df5fbb42575ab62e3c309da3405b5217864b746b SHA512 f879a3f26be439a68e1f40e32e654eea301efc9f5494039b7166673337688f0832e180ab77863cde55627ee033572caf04d5bb08816d4272382d9dccf43ef7f1
 AUX spice-gtk-0.35-libressl.patch 2025 BLAKE2B f1123494cfa4f2cf3d168ae1f2a1277b77dd2afc9a0c4911a65941977f8bac30b30de1d03575fcaf483cd5f9cc8f4ff150a40b6f1bfb8b19da18d2027fc1f04f SHA512 b7717296b66a32f3dd3458de27059c82fd826479143b0261819d0abad5f496cedaca61da42706808b686e1b55bb8c7613187c0b103ccbc9566abb3385c7a36de
-DIST spice-gtk-0.34.tar.bz2 1480566 BLAKE2B 35350cf930d091fa11df1d573f9eff23696745a20e88fcd20783c108b6ddca9064bc4e75d414f23bd94318e37d509e581866c5dcc955cd21ca7c9384b492f0ec SHA512 17ea737511855b47f5eaf5143756483542cf8ee83f8d276cbfb2c0407355f68ed329fcbed8a67737179f3e53587710634d6faa856590234ee68be7b4b13f2689
 DIST spice-gtk-0.35.tar.bz2 1437231 BLAKE2B f2731a794cf22b491bf858fff44506288af730b37f1c37e16ac3042d662373b4e4021808d5ca72440012fb36a5119ad11858cb8cf872b04376518487faebef49 SHA512 f0914a4a9baf892e39dab7d51aa9f5ab4dbb4ef01f09da158b20756f890745837d0a6c8c1f7897844e695be2ed01f3b1d04ada1cacc958b5cfadb0d4bf7c4729
-EBUILD spice-gtk-0.34-r2.ebuild 3770 BLAKE2B bf9da87c11541a41ac5d60551bc2b78273dfbe89b23ec4bff3ffaeb1a76dcb00c9c4d53970ce8d4af20da731662193cb66bbdb40d5eac8363b75e7badd80accf SHA512 0a7273137af62c6c2f6f402a3e6f06411b5c6404da965f56496c3843c67682d02a9c16e1f0dc6562f3724d469f0743f85af20c648e43b57a146c2d11fe87a238
-EBUILD spice-gtk-0.35-r1.ebuild 3701 BLAKE2B a18f1342a995ff1d7c60f97aaf7925d8debc28bfe38f196410b6e5e3d1a74c616e4adb11af200fa2168457b522085d3e066aa2001343b877ef53ddd2b2f078e7 SHA512 6f29c68bc97336b4e0b0fe7e2884d67440dc66b64cc94f886afee8e4f261d505ba72560fd3f69c5fdbfd03493272cc41d4806d249018784338f142d57c88dd7c
-EBUILD spice-gtk-0.35.ebuild 3663 BLAKE2B 307f53ae4809342debee7fbccbeb109391549f5b779b44359be4f3a4db014448af6ce96f1276fac3fc667d23b490583abab9391ed942e47cbdac87bf434996da SHA512 74d69990895f296024907468de495de049e07dc3c1e7bb0cea5442301e75964513e412800ed4771ff02ec16a44bb211cae00f468d31de0df6795ca67fbd3bbb9
-EBUILD spice-gtk-9999.ebuild 3572 BLAKE2B 018aaa56a9473bcf65db97fffbc4239c1b94622985e3f25abef438e9f99b5484d117a73857f9157da997bd8eeb4c0d2531ab8de9a3283351341732d5e839d748 SHA512 614340835d6efe1bf5fe37ab37d6756761403871cb025f4ff8646fa85d6314a6296614abc2b69e895ccb0de4c23d907ef03658f3280dbc37b9cdd606218ede13
+DIST spice-gtk-0.37.tar.bz2 1303111 BLAKE2B cf4b6664ac86d126cf14f1a31b1df93079e15fc0a0af69bfaf61cb84284daa7b6b8cb2a2ee3345f6a475838ffc0fb2a2b0bdd61301e2c1479fb5f5e0c28babbe SHA512 a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029
+EBUILD spice-gtk-0.35-r1.ebuild 3644 BLAKE2B d9af139bcc0ebf73761baf6ca0e7576b79d0684bad33ca49b48ceca06f4ae895f8d9fd737f575f241f90fc988e57d84f78f0c0795aa7532649c6d88a7f9afdb0 SHA512 139c7e72429d06b82272141430927bb6d163d64a6b9011f094cad504733dd3fdb3f8b9899fab41514e5ceedcf11b29dddad6882d9069af4a850fb8eae78c2195
+EBUILD spice-gtk-0.35.ebuild 3606 BLAKE2B e9847a0cdf2093241e8e54bfb4d56d9617c8f812abfbe3461fab52a2a3ad4440c781ab221c236eac52ea51bbb3cd3f0ce059abd81b42a218f259c0bde17ac085 SHA512 260bef70ecbea74788de9cb7730ede3e345407c382ca57fb428d2b548ccd7ede67fe948b4cc61a70055edd6c184d5cd5b37b9e144a97f35484d77f30710ba3bd
+EBUILD spice-gtk-0.37-r2.ebuild 3665 BLAKE2B 8b6b1c74a0b552e4bb8952ba9c5b3d3045b732734adfdc47fcc3dd55e6681c9153606160eb7339a0cc9bcc08c7b339a05b1ddc36ca151a2093e5bc9401688a8c SHA512 6b13b8eb98855f431e6b0a871bb16c04e5b9d887c6d6b7454f69c42bbe264b66d7b63ee191fcbda3cad3e9383a36cf6186de6acc08a6df5b771fa26dc691554f
+EBUILD spice-gtk-9999.ebuild 3637 BLAKE2B 6a95666f309c1d29779b33a225d8a429caf6954f6a4ba5ee993ea7e0db539b6341d2e3d85f66ae5d4fe2e05a7b61a69e80a578ff2ea8de1c8de3ca44f1529de9 SHA512 39f419bc6188c40e25332111ae4953f3eeccfbb6880fd7b22d20be90ce534f9267e6e6f094e36e8cb76d3677cccbea50895f53039acd46b934d24dd3b2e3c9c2
 MISC metadata.xml 1166 BLAKE2B 37cf826a7a49dc48170fb99e05b191964810eacbf8b13db383a37e70faed6a2b4b70acfd724eeffbbe10d97fab27bfec7d56cfb2cbc2537ac4df7612afdbe8d2 SHA512 5229ddeaf19765abee5b0120b066ac2049f77878b1b8886e2b552f2c56d6049df297b227f0bee36bbe6be7041b9d8e1c1d3d868c34b1e39b49a5c0bc16b2c947
diff --git a/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild
index a09931118314..2bf65fbe5552 100644
--- a/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild
@@ -81,7 +81,6 @@ PATCHES=(
 src_prepare() {
 	# bug 558558
 	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
 
 	default
 
diff --git a/net-misc/spice-gtk/spice-gtk-0.35.ebuild b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
index c56fd6248155..d6e46f5386d3 100644
--- a/net-misc/spice-gtk/spice-gtk-0.35.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
@@ -79,7 +79,6 @@ PATCHES=(
 src_prepare() {
 	# bug 558558
 	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
 
 	default
 
diff --git a/net-misc/spice-gtk/spice-gtk-0.34-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
index bf79416bb4ff..51d40d99df46 100644
--- a/net-misc/spice-gtk/spice-gtk-0.34-r2.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 GCONF_DEBUG="no"
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools eutils xdg-utils vala readme.gentoo-r1
+inherit autotools desktop eutils xdg-utils vala readme.gentoo-r1
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
 HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
@@ -14,44 +15,35 @@ HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-g
 LICENSE="LGPL-2.1"
 SLOT="0"
 SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
-
-REQUIRED_USE="?? ( pulseaudio gstaudio )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
 
 # TODO:
 # * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
 # * use external pnp.ids as soon as that means not pulling in gnome-desktop
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	gstvideo? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		)
-	gstaudio? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		)
-	>=x11-libs/pixman-0.17.7
+	>=dev-libs/glib-2.46:2
+	dev-libs/json-glib:0=
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
 	media-libs/opus
-	gtk3? ( x11-libs/gtk+:3[introspection?] )
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/cairo-1.2
-	virtual/jpeg:0=
 	sys-libs/zlib
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.2
+	>=x11-libs/pixman-0.17.7
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
 	introspection? ( dev-libs/gobject-introspection )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	lz4? ( app-arch/lz4 )
+	pulseaudio? ( media-sound/pulseaudio[glib] )
 	sasl? ( dev-libs/cyrus-sasl )
 	smartcard? ( app-emulation/qemu[smartcard] )
 	usbredir? (
 		sys-apps/hwids
 		>=sys-apps/usbredir-0.4.2
 		virtual/libusb:1
-		virtual/libgudev:=
 		policykit? (
 			sys-apps/acl
 			>=sys-auth/polkit-0.110-r1
@@ -59,11 +51,19 @@ RDEPEND="
 		)
 	webdav? (
 		net-libs/phodav:2.0
-		>=dev-libs/glib-2.43.90:2
 		>=net-libs/libsoup-2.49.91 )
 "
+# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a
+# configure knob. The package is relatively lightweight so we just depend
+# on it unconditionally for now. It would be cleaner to transform this into
+# a USE="vaapi" conditional and patch the buildsystem...
+RDEPEND="${RDEPEND}
+	amd64? ( x11-libs/libva:= )
+	arm64? ( x11-libs/libva:= )
+	x86? ( x11-libs/libva:= )
+"
 DEPEND="${RDEPEND}
-	>=app-emulation/spice-protocol-0.12.13
+	>=app-emulation/spice-protocol-0.14.0
 	dev-perl/Text-CSV
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
@@ -73,10 +73,12 @@ DEPEND="${RDEPEND}
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+)
+
 src_prepare() {
 	# bug 558558
 	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
 
 	default
 
@@ -95,29 +97,20 @@ src_configure() {
 	xdg_environment_reset
 
 	local myconf
-
-	if use vala ; then
-		# force vala regen for MinGW, etc
-		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
-	fi
-
 	myconf="
-		$(use_enable static-libs static)
+		$(use_with gtk3 gtk 3.0)
 		$(use_enable introspection)
+		$(use_enable mjpeg builtin-mjpeg)
+		$(use_enable policykit polkit)
+		$(use_enable pulseaudio pulse)
 		$(use_with sasl)
 		$(use_enable smartcard)
+		$(use_enable static-libs static)
 		$(use_enable usbredir)
-		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
 		$(use_with usbredir usb-acl-helper-dir /usr/libexec)
-		$(use_with gtk3 gtk 3.0)
-		$(use_enable policykit polkit)
-		$(use_enable pulseaudio pulse)
-		$(use_enable gstaudio)
-		$(use_enable gstvideo)
-		$(use_enable mjpeg builtin-mjpeg)
+		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
 		$(use_enable vala)
 		$(use_enable webdav)
-		$(use_enable dbus)
 		--disable-celt051
 		--disable-gtk-doc
 		--disable-maintainer-mode
@@ -139,10 +132,8 @@ src_compile() {
 src_install() {
 	default
 
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
 	# Remove .la files if they're not needed
-	use static-libs || prune_libtool_files
+	use static-libs || find "${D}" -name '*.la' -delete || die
 
 	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
 	readme.gentoo_create_doc
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index 37f1d9d190d6..c4e0bd6c740b 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 GCONF_DEBUG="no"
 WANT_AUTOMAKE="1.12"
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools eutils git-r3 readme.gentoo-r1 vala xdg-utils
+inherit autotools desktop eutils git-r3 readme.gentoo-r1 vala xdg-utils
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
 HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
@@ -16,43 +17,34 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
 KEYWORDS=""
-IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
-
-REQUIRED_USE="?? ( pulseaudio gstaudio )"
+IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
 
 # TODO:
 # * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
 # * use external pnp.ids as soon as that means not pulling in gnome-desktop
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	gstvideo? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		)
-	gstaudio? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		)
-	>=x11-libs/pixman-0.17.7
-	media-libs/opus
-	gtk3? ( x11-libs/gtk+:3[introspection?] )
 	>=dev-libs/glib-2.46:2
-	>=x11-libs/cairo-1.2
-	virtual/jpeg:0=
+	dev-libs/json-glib:0=
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	media-libs/opus
 	sys-libs/zlib
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.2
+	>=x11-libs/pixman-0.17.7
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
 	introspection? ( dev-libs/gobject-introspection )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	lz4? ( app-arch/lz4 )
+	pulseaudio? ( media-sound/pulseaudio[glib] )
 	sasl? ( dev-libs/cyrus-sasl )
 	smartcard? ( app-emulation/qemu[smartcard] )
 	usbredir? (
 		sys-apps/hwids
 		>=sys-apps/usbredir-0.4.2
 		virtual/libusb:1
-		virtual/libgudev:=
 		policykit? (
 			sys-apps/acl
 			>=sys-auth/polkit-0.110-r1
@@ -62,6 +54,15 @@ RDEPEND="
 		net-libs/phodav:2.0
 		>=net-libs/libsoup-2.49.91 )
 "
+# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a
+# configure knob. The package is relatively lightweight so we just depend
+# on it unconditionally for now. It would be cleaner to transform this into
+# a USE="vaapi" conditional and patch the buildsystem...
+RDEPEND="${RDEPEND}
+	amd64? ( x11-libs/libva:= )
+	arm64? ( x11-libs/libva:= )
+	x86? ( x11-libs/libva:= )
+"
 DEPEND="${RDEPEND}
 	~app-emulation/spice-protocol-9999
 	dev-perl/Text-CSV
@@ -76,7 +77,6 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# bug 558558
 	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
 
 	default
 
@@ -96,22 +96,19 @@ src_configure() {
 
 	local myconf
 	myconf="
-		$(use_enable static-libs static)
+		$(use_with gtk3 gtk 3.0)
 		$(use_enable introspection)
+		$(use_enable mjpeg builtin-mjpeg)
+		$(use_enable policykit polkit)
+		$(use_enable pulseaudio pulse)
 		$(use_with sasl)
 		$(use_enable smartcard)
+		$(use_enable static-libs static)
 		$(use_enable usbredir)
-		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
 		$(use_with usbredir usb-acl-helper-dir /usr/libexec)
-		$(use_with gtk3 gtk 3.0)
-		$(use_enable policykit polkit)
-		$(use_enable pulseaudio pulse)
-		$(use_enable gstaudio)
-		$(use_enable gstvideo)
-		$(use_enable mjpeg builtin-mjpeg)
+		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
 		$(use_enable vala)
 		$(use_enable webdav)
-		$(use_enable dbus)
 		--disable-celt051
 		--disable-gtk-doc
 		--disable-maintainer-mode
@@ -133,10 +130,8 @@ src_compile() {
 src_install() {
 	default
 
-	dodoc AUTHORS NEWS README
-
 	# Remove .la files if they're not needed
-	use static-libs || prune_libtool_files
+	use static-libs || find "${D}" -name '*.la' -delete || die
 
 	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
 	readme.gentoo_create_doc
diff --git a/net-misc/tokyotyrant/Manifest b/net-misc/tokyotyrant/Manifest
index b041c7218bf1..704a854ad0c4 100644
--- a/net-misc/tokyotyrant/Manifest
+++ b/net-misc/tokyotyrant/Manifest
@@ -1,7 +1,7 @@
 AUX fix_makefiles-1.4.41.patch 3247 BLAKE2B 6951d7a58fe844b5f29db84fecffb7c9670a8de366cd1b8c2ff854d6d61b14c0cbd552fc1676d3339407c371926670f0d5cd4f2abc490c2ef106b4211c59356f SHA512 0b9a1cc16f999a0a89c5e58fdc7e9aa98c66c9357804c46bb4657279434d59c3928d37ddc774fba53a8bccdd1fd530efa5f418388cb18805a5ffc81fc3405a4b
-AUX fix_testsuite.patch 6590 BLAKE2B 1022f036caba172226da34debdb0fd83436025c5d84a85a36616a0f18f394867aca6dc1a90a616be24fadd4671fbd56c2e90e45cf4cea92af2899c33407266e8 SHA512 a22dc39f3abe870f6c3219b945411e38035a00e403a477440d11232215e30df03a85eb315f3957dc6d9c494a92a1f4caa641d520744e8bd728b088ea05d3c459
+AUX fix_testsuite.patch 6594 BLAKE2B 415936e5b506e0fe979395ac9167f42a09d0a037064f537f362aa1fdd4f143e99a14572153ba5657ea03a25c6911de8038b40c8240ae950d2fa3caad1ea9a30e SHA512 2d64147c4721d5d59589e8a038fbcffb4db61f35e5bcbc4f29e806df616d4534cc281fe6a9ac00cf74cda6677b60bc6f1b44f2085d703affb9ccf81717026cd0
 AUX tokyotyrant.confd 361 BLAKE2B b1fd84606e4f3e5c528ef8fb1c4cff4c4b7ac5568fdd25951a3cdc6e5c72bba09e8ed0f9596e6ba543f2c459d17673c17ef965e63af1496df7829c5ec462e29a SHA512 5e762267eba0f214a47d385c41d32b9a2a82c7ece41c42266ad980a936080528b42d7f86fd2b32679f65e97f6b1b6a3a74d8d7c4465cc9b2739c4d1746f04cf0
 AUX tokyotyrant.initd 800 BLAKE2B 4a09d86f8dbf70ebcc38c72a9f55ee42004a94ea4c7428312b50ce60f5b89cb29a197d4293754e549ee7615f230e9d15c0cd0f1d10608974cd36aabce4d89508 SHA512 e00874a33eeab7228815e303d9a028e9ce50dde96012db397bcf11a530acecbb9a3252468d2745e239e1b7a7e873f3bb87962c585cea122e011a981fdf0ba9bf
 DIST tokyotyrant-1.1.41.tar.gz 196196 BLAKE2B adfeb14146a4078d01d75608c8deb206de60b956b73d7cab2d2b29b2daf9ef7be7c3ab932984460fc07858e836421932472eaef801d0d79f4e8dd3ed7ab37580 SHA512 fb181ecab19981733b4b478614f9b28d7f1f776bafe6c58c4bc3e26ed294301a6242d7cd1d47b7d6b55a93305474d2e8e0a75f2f01af21a8bc93d158c8f8179e
-EBUILD tokyotyrant-1.1.41-r1.ebuild 1316 BLAKE2B 7dea3f03708a3bb908c9965f71e9f1b9ff243a6637ea5f5dba497e62012a0231c104da3d97b2ecfeca8a235564decc636559f636b6d8af2b4870e6ee9a5cb72e SHA512 951748d4f910e55cfc6f4927b2e53fc25b810313413b519226bcab62c3266814b4977bb3094931521af07c089923a5a1b849e42772aa1e031c054a641a589570
+EBUILD tokyotyrant-1.1.41-r2.ebuild 1177 BLAKE2B 8edfe177dd4acd0aa12283c517973c622d5e2ff0a2763ef8658baf4b92df9fd010349e2ac7fcd0ef0a46d1e608e030a77d63c34ea0ef202a738ddfd38bbcaa42 SHA512 9c729c7a9c1d3f52e5e47dcafbc8bb7292ceb71a431b0d115b9c8f3b63ccc14bc433bd2d89337022a2ce1ac2001bb32be47495cf5b89dd66f56b0fbeeaa6e783
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/net-misc/tokyotyrant/files/fix_testsuite.patch b/net-misc/tokyotyrant/files/fix_testsuite.patch
index d48825381777..7ee9dc801cb6 100644
--- a/net-misc/tokyotyrant/files/fix_testsuite.patch
+++ b/net-misc/tokyotyrant/files/fix_testsuite.patch
@@ -1,5 +1,5 @@
---- Makefile.in	2009-10-14 10:33:16.000000000 +0200
-+++ Makefile.in.new	2009-10-14 10:27:39.000000000 +0200
+--- a/Makefile.in	2009-10-14 10:33:16.000000000 +0200
++++ b/Makefile.in.new	2009-10-14 10:27:39.000000000 +0200
 @@ -166,48 +166,49 @@
  
  
diff --git a/net-misc/tokyotyrant/tokyotyrant-1.1.41-r1.ebuild b/net-misc/tokyotyrant/tokyotyrant-1.1.41-r2.ebuild
index 3aebae8184ac..1da7a34c2009 100644
--- a/net-misc/tokyotyrant/tokyotyrant-1.1.41-r1.ebuild
+++ b/net-misc/tokyotyrant/tokyotyrant-1.1.41-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=7
 
-inherit eutils user
+inherit user
 
 DESCRIPTION="A network interface to Tokyo Cabinet"
-HOMEPAGE="http://fallabs.com/tokyotyrant/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+HOMEPAGE="https://fallabs.com/tokyotyrant/"
+SRC_URI="https://fallabs.com/tokyotyrant/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -16,7 +16,6 @@ IUSE="debug examples lua"
 
 DEPEND="dev-db/tokyocabinet
 	sys-libs/zlib
-	app-arch/bzip2
 	lua? ( dev-lang/lua )"
 RDEPEND="${DEPEND}"
 
@@ -28,8 +27,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/fix_makefiles-1.4.41.patch
-	epatch "${FILESDIR}"/fix_testsuite.patch
+	default
+	eapply "${FILESDIR}"/fix_makefiles-1.4.41.patch
+	eapply "${FILESDIR}"/fix_testsuite.patch
 }
 
 src_configure() {
@@ -40,7 +40,7 @@ src_configure() {
 
 src_install() {
 	rm ttservctl || die "Install failed"
-	emake DESTDIR="${D}" install || die "Install failed"
+	default
 
 	for x in /var/{lib,run,log}/${PN}; do
 		dodir "${x}" || die "Install failed"
@@ -49,16 +49,16 @@ src_install() {
 
 	if use examples; then
 		insinto /usr/share/${PF}/example
-		doins example/* || die "Install failed"
+		doins -r example/
 	fi
 
-	dohtml doc/* || die
+	dodoc -r doc
 
-	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed"
-	newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed"
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 
 }
 
 src_test() {
-	emake -j1 check || die "Tests failed"
+	emake -j1 check
 }
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index c9e6bba3e0f7..8127f45fec25 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -3,5 +3,5 @@ AUX vde-2.3.2-openssl-1.1.patch 2739 BLAKE2B 57062de9d624875255a4bb9a77408a356e8
 AUX vde.conf-r1 341 BLAKE2B b61648c4559e7fdc240ce7c82da6a0c0d53c4a94637ab0a4fd0d30e80306e6006c9242b9967f5fa6100c05efe2f4eb317ee55a05fbb3a4d79030fc14ea6ac61b SHA512 5aa5a52fb150f54672465b36dd215dc24e45f60015bf7afc4b376e046093089c656db642a4d8c4a98205cd0c453427e38ecc3c36cab79bf5f9d2936c61c914df
 AUX vde.init-r1 1022 BLAKE2B 3859d94c2e0871998eda1ccdddf88ab01a00a67c86ec9c28710efe8347d302a97fe727fe3d58c61c1c3abda5a5fb401ca12672fe06cbaaa75b1beea1fa6d9281 SHA512 599b3560721b6e31cbcc21e764df772bde2a8bbf131b47ebb575bf31855a53237dd1c265d33f31c91e3115d6f8cb9f94493d2dd6792c8bedb011299d1ed6d8e9
 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6
-EBUILD vde-2.3.2-r4.ebuild 1707 BLAKE2B 7bb39766358ca5d9420a02e41fca0602b78d91bad6b16bbde0ab3df98e4b6685779a73dc36ebd1233fc8efd3d3f1d6be041e3d2ce062e00c816ea9e77aa77c9e SHA512 4fd212c1023e3c6eb9759e692808a91a72c425295e9cdd3f7ebe94343d57924873521a16e178163a65827651a8e7e8b28317818699d80563368ba55a2aa23fd2
+EBUILD vde-2.3.2-r4.ebuild 1664 BLAKE2B f8da664dc0bffde29dcd6086a6140fa7d890ac3fe505ee2a1cb7e7508d7f635451e867d60bf5a4c1cbdd7082556e15a198ffaaf434028b1c6a8b2a699590a352 SHA512 516232acd5db7ef34b7a1064870a0ad2797525bda33379abbc11a18a29b99e5f86a0fcf7b22d081a99602f15a0d6e94d3688f61c9578ee50a6796e93decf2a36
 MISC metadata.xml 955 BLAKE2B 6e199d64f0af38e233d31f2f91e364f7f01910b9a450d215abc6ad4b5aad0a8d639d7dabea4d76cdf4d8730b4969a0466aa07496cb858ca9581c3c20bd837191 SHA512 06ac79d51fd38f77e4f3840995d228c61923d512e023ab74915030d9ee4ec628669c52d99fb040021ed1452fc5e4ba459a7a29e08fb898b44bd99642e1d7a6d6
diff --git a/net-misc/vde/vde-2.3.2-r4.ebuild b/net-misc/vde/vde-2.3.2-r4.ebuild
index 45c90ec179d6..868a1ad7cdb8 100644
--- a/net-misc/vde/vde-2.3.2-r4.ebuild
+++ b/net-misc/vde/vde-2.3.2-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit python-single-r1 user flag-o-matic
+inherit python-single-r1 flag-o-matic
 
 MY_P="${PN}2-${PV}"
 
@@ -27,6 +27,7 @@ COMMON_DEPS="pcap? ( net-libs/libpcap )
 	)"
 DEPEND="${COMMON_DEPS}"
 RDEPEND="${COMMON_DEPS}
+	acct-group/qemu
 	selinux? ( sec-policy/selinux-vde )"
 
 S="${WORKDIR}/${MY_P}"
@@ -34,8 +35,6 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=( "${FILESDIR}/${P}-format-security.patch" )
 
 pkg_setup() {
-	# default group already used in kqemu
-	enewgroup qemu
 	use python && python-single-r1_pkg_setup
 }
 
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 8a71218e6153..2342d5dc05d5 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,9 +1,8 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
-DIST whois_5.3.2.tar.xz 82984 BLAKE2B 2e2d9ebf2e93831a1fa3e98a2f8922e531592b95175c9280358a37160a9033ee805baa6519304350399c112e619e293a2746df527ef5c580afbdde1542cbef06 SHA512 27d9576ee7b701778cac0dd7d4df2c4ae2d152fa5dfb3f84d7d5d592314e45872b2f3d6eca0754923ec3a0741e5365bf2238b2c0b366403c35e8a5b046e59434
-DIST whois_5.4.2.tar.xz 83832 BLAKE2B ea217d44c87fd92b6e005f344b31424a3a9481f6a892b911dcbe7794ab6e28229bb74bdea02be05ece9b18a5bd4802a4c7ab0433eaa3edcd18bb5bdd06cfe3d6 SHA512 09b10529a4cc1305802a4dcaa5090e05a4abb20863a622dcad3d1f0759d56c0604280fea703a1522af1e2ddf42e5dc34710c411f306debb420cda9e1956b3cde
 DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084
-EBUILD whois-5.3.2.ebuild 1577 BLAKE2B fcafe5e78eaa79b02d6ee03ffc964307687eaccae5bda1959c63542389697c016372c3718e02478d2bf70aa91d9e4a7b3b7a1df35f5aed02acec48c85af74965 SHA512 0d524bc8e5ac35c3034b34f402ffca1e2004ea03f7b75986fc09f1c8ce5354a08834871767b2d9e5a6063ff2fde258c90d22778cf9ef66811c84ddaa7618a5a3
-EBUILD whois-5.4.2.ebuild 1590 BLAKE2B 210332c4a24726612faa28d07d33079c949821614725351fa6d4a72aeab39f373230fa84cd69cda09065bc068fd9a5b007bbaff361ec0fd4bbc91ad25d4f10cd SHA512 ea9ba736f4e5e1870dbaa6852a6d40e16ba5c23c8442c0c8166c17f84d3314ad0c990cbdbb0260f3fa3668e093831d8e4373f0a2161bc5eb31efb24c45a66aa5
-EBUILD whois-5.4.3.ebuild 1598 BLAKE2B cdef56fdf0815b5d0758fcf61bfcbefbb2d71f5e65200321041d700c2d6f15b236fe017c590413a9c30486d585549f04ce0ec45923a260d78c1f87897701a8dc SHA512 90a12f87d32e638db88fe81e23d1b21fa6650158f7f77ca196ea57d2254f5deaa8e01014debf6e1daf10baf3b6e830e25d4d34b4b10d2e18b6cd5645213500dc
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+DIST whois_5.5.0.tar.xz 85600 BLAKE2B 37c90324e1b7c773793e1eaff70816f90a6429ab91bafcff36dfa02ea09b4eb5e83b8cd36e1ca0bc5eb3a043f1973f4479037de38cf41a7b7ac646845697636f SHA512 a26730613b8019385e48c7432bcc9871984a7035e53e56188a876e70e255a1adf23d546dfeb1706879af5c4a8f2231976fe89d2571b3d2cb6d615a7834a2d876
+EBUILD whois-5.4.3.ebuild 1583 BLAKE2B a143d22a2f6f7e91122449ee15947fad9d28cb57a7995af6068f36b2d06ee82090f501a86b3d5185b3471edad319f064c0b8c485a6cd80f5beb186d3fae38b6b SHA512 b6b2d2d1e38cfc198859c969de3c870e6624b2746cfb197726cc554b8036035a6bdc09f453997c9b49b8d7ba9cc523cb8fe62d4ed3332c6e573566f62be8458e
+EBUILD whois-5.5.0.ebuild 1624 BLAKE2B 5b6225e917c0746a4db7390d3a2871eb5701604d80747a1fab174beecc82bb08c6776f958bb907ffbfc78077b9035214716f6c7ae8babedb7808c4d49a1d5f76 SHA512 81be69cb9c3a681e371aa44080aa1fc8c89d718a5474072d472c99204a0ac2c78362f1e4a5d242912196ebfe7338c148adf1ab27c79cbaf4e401946639be9b2f
+EBUILD whois-9999.ebuild 1708 BLAKE2B cfb0991a873e3afe2f0efbc710f4e8883eb3bc6b01b248c9dec9369b590d7a3270ba568b774d7ac02f12a877027896e4e58cc6c33897484e5638151e3651f9c3 SHA512 e7a58163d0c63db79c05f7628bb867727143a7dc715f65658ead427f5e9ad6e21399769a5df564e9d491bc19c8a6fc74b64e88890a7a24c018e37b2f1528f42c
+MISC metadata.xml 335 BLAKE2B 105a64d3c2f98d051101083c04232489e806ea86a66e27bbd33ebaf00cd7ce3cde1e4cce051adf86c6b61201973f9aec9c10f5b49f11586208260b7d7b40b292 SHA512 81d7c5fe370408b1cd3470c7e6b46127a8de700db07da3b0c7416263d7f0f7558da56dd2256cb4120a2fd398765d8a295436a517fbd0e9313d6abe9f5358d51d
diff --git a/net-misc/whois/metadata.xml b/net-misc/whois/metadata.xml
index 56c124413057..fcd1dc3acbf9 100644
--- a/net-misc/whois/metadata.xml
+++ b/net-misc/whois/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rfc1036/whois</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/whois/whois-5.4.3.ebuild b/net-misc/whois/whois-5.4.3.ebuild
index 48a22010a162..f4696e127de9 100644
--- a/net-misc/whois/whois-5.4.3.ebuild
+++ b/net-misc/whois/whois-5.4.3.ebuild
@@ -7,12 +7,12 @@ inherit toolchain-funcs
 
 MY_P="${P/-/_}"
 DESCRIPTION="improved Whois Client"
-HOMEPAGE="https://www.linux.it/~md/software/"
+HOMEPAGE="https://github.com/rfc1036/whois"
 SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
diff --git a/net-misc/whois/whois-5.4.2.ebuild b/net-misc/whois/whois-5.5.0.ebuild
index 05fc6a779ed0..d118bdf63855 100644
--- a/net-misc/whois/whois-5.4.2.ebuild
+++ b/net-misc/whois/whois-5.5.0.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit toolchain-funcs
 
 MY_P="${P/-/_}"
 DESCRIPTION="improved Whois Client"
-HOMEPAGE="https://www.linux.it/~md/software/"
+HOMEPAGE="https://github.com/rfc1036/whois"
 SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
@@ -18,7 +19,8 @@ RESTRICT="test" #59327
 RDEPEND="iconv? ( virtual/libiconv )
 	idn? ( net-dns/libidn2:= )
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
 	>=dev-lang/perl-5
 	virtual/pkgconfig
@@ -29,6 +31,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
 )
 
+S="${WORKDIR}/${PN}-5.4.4"
+
 src_prepare() {
 	default
 	if use nls ; then
@@ -59,7 +63,7 @@ src_install() {
 	dodoc README debian/changelog
 
 	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED%/}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED%/}"/usr/bin/{whois,mdwhois} || die
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
 	fi
 }
diff --git a/net-misc/whois/whois-5.3.2.ebuild b/net-misc/whois/whois-9999.ebuild
index 2663d8da5ad3..fbab7732283e 100644
--- a/net-misc/whois/whois-5.3.2.ebuild
+++ b/net-misc/whois/whois-9999.ebuild
@@ -1,24 +1,30 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit toolchain-funcs
 
 MY_P="${P/-/_}"
 DESCRIPTION="improved Whois Client"
-HOMEPAGE="https://www.linux.it/~md/software/"
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-
+HOMEPAGE="https://github.com/rfc1036/whois"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
+else
+	SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
 RDEPEND="iconv? ( virtual/libiconv )
 	idn? ( net-dns/libidn2:= )
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
 	>=dev-lang/perl-5
 	virtual/pkgconfig
@@ -59,7 +65,7 @@ src_install() {
 	dodoc README debian/changelog
 
 	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED%/}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED%/}"/usr/bin/{whois,mdwhois} || die
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
 	fi
 }
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 1e4922873459..a9803d2f12a7 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,4 +1,6 @@
+AUX x2goclient-4.1.2.1-gentoo-17.1.patch 996 BLAKE2B afc5538457142b93deb80832bbfe37352844289304ff07d2bbdb1251b082e471ddba787db5267109a594dd101e936a1552a20d75d8a7e27fc125f4c835ecc54f SHA512 a76e819aae1b8150bf219f58a29c24979bc11c6d49346c3a486d16573819d3663e93e5ef3070c9389a9d0c8c76bcdc4d904cfdf669bdd25176d0c365b2b5b502
 AUX x2goclient-4.1.2.1-qt511.patch 678 BLAKE2B d4c6de81d060d415030c7b160eaca2d72fc4c0fbcb4dc4428471069fbf6c6c1b8b918b382efd5b852cbd0accd4a2cd7c76b7b3a957a271bb46fd7b770fca74c6 SHA512 4c2571dfe286dc5e632a278c683df8ed3d5bb7107f9342ba843ac42b36d73df24a140927b0d147484c4e69668a85ccc309dd6a32627a9e0ba82493e0a9529a55
 DIST x2goclient-4.1.2.1.tar.gz 2735905 BLAKE2B 9ac70e350b0c586f76915edc187a2c6b179cb69bf28c082ef1d8122d4c32b79dd7bcb685e846a62481a4a3334eb902a3fe84aa8422099a5088559a3b548fbe20 SHA512 0dc4ef0b154c582e62d8e1c5fd0284510fd8c7ddac1d8f49638ca68244ac24f9220c9089e93a105cfa8978d1e2af9a4379deeb934d58741f51ee473ab041d369
+EBUILD x2goclient-4.1.2.1-r1.ebuild 1459 BLAKE2B 09c635edf46779b6448f885d27900186938fd9695865029a896b476d82f78568888f64c03cb99fb30381c5780923cf9684bb013d6ed1535abde7e9dbcf9089f1 SHA512 c129a3a931fd6f228ac4d7ee2e58025692801ae198c995e683e18026033df680bde4d4e586bb21cbbab2ea33162056f848d611bdb88601a713108088a03dea0a
 EBUILD x2goclient-4.1.2.1.ebuild 1419 BLAKE2B 3d5c8683105bb9f6b37e7111343891eb773b3ba1a8fd6755d0cae28ea9509852d1675be7bd67eb74cec52cca218d0cef222002763fb0ebf3486b2d919578b614 SHA512 5877bf18d4b5cb4db3c6541f754ed8a92d3f8d5b058e44eaab052b7b0ed8cf5b4ca9b9a201931a9d0cd176a40b2c37071050144d8901a090f8b397fbf1d79d94
 MISC metadata.xml 307 BLAKE2B 23b74b66a93119c741def7e676af997a2442085095191b9511248b54ae1b638ab7965441881e1a45c22698068a19cebd28b898324ee5570c587428f49b964170 SHA512 c1da89b20bbe06d9193927fd9b28c1ae4b3d58fde4ef79ddc2923894b59a9ff2083b16424d6935755c734069a7f0ccd03a177884cb82c64da77aaf1835c63721
diff --git a/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch b/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch
new file mode 100644
index 000000000000..b9a63264be99
--- /dev/null
+++ b/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch
@@ -0,0 +1,14 @@
+X-Git-Url: https://code.x2go.org/gitweb?p=x2goclient.git;a=blobdiff_plain;f=src%2Fonmainwindow.cpp;h=cd97e6c7f28a6ab4e9495f7a9ba4b447f2b47a2f;hp=cb6bb72918cdc1d54f57cbf0b426adb03a6f4dc8;hb=567223f;hpb=fc5c93518b9023e2499a945740cd6559233ed301
+
+diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
+index cb6bb72..cd97e6c 100644
+--- a/src/onmainwindow.cpp
++++ b/src/onmainwindow.cpp
+@@ -10754,6 +10754,7 @@ void ONMainWindow::generateEtcFiles()
+                      << "/usr/libexec/openssh" /* Fedora, CentOS, hopefully also RHEL */
+                      << "/usr/lib/ssh" /* Mageia, OpenSUSE, SLE{S,D} < 12 x86, SLE{S,D} 12, Arch */
+                      << "/usr/lib64/ssh" /* SLE{S,D} < 12 x86_64 */
++                     << "/usr/lib64/misc" /* Gentoo *64 with 17.1 profile - has no lib compat-symlink. */
+                      << "/usr/lib/misc" /* Gentoo */
+                      << "/run/current-system/sw/bin" /* NixOS */
+                      << "/usr/libexec"; /* Slackware, OS X */
diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild
new file mode 100644
index 000000000000..953c984a775f
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils qmake-utils
+
+DESCRIPTION="The X2Go Qt client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap"
+
+COMMON_DEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=net-libs/libssh-0.7.5-r2
+	net-print/cups
+	x11-libs/libXpm
+	ldap? ( net-nds/openldap )"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/nx"
+
+CLIENT_BUILD="${WORKDIR}"/${P}.client_build
+PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt511.patch"
+	"${FILESDIR}/${P}-gentoo-17.1.patch"
+)
+
+src_prepare() {
+	default
+
+	if ! use ldap; then
+		sed -e "s/-lldap//" -i x2goclient.pro || die
+		sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
+	fi
+}
+
+src_configure() {
+	eqmake5 "${S}"/x2goclient.pro
+}
+
+src_install() {
+	dobin ${PN}
+
+	local size
+	for size in 16 32 48 64 128 ; do
+		doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
+	done
+	newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
+
+	insinto /usr/share/pixmaps
+	doins res/img/icons/${PN}.xpm
+
+	domenu desktop/${PN}.desktop
+	doman man/man?/*
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 6a91e9d49e37..78ff399eafd8 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,6 @@
-DIST youtube-dl-2019.07.02.tar.gz 3171559 BLAKE2B dd3b672f672ace05f433cbf539a1f00b69000cdfae472dcf1f2c22f4c9414d8e2ca542399e5abf084d197f1f04bbe9dd1651943d8e7f81369d3b3dede6617837 SHA512 5dd4f3b024008d8722e0554f9143d1cbea3ea52971a2a5ff338585f38eb8c8ec256b83249e0145e9bf0012cbe440acf5872edd127d30a0c8803d8d0e74d0ba11
-DIST youtube-dl-2019.07.12.tar.gz 3162016 BLAKE2B 7f12b311338c4291e48f8d8f6a93d46095872a9755bc8d72654d0555da9a197d8eb31d356b37fd6851d03cf701490cac6d905871b23c930f1031e4e744c93df0 SHA512 5cb586e5e7d8f05d9292402f6b2e9fe67a9f7dc58758b904797b9925c278c2e9f41e7be9d8c0777ccabf01dc795fdc4f6714600a233e48cec72daae3f045d2d2
-DIST youtube-dl-2019.07.14.tar.gz 3167227 BLAKE2B c9dbc618e024181c28ab8090f1e895db458f31c21ef45d9617b4448fcc0aed73716e9b9b3d9b3cc26bd3acdfb75674286fca094a8021329dbaeb9b38df953056 SHA512 6ed0be021a9eb05302e47c74a33333aa22769b3970a28f4b1827cfa7b258f7ede997cefcbda08c984d5182c7bcc9562acbc13dc1acf71d8564f28b6673dfb82a
-EBUILD youtube-dl-2019.07.02.ebuild 2119 BLAKE2B 82163aa22bf146600523fbb31e67d22af5a7a591e6b0c3900ca992f89fb45ec4536000872934b8a2d3beeb0a2d25ead1e8a500878c4db5dc70611d7609e00a0f SHA512 93ba6d18d95c861af5a8224e7ca8ee9947198e3e0b3a66e0bb70e5beb12a2b0bdbd004c5f619a97e6b30985ef3581ebaf163ca69a2dc1d2345de0ebb3c01f81c
-EBUILD youtube-dl-2019.07.12.ebuild 2125 BLAKE2B 50e06196444aee277e8bc2a72c762b76b7de6a9616f3ec6ccd76cfff696c4fcbb6e2c64022fcd5536708441a9009fb06b424fd7cbd86b7a58cee8108f908c6f0 SHA512 ee93e8557d67c11a7ead1bc1f0fefaec1f331aeea30a2fe93efd913d5a866380b62ba8a02d1115fb257d1989818a06eeea4e00d9acc35fe8feee147b8d6ed5b5
-EBUILD youtube-dl-2019.07.14.ebuild 2125 BLAKE2B 50e06196444aee277e8bc2a72c762b76b7de6a9616f3ec6ccd76cfff696c4fcbb6e2c64022fcd5536708441a9009fb06b424fd7cbd86b7a58cee8108f908c6f0 SHA512 ee93e8557d67c11a7ead1bc1f0fefaec1f331aeea30a2fe93efd913d5a866380b62ba8a02d1115fb257d1989818a06eeea4e00d9acc35fe8feee147b8d6ed5b5
+DIST youtube-dl-2019.07.16.tar.gz 3168500 BLAKE2B b88eb21c246b021b036822461a55b4c0fe1b0b4cc462a32c55f022c67a586fbbb98d8a943558c3b08289ff3cfaebd12adf558ef8a31cbf47b6679da5ed771417 SHA512 7dc71913210669521684ac0484ef02d20d7ce500d8fb72581d4f8c2978b369582ee003ea4e908e262cf1f7cd734b4e989d667a1fa36d6cf19e9fc0723c55d411
+DIST youtube-dl-2019.07.27.tar.gz 3173039 BLAKE2B 8dfab65d0f30f01905fb19cdbcccb61aca955ce11fe9751bcad38542b879b97b5707bdcd9efd23c6769c9c76a6f78d6c074ddbc4ff3fa6fb52941e07a014a4db SHA512 f5d6d79097f5937d0ad0d491d922573d8fb288179d58475041783a7d245e9c200038856705e19cd74b156578594cff4cd09f9925c4fb915ff34ef4072be62ed5
+EBUILD youtube-dl-2019.07.16.ebuild 2119 BLAKE2B 82163aa22bf146600523fbb31e67d22af5a7a591e6b0c3900ca992f89fb45ec4536000872934b8a2d3beeb0a2d25ead1e8a500878c4db5dc70611d7609e00a0f SHA512 93ba6d18d95c861af5a8224e7ca8ee9947198e3e0b3a66e0bb70e5beb12a2b0bdbd004c5f619a97e6b30985ef3581ebaf163ca69a2dc1d2345de0ebb3c01f81c
+EBUILD youtube-dl-2019.07.27.ebuild 2125 BLAKE2B 50e06196444aee277e8bc2a72c762b76b7de6a9616f3ec6ccd76cfff696c4fcbb6e2c64022fcd5536708441a9009fb06b424fd7cbd86b7a58cee8108f908c6f0 SHA512 ee93e8557d67c11a7ead1bc1f0fefaec1f331aeea30a2fe93efd913d5a866380b62ba8a02d1115fb257d1989818a06eeea4e00d9acc35fe8feee147b8d6ed5b5
 EBUILD youtube-dl-99999999.ebuild 2014 BLAKE2B 55abeec62089210469af6edf2cde4f8764eb1a5d20a3cd96985dce8a833023e5dd2e44cc893a7db99d9002fc671601fabd1c26cdbfa0fc0411a9ba11e1715b78 SHA512 bbbfb4e6e8319e383eaf4db4dd4056f34374eb6f1527c6cc1c6ee0d9f61199a913bc99f929bd91ef80aa744ba9a865833395460d8b94125c362c59372f738346
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.07.14.ebuild b/net-misc/youtube-dl/youtube-dl-2019.07.14.ebuild
deleted file mode 100644
index a8b1afbfc11a..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2019.07.14.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-LICENSE="public-domain"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-RESTRICT="test"
-SLOT="0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2019.07.02.ebuild b/net-misc/youtube-dl/youtube-dl-2019.07.16.ebuild
index 4d80cb2b49ed..4d80cb2b49ed 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.07.02.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.07.16.ebuild
diff --git a/net-misc/youtube-dl/youtube-dl-2019.07.12.ebuild b/net-misc/youtube-dl/youtube-dl-2019.07.27.ebuild
index a8b1afbfc11a..a8b1afbfc11a 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.07.12.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.07.27.ebuild