gentoo resync : 10.02.2019

58 files changed, 910 insertions, 672 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c31fbcfd7883..b1263cba95f6 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/autossh/Manifest b/net-misc/autossh/Manifest
index 25c583bf1439..de904516ab78 100644
--- a/net-misc/autossh/Manifest
+++ b/net-misc/autossh/Manifest
@@ -1,5 +1,7 @@
 DIST autossh-1.4e.tgz 65852 BLAKE2B e654f7bb3efb48ab33fe7fb52b812d5b3de9bcbf4ecd79fe67372f0c832bedf4f8fb30ff5ec116418c9a6317e60d4ea4f3d3b2be4d6a8bafa431a9b289954c9f SHA512 2f71403ee005103c6a3e2e669f6b26153161c95c8dacd3e73d61673461b3512348636877760d911341771e744c0a682b107df4ac48621661ff36a9fc0191f2fb
 DIST autossh-1.4f.tgz 67128 BLAKE2B 197c964272c47bce1a137eb45560a9f70c64686915d12e1f9827eaffb66151e124a4ad7e3b5980d539d75feb0180760d6df382da77f9195ad3f703c85b02759b SHA512 a66912a04d1b659802913ec63d7b951fa6265dedf4480f0ad2dfdfb852e1e3029355b9a132bf3fa5b4b67e5ac8dace83b96e837182d8b3f0c2c72ad9188b7b8f
+DIST autossh-1.4g.tgz 67599 BLAKE2B 179af97ee6f3b9c1c4fcbad1593118aa5d69dbd2b6215efd4a16ab7641f6f0194faaca3c3101b3a918d652988a06b5fa8ce6e52f85f81edd95b3d71d49aad076 SHA512 499b560d978736f4e764d5d828282fdaba1cbf94811ae6be0be5434d9c1cdc6ca5513d728b6372aa243843cb1b91e61cfc5fdeb77ddb0b6a7ce027218ba67466
 EBUILD autossh-1.4e.ebuild 578 BLAKE2B 4fcda511da857ad5a5bb893b9ad1af5f9eb4c074b45b68c6547603a652a5502047822f1f0a13d1164f90145ba85a1404b814164748b0041c7fa01909be190c37 SHA512 59495546014f6a0e55335b235641ca9c9232bd7f680094153ca6f6c01a33b90235b6028e76e7db688d9aa76542633685e04f4c0d37d0d9eda304d6ec5ce960ab
 EBUILD autossh-1.4f.ebuild 506 BLAKE2B 3599e44f761fef5eff0d46b1e9091032922fa15a90e40cc2fb7c5bf2d45bd3cb764def709ba330c39699fab013e35f3e65d370e0342e2104a19d1a19e364fc68 SHA512 6b32ff9d21fa98311ed197659b359be4f47d07534472edc1f8cdace741674113720ef637f246b923c3ccb2dbe3765d79b714a4a6112c2b4ae4e27531687cb8cb
+EBUILD autossh-1.4g.ebuild 503 BLAKE2B a04754d13134af16e487520863c4bf9bb32cec6ddbebb43e50a1111da4b09d2bb9e1d8c3e424f64da0dd9c9bcf78b229fdb033ff888f716ba07eabb4ecea84a7 SHA512 d3a1006086423bbd823f53c7a055da4b10675dd44dc66a0cfa425f1817d61faeb1c1a67bbb4d816c9543af17e02fdaa46fd17098f6a5f47f7b51e23c8702c352
 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/net-misc/autossh/autossh-1.4g.ebuild b/net-misc/autossh/autossh-1.4g.ebuild
new file mode 100644
index 000000000000..14991df99f5a
--- /dev/null
+++ b/net-misc/autossh/autossh-1.4g.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Automatically restart SSH sessions and tunnels"
+HOMEPAGE="http://www.harding.motd.ca/autossh/"
+SRC_URI="http://www.harding.motd.ca/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="net-misc/openssh"
+
+src_install() {
+	dobin autossh
+	dodoc CHANGES README autossh.host rscreen
+	doman autossh.1
+}
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 278d6e8886a6..ca788c7ae005 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,11 +1,8 @@
-AUX connman-1.16-execinfo-assumptions.patch 1391 BLAKE2B 18685f63a346339fbdb1813b0fba1c61f8bd8a256fa62027c8cf2a1f87a5b3650ceb37c4297584b1e8f79c72ef20fc13b9875d9071d404d54876ef29b71e76b5 SHA512 5fb6e36e36147d9bda1e78b7d9c9bbc169965578b45295e65dd8d4922a7ef13a2854d4b14fb9db9d005ce6d59e8334b0e51b01f472227c4c1f1dbfbcc2004d7d
-AUX connman-1.31-xtables.patch 1367 BLAKE2B 26dd03af8e4a2389b4151cae0b5f4a87c128487cbbf428676216ffbfb28c0e0abab17d07d4378c021465f2e64a4d42660a60e7b589d63d094167d7db5dd37154 SHA512 681615666a535fe0a60f1472768f63ecfadd974e2a39d38b1e229be00449d0acd24902fb674f6b6567bb0915c5b59adc0d76d5b886d50d59c776b239ecbb7c4d
 AUX connman-1.33-polkit-configure-check-fix.patch 665 BLAKE2B ffe1a6ae19fe163ad84391f1d974df976fae943f73863200eb3acdde630c68db2979be03cc072c663a1e8198e7eb598ccfbe6ee5f20b8cadac4a6df6ff77194f SHA512 630ac9d147046f084a960795de87183c5c446006df7a6a74c02416e972a3bd55390e1ab9c3f0ea4449324d0fb7c271ebd6b64727ede834128ca8515853a9e905
 AUX connman-1.33-resolv-conf-overwrite.patch 354 BLAKE2B e72099b97477c3549d3a9082c06419f736ebb79bc12d37d3dd0acdd39a0454d62a9d5053b9fa349534be5171426a8fbca6aeed30e017404baf21f32d77a04948 SHA512 1998d0d2923f8dca3706c7c75ad87ffa2570a785ed3e5ec1c85cc539bbfb7ea9173dae5320c3f95fbeee9c9c72870607b8eb4b3fd2c36a1962ad8925d72e24e2
 AUX connman-1.35-include-ifbridge-before-netinet.patch 259 BLAKE2B a6c5ae9bfb61e2c4180d88229b809eb11081bd7e74425d9c1b565ba20b140d15eb810898abe34e2429e87ca3b7ab9f2062d092f1018595f3e57e0b8f82e194fd SHA512 6398c7e4b7d47eb27c8d962bf2c8e9d5bd9bfc1b0a8182a13d05bed3931bfd9750bdae8bcc47ba3e1f93e2391b65b16ddcf2a0c005a08d4626f2c0d2cb855180
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 483 BLAKE2B 946dcb53fbadba4b2ddea95450f779680a8a00356489480f6ade122b8b2450fae90db0be76320d3666b991d09c766fba9a7037fb16b7b18db07bcbe4cfe83080 SHA512 a9999849f1e9b7c8c44db5aebbc5d2e615ff191da582333c3a575f594b99a6324469525a2937a98ccc444fcb42cf0131b2067263451273c6e093b22cb746306b
-AUX connman.service 198 BLAKE2B 8b943dc995fed630b15bcfe1040598e13a5b2118967f9fb681e36beaec4e1bf2f9c25e10f9c2d19bc7cd56c10e811b3722d12048b5180bae57bd8af074697ad4 SHA512 a769961922c40b5ed3e5a09d08262b20b84aa27fc278678063b348431ba2976de9f2ebcd9f9b0afa6241540d255ba4cdf7120b75184510d41444b7dd3209b825
 DIST connman-1.35.tar.xz 686092 BLAKE2B 706d8333dc2fcbee8d0ef3849325c4975dfe312a7a542ee96859a1724e05b1302c244a0108ab70033b398301c235fb13cb9509e9147dc2bb049e900f3799cd98 SHA512 2234b4d18b038f9a33939035cddebd31c74ce962e5616c2c30b2912476612ef3f7d5b9edca64bf6e69fa358252ed432124e036ac3516b291b86695cb9a96c6a8
 DIST connman-1.36.tar.xz 692616 BLAKE2B 7d8cea55365fbfe78cd897b5b65d8edf475a737220732c46c95dda4c6b12badddca38150dbedddcc95c29bce486d86fe130a9d65043c6e18ed6b1eba3fe5aec0 SHA512 c0b9e924a28d58539d44c314168ae7aa46dfea8ce9d125198f525a6d6ef95ca77fd0357c4c4c7548b362b9de8e6f85c7915b1a4cf89b65116c4cbc4df75318e1
 EBUILD connman-1.35-r1.ebuild 2555 BLAKE2B 7369ceafa9bd072bd8020da45453bd07ddacb10606bb3d61ceddfd3367b15bdbf890a00aa579536d548b52fd6c6656d79cdb31d290d2ac6301a6f04ffbd0724d SHA512 640be0029a8c6568a47973743f968cc641a579523f4288cc5ac0347b72721f547f608729c2865b2a31e15394e2c85a18b360936e082ac3f7069296e9977870b8
diff --git a/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch b/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch
deleted file mode 100644
index 5404414fc0ea..000000000000
--- a/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -uNr a/config.h.in b/config.h.in
---- a/config.h.in	2013-07-02 17:41:03.715261748 +0000
-+++ b/config.h.in	2013-07-02 17:41:21.707260667 +0000
-@@ -3,6 +3,9 @@
- /* Define to 1 if you have the <dlfcn.h> header file. */
- #undef HAVE_DLFCN_H
- 
-+/* Define to 1 if you have the <execinfo.h> header file. */
-+#undef HAVE_EXECINFO_H
-+
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
- 
-diff -uNr a/configure.ac b/configure.ac
---- a/configure.ac	2013-07-02 17:41:03.715261748 +0000
-+++ b/configure.ac	2013-07-02 17:41:21.719260666 +0000
-@@ -181,6 +181,8 @@
- AC_CHECK_FUNC(signalfd, dummy=yes,
- 			AC_MSG_ERROR(signalfd support is required))
- 
-+AC_CHECK_HEADERS([execinfo.h], [], [])
-+
- AC_CHECK_LIB(dl, dlopen, dummy=yes,
- 			AC_MSG_ERROR(dynamic linking loader is required))
- 
-diff -uNr a/src/log.c b/src/log.c
---- a/src/log.c	2013-07-02 17:41:03.727261747 +0000
-+++ b/src/log.c	2013-07-02 17:42:12.717257603 +0000
-@@ -30,7 +30,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <syslog.h>
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
- #include <dlfcn.h>
- 
- #include "connman.h"
-@@ -112,6 +114,7 @@
- 
- static void print_backtrace(unsigned int offset)
- {
-+#ifdef HAVE_EXECINFO_H
- 	void *frames[99];
- 	size_t n_ptrs;
- 	unsigned int i;
-@@ -210,6 +213,7 @@
- 
- 	close(outfd[1]);
- 	close(infd[0]);
-+#endif
- }
- 
- static void signal_handler(int signo)
diff --git a/net-misc/connman/files/connman-1.31-xtables.patch b/net-misc/connman/files/connman-1.31-xtables.patch
deleted file mode 100644
index 84f4445e8da1..000000000000
--- a/net-misc/connman/files/connman-1.31-xtables.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- connman-1.31/src/iptables.c.old	2016-03-22 20:12:47.829460752 -0700
-+++ connman-1.31/src/iptables.c	2016-03-22 21:33:36.835384724 -0700
-@@ -28,11 +28,11 @@
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/errno.h>
- #include <sys/socket.h>
--#include <xtables.h>
-+#include "connman_xtables.h"
- #include <inttypes.h>
- 
- #include <linux/netfilter_ipv4/ip_tables.h>
- 
- #include "connman.h"
---- connman-1.31/src/firewall.c.old	2016-03-22 21:29:01.959472262 -0700
-+++ connman-1.31/src/firewall.c	2016-03-22 21:33:53.048144181 -0700
-@@ -23,11 +23,11 @@
- #include <config.h>
- #endif
- 
- #include <errno.h>
- 
--#include <xtables.h>
-+#include "connman_xtables.h"
- #include <linux/netfilter_ipv4/ip_tables.h>
- 
- #include "connman.h"
- 
- #define CHAIN_PREFIX "connman-"
---- /dev/null	2016-03-18 06:21:16.372989086 -0700
-+++ connman-1.31/include/connman_xtables.h	2016-03-22 21:32:21.349504786 -0700
-@@ -0,0 +1,21 @@
-+#ifndef CONNMAN_XTABLES_H
-+#define CONNMAN_XTABLES_H
-+
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) || \
-+    LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-+#include <xtables.h>
-+#else
-+#ifdef __USE_MISC
-+#define GENTOO_USE_MISC __USE_MISC
-+#undef __USE_MISC
-+#endif
-+
-+#include <xtables.h>
-+
-+#ifdef GENTOO_USE_MISC
-+#define __USE_MISC GENTOO_USE_MISC
-+#undef GENTOO_USE_MISC
-+#endif
-+#endif
-+#endif
diff --git a/net-misc/connman/files/connman.service b/net-misc/connman/files/connman.service
deleted file mode 100644
index ece38a716e96..000000000000
--- a/net-misc/connman/files/connman.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Network Connection Manager Daemon
-
-[Service]
-Type=dbus
-BusName=net.connman
-ExecStart=/usr/sbin/connmand --nodaemon
-
-[Install]
-WantedBy=multi-user.target
-Alias=net.connman.service
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index a1921a0e7adb..80bf50608e4f 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -3,6 +3,8 @@ AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.62.0.tar.bz2 3014762 BLAKE2B 0cc9ef5d19004dc5cc69444cac3b2fb4fd82ba470a831b761c147e45826fc26087f4e07da76ee0b6a070f6125a1423927607a257786387326f4c9f4e3953d5f7 SHA512 83ca5c2757745f763316eefdd4c3f0e8a211a7f0db6a708b67ae2133ad41fdf17dd2230f9283a4778c9c866126d407454a090291cd2bf274371d0a214c1c13f5
 DIST curl-7.63.0.tar.bz2 3001355 BLAKE2B 7925825f606d7eb474fb73aeec52353d3a3bf8827b34457493003ef2e3c1aed5350d849fdbd5624f148c6bb776aad318f1f49ec1ca57690f5dfb21b12fcbdc16 SHA512 2873ef57b15cf12e508626f4546f6e06450cb87b239be1d26d9b3a22f7533d76eebabb5fa00e7b8c5d7fc9854356997ce164afb069411d079b2b9f0bdb00db25
+DIST curl-7.64.0.tar.bz2 3012077 BLAKE2B 512edeaa7a4ff3a998903771307070b08f1dc53bf45b4f0c98edd78daa309877e1856e1253a3582b3db35d2ae877af5aeedf2fb2741bfd8faed3bc4525880581 SHA512 058da4c63a05f704de475271f37fb99ca90a67a919b168e07958ed45d10cb3d03898ea6e3452ffb1a1f1e5dd5915f08a2993024b12233919f3c46c036b9c07e3
 EBUILD curl-7.62.0.ebuild 7208 BLAKE2B ef907472ef262984af161c67c766c8d1e31c9601ddd61d678921bebcfe9c98b9f43e65438d28f5276ec6bbce5fdb7843aee06338e3704fd128d8742a36482bf8 SHA512 90cb165e3fe36b5eb9b9755fc0dab27109282a10fdb5092afaf1eb716719040da870a9deca0f8ad1f8f750be4c89f9b46834b18753f9d66d2c70ed39d70e316b
 EBUILD curl-7.63.0-r1.ebuild 6847 BLAKE2B d52226c50765c986e0edfa883009390af00eae62019ad8bef0e7a17f6db400662a6dbdec4f2d550c0e87ede84f692d64edcf16d310cfa8e2d21dca488283ae3c SHA512 417e746879161b9a6034dbb889184809a7684cabb7c1fe2669b8c639e20fa8130d95e8204c954f43e171140b09876ec98b998a5f41dc7efdd3f7495189d4ce96
+EBUILD curl-7.64.0.ebuild 6863 BLAKE2B 6e24b01a5e4f211b22d7f4fc34516ab8914542020503056b58e1ed965fc47533b1c4bec518e927b226ba91cfc884fe9387269fec99c56647c0f7c520ebfb024c SHA512 69642081e38eb479885ada0b0dc4c6ec6f4026497b57cd791e390056bff962a72cde54a31b762fff17a32de6ee1c1e6bc322be4a52458357d34415455a788bb6
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.64.0.ebuild b/net-misc/curl/curl-7.64.0.ebuild
new file mode 100644
index 000000000000..e50554e31902
--- /dev/null
+++ b/net-misc/curl/curl-7.64.0.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-crypto-auth \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-cyassl \
+		--without-darwinssl \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-schannel \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 4a39237b85e0..3b9300498a0d 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -28,5 +28,5 @@ AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9
 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 7941 BLAKE2B 7b6913b724a4f50dfd1e63a9f65b7192298660cf56c368a565c4b0ce8efe5adb702abc84586f371b633493942f6b8b044d2e82e39952483aa2e599dc3c8e1e12 SHA512 aaad6123f649f136b3f8ccb675a5661c1d0b142cbc0748d114dd96b47f89ab4a85ba774933d675bd87aa70f7cdc7149c3fe299a5e4f3ada05a7cdaa8e79aac32
+EBUILD dhcp-4.4.1.ebuild 7935 BLAKE2B eaa07ea858ac52f75e3dc0b021c3466e1ae96fe5e711dc8fa079b48f4b74499c791d90e273cc37818c6d00c30b9fcb1f3ecaae4eacf5d7d128f445ceac1c0c89 SHA512 789f26d3926020eef97abf2e2b02066dae9a26cb35d17eb16e40bd01508bf921edccd3e78aa20eebfa378189236ff471322e87032f6d70afa615ffcb9cd975ed
 MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index 140b6f709966..572693563b65 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 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"
+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="
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index cf04fc28c511..3de0766db8de 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,12 +1,15 @@
+AUX dhcpcd-7.1.1-disable_inet6_fix.patch 609 BLAKE2B f69a5465f8750cba0a57b151b70c178e11576d4645d6fdc6c3f943cd2c98131af0742c48505624fb24d9a940dd523f98cb66bae51e38820c49aa9fdc6084bbfc SHA512 66fcf76affa35f2174e7bc0dd9964a67fde07144aedea30dfcd4f7280b841db344872da56a10d7d2474542c840e75d5323f994989bb96b803076e7e3d37d228d
 AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
 DIST dhcpcd-6.11.3.tar.xz 194892 BLAKE2B 08253879221f2cbccf69caf06ccbde960103fdf4de194f746572f4fa10497ab23dc1a41b6a849fe75f68a1d7a653e5358a7976581da0a92c8f19e2627b921440 SHA512 249185532cb239124f847c28e6bfb3e8a85e818e05a07eb0c6ac6843fbbab8afa8d6ebce4032b3537ccfb7fafb306dd0dc51c0e97f337f12f5071ba499686a70
 DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34
 DIST dhcpcd-7.0.8.tar.xz 210752 BLAKE2B ad8ba622589cc1c8c4bb332470c59527e03c817729f43a5b55b4f53f8ed60f35faaffbff24416f8596e78df8deb304f0598e27d890e9601d36c81250fda99942 SHA512 82cd845eb35670788b8f31b973945460f4c5f1a0a3025e3a452b79230dc30704e129d97140e6aec6d0281e0c89c333c0ce0af03c4767b2e5e66547ed3e071953
 DIST dhcpcd-7.1.0.tar.xz 211496 BLAKE2B ca919723f8f205ad24e28751024ff68cb4d1e86d056d47b1390a8e81cbb62d61e6a09d50d95756968d43383420e479846a4527095532d2761e26c6f4d780988b SHA512 28d2b5ff8cb372df6432becdbfeedaea945608b14374b6af8938936efdaa73d8d8f1cb3f37d2f440137c2f6988f72ed8de6d1bda43d65d4fe22efdd0a1662c24
+DIST dhcpcd-7.1.1.tar.xz 211788 BLAKE2B 984ec97ffdcb15883f57f9e2a699a7c8f006b2630e7651ab9d55e7a980045f8891f09d9f7be420969203a59671d097a1ed76621fe4a62ff26a5020fc8becfe69 SHA512 8791e718d65ef8ae23a16b98e82824860fa91914e6eb0a42cdbbca28236c1c38005ada44214bde33aac57152fe675debebdb5d141b67dcfc82012996d8337bb4
 EBUILD dhcpcd-6.11.3.ebuild 3267 BLAKE2B 439fae2ecd18b8c32319fbda22fa419f288bc977b8541f07a27c43f908bfe0867addf4b949c8e9f9e4163ca6f366f2083949f9b4d895d4e4bfc858d23cc3f514 SHA512 8c650ccff0f4ffb6ee9a17046b18c7f4c0e849e25b73d3d3abea66cd423a77e1c80c830f639d2ce74bc9c7566f8d6cea968feeb52ccdd6e20a5975f08f6a4b75
 EBUILD dhcpcd-7.0.1.ebuild 4437 BLAKE2B c27f5d78441c62e481f4439fbebe8454838e6e1e577b239848d6d484754e12da270674ec15ed0de27645508687160077155f0e639254b8fa2da6a92578bd619b SHA512 93e79e9148afd868ec9d0c8134d538b19d2f894056beda42bacc9a6d2ae57989e862e109fd3525e78149a6f7a83e6898972af9c2b0e21892d33aac01079946e7
 EBUILD dhcpcd-7.0.8.ebuild 4472 BLAKE2B 30ae32d7990eee683eae3e7c5a88499f46251935c3b95bbcd3309b0f18fdd522eda8cf82425bb7609669ee250be1e3f61bca8b560c6650a5e2f0e5420ef42404 SHA512 c7e575473851b1205bab968a57ebe6a4d16872fdef66a2f837c7a1521c191f803aa491b0f99d7b51d5ded8db2901ddccdb10d97ffb23dd0ab81c5d44c3c43ae1
 EBUILD dhcpcd-7.1.0.ebuild 4469 BLAKE2B 584d2050407bb0bf6bf6e20ca29213dd0305ea774eb6b67afec190dd111890848fe8376cd73b1c956ec50360c85325be5d01e2f32139394fa5b5fbc057eb2fd5 SHA512 356e8dac57a1f8229dd7c68d7cc7164b21178592400170251a11c3a52098e78ba1c24d36e5c5bd672d7c550a2be86d355efb5e757c07e0617ac194f511011014
-EBUILD dhcpcd-9999.ebuild 4472 BLAKE2B 30ae32d7990eee683eae3e7c5a88499f46251935c3b95bbcd3309b0f18fdd522eda8cf82425bb7609669ee250be1e3f61bca8b560c6650a5e2f0e5420ef42404 SHA512 c7e575473851b1205bab968a57ebe6a4d16872fdef66a2f837c7a1521c191f803aa491b0f99d7b51d5ded8db2901ddccdb10d97ffb23dd0ab81c5d44c3c43ae1
+EBUILD dhcpcd-7.1.1-r1.ebuild 4558 BLAKE2B 491a2f48dc8df25daef5984f892a2c87ce55053a4084f99ef5a226c46f9879dbde1ec40adf89a7089a2a5edf5d38fed31c699da949b32e096dd000466d025cf2 SHA512 2b932437d3590f69b4de9813b9f9f7ee6e93a47470fa3da323f6f0f290231066becf1f5afe9b440b1a4ebb25a614bb4a95191511d227136a2ad199887e69b69a
+EBUILD dhcpcd-9999.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild b/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild
new file mode 100644
index 000000000000..c8f7876e7813
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild
@@ -0,0 +1,152 @@
+# 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
+)
+
+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-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index a146481fe88b..48ba26275d0c 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	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}"
@@ -15,8 +17,6 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-inherit eutils systemd toolchain-funcs
-
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
 HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
@@ -27,90 +27,89 @@ COMMON_DEPEND="udev? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
-src_configure()
-{
-	local dev hooks rundir
+src_configure() {
+	local dev hooks=() rundir
 	use udev || dev="--without-dev --without-udev"
-	hooks="--with-hook=ntp.conf"
-	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	hooks=( --with-hook=ntp.conf )
+	use elibc_glibc && hooks+=( --with-hook=yp.conf )
 	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	econf \
-		--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}
+	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()
-{
+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=
+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
+	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
+		if [[ ! -e "${old_duid}" ]] ; then
 			cp -p "${old_old_duid}" "${new_duid}"
 		fi
-		old_files="${old_files} ${old_old_duid}"
+		old_files+=( "${old_old_duid}" )
 	fi
 
 	# dhcpcd-7 moves the files out of /etc
-	if [ -e "${old_duid}" ]; then
-		if [ ! -e "${new_duid}" ]; then
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
 			cp -p "${old_duid}" "${new_duid}"
 		fi
-		old_files="${old_files} ${old_duid}"
+		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
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
 			cp -p "${old_secret}" "${new_secret}"
 		fi
-		old_files="${old_files} ${old_secret}"
+		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
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
 			cp -p "${old_rdm}" "${new_rdm}"
 		fi
-		old_files="${old_files} ${old_rdm}"
+		old_files+=( "${old_rdm}" )
 	fi
 	local lease=
 	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[ -f "$lease" ] || continue
-		old_files="${old_files} ${lease}"
-		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
-		[ -e "${dbdir}/${new_lease}" ] && continue
+		[[ -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
+	if [[ -n "${old_files[@]}" ]] ; then
 		elog
 		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
 		elog "${EROOT%/}/etc to ${dbdir}"
@@ -120,12 +119,12 @@ pkg_postinst()
 		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
+		for old_file in ${old_files[@]}; do
 			elog "	${old_file}"
 		done
 	fi
 
-	if [ -z "$REPLACING_VERSIONS" ]; then
+	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"
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
new file mode 100644
index 000000000000..2fd3a17428fa
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-7.1.1-disable_inet6_fix.patch
@@ -0,0 +1,24 @@
+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/electrum/Manifest b/net-misc/electrum/Manifest
index b5c084b3ab20..f116153e5e70 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,10 +1,6 @@
-AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
-AUX 3.1.1-pip-optional-pkgs.patch 473 BLAKE2B 35784d786735b277b9efd906c35f6dc843971c948590fd00f875591208076429860f7cc1c4dacfd54a78cc64daa13c071857f6745b9da3154fd72f8abcfa5b12 SHA512 6c90bd44f440a18a8b70c0f398d5e132164e1738524771b4e35bd5c80a0ec03b311f11afcb717a1bda6103fbabc6268f5fbeb987beeb9c3bd6a313745cb429c5
-AUX 3.1.2-desktop.patch 671 BLAKE2B 1be7fddfb50dccb1c4dbca8827e2a1198c926abba507c9bf593f43308e6976dddb390a5fdd74ebb9fe6df34cd806a4de7be698ad431d6abee9840ae82635b0ad SHA512 1b9040e8468279381ecd6331e98ad040f52297a7cef32586655c8ec30358e0590cdcbf6f5353b5b66e4a022ed00515a34dae45b42a80222ce0b977cb9dbdfbf7
 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
 AUX 3.1.2-pip-optional-pkgs.patch 458 BLAKE2B 25f2ef7a37cb7e05fb0d4e9f70b6e4656d1423d940a1dcc8b6700d2fc67c221250a55f14fc5df99e2d6dede27c47223755e19e48ed776eb34432c8fd173a28a4 SHA512 ffe18ebfb67f6de8456e38228cbf864afce94a686ebc11ef866f4d9f0c324b3d96b8f3a315c13bd0efba0c62f6ee2af6f093005115be3cfb4d8a284d3a236b3f
 AUX 3.1.3-desktop.patch 683 BLAKE2B 15babc615c74152d5005ddc8dc644557fcaf176825fed335fa84168e66c16e2d3d946bd1be75bb15c78a06fc9efcb23a1797c6cfc74c821c2fe83044153fc6b2 SHA512 c05abf3d387143543ffec3342bdc6c820a56d82064f596c5e619286056f105c048db1947d13706d9aec45454f9133109bf3ec3de3ebf4aa4ace523f441a44b90
-AUX 3.2.2-pip-optional-pkgs.patch 725 BLAKE2B e0e5c3de68bc838665d818db491113c700e9512b6556ed2e24744f32c24f015ea4c28e93af16c25c04121b46e1c1275552100d4e65ae0491074870e46280326a SHA512 b85e11ada7e3a5849644262acf6a771f11d457ffdf46eaaf1f61183203bf8c7f7b07da54a57849198d2ea78d2fd43962970397d93af7a125bd9d381b0894267d
 AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd
 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
 DIST Electrum-3.1.3.tar.gz 2806178 BLAKE2B e03a6ee8d7b211b26d99adfbaf42a9d43317e5a4ca887f62f5ef0e57d8f990c18ff07e15d4ac8faea33322cd7ae25d7544e59e9ff1fbe883b3b7be138d990421 SHA512 745d00ec944e46040a4ae21d23c5919b943696a85baf84ee553616ca73cd21f2fa95999212a23f9a96ad5606def2890ee057e5f5f18e82591fd4a9e497ba5439
diff --git a/net-misc/electrum/files/2.8.0-no-user-root.patch b/net-misc/electrum/files/2.8.0-no-user-root.patch
deleted file mode 100644
index 2ca5363effe7..000000000000
--- a/net-misc/electrum/files/2.8.0-no-user-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./setup.py.orig	2017-01-06 19:17:44.294137848 +0000
-+++ ./setup.py	2017-01-06 19:17:50.093161327 +0000
-@@ -21,12 +21,6 @@
-     parser.add_argument('--root=', dest='root_path', metavar='dir', default='/')
-     opts, _ = parser.parse_known_args(sys.argv[1:])
-     usr_share = os.path.join(sys.prefix, "share")
--    if not os.access(opts.root_path + usr_share, os.W_OK) and \
--       not os.access(opts.root_path, os.W_OK):
--        if 'XDG_DATA_HOME' in os.environ.keys():
--            usr_share = os.environ['XDG_DATA_HOME']
--        else:
--            usr_share = os.path.expanduser('~/.local/share')
-     data_files += [
-         (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
-     ]
diff --git a/net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch b/net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch
deleted file mode 100644
index d8d8a1355f25..000000000000
--- a/net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Electrum-3.1.1.orig/setup.py Electrum-3.1.1/setup.py
---- Electrum-3.1.1.orig/setup.py	2018-03-12 13:25:11.000000000 -0400
-+++ Electrum-3.1.1/setup.py	2018-03-17 17:49:54.481961514 -0400
-@@ -86,8 +86,3 @@
-     url="https://electrum.org",
-     long_description="""Lightweight Bitcoin Wallet"""
- )
--
--# Optional modules (not required to run Electrum)
--import pip
--opt_modules = requirements_hw + ['pycryptodomex']
--[ pip.main(['install', m]) for m in opt_modules ]
diff --git a/net-misc/electrum/files/3.1.2-desktop.patch b/net-misc/electrum/files/3.1.2-desktop.patch
deleted file mode 100644
index 2c271dd60d88..000000000000
--- a/net-misc/electrum/files/3.1.2-desktop.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur Electrum-3.1.2.orig/electrum.desktop Electrum-3.1.2/electrum.desktop
---- Electrum-3.1.2.orig/electrum.desktop	2018-03-24 06:42:16.000000000 -0400
-+++ Electrum-3.1.2/electrum.desktop	2018-04-01 08:37:43.362027638 -0400
-@@ -3,7 +3,7 @@
- 
- [Desktop Entry]
- Comment=Lightweight Bitcoin Client
--Exec=sh -c 'PATH="$HOME/.local/bin:$PATH" electrum %u'
-+Exec=electrum %u
- GenericName[en_US]=Bitcoin Wallet
- GenericName=Bitcoin Wallet
- Icon=electrum
-@@ -14,8 +14,4 @@
- Terminal=false
- Type=Application
- MimeType=x-scheme-handler/bitcoin;
--Actions=Testnet;
- 
--[Desktop Action Testnet]
--Exec=sh -c 'PATH="$HOME/.local/bin:$PATH" electrum --testnet %u'
--Name=Testnet mode
diff --git a/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch b/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch
deleted file mode 100644
index 0f54f477adc6..000000000000
--- a/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur Electrum-3.2.2.orig/setup.py Electrum-3.2.2/setup.py
---- Electrum-3.2.2.orig/setup.py	2018-07-01 08:00:11.000000000 -0400
-+++ Electrum-3.2.2/setup.py	2018-07-16 14:09:10.790238994 -0400
-@@ -40,19 +40,10 @@
-         (os.path.join(usr_share, icons_dirname), ['icons/electrum.png'])
-     ]
- 
--extras_require = {
--    'hardware': requirements_hw,
--    'fast': ['pycryptodomex'],
--    ':python_version < "3.5"': ['typing>=3.0.0'],
--}
--extras_require['full'] = extras_require['hardware'] + extras_require['fast']
--
--
- setup(
-     name="Electrum",
-     version=version.ELECTRUM_VERSION,
-     install_requires=requirements,
--    extras_require=extras_require,
-     packages=[
-         'electrum',
-         'electrum_gui',
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index a6aed74a5db4..268e77b478ab 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1,11 +1,10 @@
 AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e91b9e542e3e9ac0bd51992c6c024ead3c9643e067430eefec9305ea3e8c9c4592a254da518baead245fe SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931
 AUX gerbera-1.0.0.config 6164 BLAKE2B f16c1e32be600b778e6818267b76bff34a26653d8a8bb3958ff7096d95c96b225f679ceb3ffe306bb1b3a03c2300fa433c4edffd9cdd79fb2fac3ee2aa5621fc SHA512 5a4c44d71e7bb4f1e9be2de61ab831d6b8871ab432ed31b58799957e7812e23c382f81c32062c0db44712287643e495fd66e1fa214676df3e0b18d7e1bb2f23d
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
-AUX gerbera-1.1.0-build-failure.patch 455 BLAKE2B f8c52b6d37b999f3ba6765fa61c732a8b5b00151a8b2dc4bb0292b39282e6cbc28b7348eca41b645fd95997731fa36cc628c8850d43366e048c91d57abcea079 SHA512 5def64f7d94b9005890d56b16385df8b78701fb139dbc379f29818413f4bea03eb1e2b87db0e4b4206b710d9e80f646061dd223f3370deced72667ece9b5f25d
-AUX gerbera-1.3.0.config 6341 BLAKE2B 3252c1a1695953e52335c8cc35515ce5af3162499d35e4b05a6fe5c674b8f97bdff43d887e5934b12309a8fb7191df957b07fd96cbcb7ccd0bd61e2f491f20c6 SHA512 8748277007760c60484a23edf73e81301ad9d327a6c8a5ee26a2d9f83c6b4eefdc6fd849979c4ae9a178ecd7827ed7cbb8214d686bd08cf63ebf4da16f45c616
+AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
 DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
 DIST gerbera-1.3.0.tar.gz 2799974 BLAKE2B b062b554552a58e3c71b18d189e4c1e6a59be4150ab3f2c22ba1e2186ca55a181a4037694e79803ebd5e877f3c75e55fe09665b06ec64374fe418082dc22fa7d SHA512 1afebd865a226ac13f82fb97381015d7875c1bebd9186e793acd8d715ac049e0502e60e4696a53b9d23d9dbccb4758889e1b3638fb53aeede3796c3264a01434
 EBUILD gerbera-1.2.0-r1.ebuild 2558 BLAKE2B c5f81e11241cb74d63428c263cd0141d61a90f595f8c42ad4f2987d73f885ff6275b85f9ad772b8ff8862847119dd953206972ebe8461e659cf5bc9476b3da89 SHA512 57b790ea36d49c2ecff0116d0aa2e583a8a6bc9847e79396d93061156c06d2b9380f9725a543e4f1cd6f91574b6cd77c26fec65b77552308998b886f6f993495
-EBUILD gerbera-1.3.0.ebuild 2551 BLAKE2B 9ca7199ed286be5bcbcc6cf5f32b51966423d274f105854a76da68d06fbeb1f85b4bfc70eaaee7cdf2ae0b6e83e501aa374fb7a3fe231e99f06e9e4f1be6bf82 SHA512 f834b15ed8fd8d10bf331cefbd984cd06c5b890a97c0b2a95f49ba46ce707311d8b8e2bef9387699c29b650b4c4490d04bebd0590b96a43fb692ea219ae3c5dd
-EBUILD gerbera-9999.ebuild 2554 BLAKE2B 24fbd4b31248cebce80d7732b5b3e884adfe72f83986e0d0b44f573ae856bc50170d3b253db0fb67848495bf44f1f1de389c389dbd84546a713f4da55d75fba3 SHA512 8082eab99d34aeb588f4ece501de7f45e8acd34eac5af3380053c81a1c96b97d768bba05301563f69b29b8e7e9ef74d56bb163542a6e4e5d3475952e3e51e086
+EBUILD gerbera-1.3.0-r1.ebuild 2551 BLAKE2B 9ca7199ed286be5bcbcc6cf5f32b51966423d274f105854a76da68d06fbeb1f85b4bfc70eaaee7cdf2ae0b6e83e501aa374fb7a3fe231e99f06e9e4f1be6bf82 SHA512 f834b15ed8fd8d10bf331cefbd984cd06c5b890a97c0b2a95f49ba46ce707311d8b8e2bef9387699c29b650b4c4490d04bebd0590b96a43fb692ea219ae3c5dd
+EBUILD gerbera-9999.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 MISC metadata.xml 1209 BLAKE2B b724abc66f5a3111c66a94331e61f9a50ae67344dab4695e7fc68154ddc9843e0295c7a12438e342be409b9429a4f9c60abce02422594df708d7933521bf9673 SHA512 c91dddacee6beab0a3cec3ab317810f77d3715a84384ceeafd3bdc872fff6d352d6bd4312d8194b59a159604794b0197780db6c27b20a327afa1e7bb9cba6a26
diff --git a/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch b/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch
deleted file mode 100644
index ff5f6075ec10..000000000000
--- a/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git gerbera/src/file_request_handler.cc src/file_request_handler.cc
-index 2fade4a9..de33617b 100644
---- gerbera/src/file_request_handler.cc
-+++ gerbera/src/file_request_handler.cc
-@@ -282,8 +282,8 @@ void FileRequestHandler::get_info(IN const char* filename, OUT UpnpFileInfo* inf
-                     header = header + "CaptionInfo.sec: " + url;
-                 }
-             }
--#endif
-         }
-+#endif
-     }
- 
-     if (!string_ok(mimeType))
diff --git a/net-misc/gerbera/files/gerbera-1.3.0.config b/net-misc/gerbera/files/gerbera-1.3.0.config
index 4c41a27143cf..5659140c6f86 100644
--- a/net-misc/gerbera/files/gerbera-1.3.0.config
+++ b/net-misc/gerbera/files/gerbera-1.3.0.config
@@ -11,7 +11,7 @@
     </ui>
     <name>Gerbera</name>
     <udn>uuid:f6344839-539b-4cb9-9a12-cab6bbb30fd9</udn>
-    <home>/var/lib/gerbera<home>
+    <home>/var/lib/gerbera</home>
     <webroot>/usr/share/gerbera/web</webroot>
     <!--
         How frequently (in seconds) to send ssdp:alive advertisements.
diff --git a/net-misc/gerbera/gerbera-1.3.0.ebuild b/net-misc/gerbera/gerbera-1.3.0-r1.ebuild
index fcdb0195c5e0..fcdb0195c5e0 100644
--- a/net-misc/gerbera/gerbera-1.3.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.3.0-r1.ebuild
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index ff9299acd184..1b1129c47251 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -25,7 +25,7 @@ IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav
 
 DEPEND="
 	!!net-misc/mediatomb
-	net-libs/libupnp:1.8[ipv6,reuseaddr]
+	>=net-libs/libupnp-1.8.3[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
 	dev-libs/expat
 	mysql? ( dev-db/mysql-connector-c )
@@ -84,7 +84,7 @@ src_install() {
 	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
 
 	insinto /etc/${PN}
-	newins "${FILESDIR}/${PN}-1.0.0.config" config.xml
+	newins "${FILESDIR}/${PN}-1.3.0.config" config.xml
 	fperms 0640 /etc/${PN}/config.xml
 	fowners root:gerbera /etc/${PN}/config.xml
 
diff --git a/net-misc/gwhois/Manifest b/net-misc/gwhois/Manifest
index 8e23bf583a67..10c3a93d3612 100644
--- a/net-misc/gwhois/Manifest
+++ b/net-misc/gwhois/Manifest
@@ -1,6 +1,6 @@
 AUX gwhois.xinetd 305 BLAKE2B 7ed747398edeb544cccd308ca04a192b62c2bad7206a8a2db85382f01cb72d5794a7c7818caf9a26a9a59841b1282a1a6dd8821b2153d8a3ac6631aa23074419 SHA512 33afac83df9f8d53b54144358cd50b1ea40e266fd5438d1f8a32954c4f05cdb608b5ebc688673f1866ac76e59dfb0b097884bb38077e50061639152899d68460
 DIST gwhois_20120626-1.2.tar.gz 41800 BLAKE2B 695005bd37abaf0dc39593dcc3dfd01102b896dc2bb74a8f3be774d5f7316861588ca3ca621eabdeb19739abfda9be0ab215c757181d3d08ce0416f315410d0d SHA512 c18e20a033e3d2de3b1a5c81d1fdae88cfd9dbc5261b4512b87376d0909ea538db46b3380aaa426ef43904ef292662185dd2f3cb59c56dba306c41a0e827bcb0
 DIST gwhois_20120626.tar.gz 41698 BLAKE2B cce3a6eb385bb782a772a7532cecc2ae164d6ea00a42a6afa29b2ff4d16526507511c16e9cae3dab3d26e7818126b2fcd20a5d88a4affa472162f9ef30c0e464 SHA512 8ffaa611389929435f70d3f020e28249e6e3109c4e822e9318b050f52cf09d6934adbb14ab67a6361574ce8645656d5eaf24808dea453f2187352fc2b2513e0e
-EBUILD gwhois-20120626-r1.ebuild 1364 BLAKE2B 31f0f5d87f4955f1d56ce0f059e8fe7674b012325edfc92a8fa7c9ff639ea12933d635bb3007fe89852ae101f367e860ae4ed99b2a0d584cd0b53ea2442160be SHA512 d6a562e6ad5b71912daed0676bea90280c532a50c987a43f15c29c21f0954fee74afe69c7e4601cfb9129bf422104a90a94c7eefe2195a4617f6f73c8bee34d7
+EBUILD gwhois-20120626-r1.ebuild 1363 BLAKE2B 080a0a2528e1724b124a01b2a48012ab0dc377f2604d8096976563c8c297b35575fd2277d8fb0e99f4cfe785f07028279fe367302765cf19e388282ed3e1981b SHA512 93bf217161133b337e9f5735ae81a70d4652374ccca3209d336c148152d043fc44091cf88b8c603e071e8f9cfea31c637a8f2d2f157db3f7ab1c56bde179ce89
 EBUILD gwhois-20120626.ebuild 1176 BLAKE2B 8c4f27cd2a32a3227b4a22ebac16b9d694e8ce845ca450f83e3a23cc90a99f1ca0a0cdc044d9eb97cd9e801997d646df6d6dcfccada9df39626892a2da46758b SHA512 730f084c67f0051c130d25dd1f2dfb765b8ace18bf29d81454b8f937d45ec80e01cacfc02adc6652fa369e95fd3553d688edd4030b2b7455ce7201e6e3c4259e
 MISC metadata.xml 530 BLAKE2B 8bde49044c3d194febcd4dd6d43e60854f2282264a5a22d8e35a131c3f6fe5f72f91bb20a8d1179267af873246611fb4defa8ffc5b8e0f0288f6e514475f55c6 SHA512 8e59f39cd78c74a06d0c9d0efc4cf72e80df415b2433970707977cf049140630e976e12062ad2bab2822ac790ae6c160f87cb65c2c746e7ede14d288f6364306
diff --git a/net-misc/gwhois/gwhois-20120626-r1.ebuild b/net-misc/gwhois/gwhois-20120626-r1.ebuild
index 3ff907bae8cb..05fb4bf692e7 100644
--- a/net-misc/gwhois/gwhois-20120626-r1.ebuild
+++ b/net-misc/gwhois/gwhois-20120626-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://debian/pool/main/g/${PN}/${MY_P/-/_}-${DEBIAN_VER}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="alpha ~amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 7a103bb1beac..15126a899f07 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -11,6 +11,6 @@ DIST iputils-manpages-20171016_pre.tar.xz 29764 BLAKE2B 47def1413b2cdcfba7f924dd
 DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a
 EBUILD iputils-20171016_pre-r1.ebuild 4045 BLAKE2B 8762cc82fd5c71865106bf2e9763fa5150a8228b292e617654279e517e5a3f4bebc50f312133740d4c54d0ef0a75abac2e42775cd9d865d41b5444e75f56769a SHA512 397bd386cfff8a3551af24ac67677de021e56bf75908e6495e9e4b7eeb6bb2435b7c72101b78523da7e502d1a7fac92d5640d45a1da463986f01ec5230273c95
 EBUILD iputils-20171016_pre.ebuild 4082 BLAKE2B 8c9aedbe404bd31ddcb466b93eb6272eebba0e3fa18f7a0de285dd7aa007894614a47a9cab018f6c5546a172ca3ae240b7fdcf6196eb3cdd7a6fcfc6d34cd652 SHA512 08f92d29d3baeb0eadac360b5a7f81e550d264fda70945b416d38ae39239e75ef201587d7466d6a9431df1a4be28c62e59d11b685fc811f40f1c755bbae2637d
-EBUILD iputils-20180629.ebuild 3960 BLAKE2B 75270f1f195528663eb23a8b7e453aec559a0254569ae81c4b9df2dc53b3e726ac3958708e77b2c22b23bd994c33f487344ae92d0fb6cbd4096044716ae008e6 SHA512 831524795c0df5320e2cce8c6a5349e259dca5b4c0f551ad476ef2e887dd41cc43f6516bcfb0021e010c1ac0bfaa255adc1b76367f9c1799c1a18d490706c42d
+EBUILD iputils-20180629.ebuild 3957 BLAKE2B ba1c3f2756dbbfc6a597757faac29b5c6f0764fb0b2033f2696c4261e5247dd281dcb86f95794e0ef89e3d07683242a08daab3acedccf5911219417b5b569f2c SHA512 a36103a6be134a2d8fd1d7469ecf061b423088a8241715066074aeafacd0ab613ac3cef4689b1c2aae21d12b0ebeb39354f0205c63aef6dbd797b64542e0c6ca
 EBUILD iputils-99999999.ebuild 3939 BLAKE2B 9b6d7d78854369cba6255685f634ed526bf97d4a195a0bec0271f8f40a63aa671f26168dd33e99bf9c1db8398acee79205a025b04edf7865d67a76fd1190b756 SHA512 22ba0bcb65f8b13800f2a14f901fc0140c02f4d22c2e96624a381b59d3ba9fe5f385cf6e4bb6d3a32659d6b3aa9dc2bfb8f26b67e3c9f50ffe41094cf4712734
 MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc
diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild
index 05db264e8bd4..a667ae038ad9 100644
--- a/net-misc/iputils/iputils-20180629.ebuild
+++ b/net-misc/iputils/iputils-20180629.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/s${MY_PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${MY_PV}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 5f4541dda61a..03fc38918904 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -2,8 +2,10 @@ DIST ipv6calc-0.97.4.tar.gz 1037582 BLAKE2B b01929321c94169631c865ddf00067a85d0d
 DIST ipv6calc-0.99.2.tar.gz 1287951 BLAKE2B 14de353f5883e1aa538c9fd1b66dbc9d9b485192a7cd7853f4b8a00a31b1b798cee33edb4263a9c5acd8b6dd42b26cbce35e0f072e7b92a7c40f1222bba27075 SHA512 f757a4a7d69b5dea34051125b96b9f9f36957bfabb1568ddae2aaefe6551aac7b9edb6abfdb3ac90aeaf32e517720157614cb7552b4e9dc18180904674e48f09
 DIST ipv6calc-1.0.0.tar.gz 1342987 BLAKE2B 0c5a28b8431a82669870c475c5a73c239368f3486c9d16e66918a110937ec134d79f9b3ce79edffe65ab2789b36b7ac9ecd90e57f891759ba4542d608bcc5380 SHA512 46e33697551c4bf0a472c7f2dd51c11ae21d49c7d78fe5213bce60c1d11f9230491c328e425f36733c7262a369644bcedb8392ffe2279031eb2552092a5ac209
 DIST ipv6calc-1.1.0.tar.gz 1396498 BLAKE2B 67b95057ea75f7c26ab1f9fc8b8e869ef027594e71800c4f8f1c442f34bce31340f1e7160d4f48033b8bc080738051418be48e3913ccd62594256ab64eaef919 SHA512 8fe2a4717f2be4ceae051b635d4329b8c438d9741e9a99a3c12cc1c0d0daef89325cc9beb7ca65da3c671586ce2a596191962118005aeaaf7cfe33a1d4549101
+DIST ipv6calc-2.0.0.tar.gz 1436990 BLAKE2B c445db7583f39b5084adcf756f383d888f1ac75c15702215bbd320c4a54222dfba8ab7b75582d43fb48fa89db1b6e186594f9028d0b30b843e0e7d033baaf6e7 SHA512 6763c27399529b1cc22bdffd84e1fb412d8fe7e20fa7c120fa9a231c0d24e2dde5c285856166ed71e498c93574baaf9d87c4ffb50b2a8511d71b7af4f35c3f25
 EBUILD ipv6calc-0.97.4.ebuild 1261 BLAKE2B 685a6981839b68a33c680812c5d4307a5d41ac580db6d08394134b000f9b0045eaadaf85491a6fecd4ee91b5540ab155354d3feeb0bb30271bc1671986fe118a SHA512 d80802c0164be4d04daf115945b0addf1e2821f8c6af49371378f39bc2df09b0431300ca76657b4149fa8865304074e07d63fb3d7e557d2acd3cb38a756b65bb
 EBUILD ipv6calc-0.99.2.ebuild 1509 BLAKE2B 9f5bfc6e3dea8ec9d1659a44b8e646f7fa41278db028d99c3451a201dbbd51d24d27117ecdd1a41cc1d16603a39115db093736cafe399eceef90593ddcb41135 SHA512 b0a1cd648acece998390e55d6ee38659f0352d1f82599e17c2761c9f384079c2eec4e371673f1566cb1d4baf61a97f3b0857f79f0c4ca6980b402c33ebcf0756
 EBUILD ipv6calc-1.0.0.ebuild 1506 BLAKE2B e1c0db4b5904351ba98a0b141dcd906836cce9eac0f81d20ab86bafe52b9101f9cef108dc6fb08b948d940e42001b74533cd2c9e0fbe7ca0c7aa02eac12211fe SHA512 4dd8479d8738b0ba7c0cb31462981715dec73f820c4c6fb2829693359944b32babbba53315d019d37290c7722da1f4b941927c6baefd8bbd927f200d72fea78f
 EBUILD ipv6calc-1.1.0.ebuild 1514 BLAKE2B 1b520e08975817482c85dccf0ba9ff118a2f976dae4c83ee35f155277862969562ca8c880ef4d215ed92c9fc2f304d42d5f68b070f24a585c617c47e742d60d1 SHA512 34ce1a7e1ceecac75e0758078a72a7b9e319b2050eebc0b2f56497436744b1e7e9c74e44b36ec2457ef8658ff20aab560302a7c4037c9bff5d6e263a62209227
+EBUILD ipv6calc-2.0.0.ebuild 1511 BLAKE2B 4ad3e6d1f76eb345a2d61a9bd140980296706177e4d682a03e7c312ea6bbaf2555dc092263311df3f4b68fec3ee0f1d08226776c6b77ec4b7ed3c23b8ce705dc SHA512 4a2861424be22075c9e561a170711bdb7f2addde58b1c51f8dc8b9aaf9aec4e257174b4d4976d78eadc107256b965982cb1835bde3ed33c73194454071dd76b4
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/net-misc/ipv6calc/ipv6calc-2.0.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.0.0.ebuild
new file mode 100644
index 000000000000..af1dab4b99bc
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-2.0.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="IPv6 address calculator"
+HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="geoip libressl test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	geoip? ( >=dev-libs/geoip-1.4.7 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Digest-SHA1 )
+"
+
+#dev-perl/URI is needed for web interface, that is not installed now
+
+src_configure() {
+	# These options are broken.  You can't disable them.  That's
+	# okay because we want then force enabled.
+	# --disable-db-as-registry
+	# --disable-db-cc-registry
+	if use geoip; then
+		myconf=$(use_enable geoip)
+		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
+	fi
+	econf \
+		--disable-bundled-getopt \
+		--disable-bundled-md5 \
+		--enable-shared \
+		--enable-dynamic-load \
+		--enable-db-ieee \
+		--enable-db-ipv4 \
+		--enable-db-ipv6 \
+		--disable-dbip \
+		--disable-external \
+		--disable-ip2location \
+		${myconf}
+}
+
+src_compile() {
+	# Disable default CFLAGS (-O2 and -g)
+	emake DEFAULT_CFLAGS=""
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		# Disable tests that fail as root
+		echo true > ipv6logstats/test_ipv6logstats.sh
+	fi
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog CREDITS README TODO USAGE
+}
diff --git a/net-misc/irrtree/Manifest b/net-misc/irrtree/Manifest
new file mode 100644
index 000000000000..71bdc9573d48
--- /dev/null
+++ b/net-misc/irrtree/Manifest
@@ -0,0 +1,5 @@
+AUX irrtree-1.2.1-leniency-deps.patch 397 BLAKE2B 3fa9214970d783cbeb860e84196df71cd025a7bfdb4df0d6cec5667cf9099ee6e765436250facc0f3e44e1bdebf834ceaa30bc4584795953acb3431d3d8f92be SHA512 e6550c004ba66245c2c0c73bc4e4b04323d347cd2eaac27411dc992a7ae13ef7cb12c1c3de82a9834f2a4bfd1ed49752e2cf909887769d06a1fbb6934f561c6a
+AUX irrtree-1.2.1-queue-capitalisation.patch 395 BLAKE2B 8b04335ed0a76136ccaf3e56b788319b01aa89916f81ae39b85187a711e03635f960eb17d4e3ef27974565925f5ff21e06e1ea59a5dfa12f3d16b7f6b17f43ff SHA512 6d1a790c374d44f27bd4941b154826bea6837e0bd03407a3612a4b2f6e26248599b62f10b4054069d80c5b3bed97715c29f878ee1849b86970814d2648e01482
+DIST irrtree-1.2.1.tar.gz 5554 BLAKE2B fa5482f461d2eb4a93b7daa4851db11368ee39083bc312eb9e72836a2f001223db796e5a2947e3377d610496adda63d02f2cfedb65520570b4ca0328a5532af5 SHA512 c22f3ca606cbbda66a466e3c0518c8bb61d32fe3d376005b351de1f36a245cd3a28d89ba1ef8102e6dc2d06d679e260a46c8d056554f62fc2eb0ca21a23ab981
+EBUILD irrtree-1.2.1.ebuild 551 BLAKE2B fa24fdc722b2d1293c3819b1ff93d7cdc9559d0f2ca873abcb56cb1f0df8424ccdf72e36b48ca04c8187856477bb245b2e5acdda3cfd19a940897d9f32e8a5fc SHA512 364fed348010705e7a1606754050a0e4789d78a5cb6f7df2718c808717ed61d8741a9c8b444fdc7440f779a0636384f0e567c96ffb8258a0276317bf7505a351
+MISC metadata.xml 331 BLAKE2B e0038f66237900b0ac3c664b7ea1b5fb69789d64721fe57cbc86119c9d6a09954e69e5032719ee3aed04821b13af51f07a6d9ccd298a716de5966e3aa462e1db SHA512 25845f8cc4afd970c4c0a6aec55e1c3e3001c6d03ecf6803dd33f2a15932e0bfca20fd213d2b1c0edf44150cdf0fd0edf969cb2696e44cc556b0c724d5a84090
diff --git a/net-misc/irrtree/files/irrtree-1.2.1-leniency-deps.patch b/net-misc/irrtree/files/irrtree-1.2.1-leniency-deps.patch
new file mode 100644
index 000000000000..2997d2af2c70
--- /dev/null
+++ b/net-misc/irrtree/files/irrtree-1.2.1-leniency-deps.patch
@@ -0,0 +1,12 @@
+diff -uNr irrtree-1.2.1.ORIG/setup.py irrtree-1.2.1/setup.py
+--- irrtree-1.2.1.ORIG/setup.py	2019-02-01 15:42:43.837122511 +0000
++++ irrtree-1.2.1/setup.py	2019-02-01 15:42:58.682123129 +0000
+@@ -46,7 +46,7 @@
+     print("  git push --tags")
+     sys.exit()
+ 
+-reqs = ['asciitree==0.3.3', 'progressbar2==3.34.3']
++reqs = ['asciitree>=0.3.3', 'progressbar2>=3.34.3']
+ 
+ setup(
+     name='irrtree',
diff --git a/net-misc/irrtree/files/irrtree-1.2.1-queue-capitalisation.patch b/net-misc/irrtree/files/irrtree-1.2.1-queue-capitalisation.patch
new file mode 100644
index 000000000000..1196efa760f3
--- /dev/null
+++ b/net-misc/irrtree/files/irrtree-1.2.1-queue-capitalisation.patch
@@ -0,0 +1,12 @@
+diff -uNr irrtree-1.2.1.ORIG/irrtree/cli.py irrtree-1.2.1/irrtree/cli.py
+--- irrtree-1.2.1.ORIG/irrtree/cli.py	2019-02-01 15:49:05.583138394 +0000
++++ irrtree-1.2.1/irrtree/cli.py	2019-02-01 15:49:18.405138927 +0000
+@@ -26,7 +26,7 @@
+ # POSSIBILITY OF SUCH DAMAGE.
+ 
+ from collections import OrderedDict as OD
+-from queue import Queue
++from Queue import Queue
+ 
+ import asciitree
+ import getopt
diff --git a/net-misc/irrtree/irrtree-1.2.1.ebuild b/net-misc/irrtree/irrtree-1.2.1.ebuild
new file mode 100644
index 000000000000..998439317b24
--- /dev/null
+++ b/net-misc/irrtree/irrtree-1.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PATCHES="${FILESDIR}/${P}-leniency-deps.patch
+	${FILESDIR}/${P}-queue-capitalisation.patch"
+
+inherit distutils-r1
+
+DEPEND="dev-python/asciitree
+	dev-python/progressbar2"
+RDEPEND="${DEPEND}"
+
+DESCRIPTION="The BGP swiss army knife of networking"
+HOMEPAGE="https://github.com/job/irrtree"
+SRC_URI="https://github.com/job/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/net-misc/irrtree/metadata.xml b/net-misc/irrtree/metadata.xml
new file mode 100644
index 000000000000..723a74591c68
--- /dev/null
+++ b/net-misc/irrtree/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">job/irrtree</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index cc3be97a3cac..07598f051024 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -8,14 +8,11 @@ AUX oidentd-2.0.8-no-conntrack-masquerading.patch 1141 BLAKE2B cda18949cdc768592
 AUX oidentd-2.2.2-confd 69 BLAKE2B 37fac35c28304f92942844ee7652f52496cdc4c66da67d449127c3e9b61c715afb25cae7379137d8b9e2863d44e72535734c595c8edcc18f94b8c3841cd216ab SHA512 639f062b61b3aac829d6d16497d548290d8de3e161a1d8037b689593374b89028243b9369109b1b4b55d125ec665f1433bb971ea873a2e6e1b6b15eabfad8e6a
 AUX oidentd.conf 298 BLAKE2B cc234d09546ac12fc51440ad4a24234a348c947f15bdd750b88bb0e87b0276a3b27ac2d7ef10d1e30911e851b64894953d7ac53eeb2e873d7a9a15fe83ca44ad SHA512 a05de9b08f87a200309c39d3bc3aba0aa2c6461c3c43a9d851299e6083f0ca9a362409b0db93ca069c7a50d3a14169a308aea51b3d42ebf0180a4b4c99bf5126
 AUX oidentd.service 186 BLAKE2B 2c5e3d68b2cc71ce369d063b27de0ba698f899003967d2eaf4e5746bd0637774070d951b23f040b6536ddda14ab8ba69a24d3f9c5ca1d98f86b785a0629127fd SHA512 dd89471b232c0cce1113ea8550a3cb0ad55bd0791b7c916ea13b533051fe10271cd8e41aff13bf4071b507251ab6b14de20c8b63a525074a728f007fe0d647e8
-AUX oidentd.service-r1 188 BLAKE2B adf68f123ad057936e92aee7de77d84781e13444508b65ad0f1c973192631f41623221a0be0330a5bb7e8b1800421b274dad755e21d85d002ae5e59e33e4c75b SHA512 8f0bc4a8ffd7800ca2c11a9eacf560e5297efbbd2c477fea85c2dfe9a4f3871a2ba67b7037149eea58cceeceaca20251480a5866c88f0a86b6de7485c58a3ce9
 AUX oidentd.socket 142 BLAKE2B d085224442446c55f6850f15537ab9c4f51a4093e12de58a8765851131c41b3df1e5961115bfbed616b02862dd7a0bc6f1f9bae1abb9d189b3d05cd2aed8224d SHA512 151f846a889968084f4b6900e42806ea2c16f184fe65fe67b77bd9176318faeb3db3f7a43d6eec8d70bca7c2919952ad9059301ba396ec56a9da1ab0371b44d4
 AUX oidentd_at.service 179 BLAKE2B 54ab7d09f950927a2dac5bc473d0533c6bc9d437e6f5c80d481795b46b67ce779682480084a02234c2a9f6b4b052eaed7a6ab8d9e31df34e4b1c81e5201e7a4c SHA512 513e49d74c25ea0392a4b9541df0b275fa497bf2cb1d55a3c1c31a9cfe207ec2de69e76d7813531c90b5b378d1dd55b3ee21371ad281ff5f2a89ab70f59a25b4
-AUX oidentd_at.service-r1 181 BLAKE2B bc930b3eb87d310eeb41ba7be5cdc2075703220385d6fc24f922c89ddefcf6422bc259ed425ee0855ed0df1cf1504e3520fa1f0cf89dcd2178b551b81e004512 SHA512 788f822926549418dfc16b9c5ada7b31079fac385926edecec2f3924746341f4deee1c361bc67f9592a0f0c9eb4151a6d3b9b7c79967982158f9f750d536f304
 AUX oidentd_masq.conf 429 BLAKE2B 08612753eb38386b0a20cf4432856d935697684680894a9303df3315d3708042cedb77ea60f913c448c311741fc19de757f7e3c55b148dd95b821457b839f27c SHA512 72e48e1923adf594d53ae325b0ba5a6ab406ac934985a699f6f3b2a88010f312ddac279a752bba6b237aa87451348a0933ee4166aa267a0b08919c37eaaac40a
 DIST oidentd-2.0.8.tar.gz 212354 BLAKE2B 46f4c4478822e832885f5f38a2ab5b2132ff5c1e5071fd1dc6050e55992d50bd96be096064996853af69d16316e6aff648c5320714b53b60c038cc9aaedfedda SHA512 86229a4ef9892121c25a7140616e180f862ca34b73ea3ad9f0fbb008f657abb17e9f14c2c25ae14c14bfc14bf1ea10b50fd68318631a9c52227bbfd6e6d43288
-DIST oidentd-2.2.2.tar.gz 260185 BLAKE2B a719413751280d44e134245793c4a88d93dd573d7d85895e341040c2d83a7b201f21f499b931c27e5c0f1d7d0957d730b2cda698ef98b74755e2ca1958457579 SHA512 c5c5040f8955e61e8a7cddd310501d24c3b2a3818e0cd122db85c03dc5b2b18ca7ea4e7edb420df3ad81558a25d4b31c1fea97684a9f53c71c9159014f84678d
-EBUILD oidentd-2.0.8-r5.ebuild 1203 BLAKE2B ddcffc10ec4c3ade58052268aa8eb33d64eca064ffcde17061801ca1103e6ca4ae3c3ac73ac28492ec09327ac048f49d8e71a5e2cafcc64949a8cf78d531111e SHA512 53a4113831796de47144d3bcf0c26528a2567ee3b3473cb53d455f0b51bfeacc2b18ee7d1a5b0d9d71fcc91fd88fe0101f332193a1fab6bdf95bc0509a93ca17
+DIST oidentd-2.3.2.tar.xz 187772 BLAKE2B 460d2959cf9f1f125a76191f8b67a083a7d9bce84c706c76f6e8da6113b12eb6e760345774d15079ff449c153ac54805d4bfa8b057c1238ff703474e118b8458 SHA512 7293339897149a990928105e6cdd77aef7cd273f625496fcc674a414764ebfe835d2a9525e518a7215fc93537c48b70d15999d5669227dbb7fbf5cefb3d04e14
 EBUILD oidentd-2.0.8-r6.ebuild 1452 BLAKE2B dd2938141d3d6d7bd666eec975e1c2a2908688c3da7295cc24a066a46555021657eaee49973f551af2d086a2d98c647650d441e93f658b5ab2401e837699f5c4 SHA512 ec3554673feb64904c19231bd749bc67a333148c61e56e1a57ac8ecfb451b13f739ec9b269f1e7cfb4a4fc2371d516a27c722bb87e269dead98d97a626c3de8f
-EBUILD oidentd-2.2.2.ebuild 1187 BLAKE2B 1245734eef6f751fc7564028231916fc88338236446e4d006802d438ff3052bb319007508ce50bc116d859d2668a665447db76edc04479172fd021b7d8fc103a SHA512 507a1e641075f577e60b9cfea052cab596e33f367214d2ad32d50f566ed56f1458455682ec6d8ab6100cf429580975f8fe5a42520356dfd72ccc8dd66cb7db41
+EBUILD oidentd-2.3.2.ebuild 1243 BLAKE2B c1b922a6e7808203f629631560046bbfc68aee794aeeb9ab3082d1536d0f1f370a04a924ce0103b6b8fc9e2e23807cb47adfc9196749b3741724ba3a96c1ec8d SHA512 dbb12ae0f7c54fb1fa5440dfd3868e7fe43e0114cc7346284c5c53954c5b9db8b78d8f494b16bb1e029cfbf25bacb1a87ab227e8447c315bf93b58515fef3d2d
 MISC metadata.xml 539 BLAKE2B 10058ed518667411899809727711217f873c5ea4f65819a7f70315f1baf9a856f2b017197e1bd5b02e7b1a9c38b9a189df27e572c1eb6b04b08d29429f8f6d03 SHA512 0e2ad57b9a3032c73a0206ff665dbf8d258fdd91e595eaf7b06a309488321809e0f8bd567e37452cf83c89c734c4d57857b95df0472bda0b8c29f4e14b23af84
diff --git a/net-misc/oidentd/files/oidentd.service-r1 b/net-misc/oidentd/files/oidentd.service-r1
deleted file mode 100644
index af426eed6175..000000000000
--- a/net-misc/oidentd/files/oidentd.service-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=TCP/IP IDENT protocol server
-
-[Service]
-ExecStart=/usr/sbin/oidentd -i -S -u oidentd -g oidentd
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/oidentd/files/oidentd_at.service-r1 b/net-misc/oidentd/files/oidentd_at.service-r1
deleted file mode 100644
index dac0e70fd79c..000000000000
--- a/net-misc/oidentd/files/oidentd_at.service-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Ident (RFC 1413) per-connection server
-
-[Service]
-ExecStart=/usr/sbin/oidentd -I -S -u oidentd -g oidentd
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
diff --git a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
deleted file mode 100644
index 1a328a04f7ab..000000000000
--- a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd
-
-DESCRIPTION="Another (RFC1413 compliant) ident daemon"
-HOMEPAGE="http://ojnk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="debug ipv6 masquerade"
-
-PATCHES=(
-	"${FILESDIR}/${P}-masquerading.patch"
-	"${FILESDIR}/${P}-bind-to-ipv6-too.patch"
-	"${FILESDIR}/${P}-gcc5.patch"
-)
-
-src_prepare() {
-	epatch -p1 "${PATCHES[@]}"
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable masquerade masq) \
-		$(use_enable masquerade nat)
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog README TODO NEWS \
-		"${FILESDIR}"/${PN}_masq.conf "${FILESDIR}"/${PN}.conf
-
-	newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
-	newconfd "${FILESDIR}"/${PN}-2.0.7-confd ${PN}
-
-	systemd_newunit "${FILESDIR}"/${PN}_at.service ${PN}@.service
-	systemd_dounit "${FILESDIR}"/${PN}.socket
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files are in /usr/share/doc/${PF}"
-	echo
-}
diff --git a/net-misc/oidentd/oidentd-2.2.2.ebuild b/net-misc/oidentd/oidentd-2.3.2.ebuild
index 73fc0be4d052..3c995fd53776 100644
--- a/net-misc/oidentd/oidentd-2.2.2.ebuild
+++ b/net-misc/oidentd/oidentd-2.3.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit linux-info systemd user
+inherit systemd user
 
 DESCRIPTION="Another (RFC1413 compliant) ident daemon"
 HOMEPAGE="https://oidentd.janikrabe.com/"
-SRC_URI="https://ftp.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.gz"
+SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,18 +22,21 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-oident )"
 
 pkg_setup() {
-	local CONFIG_CHECK="~INET_TCP_DIAG"
-
-	linux-info_pkg_setup
-
 	enewgroup oidentd
 	enewuser oidentd -1 -1 -1 oidentd
 }
 
+src_prepare() {
+	sed -i '/ExecStart/ s|$| -u oidentd -g oidentd|' contrib/systemd/*.service || die
+
+	default
+}
+
 src_configure() {
 	local myconf=(
 		$(use_enable debug)
 		$(use_enable ipv6)
+		$(use_enable masquerade libnfct)
 		$(use_enable masquerade masq)
 		$(use_enable masquerade nat)
 	)
@@ -46,7 +49,7 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
 	newconfd "${FILESDIR}"/${PN}-2.2.2-confd ${PN}
 
-	systemd_newunit "${FILESDIR}"/${PN}_at.service-r1 ${PN}@.service
-	systemd_dounit "${FILESDIR}"/${PN}.socket
-	systemd_dounit "${FILESDIR}"/${PN}.service-r1
+	systemd_dounit contrib/systemd/${PN}@.service
+	systemd_dounit contrib/systemd/${PN}.socket
+	systemd_dounit contrib/systemd/${PN}.service
 }
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index d433c8d0949c..7fbe6da93255 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,11 +1,7 @@
-DIST owncloudclient-2.4.1.tar.xz 15403164 BLAKE2B 0ab1ffbe2179fe04efc7977972d5941a32bc20cd73e310fa72e2a3cf341f7223911fd430f4d34f7e265819acb68d8576e2687a7bfe4ab7140b4c9e9381ea863b SHA512 5b0ceea299078efbc92c1abe22210a93df44bf98094bf4cf8a0c5138f0b69a6719fdc88ef2d5674d49c0ec18ffb12493319eb84616c3e4b8666171cb1a52f0b7
-DIST owncloudclient-2.4.2.tar.xz 15409188 BLAKE2B 89ae891479f29c8637843e14e3aa58d91769393dcfedcfaa415a601962eabd4d1760250fa57166fde215e5c0c5b5799b72dc4f1b52814e59149b778d92d5eb93 SHA512 17f857354b270ecde75cae81557adb78dab830589b32df0b3cf96667010f02501d793609cddf57223d1dd3d9cdb493f1f55bcb04a09d05c467afaddfeb2210b0
-DIST owncloudclient-2.4.3.tar.xz 15406724 BLAKE2B 1e8790f9ebb96ba7de5350c3f7be01f6e0a06e66de591b598795c2ea6787d0caf238daae4f56fad5a8695b8c4eeeea62e36b469fecfdc2df7a90f110a7c7a1c8 SHA512 072fafe69a962f3f0892706f8fff9a9af643b479229dc99e95c712071f11942f75ecc08e7a3470a9ac49f0564da23f8fb21097064c9fa8c6ba1c830c32a6c01f
 DIST owncloudclient-2.5.0.10650.tar.xz 16651172 BLAKE2B 98b928963f3327bdcddaaa61eadcd73422e982cda11c4a4791987eb34ce692258af47649dcaddaefd01097bbc3aa514a56726dce52ce6f51eb61bdf493bca37a SHA512 61f355e514306ce0dec628ac8af7ba004158a890bc40c3905e5aa7705aff753a3a723ba4a0727625327b399cc71bb6c1ad2b415acc760c551eea1bf2590392f7
 DIST owncloudclient-2.5.1.10973.tar.xz 16662564 BLAKE2B b0c58fee00e366c2a2e0c7b316fc098558758fc3644fdd5a0f39e29dc853030f1df504536a6725a3557e08024346ed9c3fa3d54e35a4d5d452afd1a34ff6fb62 SHA512 11a16f2a2656517f6c89433d8f5e9e44d61be7cc45eb702fe118a000e32ec2f2c53bab75e2d226bc50106c3be975b34b1bafedbaed757d0c3bd8cb025facf47a
-EBUILD owncloud-client-2.4.1.ebuild 1977 BLAKE2B ce1731892cab01d405f6ed07d94cbaf567b85c8bb94b0d49b6eedd158a0721efb821a3f4fa2385b3c5f500d5755c29bbc2b6dbb92d0bb7d65996bb5afad150c0 SHA512 74259af9e1679515592c929687a92dcbde906da7d14c4d6bf5949bfb7d38acb60827e9705b11d1cf37380794bf47976390b862cf457c3df5f33c10da50a86af2
-EBUILD owncloud-client-2.4.2.ebuild 1977 BLAKE2B ce1731892cab01d405f6ed07d94cbaf567b85c8bb94b0d49b6eedd158a0721efb821a3f4fa2385b3c5f500d5755c29bbc2b6dbb92d0bb7d65996bb5afad150c0 SHA512 74259af9e1679515592c929687a92dcbde906da7d14c4d6bf5949bfb7d38acb60827e9705b11d1cf37380794bf47976390b862cf457c3df5f33c10da50a86af2
-EBUILD owncloud-client-2.4.3.ebuild 1964 BLAKE2B 5f76eaf7e9a235a59ef092b870dba42de326def85549ebacfe9e903f5f192c8ec82ce5f19a3d349b2017a8b2f36f47209fb45b203933ca92bbf220fef9f68520 SHA512 731ec31418bc8ab853fb2015baee798ae9473500c0aecd0078526a9e4fbb8450f623e19e6f465cf3c02c4fbe2832d41c12a41dd4764ad98b0e42b4fc8ec36b9f
+DIST owncloudclient-2.5.3.11470.tar.xz 16719780 BLAKE2B 0c10d95ef2d851ba3f728dfe1c55c4143cf9d1542c1f9e77904324f598ecbfa29e54119d12ebef78b8eafa1188e7359ce11d01034ff34a55a80d31d1d3b1db35 SHA512 331d8e8e71d64cf9c958f9391001c6fdff45795e7caad2ce7bf6802c4f0959adf694712cd298fb8702cd4e93577282957cabc61ccc5f4f3a57edc9ddf1c7c2a0
 EBUILD owncloud-client-2.5.0.10650.ebuild 1961 BLAKE2B 1febde1d3ca49b463c6f05b45e42178a6bab1b104e3cc00986a29d3f3037bc05a9ddc7df94fc0e3d0c3742cc02af0a6b1975fc8857ace251a28ba27fece66061 SHA512 7afaae30ccc8fdb53e812f54c2d2c01c1960d07e990cd470a067a0679d6c005f38791c8333954a75d9c3dd4e99560d5e0a4d7a39ad1d5d33c50e715ae87c6498
 EBUILD owncloud-client-2.5.1.10973.ebuild 1961 BLAKE2B 1febde1d3ca49b463c6f05b45e42178a6bab1b104e3cc00986a29d3f3037bc05a9ddc7df94fc0e3d0c3742cc02af0a6b1975fc8857ace251a28ba27fece66061 SHA512 7afaae30ccc8fdb53e812f54c2d2c01c1960d07e990cd470a067a0679d6c005f38791c8333954a75d9c3dd4e99560d5e0a4d7a39ad1d5d33c50e715ae87c6498
+EBUILD owncloud-client-2.5.3.11470.ebuild 1961 BLAKE2B baf378b6d0821038ef0afab470041aa4d2b59687f3b53e06361221b832361f659f0e4dc9799b79f1035a21c373fa705d9b5021f9b6d132c3b1b2909226145e75 SHA512 8a8570108aaf635ec5842e34f620526c7ede5d3cf0ab77ed7dea31e35114d7ef6e9e8f04f973c301e49c5a3c96f55c017ad74f94277d094f3473f08a9d2caef0
 MISC metadata.xml 508 BLAKE2B cbba1d7edcfe92d38f2f0d959695cac4f2c1eef8949e9816a995b18432a5c372185094cfa2548787ee63d58175b2110792f5e51688bc456c6376d86a7e8d9864 SHA512 1e757d6db30a7d5d90f317325fa96a1bdf46029e79846d17637f699d07ffa9f489f2d66855c647896a7b932e545b91242cc9df1dbb4bcce83e266c13c8fcf6c1
diff --git a/net-misc/owncloud-client/owncloud-client-2.4.1.ebuild b/net-misc/owncloud-client/owncloud-client-2.4.1.ebuild
deleted file mode 100644
index 3966ff822847..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.4.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	shibboleth? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/ocsync
-	!net-misc/nextcloud-client
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)
-"
-
-S=${WORKDIR}/${P/-}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DNO_SHIBBOLETH=$(usex !shibboleth)
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.4.2.ebuild b/net-misc/owncloud-client/owncloud-client-2.4.2.ebuild
deleted file mode 100644
index 3966ff822847..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.4.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	shibboleth? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/ocsync
-	!net-misc/nextcloud-client
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)
-"
-
-S=${WORKDIR}/${P/-}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DNO_SHIBBOLETH=$(usex !shibboleth)
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.4.3.ebuild b/net-misc/owncloud-client/owncloud-client-2.5.3.11470.ebuild
index e777bb2702aa..024076bcd690 100644
--- a/net-misc/owncloud-client/owncloud-client-2.4.3.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.5.3.11470.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/pyhoca-gui/Manifest b/net-misc/pyhoca-gui/Manifest
index f2da4c1ccf2d..6519ac4064b6 100644
--- a/net-misc/pyhoca-gui/Manifest
+++ b/net-misc/pyhoca-gui/Manifest
@@ -1,3 +1,5 @@
 DIST pyhoca-gui-0.5.0.7.tar.gz 1345182 BLAKE2B 4986c1d19663ed3df29992cb7b442bed4fc95bdd6e0f1d3521e1bc3d2ab0d98aa9578a470995ab0b28ba13fb29fdb8c384a59f09d08270dd1d689177a9548045 SHA512 bfb0eb95a87e19ff84fd13c642725be40369ec8e7f58615301033d22e3c1f81ed8b47542989711b1ee9414382989c8e258fa24f3f3c6cb950c42a53a9a6bd8b6
+DIST pyhoca-gui-0.5.0.8.tar.gz 2064483 BLAKE2B 63bca5be8673ef4e274caf4e0813b73f5dc8af7818b7638b2ac7411bb1598272bab573bc55c6c5e48fc45cc185bad907594b99ee0c96546683ecd8dd1ef1e3f1 SHA512 35bcbe35056d718ec5b58733b8569fd40cd6843a6661cc19deed02287cf65e03b4812fc82bdb0d54b12a78d5547456463e8adf236d4a7f04e11d0d462fe3eded
 EBUILD pyhoca-gui-0.5.0.7.ebuild 809 BLAKE2B bc974a3908bc993af18c86483bcfbdf655dde6cbb2c7ba80229f8dce0efde64e6f7222c1b53a119ba57f3f1d1f7714349afef887abd370de3f95df3a912f038e SHA512 c4e457b3f8d597fabc3842cde26f5acd5fad4a54d7849a0c1349aaf253146217ba8695e9ebc879bdec939dad897e5f57680e7121981da0483ae8d4ff382ec092
+EBUILD pyhoca-gui-0.5.0.8.ebuild 806 BLAKE2B da301c05769a3fa90efd30a45330d4baae3eccd8a6a59d97b13906f4a7a95e2e3995d219edcfc3f7e457c1b062ee65ede0a8c73c0564191aa3b0d05f2a400ea1 SHA512 c95d09e557617176ace03d0a13b5101fec19b2702846857a67881b58273dc2eaac6a7cd5d9e1a60c7d3a5e2c98d492b93b8e042d014e2ca9b9259d39c4d91597
 MISC metadata.xml 791 BLAKE2B 7f823d058d401072a1e1407391c2eb02c0b70705f5beac53656d582b977455201f0687c3b93653314be45339dfc749a81a06197a3e6e1b0c78205986fbf033ef SHA512 5e05aefac383cb0cc65e2747aa5d9eef23b2f26931196fa544f263a0c0bf2dfc63c026fa606fd910ab589f447d3bd78f42de0bff61a44286964098531000a5cb
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.8.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.8.ebuild
new file mode 100644
index 000000000000..633abd8f8d76
--- /dev/null
+++ b/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="X2Go graphical client applet"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/pycups[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/wxpython[${PYTHON_USEDEP}]
+	>=net-misc/python-x2go-0.5.0.0[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript ${PN}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/man1/*
+}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 518a31c69339..4c1a1ca6a8e9 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,9 +1,11 @@
 DIST Remmina-1.2.31.2.tar.gz 1247378 BLAKE2B 923b131ea2b4cff57d952bcfc2cdac58ad849ce3220dc6e3084b3905f9fe1203443fe0bb2f8a3fa910e7f367299b1b8c1b2373e8b337da7c4ff99ced1951492b SHA512 e66bd77e3b3e8374773e6029a727d814ada09b90a5620452e8ecce19e6f4327aa2e50b8956b292abce2e9329deec79370665a6a6aecbc2d33557381ce5b8db3b
 DIST Remmina-v1.2.31.3.tar.gz 1248295 BLAKE2B da748ceea5aa50702b060075c8e5c4aefe11ca1ebbc301b2951df76208da5998746631ef4c57f5692678e948839a8869a183b777f7046d416a55e5ac5b0d76d1 SHA512 f95c4dcebd833b590fbf0b418854bae66541743bc77cda4b0b97e1e49b158927fa859907619fd532b0660fc30eee80be472e02c38a2afe33e477c4a903a99e28
 DIST Remmina-v1.3.1.tar.gz 1341006 BLAKE2B a4938558e2b3595a62514789a6f748f0e526a20dae23f21c835b6c11a3f321fe564fbc77fa4ea7def97875ada169b73692861707d432b81c3ad51d5630633e67 SHA512 91146a75563f169b39f7aa57fbd846cef1965a0e7c11931acda4bc461407cf3644a1f363b1f46421e5a6ccd1d43d6a89cdb38420dd98fea5ddad1a52ae65d41e
+DIST Remmina-v1.3.2.tar.gz 1362006 BLAKE2B fa6c4f84b6987850944906fac97340c7b17b44b076dadc73143924e35916f8306f8b053e734d1a388e97821b1bcf9eb8109cf787a8d3f4e02f0885fa06a338e6 SHA512 076759acbcb5191b01dda777137eb239a38124d20141e85556b23e3380e5d0a39ff187a4928605ca089d53c6cadd268d0de735795db84672ffa55ea247196ea8
 DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e
 EBUILD remmina-1.2.0_rc24.ebuild 2035 BLAKE2B 7490ba779c88bf0caf7f1de2398dec1484acf428f3f1ddd06b021965d3ef255927d9637e24c56a71a3737707ef6a2df0257dc1a486c60e665e99721aaa5c1092 SHA512 058740deb4f072b8677fcb5bcedf2c870dccf748c166594cdf24cc09574b1fd1b8fb0157b89c82e43bd3dabcc892e72f561ed4db816ea269c40b2da9b73ce3cf
 EBUILD remmina-1.2.31.2.ebuild 2223 BLAKE2B 475810adc6d4769e4ffe6e3763b5f9539dd110ba33d68f7f2a8c7c6cedfd4d1b95d0a221051a49392b9030f51c03252dc3a28180f4aaf634297612e93bf98050 SHA512 f54b5095ddea11519b03258406b5f36db4afb010020abd9c883028e24690dd36f662d0f8259d3247ee652294dcb04d1a6ac508ce361ee2076148b032fc2d8bca
 EBUILD remmina-1.2.31.3.ebuild 2239 BLAKE2B 65e7720bc587f060e1014ea7c35832a4eb3a7c3a618913b35803c56103f814e0d82e65756471cef1e55da3f5d6a2044660b8adb33e7fa82618dba3c376e5fa6d SHA512 f038e0f8242aee5eb86403dc0e4758278f91407b9382b837d248de914037d88f7fac489ce326f5499c4cc548215f924b17ae10e8792955efec868b9e4c00f3f6
 EBUILD remmina-1.3.1.ebuild 2241 BLAKE2B dcf61f0d57abca3f24bd7bffab8bb43b6834f14cc214f3f7fb36e9e10da1fa40ca0f98f97853d21bf1c2a29351f32d18f8f1ce489487ef5c85be88213a10ae56 SHA512 2505786c61408b6bb47f6f0c73505f0431f0ac53be831f6d177d226405ec8a0bb898304368f085737c3afddf52dab428c067a3a23f9e552835465fff74859235
-MISC metadata.xml 1255 BLAKE2B fefa1b10f16641e6641e44792dae98bc75449f2a514572819f541a616345a56448b4fafbd2da649e41ddbcd7562debd481ad033012e3db0d12e5c07d2ffd3e0e SHA512 2d75beb76a8e3d652a9b68b7e563126e8bd2b487974f0b68b6cc79ebd83cb9706349c3802e383995c3ff9c0e61b8221a72beb469d68ec432fb429af1e2109ffb
+EBUILD remmina-1.3.2.ebuild 2247 BLAKE2B 99065b1b37f957f07f0a16487f2dd4c9dc3f7c60cf9657584b6c0f1ed06b41602f8763d3e88f02234a42ad424080818e35df676e61dde7a6042d4934526ce65b SHA512 f80bf47e941b0c505610f757647c3260c7182d230e2f8067c3ed3781bd37c1ebcdab52aba279e9a51bda2f6faec78a7c0eb4e75c8c85f6fadb965ab0ff9910b3
+MISC metadata.xml 1255 BLAKE2B 8567efbc8604b6fa65c44a072f8f49c6b0329de326b6bae638befd74ed0a506985174df29e09ceb391c8aadb3d11ee157137dd7456483b1c49908801831a6099 SHA512 5ce1ab53566158e4d3445e4549f2436bd758a486f39bcd59c732935d0b1f2b4033df616f8e3096632d1053aabfbc5b8602b509bccab676f2a36db637c691eb57
diff --git a/net-misc/remmina/metadata.xml b/net-misc/remmina/metadata.xml
index 17edcfb89bca..f71db79b2675 100644
--- a/net-misc/remmina/metadata.xml
+++ b/net-misc/remmina/metadata.xml
@@ -27,7 +27,7 @@
 		<flag name="telepathy">Enable telepathy support</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">FreeRDP/Remmina</remote-id>
-		<bugs-to>https://github.com/FreeRDP/Remmina/issues</bugs-to>
+		<remote-id type="gitlab">Remmina/Remmina</remote-id>
+		<bugs-to>https://gitlab.com/Remmina/Remmina/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/remmina/remmina-1.3.2.ebuild b/net-misc/remmina/remmina-1.3.2.ebuild
new file mode 100644
index 000000000000..834591991fa1
--- /dev/null
+++ b/net-misc/remmina/remmina-1.3.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils xdg-utils
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana crypt examples gnome-keyring libressl nls spice ssh rdp telepathy vnc zeroconf"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	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 )
+	!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] )
+	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 )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-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_AVAHI=$(usex zeroconf)
+	)
+	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/ser2net/Manifest b/net-misc/ser2net/Manifest
index a04eca2a31a0..ceeabe263cd9 100644
--- a/net-misc/ser2net/Manifest
+++ b/net-misc/ser2net/Manifest
@@ -4,7 +4,7 @@ AUX ser2net.initd 1528 BLAKE2B 509df2c77f6c8495a669aaf017c9809f342ec9bb50033461f
 DIST ser2net-2.10.0.tar.gz 364322 BLAKE2B db041297069ea0a111ed73d6b1fc8a639971f113952fbcd499a81671bbd873ee3e1724146bfb5c6975d1812acd8e545e9df2bde445f4a86af57a0ae5b9b19ec1 SHA512 dd3e37619b10d8bf20d738e90c253bc2d109e0a57ee9f3a8b2a85a69399afa5a8459a4602b2856f0b655427023a36c78330851bf7f8d8da0f28d1fe22c1d5e10
 DIST ser2net-2.7.tar.gz 355064 BLAKE2B 682210619b26d6d34b8ad26559fc20f73febdf8c106afa7cd64c272af5ed9353186db2dcc899f58cd93ae82f5df45b66d025c3f3e88cee0ae1a25252e5be2d8a SHA512 39ee99031fad45ea8eeeb9e8bec343e8d6bd58c818f56ec01a05c50ef6d8ed845c6521a6d4a306671ed26959bd2df5c0b29a6b4399103815923cf958c1891c16
 DIST ser2net-2.9.1.tar.gz 357820 BLAKE2B 2068d9aabad23e647d71baa2951ebf882e2575e457606b15c18ac8a2cf5ea55a251f19b553fe926f37ace51de4b4d33de4a32a0ebd5f33a88c0a231f5e1c6ed0 SHA512 9fd0efc853993b70c0c632a7059df7a04c832f85491194c49dd8b384e1bb1a576ed9cfe28088cc181a2f7084c88dc6ef6dabbc4ead5ad9339a7becebaa6fb8e7
-EBUILD ser2net-2.10.0.ebuild 628 BLAKE2B 70258facaf595c95aaf2071fda9c4d38faf71fbcde5b46956940e8165d91479f096fad7e0209707a614320b400a7790691056c18856acbd9579923bd68176640 SHA512 5e789763072adba021dab5e10b5be926b8f6108097eef98e3cb1912b4199d8a1f30bca2309b792f676849fa7da00f278f53106f6cb4b166ee73cefddc1f022c5
+EBUILD ser2net-2.10.0.ebuild 624 BLAKE2B 915b33a1be0ce0d363b88affa4b1019bbb06e6e8d406c5d6bb65b5663fe4201b8d6249ad46f2303bc7557b8e67ec4cea4af28b0c1322ff005acdc0fefe3489b4 SHA512 42276201d860557ac7594d2b0732a4ba3966629dfd51cf87653d3cbdc303e45bb295d7a6572f56f5ccdf1159c68448c05dc7be7eb3033ca7eb6bdca9a745a0e8
 EBUILD ser2net-2.7-r1.ebuild 847 BLAKE2B e3fc02c86a660671e5767c89296ea2852a68db014552ef12a6b01b79f6119c1e83f1c901ad78eeb84255e2332f7dd4beed1e25620a2243726c8173ec2b500aae SHA512 f2acf54587c7791b9516db5488eaef6f5fba022a5d43ab6451dae3fda14a190dde790eba2ebce0d1bac488eeb4a90e0496663b243f19d80b5422a3f9583a7345
 EBUILD ser2net-2.9.1.ebuild 626 BLAKE2B 4a8ceeb1f02be88b95ce5e62feb0170d74043a3abfcac79242b373b25aa3a14ac52c8446fbf4509ef0ec5a18b933980a0f5954c48d71ce0e2196c0e4837b2ff2 SHA512 5c401b1795a2b2a46af9af947891702d1074a8edc6f3e252874531b8325d1a0474871e5f35a2c3684a4d311c06cda74fa57ffc66594fcd7c7d010e52e8ae90c3
 MISC metadata.xml 244 BLAKE2B 31c4948eba2d8d59d90f9f49328291d0d678db43eadabae9c482ccc82e2343160809308451a5f014180a4e017eb85afd24e64b6f630219987b3bbb4df45fd170 SHA512 c026f437d46c264d228d51fe7e6d9fa32e7647aad09124fdb77b2c602885609135c63f2b8fae8092b5c68ba62cf4bda87bc3c321f2918bc2f3e77c4fb42a10c0
diff --git a/net-misc/ser2net/ser2net-2.10.0.ebuild b/net-misc/ser2net/ser2net-2.10.0.ebuild
index dedcff7d474b..f0ce78d33a8b 100644
--- a/net-misc/ser2net/ser2net-2.10.0.ebuild
+++ b/net-misc/ser2net/ser2net-2.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ DESCRIPTION="Serial To Network Proxy"
 SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz"
 HOMEPAGE="https://sourceforge.net/projects/ser2net"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index ce5c858ed86a..6f296c3aa368 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -8,8 +8,11 @@ DIST teamviewer_14.0.14470_amd64.tar.xz 19458912 BLAKE2B ae106af9126719d92d69501
 DIST teamviewer_14.0.14470_i386.tar.xz 19473776 BLAKE2B a96ed757c6af5e07d4b958d2034c94bdd04625e0ae68c6dba94eebd1f1416f33e339a8766161bfa412ce90119a70cefbded995d66656ac11c0b08869639ba15b SHA512 6c867e32f26df3675bee80e3dfb2aa5868f3bf4717ce07deabc7495d2797018051dde42080eea6e3c0a919e20f5517d621e075c7d7f75cabec4b6feeae5fa74d
 DIST teamviewer_14.1.3399_amd64.tar.xz 11311600 BLAKE2B 082b23322b4a24add2f7a1235810a3fb3cfd6572ccfe2a54942bd93902d3adc170a175d32653375c406de7a54949fd0904dfae8b8cf98da58ef492ac63d0e576 SHA512 9417fca34d2b4b3e53d173ed31f85ca6d3f2488dceb7bf2321082631b425d7c3404549ff4bfe615e6f8f82354df5c43ab61e8cd4ec99ae9c42b28807ea0db365
 DIST teamviewer_14.1.3399_i386.tar.xz 11305576 BLAKE2B 1a40cd6dd5e1554b44d210fb0ca78a3570185e046b12eba52d0e089cd317ab6c8828f774d6b786ab7232ad663785bd9fb2e9137eb0ea7364347ea5513ab5e6ef SHA512 0fef5c5794ea06d9a729cd5be0b2e7c28add1fca9bbf9e77ca69fe569a08fc1efb6dc007040d8a8d3608061469dc2e2d364584130316d58e2d8195b2389deb0f
+DIST teamviewer_14.1.9025_amd64.tar.xz 11357456 BLAKE2B d3401b4465341533e0e3e7d57515566b1833689cb55d3d2b2b4ca95ed706ebd5609698b128033737dc1532e10fd15837241f11e327d3345ef266b90d2837075c SHA512 2a6fcfd3bb74a9e0f97bd94cf92ba5c8500c17436887e186c6b65d1c02b984799a41003e0cb58af503ece6c9c4f8205c907ba179b491efd3b765ef34b1ec9f76
+DIST teamviewer_14.1.9025_i386.tar.xz 11357824 BLAKE2B 6eb496549e39a1f66a5e14af3d69f8f11dda1549e4af51d354fa8cdfd027dec58240dc6ddacbaf0b1c0ccecf918873d9307f6d75a09abf180a1be5aff65f2613 SHA512 b5ff7e417ffa59725656611348dd717141fa010460f2d872ef555471f22af24d7dde02b0356eece69eb2a7e8fb0d94024646b74e9c8d5c00577eeda1e8c9a713
 EBUILD teamviewer-13.1.8286.ebuild 3704 BLAKE2B f3811ce525af9e8fc62cf4563e575b2176930a6de394250b160959c14dc06d3df03c743d26292dd8385b069b3c99245f7f5024ccb125dde8f959ed48ab266ccd SHA512 0530eab9b9a03d04c7485245378816368611a897b2e87d6aecce42496ef9200a4103ddb1f07510c36d546ae60d2848237048d82c06e420abe14c1919dd0b8259
 EBUILD teamviewer-13.2.13582.ebuild 3704 BLAKE2B f3811ce525af9e8fc62cf4563e575b2176930a6de394250b160959c14dc06d3df03c743d26292dd8385b069b3c99245f7f5024ccb125dde8f959ed48ab266ccd SHA512 0530eab9b9a03d04c7485245378816368611a897b2e87d6aecce42496ef9200a4103ddb1f07510c36d546ae60d2848237048d82c06e420abe14c1919dd0b8259
 EBUILD teamviewer-14.0.14470.ebuild 3701 BLAKE2B 4f022ce30f521cdac93245040fc1963960fbd83eb5349c8febb1e17019ab990036d6de02a250384b0f2fa332913feca4fa7bb18c0c46812d5e9f64834f17cf29 SHA512 b97758ece045326b9096538393fba63215690996ca5c0ac56b95d4e235b6c9ba182c5909846ba48bad2819dbc3d880f34ca67dfbd083c8770db4962a9150e8db
 EBUILD teamviewer-14.1.3399.ebuild 3701 BLAKE2B 4f022ce30f521cdac93245040fc1963960fbd83eb5349c8febb1e17019ab990036d6de02a250384b0f2fa332913feca4fa7bb18c0c46812d5e9f64834f17cf29 SHA512 b97758ece045326b9096538393fba63215690996ca5c0ac56b95d4e235b6c9ba182c5909846ba48bad2819dbc3d880f34ca67dfbd083c8770db4962a9150e8db
+EBUILD teamviewer-14.1.9025.ebuild 3701 BLAKE2B 2413ca30f73a54cf75f69600d9928d8803b0d6c66a4ef0e40c37703573845984ab15f00dfdba33b9359676a1412828df84dafeb5649d68e71d4f8ce3e8331dd8 SHA512 871ded4d964787d875a4731fa6e44590df92746c855ec1e5d471ed8cea8b7d464c591b308df4ebfd9dcf29cfa5e6cedcc53a98d40547ee3725a54536f83fe65a
 MISC metadata.xml 250 BLAKE2B 94de840f3a83c87af4ee3224855111d06a5c77ebbe20d6691dd5a95b4677075a0e9e2fe405a327ac485056269bf3146d5ee6726843447f6436a97d1f7ef44288 SHA512 1ec261c858ac8824789dab07b4b01fde96e8d2a13add9b05617a4b824085d77c181057a7c602db5f4fd3b864b864e6314a64512159d174304fc4fba393b49734
diff --git a/net-misc/teamviewer/teamviewer-14.1.9025.ebuild b/net-misc/teamviewer/teamviewer-14.1.9025.ebuild
new file mode 100644
index 000000000000..2887c5d78191
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-14.1.9025.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=${PN}${PV/\.*}
+inherit desktop gnome2-utils systemd
+
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
+		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
+
+LICENSE="TeamViewer MIT"
+SLOT="${PV/\.*}"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/dbus
+"
+
+RESTRICT="bindist mirror"
+
+# Silence QA messages
+QA_PREBUILT="opt/${MY_PN}/*"
+
+S="${WORKDIR}"/teamviewer
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
+		-i tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_PN}" # install destination
+
+	# Quirk:
+	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
+	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
+	# when changing the ABI of one of its dependencies. According to the
+	# TeamViewer devs, this binary is an unused remnant of previous Wine-
+	# based builds and will be removed in future releases anyway
+	rm tv_bin/script/libdepend
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
+		fperms 755 ${dst}/${exe}
+	done
+
+	# No slotting here, binary expects this service path
+	newinitd "${FILESDIR}"/teamviewerd14.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
+	done
+
+	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
+	# have the undesired result of installing subdirectory 'doc' in /usr/
+	# share/doc/teamviewer-<version>)
+	for doc in $(find doc -type f); do
+		dodoc ${doc}
+	done
+
+	keepdir /etc/${MY_PN}
+	dosym ../../etc/${MY_PN} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_PN}
+	dosym ../../var/log/${MY_PN} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "Please note that parallel installation of multiple versions of"
+	elog "TeamViewer is currently not supported at runtime. Bug #621818"
+	elog ""
+	elog "Before using TeamViewer, you need to start its daemon:"
+	elog "OpenRC:"
+	elog "# /etc/init.d/teamviewerd start"
+	elog "# rc-update add teamviewerd default"
+	elog
+	elog "Systemd:"
+	elog "# systemctl start teamviewerd.service"
+	elog "# systemctl enable teamviewerd.service"
+	elog
+	elog "To display additional command line options simply run:"
+	elog "$ teamviewer help"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 1f20272b5741..f111c2cf351e 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,6 @@
-DIST youtube-dl-2019.01.17.tar.gz 3088912 BLAKE2B 6cd46442d78126b3428135fcb820eb02bb2d567fe41fbfefcd80fc68a9ece0faaf2aa4981e31c619c3be1f789a9539236b1a71e72490c4ee667953837b25f0e5 SHA512 b8e81c2b2ec284033a5a92f49a965375d681d92435bc0402bb891b443f94d1321716a15717fe4e3c1fbc54ec610445282c52c18c046e140dd53731560230bd3f
-DIST youtube-dl-2019.01.27.tar.gz 3102349 BLAKE2B 4d078cacc220e7c0ec46a395c58fddcefbdc4c6abfb68ba36eec0aa8a4506896132ac14c0edf1cafb8d55473931d1ce7f80cf0b08f2217c72c16d8084ed7afaf SHA512 33c7ac784b57feaa7b28b1cc0916f722fd958d111e3caeff6edf30bfe7d4f96bd61ee666dfaf672c75f1da7abc7d54510f7c9b7d7fdc2479e0dfd4625f4c6a42
 DIST youtube-dl-2019.01.30.1.tar.gz 3105464 BLAKE2B f09cf3e86710f6d3ec6555e18299097800775a44ed336fa54fd5abb8ea753806dc6431894659e51fef43b90f974250dbcce9bb51eed50e1e43b75fe40dd21fbd SHA512 4d1fd2b9cf84dbbbf3a7a84ce9e7b2fe39d34fb29c337c71c4dba598bc3eac9d205399055dbcd7ec964398dafac90d488188c4fbc5083ee0abfd09269dce26b3
-EBUILD youtube-dl-2019.01.17.ebuild 3410 BLAKE2B f16485a95281547c0ad2b0f32d1005e7a1500f630d5894dac2f2ab3961de53d92fd535cb7b253ae566a5779e757f5439bdf68d204c9c8a8da8e8c816eda3f72a SHA512 c3745e5375971e638f46dd20389523d648c853aeaa03a36d982814158fd2a0561749e8704998617ef2983905be0f4dbc5b78f06b6faa965e6299487bb55991e0
-EBUILD youtube-dl-2019.01.27.ebuild 2027 BLAKE2B 028f1bd62a12ad5b2b20eeaaf83e63c3dc765c0fd220ec2a187844993159f449b631a7e5c5d0b80977545e7ed47c9c452b3492c5001ce78c0452a69207120b8b SHA512 ce09e4ee4e17b44a51581d252ae5bda890d22168c612785033abd9297ea8be0409845b25a175775ddc64d9dbee0dd9324a2494df6316b4a41837fd4e8f483b23
-EBUILD youtube-dl-2019.01.30.1.ebuild 2027 BLAKE2B 028f1bd62a12ad5b2b20eeaaf83e63c3dc765c0fd220ec2a187844993159f449b631a7e5c5d0b80977545e7ed47c9c452b3492c5001ce78c0452a69207120b8b SHA512 ce09e4ee4e17b44a51581d252ae5bda890d22168c612785033abd9297ea8be0409845b25a175775ddc64d9dbee0dd9324a2494df6316b4a41837fd4e8f483b23
+DIST youtube-dl-2019.02.08.tar.gz 3104780 BLAKE2B e89a9950de84c3d2c5530ca229f2dfb39bb372454a6a1d67c0d1c966f68f2372008556ffda32c042eca6d3c0aee3ace0c1cabdf1d65cb16efc80326b821a3624 SHA512 4fc027ec6d9d7059c34a3c16f1265989ec000c131e6a937f667928531dd2a6d9f56592d367f08ec5e3b1900b3e191aa36bcc997db04b77b95850a43ed1272640
+EBUILD youtube-dl-2019.01.30.1.ebuild 2021 BLAKE2B a7fe20e586f2d3243069237315e89ad05ff23c1684854a4029111c30622f23a8ba0c73325bb3a98f6fdc76203afd3ae4246ae62e0cfdc02c281188d3b1e25e40 SHA512 c589d6d581b2a91443ba9def42b278ed427bebc45a02b25a053dbb556c23dc299b5a8873540679394863a1ca2a3da929d27b779e467c0269707600fea55a7e7a
+EBUILD youtube-dl-2019.02.08.ebuild 2027 BLAKE2B 028f1bd62a12ad5b2b20eeaaf83e63c3dc765c0fd220ec2a187844993159f449b631a7e5c5d0b80977545e7ed47c9c452b3492c5001ce78c0452a69207120b8b SHA512 ce09e4ee4e17b44a51581d252ae5bda890d22168c612785033abd9297ea8be0409845b25a175775ddc64d9dbee0dd9324a2494df6316b4a41837fd4e8f483b23
 EBUILD youtube-dl-99999999.ebuild 1916 BLAKE2B 035ac8f58fec97b741be4d080401d6dea03531c95ef61782dcad898f51b2fe845d97ede3ddb4ac3ae52c327fb08d5729b41a1c057e8fb6c81e81afc3d87c4651 SHA512 ae1467fcc2b1bde3b33354a61e29b311a6d8876cbd0502186f55f0826c0182ea21afb229b34b39b37c9e625bb142d86348baa31dc0defc01e19beb427de40321
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.01.17.ebuild b/net-misc/youtube-dl/youtube-dl-2019.01.17.ebuild
deleted file mode 100644
index c26955b40882..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2019.01.17.ebuild
+++ /dev/null
@@ -1,117 +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_4,3_5,3_6})
-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"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="+offensive test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-python_prepare_all() {
-	if ! use offensive; then
-		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
-			youtube_dl/version.py || die
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink camwithher chaturbate eporner
-			eroprofile extremetube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
-			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
-			slutload spankbang spankwire sunporno thisav vporn watchindianporn
-			xbef xnxx xtube xvideos xxxymovies youjizz youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	eapply_user
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake test
-}
-
-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 "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.01.30.1.ebuild b/net-misc/youtube-dl/youtube-dl-2019.01.30.1.ebuild
index 2cb0551f3e35..d63726ec5fe0 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.01.30.1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.01.30.1.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 RESTRICT="test"
 SLOT="0"
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2019.01.27.ebuild b/net-misc/youtube-dl/youtube-dl-2019.02.08.ebuild
index 2cb0551f3e35..2cb0551f3e35 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.01.27.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.02.08.ebuild