gentoo resync : 06.08.2019

71 files changed, 1409 insertions, 520 deletions

diff --git a/net-misc/AQtion/AQtion-2.2.7.ebuild b/net-misc/AQtion/AQtion-2.2.7.ebuild
new file mode 100644
index 000000000000..157bb239defb
--- /dev/null
+++ b/net-misc/AQtion/AQtion-2.2.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+DESCRIPTION="Aquantia AQC multigigabit NIC linux driver (atlantic) - development preview"
+HOMEPAGE="https://github.com/Aquantia/AQtion"
+
+COMMIT_ID="e024a859ea828ced78db310328db90dbedea837a"
+SRC_URI="https://github.com/Aquantia/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="lro"
+
+DEPEND="virtual/linux-sources"
+
+S="${WORKDIR}/${PN}-${COMMIT_ID}"
+
+MODULE_NAMES="atlantic(drivers/net/ethernet/aquantia/atlantic:${S})"
+BUILD_TARGETS="all"
+CONFIG_CHECK="~!AQTION ~PTP_1588_CLOCK ~CRC_ITU_T"
+
+DOCS=(
+	README.md
+	README.txt
+)
+
+pkg_setup() {
+	use lro && CONFIG_CHECK+=" ~!CONFIG_BRIDGE"
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if ! use lro; then
+		sed -r -i -e 's/(#define AQ_CFG_IS_LRO_DEF[[:space:]]+)[[:digit:]]+([[:alpha:]]*)/\10\2/' \
+			aq_cfg.h || die
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc "${DOCS[@]}"
+}
diff --git a/net-misc/AQtion/Manifest b/net-misc/AQtion/Manifest
new file mode 100644
index 000000000000..c9aa8208c79f
--- /dev/null
+++ b/net-misc/AQtion/Manifest
@@ -0,0 +1,3 @@
+DIST AQtion-2.2.7.tar.gz 122679 BLAKE2B 9d4e2d4d4b26a191551e2cfd30c2a8ce4e4bde01b7ab1e9beb9564abdfd1093b63f94713570fe2c949943037b649c55a9f448b0333fcdcc7227849330d466f92 SHA512 d3ba78acbe5d85d1017d5460fa7d916ffa59eeb137aa1817da215f08b994a10336a9f865c9b84a16b8cef7238d4fd87785bc17d6e3eac577210bf321538cbda3
+EBUILD AQtion-2.2.7.ebuild 1011 BLAKE2B c7210658ee6823245bfcc3b44252228e913f0c38d7a7180d5c65d0effb830ffc37950216d6f56685fb181c78cc27e33fbfa437e57100f5108c3baac0c8a7a9ef SHA512 938ca7011bf9952768306b8f26ccc24b1dd73c48cb3cba6991e2bc8b5ab282b99def15bbe4bb37978f29849a961cb0527f8e5f408f600b4c2045fa74e512cdb8
+MISC metadata.xml 697 BLAKE2B 2462c0dedde087805f1879750ad183a9c5d29dbd8561270f9e999bda47946517ce45ab70d29851aec06b5f2e79aa93fa5f7d9f09bcb3f089bf4cada541c4b87a SHA512 f2cbb250acd2690842dbdb5645f04e071f08a65e9dd80153fef3fe1c5d35ea1b5c40e8c58309b9323ca53941e902069c11b710037289923ff2b9a77570cb8313
diff --git a/net-misc/AQtion/metadata.xml b/net-misc/AQtion/metadata.xml
new file mode 100644
index 000000000000..62085b44d7b0
--- /dev/null
+++ b/net-misc/AQtion/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Aquantia/AQtion</remote-id>
+	</upstream>
+	<use>
+		<flag name="lro">
+			Enable/disable Large Receive Offload. This MUST be disabled for
+			bridging or forwarding.
+		</flag>
+	</use>
+	<longdescription>
+		Latest development preview of aquantia's atlantic linux kernel
+		driver for AQtion family of multigigabit adapters.
+
+		These drivers are UNSUPPORTED by the vendor, use at your own
+		risk.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a5604d411c5c..52931c895d87 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/bgpq3/Manifest b/net-misc/bgpq3/Manifest
index 624c3d00ce32..21f2eafb85a3 100644
--- a/net-misc/bgpq3/Manifest
+++ b/net-misc/bgpq3/Manifest
@@ -1,5 +1,5 @@
 DIST bgpq3-0.1.33.tar.gz 82696 BLAKE2B d6a8b950747ed0889d2e67873f4b029127d49b730bb0cf4047df7025415db2ee1870d4be632e9347cfe7930f3a453d34e87ba236314825eb994809a5c2b990e6 SHA512 f4faec46eaa5fe77a9118ed76e3d2dddce855cebfe6ead3dadffe0f72ea720502e378febd04829409039fd2bd6a693e518814408c628df1a9e5c7e7c5c170f49
 DIST bgpq3-0.1.35.tar.gz 87066 BLAKE2B b217d490ed74e9174cbbd70ed5d1dd4bc72b136a23d583b6b9cede8fd38d8b579a463d8a146313f9eec1904e836ac4db0b75a2c1554c00c5df79a8d0d32f950f SHA512 a41a424fc0230a0ab7d64ff017b9c1a52e32d7deae542ba096d4815e0e5ce76342ad55c204bbcc22ae4c47ad486917410c53b0dbb2306d40fa5c5a5cf93fcd01
 EBUILD bgpq3-0.1.33.ebuild 674 BLAKE2B 14f8d30ead4bbba32fb56baf8292aba0eeb03bbcc17e48c0fabc6ef00806beabb64acb5044a514a7510813829280719b8f3d39a200d98b9e0cccccc7aeca5117 SHA512 dcbb1c3312da4aec1455b74d2fa9a741c295e1053ae55651a6df2c86011a0f0dbf0799f1dbb4d30383539fff9a6c8f8931022bf6650d3795f76e3ccd6e377bb0
-EBUILD bgpq3-0.1.35.ebuild 768 BLAKE2B 275fbc4571d5beb7225c29a59aa3300b4534d0e059c4f7816ec42293a943f3b19f4254429593c440988a139b00e5e6a82567c366d7ca479249e4fa9b8c2e908e SHA512 195a72098033c91ab86da0a709b97bd6e0d80361e3d85d6c36a0b486f6efdfb6f0b2460e80794c2aa7765eb0241e02e663cbd1ab547ad3e88a6321e704c00cd3
+EBUILD bgpq3-0.1.35.ebuild 770 BLAKE2B 7af3683fc58bf8a2fe675f1945a64456f16800c2746d876d862cf1d2dff758ec929e922ff472adc708be5677bf9d5d8bae25dae3dc35c1c173db1e056a7bd4f9 SHA512 c633a9af222adbf10a50b42ddf6cea73a325ede45e782b2296aad5a06ff4758eb83b3e82e43aad29095d2f8d3407ab33e4c09b02eba8c5515e5717ace197d2dc
 MISC metadata.xml 1265 BLAKE2B 08a5d75cc81e3edee274fe845a5d0495bc6c2dafc127f41350dfae62a0ad7425cfb34817ede9fafec65c510f34d9728ecab15e621ba7310093f2d41d9ce32141 SHA512 9364ecadb0b1fd98841b69d59e5bf000be9cd92997c4203506ee4ebfba9513b33141526153defc23bbeb3e5ae6542648e5ba7d2583893fb06420e831b2cd41a1
diff --git a/net-misc/bgpq3/bgpq3-0.1.35.ebuild b/net-misc/bgpq3/bgpq3-0.1.35.ebuild
index 2ee24d24e3db..ad300b09c414 100644
--- a/net-misc/bgpq3/bgpq3-0.1.35.ebuild
+++ b/net-misc/bgpq3/bgpq3-0.1.35.ebuild
@@ -30,6 +30,5 @@ src_prepare() {
 src_install() {
 	dobin bgpq3
 	doman bgpq3.8
-	dodoc CHANGES
-	dohtml *.html
+	dodoc CHANGES README.md *.html
 }
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index aa83e8587874..c2b1b5f2d533 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,9 +1,10 @@
-AUX dhcpcd-8.0.2-string_termination.patch 1827 BLAKE2B d90f757e740cf73adc76d82705f669bd0d43415f523ff01d11c0afe911ab744cf5d36b32906209abc110eff2355f1687b2055cfac4a22085ba4aee65c74e5e27 SHA512 1d232efc8c822534dd55a5e5998392e4ded7b9051b69413a7ef44b450a1e050c651467148d560008fd537a5388873ba0d2efe9f4f6e4b7829f3f6ae87d82971e
 AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
 DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
-DIST dhcpcd-8.0.2.tar.xz 222408 BLAKE2B fb27a33cd64c7aeedb28e05c885c860618d923ac857895b9fdc7daa608f433587bea1e6630fd9897426b371a45b8a336e1edaa804d76eda6e9fc2adc1411aed2 SHA512 a6e3aa66800adc8b209324bae02a6e373e2623735bf0695ffec4a7c972d65c3498f55e4da62f93df0bc6cddb4bee8ab667b3743b5b25cd5f4cc9da4d1f8e15c4
+DIST dhcpcd-8.0.3.tar.xz 223104 BLAKE2B ca1b35e0fc0f8b345d2a55e380aa4e10b864f18f4b5368659875ef5efc955fac442b0505b0192578d83fa8c3b304942e50aa082d753e98dc3cd44237100f106c SHA512 0a740286181e1b24e7ac5157f60727c2a3abd81080235efc8ba86628bb8e2aa877b8d9348055c16cdae1a819f443afbf452907a25152bb936a6dc72f3a179944
+DIST dhcpcd-8.0.4.tar.xz 224236 BLAKE2B ae1bc71fef58526482d5c0b34f66d68ad4baf84979da2fa90d51ec1831ccdc2a2d77dc1a09b52b8fa58deed42ff7c6af49a165afba50decae0085788bcbb10c2 SHA512 d5ea895b841a1afcabd50013800f567c0a9c077cd409ec18c5442b3da6bac814db5e9ae4a4218076eb5119bd7ccb732d3f58e22dcbba38ede26ee668f9733ec4
 EBUILD dhcpcd-7.2.3.ebuild 4407 BLAKE2B 6f5df954ec0be66be6a4f4c1b63a1dee87e78d5cab8de8cbe935bd0d2a82caf70c5dc8d513ddc69b6e317a3d44c2a527529420da71ecf1489a71cdc2f4384eb5 SHA512 aa591926ec797c71c9d28d91a64257eaee76e2fae6853925e0b0fdf9001fd6279bdae68bdd2727f500661b8142c96b3c66ab28b055fb8887c4b7d96162d42843
-EBUILD dhcpcd-8.0.2-r1.ebuild 4486 BLAKE2B 4fa85a2475043c6a24402a596a38f1ff01aa9d8df9ce03270b411060383d4382e21958b7eb69c7e1963f3b9f5a9296bdbd4cc814c7e344a759fbd0e5500d1f3b SHA512 ba68295d42423c80ab51c332b642837e19bad3126584d9f0cb210fccf9ce4d51d197e159f79b7edfefc80996bc96d98a1dba7e0dc51d213bea54ebd596960982
+EBUILD dhcpcd-8.0.3.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
+EBUILD dhcpcd-8.0.4.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
 EBUILD dhcpcd-9999.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.2-r1.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.3.ebuild
index 1696c38dcf71..d8940210a7b5 100644
--- a/net-misc/dhcpcd/dhcpcd-8.0.2-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-8.0.3.ebuild
@@ -27,10 +27,6 @@ COMMON_DEPEND="udev? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-string_termination.patch #691426
-)
-
 src_configure() {
 	local myeconfargs=(
 		--dbdir="${EPREFIX}/var/lib/dhcpcd"
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild
new file mode 100644
index 000000000000..d8940210a7b5
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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}"
+
+src_configure() {
+	local myeconfargs=(
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
+		$(usex udev '' '--without-dev --without-udev')
+		CC="$(tc-getCC)"
+	)
+	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/files/dhcpcd-8.0.2-string_termination.patch b/net-misc/dhcpcd/files/dhcpcd-8.0.2-string_termination.patch
deleted file mode 100644
index a1bc19ec974d..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-8.0.2-string_termination.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-https://bugs.gentoo.org/691426
-
-diff --git a/src/dhcp-common.c b/src/dhcp-common.c
-index 08ab9493..9f556557 100644
---- a/src/dhcp-common.c
-+++ b/src/dhcp-common.c
-@@ -645,14 +645,16 @@ print_option(FILE *fp, const char *prefix, const struct dhcp_opt *opt,
- 	if (fputc('=', fp) == EOF)
- 		return -1;
- 	if (dl == 0)
--		return 1;
-+		goto out;
- 
- 	if (opt->type & OT_RFC1035) {
- 		char domain[NS_MAXDNAME];
- 
- 		sl = decode_rfc1035(domain, sizeof(domain), data, dl);
--		if (sl == 0 || sl == -1)
--			return sl;
-+		if (sl == -1)
-+			return -1;
-+		if (sl == 0)
-+			goto out;
- 		if (valid_domainname(domain, opt->type) == -1)
- 			return -1;
- 		return efprintf(fp, "%s", domain);
-@@ -693,9 +695,7 @@ print_option(FILE *fp, const char *prefix, const struct dhcp_opt *opt,
- 					return -1;
- 			}
- 		}
--		if (fputc('\0', fp) == EOF)
--			return -1;
--		return 1;
-+		goto out;
- 	}
- 
- 	t = data;
-@@ -760,6 +760,7 @@ print_option(FILE *fp, const char *prefix, const struct dhcp_opt *opt,
- 		}
- 	}
- 
-+out:
- 	if (fputc('\0', fp) == EOF)
- 		return -1;
- 	return 1;
-diff --git a/src/script.c b/src/script.c
-index 74aef1b1..3dee7b08 100644
---- a/src/script.c
-+++ b/src/script.c
-@@ -33,6 +33,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
-+#include <assert.h>
- #include <ctype.h>
- #include <errno.h>
- #include <signal.h>
-@@ -477,12 +478,21 @@ dumplease:
- 	fp = NULL;
- #endif
- 
-+	/* Count the terminated env strings.
-+	 * assert that the terminations are correct. */
- 	nenv = 0;
- 	endp = buf + buf_pos;
- 	for (bufp = buf; bufp < endp; bufp++) {
--		if (*bufp == '\0')
-+		if (*bufp == '\0') {
-+#ifndef NDEBUG
-+			if (bufp + 1 < endp)
-+				assert(*(bufp + 1) != '\0');
-+#endif
- 			nenv++;
-+		}
- 	}
-+	assert(*--bufp == '\0');
-+
- 	if (ctx->script_envlen < nenv) {
- 		env = reallocarray(ctx->script_env, nenv + 1, sizeof(*env));
- 		if (env == NULL)
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index c68bc17e70a0..791de97ebcdf 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -2,9 +2,11 @@ DIST geoipupdate-2.3.1.tar.gz 362497 BLAKE2B e07eb22d6b4897d735af0c354f991119316
 DIST geoipupdate-3.1.0.tar.gz 370293 BLAKE2B 5cd7b4563ca0b6820b863e24b80054f27c49bd9e89898f6b7248d3389a81f9c680f9979293fa2acaab0727b3c915926396404e19e90ffbb0ef6647a64d30c14a SHA512 9efd30593df0a2564f98a0e99d02ac3671e5752034d8c747d84a204cd620845e619bec511b6004d895cdb611a2d98b921eb830192d258c572ac9efd603cd5c99
 DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3f4ee5cea873f2fd3fbcbe7a38f22d2995558f8196f4c4030fb6f24b179104912af3290d3b7ed9bde9fbe5ff37862c SHA512 24e6a9f72449df1a2763314f188828332b5516962dbd75892689e505516af967bece60cc846fe17cfcc1ddb4d6111c9cd7d5c0ebc9d3e8e7af355f8a1c7f1a2f
 DIST geoipupdate-4.0.3.tar.gz 107019 BLAKE2B 55978bb6fc37b02706d4f48b76dc8b85f3aacc86f1192a0d31cee5c55fb4d0feb8d5ddb2b6a13d4a85d80133ccaa318bd9ad3e7d3d5b818fea2a3a0fa09a62d3 SHA512 870f930a54a45f5fe14c8328158ea2c8d2d8e4320a5400abc8ec18ae1e234426e86492a41868ccd3bf649acf0cd347722683326817359fed7d147ab21eb64397
+DIST geoipupdate-4.0.4.tar.gz 107115 BLAKE2B 1ab08a34c41ac08aa26faf2078e7a964350c09c65871829023928dc25011a931f9be4aff32300778ab645831b8786898a986e15aec8bceb31f77715be77f857a SHA512 2d97f65128d26600345b07cab4b1c1ed26f68bb850f4fa92d8f6b4065d1e9a25b73b38e1cc08bc0afc11135394fe20fb77bd931e557ba6fe83d792ad3bcc4a1c
 DIST geoipupdate-vendor-4.0.3.tar 532480 BLAKE2B c619098fa40d6a92743a2847900e7cefe5d61aa9dbd36399e4a26d7c2fda1ea493f91ded8a4b17a76063960c0f8a11cc7b3b7b734e9f3d978da7035799d32956 SHA512 25976c66d775e3e50b422e9f564b9486c7c08d9dba8a11b5ac9faf62f3545673fa94d2ea6ea40750835840c938b686b174de5658236a19e85d592d861eea05b8
 EBUILD geoipupdate-2.3.1.ebuild 573 BLAKE2B 1a4e9421d90bed8da5b4ddb282b53a9bb2cd9d7123007a8c7a207ed807480abf95ec3c2e7cea6a987d399fd73c7148778f6b28b9c66ea0f48f2c1cb4d9ae4435 SHA512 add023538fe12026667cf0feba8c1ebf1157609ba2ac9622466920d2ed7c128bec10ba7ac1a12acb358067e0ec757996ad0eec63c91c7b4a7c9d75984b06bcff
 EBUILD geoipupdate-3.1.0.ebuild 582 BLAKE2B 106db9ba7a0f95104f0728fd820da17c03ed7c1fa79481d3fe09e666594b707b64ec4522b5095c1f19b0afecc0cfa9f5dd6e60829d12cb0887910ddc82e66053 SHA512 b6fddee463197592d4bff439b9ba4e407725895544af9875c9157fad695cc700ce2d3ab293da271fa6d3826b458a1a20c477c1df51daef6367d59798b4ad1392
 EBUILD geoipupdate-3.1.1.ebuild 582 BLAKE2B 106db9ba7a0f95104f0728fd820da17c03ed7c1fa79481d3fe09e666594b707b64ec4522b5095c1f19b0afecc0cfa9f5dd6e60829d12cb0887910ddc82e66053 SHA512 b6fddee463197592d4bff439b9ba4e407725895544af9875c9157fad695cc700ce2d3ab293da271fa6d3826b458a1a20c477c1df51daef6367d59798b4ad1392
 EBUILD geoipupdate-4.0.3-r1.ebuild 1268 BLAKE2B 39d26909a70acfdddbeb9f823e4babac6af48077af154f15f1228d7d50a40fe73b2c4de5842ce8d6b87ea6d39a25d998e553ec0cbf42904a9efa45302d9f7eee SHA512 194465588a84cd045cb0694c5dfbfd1e9e14cd07d49d3a77d68ec6e0df4a872766d8a5bcb2a9094f72853cfe3e28a350969cbd4bec99bce35edaa2786cb4d52d
+EBUILD geoipupdate-4.0.4.ebuild 1146 BLAKE2B 7b690131bd0f63803a2709e718bf6d33ffb6109d2e62c5eb99ca5bb793a9ea185bc5ca6962abffcdc0068a54187e70cdcee5d12128443f673637d92903f37015 SHA512 a3242fffa1b3511f861664134362ecd3dd06525b86be3791137ccade9bfb382ec3261ff24dd2c4bde2c5f75a79ddbbb1e9bb94102a9a3a35017bbc589840c336
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-4.0.4.ebuild b/net-misc/geoipupdate/geoipupdate-4.0.4.ebuild
new file mode 100644
index 000000000000..37d94082af11
--- /dev/null
+++ b/net-misc/geoipupdate/geoipupdate-4.0.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/maxmind/${PN}"
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
+SRC_URI="
+	https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( GeoIP.conf.md geoipupdate.md )
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+}
+
+src_compile() {
+	cd src/${EGO_PN} || die
+	# requires pandoc but the information is still in the distributed md files
+	sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
+	sed -i -e 's/go build/go build -x/' Makefile || die
+
+	# the horror, the horror ... but it's all automagic
+	export GO111MODULE=on
+	export GOFLAGS=-mod=vendor
+	export CONFFILE=/etc/GeoIP.conf
+	export DATADIR=/usr/share/GeoIP
+	export VERSION=${PV}
+	default
+}
+
+src_install() {
+	mkdir "${D}/usr/bin" -p
+	cd "src/${EGO_PN}/build" || die
+	cp geoipupdate "${D}/usr/bin" || die
+	keepdir /usr/share/GeoIP
+	insinto /etc
+	doins GeoIP.conf
+}
diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest
index 79917856d8ae..84829e716051 100644
--- a/net-misc/geomyidae/Manifest
+++ b/net-misc/geomyidae/Manifest
@@ -1,5 +1,5 @@
-DIST geomyidae-0.29.tar.bz2 16279 BLAKE2B 148c6fe39de7333fbda4d1794c540940d06317f89291bae0fc35cb2cad8bde7a0f665ada79a9a0f7e7d4c96707bb811cc6cbc1b7b167c0dbd0ca301175176d2a SHA512 00bc7c4b5c1cd58d7e36cc5bce9a8d2e3dd70ccfd2f3c2729527ed7c55ced04aa0f9cf024b825f6f3317b2c1b35b4f3fd4dd88c83b14369e98b72b59965b0aa2
 DIST geomyidae-v0.32.2.tgz 20897 BLAKE2B 117a4e89a379a8e84355661d910fcb227ef6105cdf6c5860a89c94caa7ed71d278b53c325a59bf200acdd589b515559995b27536c9fab3fe30fe87cb82f10130 SHA512 3b0927a16082df862b9efacc2f29fd1b1ca76f7d465426e179d5995a416bc27b518daba422512091304ed5479ff133e3d40f7bf66aedfbd8d99d13710809d519
-EBUILD geomyidae-0.29.ebuild 1155 BLAKE2B 2f2f61c475a43ae965e44a08a625551cd7af600fea83e34ba3294f45ce31bef74a0916723a5dbaae38cb173be6f6f456e50d75b7a0287c2c70083796a52f414b SHA512 dc20c4e2e198695df054931968dd81ce23a7e36a01ce5b184069e67a2a4112d5bb1de693dfd0d6ccb460849d1a643f15a27fd90ce3a3b0164c0a3c362d1cd70d
+DIST geomyidae-v0.34.tgz 22242 BLAKE2B bc25f50c49c10e5a04b83a12cdcd7546b33f6a7d93eab504122bcfb2fdacfbcb82205890d5fd999d1b8b681c65dc0ef0dc5f95ea2d56a795fa371031c4af43b8 SHA512 55b7845c8b9fbee70b2e2bd71d2e3bb8e34c3029a1ea410cb39750763c81d5c31af8c703f7b673aa28fbfd61dd7915300ed4ff22f94c8430ac754681bc30ce41
 EBUILD geomyidae-0.32.2.ebuild 1031 BLAKE2B 04a3cccb671609ed69f0c715edc73f6f5ae9522d225f375d5cb58827fe864b1e3a66aacd467ecd32ee85503748237a2410477bb100f6963838f8b393748fa8e4 SHA512 e3ff159000ca3068d6a2583071944af7f87d530ef5482d79ff7c7037a5efa460f3902cb88abcd9e9b79b238c628df3553783973456b05ad5aa519e6126c1aa7b
+EBUILD geomyidae-0.34.ebuild 1028 BLAKE2B 3ecd610bdd02391345b49857dc8569dd2874fce30a739c601689e62e9513ad545a35597a3e2737fc8bddee712695dd265c93249affece0a2385b5e1eb6914535 SHA512 d8f0a0e9507384c3616b0bf806f3389da5c089ab16ca7887c7e398b4d07973633ad5e7f39971b7aaee951dad4917b77dd7ac4a79064efa1d177e0722b8b84fd8
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/net-misc/geomyidae/geomyidae-0.29.ebuild b/net-misc/geomyidae/geomyidae-0.34.ebuild
index 57dec0d5956e..86affea4be21 100644
--- a/net-misc/geomyidae/geomyidae-0.29.ebuild
+++ b/net-misc/geomyidae/geomyidae-0.34.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs user
 
 DESCRIPTION="A daemon to serve the gopher protocol"
-HOMEPAGE="http://git.r-36.net/geomyidae/"
-SRC_URI="http://git.r-36.net/geomyidae/snapshot/${P}.tar.bz2"
+HOMEPAGE="http://r-36.net/scm/geomyidae/"
+SRC_URI="ftp://bitreich.org/releases/geomyidae/${PN}-v${PV}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
+S="${WORKDIR}/${PN}-v${PV}"
+
 pkg_setup(){
 	enewgroup gopherd
 	enewuser gopherd -1 -1 /var/gopher gopherd
@@ -25,11 +27,8 @@ src_prepare() {
 		-e 's/@${CC}/${CC}/g' \
 		-e '/CFLAGS/s/-O. //' \
 		Makefile || die 'sed on Makefile failed'
-	# fix for correctly start/stop daemon
 	# fix path for pid file
 	sed -i \
-		-e 's:start-stop-daemon -Sb:start-stop-daemon -Sbm:' \
-		-e 's:start-stop-daemon -S -p:start-stop-daemon -K -p:' \
 		-e 's:/var/run:/run:g' \
 		rc.d/Gentoo.init.d || die
 
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index c25032c2e656..8c6137475728 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -9,4 +9,4 @@ EBUILD gerbera-1.2.0-r1.ebuild 2558 BLAKE2B c5f81e11241cb74d63428c263cd0141d61a9
 EBUILD gerbera-1.3.1.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 EBUILD gerbera-1.3.2.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 EBUILD gerbera-9999.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
-MISC metadata.xml 1209 BLAKE2B b724abc66f5a3111c66a94331e61f9a50ae67344dab4695e7fc68154ddc9843e0295c7a12438e342be409b9429a4f9c60abce02422594df708d7933521bf9673 SHA512 c91dddacee6beab0a3cec3ab317810f77d3715a84384ceeafd3bdc872fff6d352d6bd4312d8194b59a159604794b0197780db6c27b20a327afa1e7bb9cba6a26
+MISC metadata.xml 1142 BLAKE2B 000fa449f9dff3541b6d1507e6945a2508c0478ac19ed4a1ff1108ecde9dbbad96b76d304da9f34a2169bdaf620be5d710b111e0c442e05c94ab58747a7dab87 SHA512 28acbb3ef7011c52e77a323a4ec346ca25a3c255f8dc41da4c4c6c8f21bcbf0fcc8ebef501efd0f225ac2f0d29d828584a904774d7fb061635b007a0ea123f54
diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml
index 22d6ba3fd3c0..2ea8b3e052b0 100644
--- a/net-misc/gerbera/metadata.xml
+++ b/net-misc/gerbera/metadata.xml
@@ -11,7 +11,6 @@
     <flag name="exiv2">Use <pkg>media-gfx/exiv2</pkg> to extract EXIF information</flag>
     <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
     <flag name="lastfm">Enable last.fm support</flag>
-    <flag name="magic">Use libmagic to determine file types</flag>
     <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag>
     <flag name="protocol-extensions">Enable partial DLNA support</flag>
     <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata</flag>
diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
index f192459fbea3..99f7ca948a22 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -2,8 +2,8 @@ AUX htpdate.conf 359 BLAKE2B 7bcd2aa3e818ee31796e6f1e3b060cb6c04558fbfcfbdc51cd6
 AUX htpdate.init-r1 507 BLAKE2B facb31723331fd77ae24ff64753cc12c913e35b7ba97997925bd421164dd25d3820e4c7727e14389cd5372635afdf5cc8e313297679e74b3a65ab65f0c4a12b3 SHA512 d18a91792787fdcb4808da042025d60bbe19335fd8492b33af33d33bc24d250bcc65c8ead7d443e4d37a9ca61428361db7b418a5fb3256b030b02b9a772fe10f
 DIST htpdate-1.0.7.tar.gz 16848 BLAKE2B 2e7350f186af09d8876c9caddf3d3bdd1b3d361169417e1c672eb04e499d07391ec93c56fad7e6d0f947a5bf60580a9f52ba564f213662a65dbbd67df875399e SHA512 83408545d1d2cc794f62efaf348e54cc2ce47dfb27815710e92d0c7d34360a581e637ef82424030c8a4fcabcc9a07205518fac08f426b37c7c4519cfa6696360
 DIST htpdate-1.2.0.tar.gz 13618 BLAKE2B a94f08738d08c0caacc876d2e25e1dba43bbe371b0a31f957a1d5ff522b0ae5bd7bf5abcde63802843b1c32799e4cc38bacda657a9efb3a56a1eaccdb4f8c35c SHA512 5447d54a54038cc3c33f7877410ae42022e01eb10a93bd79fe4937452a823c65c6bdb743213bc77a8506128d5b384e26812f1291a0ffa1aeafde0230c1b645d4
-DIST htpdate-1.2.1.tar.gz 13580 BLAKE2B e14ec96366cbf7d546f718f2577d4c862e7b90557622a12f3e01de4f9bf6bd153c297a81dd16c376da33aa13c1a83937e66537f52f429586eea9994b316c22a3 SHA512 02f8775b0c6424108aed2e6a37ee1c0ffde5484e8e6f3dcdbda6a1ccf8863c986c6bb86804e912d257af2753b745c2c7f270fba6c2cf0dc7cef9875405235d69
+DIST htpdate-1.2.2.tar.gz 13625 BLAKE2B 11813def81e3cce1194120a21cf99e8ad288b0f604aab201850f03b6ca786d19792b9586c9d805aa1945bbc651e6afc5099b5c7cb6ea354473a4b3bab01397e3 SHA512 00d52b291004ddb3d0282aef78c5fbe5d9397dbf171a6646803ee7ba4bd0514af6089f7e48a92397dd1b0fbae5ba314f5165c9902028438e16d3516b65724de0
 EBUILD htpdate-1.0.7.ebuild 1104 BLAKE2B f8430b15362130cc425a75b6b296b274e8f26ae4bc30085bd9d4d5d7330fa16560e19809e65dbf55d346f96a7f70901b8165526a0842b0b3a9cc2d9bf21671ad SHA512 b94a56bd7230572bc2b52fcba820a7606abd26254b202ad2c7be1ccbe29bb7a4fcce4e211576e06fe08d04d7b88979e4116b823254d9dd406cff61dd9b21fed5
 EBUILD htpdate-1.2.0.ebuild 1006 BLAKE2B ffd29371c97e36a023bbc436bc584bb00424cf1317e9fb2003e8d66f4ffaa971efba6e1244eb44807af776cdba3353a37232c774ac57b0c4e4e35e91ea996327 SHA512 d9a33a5e3ec3eb7f24e8853b3d9903f4206379ca94d49c80d7d74e5bf1628d5cd092545fd11e364d0a30d007cb8cc0ed18d06d5935a76ce2b455f9aa5aae0a7f
-EBUILD htpdate-1.2.1.ebuild 1013 BLAKE2B fc54769cb76b36f7aa5a571e5f079b30d99e51f1f20400b2cb7cf7644f1b15db75427b0090fe0b58870a9466a8921798242a1510e48fe1372608fb53362ac4f8 SHA512 93e35fd309c8c1d44f96bc7f40cc32ca571559b45b16c78ee2124b1ac2f011d91218fdcfb92baa3d4910e587db089ec20f630ee3f38f49ac8446035872f0d7e7
+EBUILD htpdate-1.2.2.ebuild 1013 BLAKE2B fc54769cb76b36f7aa5a571e5f079b30d99e51f1f20400b2cb7cf7644f1b15db75427b0090fe0b58870a9466a8921798242a1510e48fe1372608fb53362ac4f8 SHA512 93e35fd309c8c1d44f96bc7f40cc32ca571559b45b16c78ee2124b1ac2f011d91218fdcfb92baa3d4910e587db089ec20f630ee3f38f49ac8446035872f0d7e7
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-misc/htpdate/htpdate-1.2.1.ebuild b/net-misc/htpdate/htpdate-1.2.2.ebuild
index e004eb864aca..e004eb864aca 100644
--- a/net-misc/htpdate/htpdate-1.2.1.ebuild
+++ b/net-misc/htpdate/htpdate-1.2.2.ebuild
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 98d133480c5e..ee38a6aed47f 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -4,10 +4,10 @@ AUX conncenter.desktop 194 BLAKE2B 96fdae8892ec9cef05a92e129bba42efb666874a2a218
 AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
-DIST linuxx64-19.3.0.5.tar.gz 22254035 BLAKE2B 7ed276f0096a39a9089c02fba4c2a62f4cf7de524b24210c979c272105f40294a7773e14ecb6a6e6f65f07e9a7400a83d5c5c0dd306cf7dd1cbea4f39f489d73 SHA512 5331ec70771016ef01cb99eed9ea058e1c318b119c245318803a0f72aeaf14fd00a90150fe59b03342894f7a627affa9a383d5bd783fee424f55978db6136489
 DIST linuxx64-19.6.0.60.tar.gz 101850500 BLAKE2B c292a6dbde3f6b7a52952ceb1c6127729be9c82b2447138bc3487bc3eafba95cbe6b54e18df8b91583330dcd47f30cd51a1ebc0bcbc869baaf003024a889efb7 SHA512 952a81734b8284489a3e03a894ca721ba1f47227217cbc021fcca310ed6ebc53195b7df24985f408062b472b5be580b4b4719d1809ee01b0ab634d5cb5e06258
-DIST linuxx86-19.3.0.5.tar.gz 24360452 BLAKE2B 823a26f23fd4979b633baa2d47034bfb6c71cad9568853dad12d857dd4a3df0e1f885d79d69e440ed01f2f9ec0af4f64a0ab9cd1460aead5cd3d2c36e7436897 SHA512 253d11f2d46928eda958036d398a58d33239beb9f754a381244ed5333277435c7d1f5bff77e8b79ec9066cb2f7e8b67b71b6609d12e8faa869a79d3109d7261f
+DIST linuxx64-19.8.0.20.tar.gz 101850343 BLAKE2B 275896b781addbc4b83e2ce54b46136a2595b65eb8adf9675b2a2695aea5acd36d99ee01b0171498a6f724c5d1878ec4a7741f3fae27a08b93d1bb6a79a9c49a SHA512 141f2c3a0fef7be341568029228a4c32ed5d578014a513fb3ca1fd6213b42b613a07b0c5dcf350712a0d7190006b9443ed3d7279707a29d0c00ddc4108b7b090
 DIST linuxx86-19.6.0.60.tar.gz 108052444 BLAKE2B ce784be607ac74a4087a66fa492625fbb6aec6cf04271ecc6114e0a1d8940314f0f715dcfc3842cb145f05cf880f164dd83b4bec7d3ba63fa021bc2a5fde0d9e SHA512 9056d716f0c9f895d5d24eb81582b6f9ac1cc5db5063d2edf892841ad87d4bd58d68ba67b03f7f04f7287d2472b067ae3d2040bc3c773e5c2a79a401dbd04732
-EBUILD icaclient-19.3.0.5.ebuild 4989 BLAKE2B 3b9185b6a5f125600481585498146cefb34c8137d3c678fe8573bbb39cac3a0b606f2eddcf6fef94c5463064500dfe5c0ab7ffda17050130d97a742809693200 SHA512 11cda20539aa5ec3478a4d669dd198d3d96fe445d13d11d056eb3e7e7654b87c097fb44b5098960f61a2962525ffb24c48b8dcc70b6bfc4490b6dcba535fd025
-EBUILD icaclient-19.6.0.60-r1.ebuild 4562 BLAKE2B ecc1d62665c372e622df639a2445ba67a04011622ca01551f56164ca7bd7a89eb24954765ae8ddc24975e2730cf2de4bb44505e986387c1121cc417b8db508c2 SHA512 ea51340b1bc5d1b5435e3067a5eae1410055454503bf85abc9c7be22f2e5d5abdc0789617c6c7d99298f04765fd5ba10d736574face335510cf908778b1c4d0b
+DIST linuxx86-19.8.0.20.tar.gz 108044897 BLAKE2B a76d8c507bdc662f62c7874e19bbbbbe5a59f0f146b7226f3f989ff9626db3def036b7b218c47a71f75c5ec873cd81a785d79a69291c49d3db3ca630950379b2 SHA512 0c88f511b289caac27d1b8a83e8a1c49a9a9f431b880f53172229a58df85052d67890bbb1b5e3f8272c9c7f6d3dd9e588aff481ac727293cec6148a18facb061
+EBUILD icaclient-19.6.0.60-r1.ebuild 4560 BLAKE2B 3134576f7a893a1eaa82d768d94391ba5b3bfac015437ec8e00223866206fcdd8ef2242a7b2bcccd3c6c12beb792f50c319229979d5a222bc82ba501e0ff91dd SHA512 cc4eeefd96a0c3fcebea06a408abb34bd51f9fdd322ec408026b37397d41970e94a04a8b05fc8caca03a4deb9b66ca00a09b94d2bec9d34cac3a1a26e85e6196
+EBUILD icaclient-19.8.0.20.ebuild 4562 BLAKE2B ecc1d62665c372e622df639a2445ba67a04011622ca01551f56164ca7bd7a89eb24954765ae8ddc24975e2730cf2de4bb44505e986387c1121cc417b8db508c2 SHA512 ea51340b1bc5d1b5435e3067a5eae1410055454503bf85abc9c7be22f2e5d5abdc0789617c6c7d99298f04765fd5ba10d736574face335510cf908778b1c4d0b
 MISC metadata.xml 602 BLAKE2B d0a0f2a13b43053f748f4250ff9fd0f7aee5d53501d773081e646097e40b5a60bb49c4517ec4689272c2e14bfd51acff76c8b4c8575533697f8f069854a4d5eb SHA512 281c87fd74b63941c4ae76772c7020b0c70adfcde3e87be13cb9b0994aa4794df2c2904e623518812d1da8ea602b45c95db083ea7d239e7f0e7c9c92487bd68c
diff --git a/net-misc/icaclient/icaclient-19.6.0.60-r1.ebuild b/net-misc/icaclient/icaclient-19.6.0.60-r1.ebuild
index 941c09b0cfba..935af4875168 100644
--- a/net-misc/icaclient/icaclient-19.6.0.60-r1.ebuild
+++ b/net-misc/icaclient/icaclient-19.6.0.60-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-19.3.0.5.ebuild b/net-misc/icaclient/icaclient-19.8.0.20.ebuild
index c8e2a36e854d..941c09b0cfba 100644
--- a/net-misc/icaclient/icaclient-19.3.0.5.ebuild
+++ b/net-misc/icaclient/icaclient-19.8.0.20.ebuild
@@ -13,8 +13,8 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="nsplugin l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
 ICAROOT="/opt/Citrix/ICAClient"
@@ -35,12 +35,11 @@ RDEPEND="
 	media-libs/freetype
 	media-libs/gst-plugins-base:1.0
 	media-libs/gstreamer:1.0
-	media-libs/libcanberra[gtk]
 	media-libs/libogg
 	media-libs/libvorbis
 	media-libs/speex
-	net-dns/libidn:1.33
 	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
 	net-misc/curl
 	sys-libs/e2fsprogs-libs
 	sys-libs/zlib
@@ -49,6 +48,7 @@ RDEPEND="
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libXaw
 	x11-libs/libXext
@@ -94,17 +94,11 @@ src_install() {
 	dodir "${ICAROOT}"
 
 	exeinto "${ICAROOT}"
-	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+	doexe *.DLL libAnalyticsInterfacePd.so libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
 
 	exeinto "${ICAROOT}"/lib
 	doexe lib/*.so
 
-	if use nsplugin ; then
-		exeinto "${ICAROOT}"
-		doexe npica.so
-		dosym "${ICAROOT}"/npica.so /usr/$(get_libdir)/nsbrowser/plugins/npica.so
-	fi
-
 	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
 		insinto "${dest}"
 		doins nls/en.UTF-8/eula.txt
@@ -200,17 +194,6 @@ src_install() {
 	domenu "${FILESDIR}"/*.desktop
 }
 
-pkg_preinst() {
-	local old_plugin="/usr/lib64/nsbrowser/plugins/npwrapper.npica.so"
-	if use amd64 && [[ -f ${old_plugin} ]] ; then
-		local wrapper="/usr/bin/nspluginwrapper"
-		if [[ -x ${wrapper} ]] ; then
-			einfo "Removing npica.so from wrapper."
-			${wrapper} -r ${old_plugin}
-		fi
-	fi
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 }
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 68289de0e334..49e9f74c2b4a 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,10 +1,8 @@
 AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab
 AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31
-DIST kea-1.4.0-P1.tar.gz 6645111 BLAKE2B 290b7bcf8b32fcf2762240f2173cb45c035187c7dfd1affd0fd8a947721745ea9d8846be365ee3f9331d578b7bc248ee53a1e37666585a62c90d7dc541c7aaa5 SHA512 beb3baae09510de970fb5c1a301c57d64fc56d825d964f413357ba448b993d0a4f714d4efa4da166d3c06623a9ae78b70c25b61793e696551cb97b7e08d5e634
-DIST kea-1.5.0-beta2.tar.gz 7372364 BLAKE2B bb5c8c119fbf52ceea58998cb37b19286ea85f30f67d0b6f4bd27be188f2d68ec551667a136f0e9f4bf5320ed1250494b67fc26c8d15910a46976c968cd4480b SHA512 c107a7a570d018a05d42bd0d521757d9036c4bdabf2943ac3c96e2f5124ec6f34fe1d60660450a51cba20b24e8fda3915e8c5ee2d3e5e6df4319ba965153b8de
 DIST kea-1.5.0.tar.gz 7395257 BLAKE2B dfc28916166a732714253e1e7458076643e1a40e9fbcfca78d7206155b355abedf630f19311a2b164b2af78227e9c8cd0db9afcc01015554e5b2c4c336a11c9c SHA512 6d6b7407831311ebe37abce382ce77c664015ddbe3e73ec78153a00b301f98af5be52e26ad4febf5ca1e478d2c1844db4c988b241d2700d758e90b077f176ad8
-EBUILD kea-1.4.0_p1.ebuild 1485 BLAKE2B 8b860d58efd988221fe35ce2d75e4ed0b59ba09d2c2b951e89c8a7d402f9689a9a59627f61c0df4644ab4e781b63e44d1994f294b37d30c6c98561a02964976d SHA512 9777bc0844c9e261e84f63294109935a8c8cab6e3545ab182ee7d3c8c996c0b979495182117701b30714c418eecd62600e435be279864b187f3227a279498aa7
+DIST kea-1.6.0.tar.gz 7154301 BLAKE2B b05bd6cbf53140e10da2614917d2f314a048035f1ba5b33bc260166d203c3c99c1aa6438f886569aa5a809f705572096834dbb0ccea67eee1a93c1ed61fc0d9c SHA512 09e670996ad3dbfc523ad7639e3cfd43147bf370069cec80a6ba6af4c45264f33318594a20073f1c5d75bd19bcaa275e3167b243e13c5a6c151c10d634f338af
 EBUILD kea-1.5.0.ebuild 1620 BLAKE2B aa8f2a332a2387db5d86cdb04d5d81974cb2940b78e37a9d1fa046d84af7481b74e5e922e9a02e8304079ef422b59e20f8f6bdc8ebc97099e6ce44167522dd25 SHA512 9e4d61c89e66dd06c58b5db9a6ad4daf29bccf39172ea6123c876d53211cd5a73cb54352b9865bbd19934023777a625573fc3f7f4c15e5cb2e5881e6a2a49921
-EBUILD kea-1.5.0_beta2.ebuild 1483 BLAKE2B 032da6b42cc0333422a8f88ccc823ab26ff33b1181f8ab0b3b009c4b094d72bb5ec0739ac97fbc058d30ed0c3095481012f50b7c2790f13f7f1da7c8fac87855 SHA512 ef638d67430c9f980121434367f7df2edc8b0e7a8c80f5dd56b346bf78e6062ec61932f2cb0e1dde989e21e03ba37f6360cd93d36fabf167f6aa3982276018b8
-EBUILD kea-9999.ebuild 1620 BLAKE2B aa8f2a332a2387db5d86cdb04d5d81974cb2940b78e37a9d1fa046d84af7481b74e5e922e9a02e8304079ef422b59e20f8f6bdc8ebc97099e6ce44167522dd25 SHA512 9e4d61c89e66dd06c58b5db9a6ad4daf29bccf39172ea6123c876d53211cd5a73cb54352b9865bbd19934023777a625573fc3f7f4c15e5cb2e5881e6a2a49921
+EBUILD kea-1.6.0.ebuild 1750 BLAKE2B a4d18a5a46923bddac174ed443d03c838cd6d6bbc253683a890f921ff11683ba2566fcbaf18d6004505132e738da9f54fd2dcda2d0df666707337339c76fb52a SHA512 64c24cf23105b94a1df01bcac4ed3fbb8a70c4ea2507becfa58a75e9951161ac3280a8e62b261b532fec733fb30185c9169b0dc2e66fc7c2c6295d8d56c0d588
+EBUILD kea-9999.ebuild 1750 BLAKE2B a4d18a5a46923bddac174ed443d03c838cd6d6bbc253683a890f921ff11683ba2566fcbaf18d6004505132e738da9f54fd2dcda2d0df666707337339c76fb52a SHA512 64c24cf23105b94a1df01bcac4ed3fbb8a70c4ea2507becfa58a75e9951161ac3280a8e62b261b532fec733fb30185c9169b0dc2e66fc7c2c6295d8d56c0d588
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-1.4.0_p1.ebuild b/net-misc/kea/kea-1.4.0_p1.ebuild
deleted file mode 100644
index b3312db88dd3..000000000000
--- a/net-misc/kea/kea-1.4.0_p1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
-HOMEPAGE="http://www.isc.org/kea/"
-if [[ ${PV} = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
-else
-	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
-		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-IUSE="openssl samples"
-
-DEPEND="
-	dev-libs/boost:=
-	dev-cpp/gtest
-	dev-libs/log4cplus
-	!openssl? ( dev-libs/botan:0= )
-	openssl? ( dev-libs/openssl:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	[[ ${PV} = 9999* ]] && eautoreconf
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with openssl)
-		$(use_enable samples install-configurations)
-		--disable-static
-		--without-werror
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newconfd "${FILESDIR}"/${PN}-confd ${PN}
-	newinitd "${FILESDIR}"/${PN}-initd ${PN}
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_preinst() {
-	enewgroup dhcp
-	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-}
diff --git a/net-misc/kea/kea-1.5.0_beta2.ebuild b/net-misc/kea/kea-1.6.0.ebuild
index 6a29a56af228..2d0234c2da44 100644
--- a/net-misc/kea/kea-1.5.0_beta2.ebuild
+++ b/net-misc/kea/kea-1.6.0.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs user
 
 MY_PV="${PV//_p/-P}"
 MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
+
 DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
 HOMEPAGE="http://www.isc.org/kea/"
 if [[ ${PV} = 9999* ]] ; then
@@ -22,16 +23,19 @@ fi
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-IUSE="openssl samples"
+IUSE="mysql openssl postgres samples"
 
 DEPEND="
 	dev-libs/boost:=
 	dev-cpp/gtest
 	dev-libs/log4cplus
+	mysql? ( dev-db/mysql-connector-c )
 	!openssl? ( dev-libs/botan:0= )
 	openssl? ( dev-libs/openssl:0= )
+	postgres? ( dev-db/postgresql:* )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -46,10 +50,14 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		$(use_with openssl)
-		$(use_enable samples install-configurations)
 		--disable-static
+		--enable-perfdhcp
+		--localstatedir="${EPREFIX}/var"
 		--without-werror
+		$(use_with mysql)
+		$(use_with openssl)
+		$(use_with postgres pgsql)
+		$(use_enable samples install-configurations)
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -58,7 +66,8 @@ src_install() {
 	default
 	newconfd "${FILESDIR}"/${PN}-confd ${PN}
 	newinitd "${FILESDIR}"/${PN}-initd ${PN}
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+	keepdir /var/{lib,run}/${PN} /var/log
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
 }
 
 pkg_preinst() {
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index 75288a0c58a2..2d0234c2da44 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs user
 
@@ -35,6 +35,7 @@ DEPEND="
 	postgres? ( dev-db/postgresql:* )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -49,12 +50,14 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
+		--enable-perfdhcp
+		--localstatedir="${EPREFIX}/var"
+		--without-werror
 		$(use_with mysql)
 		$(use_with openssl)
 		$(use_with postgres pgsql)
 		$(use_enable samples install-configurations)
-		--disable-static
-		--without-werror
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -63,7 +66,8 @@ src_install() {
 	default
 	newconfd "${FILESDIR}"/${PN}-confd ${PN}
 	newinitd "${FILESDIR}"/${PN}-initd ${PN}
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+	keepdir /var/{lib,run}/${PN} /var/log
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
 }
 
 pkg_preinst() {
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 2256476e68bc..88b304073c18 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,4 +1,3 @@
-AUX lldpd-0.7.11-zsh-completion-dir.patch 318 BLAKE2B 98a182c00ac6d5fedabf2c5c0891020b1c896e6b412bdefbf2db6715065df8b1bf75965f262f42a794d2be3cfe78c716c44b02e6076bc5a1bfcb68f88730e337 SHA512 cd4c069f9d637d6c9f0a687a7a415a6382bf5217390a94a269de19f5a35c1edd47d5c3455bc63d75aa7bc74a72d7f2c9de9210c0795a95bd0c78a10c1709fcb1
 AUX lldpd-0.9-seccomp-missing-syscalls.patch 1192 BLAKE2B 2692d29b9ffcd7edc09c96b512dfdf1e868be50a07428ac810ec5276b132ef43215f59de498e0b1e61fbf9dce0db4261c96ee81461b20d2ab9764448b74a56ca SHA512 360c53265171ba2effed935da762d66213a911da53832d2c5426e775d4e0d00d2ee74b0041bebe100a4aeb1ecd0292ac4bd2f95dcf0c79440e28f2ec47b01669
 AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 BLAKE2B 47f508fd0894334cc4d00079c3c3907bbe419c1729ed54214dee835661742b8a904098a5a28a86bdf836becf10004942fe6159be29ff27adeaa8bc8258156681 SHA512 5b39207b33a5b419e1775bfbaa91f11b1aa07af786a4be7733f305ac5d5a7a1ef9e8a2eb91d023aaac005bc19c1445f864b5a702073892436b5e310fd4fa79dc
 AUX lldpd-1.0.1-seccomp-add-brk.patch 900 BLAKE2B 0bfbdc01382c8b96e6b266797110f5988f94abc9e40c19e0e2b7f24eebe07d91182629c8c2f06632360096b9f2509dbc0aea3f87e2152ca1ea264535c9c25f55 SHA512 8b51bce336da2151323f9fd8a48efa59684bc72450a49c438a4fcac81f64602f0a2777bdc8880b21541ac22760c7922b455225af7c27e8c392d70a651f84e752
@@ -9,11 +8,8 @@ AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e1
 AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893cc7437aa236fac9449d4890989f10618146b1da11795c637f29f2849c89af04b5156f6d9b1d SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0
 AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d24c4fa2b5b72426af5ee5ac57d40cfb2d1bc3ea6c1b253e1daaa341d998d66889bbc94c83d2438 SHA512 5b5aead569c842c2850fb0180b67beb87b4f0301e9e591d957089f5c659a30ef464fadd44a01f9b5476ff999368c3494c7dc7013db473d518721e5fab41cd054
 AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde
-DIST lldpd-0.9.3.tar.gz 1601102 BLAKE2B 0ba31d20dad9770c93fa4930a7c439273c36e5cebdb0b4a1674f0a375008f642e33d71b9668c91313ec4bb3311e1b4bd22d0996ed6347d2cacfd7cce24536a58 SHA512 0d40d77bfde78f9ceece56968981f3a36bd7e683b12de05e84e5da0409b8e0d06062e5d665942637a66164af0254a6ac3d1a327aab3bcb48ec91ecfdd2693283
-DIST lldpd-1.0.1.tar.gz 1590903 BLAKE2B 37ff1c042537ac31f394986f1bbd3faf13105d07f340ed045a4bbc196912c0c017a5d60b2c6a89b0da9faa5a7ff8e9c4ef0d4d01a39504a31c23288a89eb92a3 SHA512 61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd
 DIST lldpd-1.0.3.tar.gz 1605563 BLAKE2B 968d1c2e046049fd9ba9e9af7b8cb4f531fbd99f41a9157679f3694f800b0da1a4dd3b21feac583fa5cde3f57b022e2d6ee543ea349e1136037ba10419e3c855 SHA512 bae121a707d06726830dbb6b45210c1ed23aa2a99349a68d088b3ae3109504a6b462c7b0abf8543297083294519be2878779edf1a41bb73fe002bb6c9f966ef1
-EBUILD lldpd-0.9.3-r1.ebuild 2476 BLAKE2B ea99c4a7cf9b328e074c400ae1873340e10c2865b0ec7297f995563f5f0bb7656806d02caa490664b69e72effafa9af964820013a7c3b2a7bb83629680ff3b68 SHA512 aade0484be9dd930dbd7e7225e70796a93f3986b79a6a3a289f30de717e82845c890a6ce93c7986f7542e3f398ac583a95768d60ecf5e34091db7b70bd749fb0
-EBUILD lldpd-1.0.1-r1.ebuild 2439 BLAKE2B fc2b1c220d371f0e2d42efc6e7ed3f7ee5389cd4c2b96f7d5af6449a1bd8f1ccd7b42c01fd5a98587048df6694261ac0b5c157cae80010cb058bdf091227c829 SHA512 3a8fb50e15715e6b7cf53f6723b74b476ffe942adc39ee93612fa7eb7a4dd37c05b763c19afe128c9e17e4251cec9369e2c2c6f78249356f96d9caf0b4e9c788
-EBUILD lldpd-1.0.1.ebuild 2390 BLAKE2B b201067dde29c59460b13866be79e359bd933b24d9dfff80e59f69c0f586e8a6ba1daac4ef4dd4c86a3de398a05e96866f7fd3297771c07cc478830e2d1438fd SHA512 084fb2530ed91f354410515ddaeb790bdf8c6cc94d4db3e34c6ad9d6e094ecb18e7659a92ca46110975a1a6b39693c58eab72b89d0fdcb4b622aa687f1a054af
-EBUILD lldpd-1.0.3.ebuild 2542 BLAKE2B 047b22f95ba2b5b1708b963952d8e0a0f7d1de026fe07247761357006c19be93eabdbef1f666da9ce2ec4a32439834037918aa231fcf7bfda3838be147b98f4e SHA512 ddd5b65a8545d030284043eb782e0faa1a2ab0427891861d0f4323db595693225d0d7bf8f05f88f0bb8a30c846f63fb758775fe37c034ff844348a275064cd66
-MISC metadata.xml 2829 BLAKE2B 83e3f2636828107af74952f951e1e5874ce647f786932a509f79e154ab026a0556bc0341576f4c458e40c88feacee187e7a18fd1ee736953425d2cb252e0175c SHA512 a401329c2f122ba079995ce0c7810d32920a91dc94e8678378f3c0eb9f72e613710933df8508eb25ad1516bda1f406d6e459fe1049112dedd8c524a7d8432c01
+DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04c228eeb12a2f60ea6643f63a7de3831ee3f0a060cd4de3849e75b58fdb6a868dc1aa0f8dc4b516fdd4f4ead0 SHA512 a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9
+EBUILD lldpd-1.0.3.ebuild 2540 BLAKE2B 5feb12c469fcc8b1197ae90b81b07384ba5d9562e8a8104f5e1e1f3f89c1a50aca0b4801cbd18e553bbb5db8aae0eb41a328e37050c22393f62382b700b600af SHA512 497abc9c43b915427ae051d522a613db865ea7d221fece4c005e416bbae69aff60b99ced62d372f4c6ea8728c92dc06256f35ee2c50f858afe9fbb5cc9b456a9
+EBUILD lldpd-1.0.4.ebuild 2522 BLAKE2B 301b2684c36504372139267a37b51523ce21fcb0d775413f0a0234abe6b1a716d2825ea30ef8d49e1dd6dec3094200931a6f0d31585f621656dc071cba60e914 SHA512 24480ce8ad674947232f640ca6c8a6962cf3f79b568e83b34be709d30acd331a2351f9c6db4b714fce2e2950df01567581e5d80bc9c8cad13da34b04353b0fb5
+MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511
diff --git a/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch b/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch
deleted file mode 100644
index ff20d9aabc75..000000000000
--- a/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/src/client/Makefile.am b/src/client/Makefile.am
-index 454bdeb..fd391fd 100644
---- a/src/client/Makefile.am
-+++ b/src/client/Makefile.am
-@@ -46 +46 @@ dist_bashcompletion_DATA = lldpcli.bash-completion
--zshcompletiondir = $(datadir)/zsh/vendor-completions
-+zshcompletiondir = $(datadir)/zsh/site-functions
diff --git a/net-misc/lldpd/lldpd-0.9.3-r1.ebuild b/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
deleted file mode 100644
index 4f8d9c61c91d..000000000000
--- a/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user systemd bash-completion-r1 autotools
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
-SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph jansson +lldpmed old-kernel
-	sanitizers seccomp sonmp snmp static-libs readline xml zsh-completion"
-
-RDEPEND="dev-libs/libbsd
-	>=dev-libs/libevent-2.0.5
-	sys-libs/readline:0=
-	snmp? ( net-analyzer/net-snmp[extensible(+)] )
-	xml? ( dev-libs/libxml2 )
-	jansson? ( dev-libs/jansson )
-	seccomp? ( sys-libs/libseccomp )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		graph? ( app-doc/doxygen[dot] )
-		!graph? ( app-doc/doxygen )
-	)"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.7.11-zsh-completion-dir.patch"
-	"${FILESDIR}/${PN}-0.9-seccomp-missing-syscalls.patch"
-)
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--without-embedded-libevent \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/run/${PN} \
-		--with-lldpd-ctl-socket=/run/${PN}.socket \
-		--with-lldpd-pid-file=/run/${PN}.pid \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable cdp) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable graph doxygen-dot) \
-		$(use_with jansson json) \
-		$(use_enable lldpmed) \
-		$(use_enable old-kernel oldies) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_enable sanitizers) \
-		$(use_with seccomp) \
-		$(use_with snmp) \
-		$(use_with xml)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-	newbashcomp src/client/completion/lldpcli lldpcli
-
-	use doc && dodoc -r doxygen/html
-
-	insinto /etc
-	doins "${FILESDIR}/lldpd.conf"
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
diff --git a/net-misc/lldpd/lldpd-1.0.1.ebuild b/net-misc/lldpd/lldpd-1.0.1.ebuild
deleted file mode 100644
index 31d70bcb6cd9..000000000000
--- a/net-misc/lldpd/lldpd-1.0.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user systemd bash-completion-r1 autotools
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
-SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
-	seccomp sonmp snmp static-libs test readline xml zsh-completion"
-
-RDEPEND="dev-libs/libbsd
-	>=dev-libs/libevent-2.0.5:=
-	sys-libs/readline:0=
-	snmp? ( net-analyzer/net-snmp[extensible(+)] )
-	xml? ( dev-libs/libxml2 )
-	seccomp? ( sys-libs/libseccomp )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		graph? ( app-doc/doxygen[dot] )
-		!graph? ( app-doc/doxygen )
-	)
-	test? ( dev-libs/check )"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.5-seccomp-add-socket-ops.patch"
-)
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--without-embedded-libevent \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/run/${PN} \
-		--with-lldpd-ctl-socket=/run/${PN}.socket \
-		--with-lldpd-pid-file=/run/${PN}.pid \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable cdp) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable graph doxygen-dot) \
-		$(use_enable lldpmed) \
-		$(use_enable old-kernel oldies) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_enable sanitizers) \
-		$(use_with seccomp) \
-		$(use_with snmp) \
-		$(use_with xml)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-	newbashcomp src/client/completion/lldpcli lldpcli
-
-	use doc && dodoc -r doxygen/html
-
-	insinto /etc
-	doins "${FILESDIR}/lldpd.conf"
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild
index 822e037de615..df8005f63804 100644
--- a/net-misc/lldpd/lldpd-1.0.3.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 	seccomp sonmp snmp static-libs test readline xml zsh-completion"
 
diff --git a/net-misc/lldpd/lldpd-1.0.1-r1.ebuild b/net-misc/lldpd/lldpd-1.0.4.ebuild
index 4f6e234cb95b..04dd3d66540b 100644
--- a/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils user systemd bash-completion-r1 autotools
 
@@ -19,22 +19,23 @@ RDEPEND="dev-libs/libbsd
 	>=dev-libs/libevent-2.0.5:=
 	sys-libs/readline:0=
 	snmp? ( net-analyzer/net-snmp[extensible(+)] )
-	xml? ( dev-libs/libxml2 )
-	seccomp? ( sys-libs/libseccomp )
+	xml? ( dev-libs/libxml2:= )
+	seccomp? ( sys-libs/libseccomp:= )
 	zsh-completion? ( app-shells/zsh )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	test? ( dev-libs/check )"
+BDEPEND="virtual/pkgconfig
 	doc? (
 		graph? ( app-doc/doxygen[dot] )
 		!graph? ( app-doc/doxygen )
-	)
-	test? ( dev-libs/check )"
+	)"
 
 REQUIRED_USE="graph? ( doc )"
 
 PATCHES=(
 	"${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
 	"${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
+	"${FILESDIR}/lldpd-1.0.2-seccomp-add-misc.patch"
 )
 
 pkg_setup() {
@@ -87,7 +88,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 
 	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
 	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
diff --git a/net-misc/lldpd/metadata.xml b/net-misc/lldpd/metadata.xml
index 83adab8a47e0..1b100cd39eca 100644
--- a/net-misc/lldpd/metadata.xml
+++ b/net-misc/lldpd/metadata.xml
@@ -25,7 +25,6 @@ lldpd also implements CDP (Cisco Discovery Protocol), FDP (Foundry Discovery Pro
 		<flag name="dot3">Enable Dot3 extension (PHY stuff)</flag>
 		<flag name="edp">Enable Extreme Discovery Protocol</flag>
 		<flag name="fdp">Enable Foundry Discovery Protocol</flag>
-		<flag name="jansson">Enable JSON output via Jansson</flag>
 		<flag name="lldpmed">Enable LLDP-MED extension</flag>
 		<flag name="old-kernel">Enable compatibility with Linux kernel older than 2.6.39</flag>
 		<flag name="sanitizers">Enable code instrumentation with selected sanitizers</flag>
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 5a392a1abf91..f2ed72b4e66e 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -7,6 +7,8 @@ AUX memcached.init2 2205 BLAKE2B d27dbf6fb4d72ec49ff89cb3957770a25afe467c96c0564
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
 DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed
 DIST memcached-1.5.16.tar.gz 487868 BLAKE2B b9889866b8adbbbf23785f0da35f6f6b3cd5c842c6167beab3dd5385d6ed53e4607a2ffc18cd815005f2a1d67a3a549c780411b93d34335c541f4999d793b8a0 SHA512 999872c4c68e0210feab76f74c9487fbfb652cf3e6b7fa347f882767aad41ea6d8ba3ee056494409c054d673fc209032d8a890605810b2c6c9048d26d50751a0
+DIST memcached-1.5.17.tar.gz 490891 BLAKE2B a971083ec29452755de953537ff9c23fc872496d4746420c9c20e91c226481bd3818c00495cb7a5d85f2bd38683061e57a9e92cbfe0e4cd28bcafde37f05cabf SHA512 533c916015d738ff4c7ba8420654ae15b19370b3e959b89d43bc60cae1bda65d36906be05fad44a025ea1878570a8c1a36041c4e4c0cdf0cea84e6bb0e7ba325
 EBUILD memcached-1.5.14.ebuild 2912 BLAKE2B c0fd78c76871cb26f9c8375d9b22d6073f6f81d8daedca76b0398de33fd1d2665dcdbcbddbacba4419747e16b3a379dcdefc1da99167826d68f6829e04072846 SHA512 795f3933d27879e5102773a7527b129a1de60a61f4c53acae02d5229fc37efe8cc2e0055e1cd829a958e4f7681d9b0785090c04a8ed2f261a4253ccdccf99bc8
 EBUILD memcached-1.5.16.ebuild 2920 BLAKE2B 44a9e54f77974921a4550308dff727bce9b1924514770e3526f710c5b1b1c8cb9b422c0f53dda5d7e6b67f75173c3624117871ecd12fa06f290e05b0dfa59628 SHA512 cd45d05190af8eb23017b52ff00a01909f35003c58d1591857d47ba6ccd445885595262ddc02f0a251621c6270fa81f684c59e953949a994d85f066e91fc0f54
+EBUILD memcached-1.5.17.ebuild 2922 BLAKE2B e2dd55a2876f4ae53465b2df1aedac099e496227b4ae56c00a9c081a8069d2e6ad4d489b8414865a431101db52dd32f50a65e2245122e3a484d3b3afc2800a1d SHA512 45cff587c952d530c1c986789ef6b54f5cd177b238e2941f8ea604412374b9fbdc09b4fb0a676914f6d54edfbde3a463d2fa94a45a70876a20ba89166e4af251
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.17.ebuild b/net-misc/memcached/memcached-1.5.17.ebuild
new file mode 100644
index 000000000000..8d046a22030e
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.17.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic systemd user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 5c7efc667443..424c565fc86c 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -1,5 +1,7 @@
 AUX minissdpd.confd 487 BLAKE2B aeb624644debe2e9ba438f9839f526fc9411e6f4d355bf46764c5b7b59a62776c16c93d4112821159835e9d9f174f2af443c0d07a10823b41182910d12899947 SHA512 5ac723cb5b3d3f8bb97989cffb174f22566fcebff304e40f12ca5144cfa94b00614fdf6925e2c5a1dd0f8fa533aac12e991bad0d0909cbdd90a9b7ed73e0c296
 AUX minissdpd.initd-r2 1522 BLAKE2B 35bde96e182529f0dd10ec4081c495ba1f52706dc191e29fa99ebb7d37b302578e492f705d4f724744ec3a9ca455730f01294e2a781529c3750193fd8e84cf50 SHA512 6d14fa0730b4c1f0e6a6765c80250ebd01d69c6fd3341049fae276a3d0ae2ec806cdfeb3b7897be0b62e426c7c9d7fb59514a0d67bb751a2e41f9b9616cc9ade
 DIST minissdpd-1.5.20190210.tar.gz 37227 BLAKE2B a273c35bb332e50f5c528cc395b257de7761fbec2cdef910018b0c751026ca4f3fc9fce60485c4209488574d3130a3c8a6d2755ae4114d2f4e2c0316491be021 SHA512 1902c3c396cdcec90af0638305224f77871bd7f70057ac8a1ff59b3ab6da168ee17eb52a5bee87eb85c8d759d02112225876e38c254ad521396eca9c4884686c
+DIST minissdpd-1.5.20190824.tar.gz 37300 BLAKE2B 3a04f6af0af8ce5d26e4860ceafe2c52f1ee562f179094fbcba3485c85ae75b7374fd7fa8f89ec6d9ce2a10bb94120618de40e0191fc7ecdd1e813a2b9c5d6af SHA512 79a14482b69a88b778e484a3b3e98964c420ff7576ac818ba60fd5e07f5b31754cdef3ee00d9189ba0a33f0268f11acd1f7c4222d8d0958920d1f568ec7755e2
 EBUILD minissdpd-1.5.20190210.ebuild 676 BLAKE2B 1d2e443df9406d31e7942c150b430eee7c68e3550f434b8fc4732db1c593335266864408ae93bb669d769dcfc83a9a1524d234a5bafca2446fc06fab63cb410d SHA512 f3429b14b6e2e7d019c582e7354f073159526299c3638e20622a5030cc49a2756d098356facd4974be82f14260e84775fd598e23ad05a0b2ce49c4728a94550e
+EBUILD minissdpd-1.5.20190824.ebuild 676 BLAKE2B 1d2e443df9406d31e7942c150b430eee7c68e3550f434b8fc4732db1c593335266864408ae93bb669d769dcfc83a9a1524d234a5bafca2446fc06fab63cb410d SHA512 f3429b14b6e2e7d019c582e7354f073159526299c3638e20622a5030cc49a2756d098356facd4974be82f14260e84775fd598e23ad05a0b2ce49c4728a94550e
 MISC metadata.xml 360 BLAKE2B 7e083fa0362b52310ab298a0684308dbe220a6f6acb7b99c99cf6bf22cb9406da9d34e021a367d50eaefa67f133c5b57f01d4b63aa46887ea15bf4c66ad5e5e4 SHA512 fbf209d07841a834e1d216090879be7a1e739f7ddd1e649d40d24aabe8782d2ed55a37fe8525453cb96137f1c76044087a6b435c786877349bbe939485d7b855
diff --git a/net-misc/minissdpd/minissdpd-1.5.20190824.ebuild b/net-misc/minissdpd/minissdpd-1.5.20190824.ebuild
new file mode 100644
index 000000000000..35c0a1f9b2be
--- /dev/null
+++ b/net-misc/minissdpd/minissdpd-1.5.20190824.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit toolchain-funcs
+
+DESCRIPTION="MiniSSDP Daemon"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+HOMEPAGE="http://miniupnp.free.fr/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-libs/libnfnetlink"
+
+RDEPEND="$DEPEND
+	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	emake PREFIX="${ED}" install
+	# note: we overwrite upstream's init.d
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	dodoc Changelog.txt README
+	doman minissdpd.1
+}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 7a1e27887d4d..650c9f0f9462 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,5 +1,9 @@
 AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
 DIST miniupnpd-2.1.20190630.tar.gz 240466 BLAKE2B fe4d4e59a7dad32bef9ed9b4c58b52e378ec9b26ea2439e84284630a7ef7269c6cd53cabdc632ff274cae88aea2552a8808af2ea349138f8b8ed667baf9e87ee SHA512 cd6006e5487652a258f7320e1e28fea7b0790528cc014071109a1abd0f6c249237cf8d0620987c14ee0ce1cca14f4bb4abd439b1d422e0e49a398cd485eaf970
+DIST miniupnpd-2.1.20190824.tar.gz 240490 BLAKE2B c2eaf08b18d4cd27a18a71232fd8d972ced799a68b0e6f3ff1b3d155ab0e27047153dcd81a0c89806f74a6c09c303eb3255825f6fd4083f1ec77605ee4f0d1b3 SHA512 f3e591e10b33d2459e55118db11f6692bafd75ae867f934f4a5c6ccf6c9cf21363d0a746d1b319a08381119f382d5941af84c5bfb5c54b97f8945aa9d7372987
+DIST miniupnpd-2.1.20190902.tar.gz 240742 BLAKE2B 0b880b1e8a96c56af92726d3fe81da0a26de83861efe4dc266e287623dcac4c6bd4c4ac8d2c6ef7724c1055933d5138e7c86da5c8e3852f2022f69697505f231 SHA512 0abeb9df088ecd57909106fbb43de14d90eebd351a466477777f413f40c49bc432050bc8ea0d655d2eea0bfcedbdb97719ea2476a8bd9170ef9b74ad97217d26
 EBUILD miniupnpd-2.1.20190630.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
+EBUILD miniupnpd-2.1.20190824.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
+EBUILD miniupnpd-2.1.20190902.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
 MISC metadata.xml 1037 BLAKE2B 9fa42839f13b135ac2b69091b9d0ba1d3749f3b9903bcaa209c0d23ff981615c58df027725a536b4e268c53eb285ab6750bbeb7e0bc8e668dfca61b787ec9c60 SHA512 536ef1fce9d3d76eb33a88707c5750fc0b014cf29b4c20d3459bc0116a68234667689a297e8aae35507f1b6b9fde7590d14b3763f2813c485478e18f396bfeb8
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190824.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190824.ebuild
new file mode 100644
index 000000000000..07c804f35640
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20190824.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0=
+	!nftables? (
+		>=net-firewall/iptables-1.4.6:0=[ipv6?]
+		net-libs/libnfnetlink:=
+		net-libs/libmnl:=
+	)
+	nftables? (
+		net-firewall/nftables
+		net-libs/libnftnl:=
+		net-libs/libmnl:=
+	)"
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release"
+
+src_prepare() {
+	default
+
+	# Prevent overriding CFLAGS.
+	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
+
+	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
+
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_configure() {
+	local -a opts
+	opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+	)
+
+	emake CONFIG_OPTIONS="${opts[*]}" config.h
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	local confd_seds=()
+	if use nftables; then
+		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+	else
+		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+	fi
+	if ! use ipv6 || use nftables; then
+		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+		"${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190902.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190902.ebuild
new file mode 100644
index 000000000000..07c804f35640
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20190902.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0=
+	!nftables? (
+		>=net-firewall/iptables-1.4.6:0=[ipv6?]
+		net-libs/libnfnetlink:=
+		net-libs/libmnl:=
+	)
+	nftables? (
+		net-firewall/nftables
+		net-libs/libnftnl:=
+		net-libs/libmnl:=
+	)"
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release"
+
+src_prepare() {
+	default
+
+	# Prevent overriding CFLAGS.
+	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
+
+	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
+
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_configure() {
+	local -a opts
+	opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+	)
+
+	emake CONFIG_OPTIONS="${opts[*]}" config.h
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	local confd_seds=()
+	if use nftables; then
+		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+	else
+		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+	fi
+	if ! use ipv6 || use nftables; then
+		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+		"${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index eee1fde6781d..eddfafa356e5 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,5 +1,3 @@
-DIST mobile-broadband-provider-info-20190116.tar.xz 85904 BLAKE2B e41ca1914c8b9c47f52f5b65cbfef577814269a23c5777fb1caf582cfc1c0c9a5125f51907748de8516b8aa3a8cf3fb044c8521d305161b206cc75f06e791764 SHA512 82cbf2c4523bc941d7cbfb1f552057d8259fcccbf95d02a6d43d315136050928ae5a8cf85f9900196214b803bb087446e28254d148af6b004225518f07aa9d23
 DIST mobile-broadband-provider-info-20190618.tar.xz 82640 BLAKE2B 6aad85193297a17c4606bdc700b0d3c7ce59c897d5d8fe0cec4ba3d17168aa519971c52a6b4c1f133c24a8fbd3f2ed1f3d45461248612ac95fbb746a3de9217f SHA512 511e6561b9b0db6c26f2e08bd06bb1dc9bb46696730fe6c6eba82cceec600dad684dc8dbe27adae78956367fb00dd8745070046acaa7a1129f194d8f16df425a
-EBUILD mobile-broadband-provider-info-20190116.ebuild 458 BLAKE2B 1d88977c00eabd0b81e15b93b718b7a1dc23d873dfc3d6e89ba5d015c3777b0d8103a7c3c5d9a5a91f5db9ed81b1aa3ba6b575affdd2cbb5d0ed7d951143d2a9 SHA512 032590ceacc4a2e212a6bb07ee227d386c1a4aa637fc8c74f6626ad0ad5c184b20f00d280ffa76da9355f365722963ceb7633b806fc2b711abad1aae2755ba68
-EBUILD mobile-broadband-provider-info-20190618.ebuild 451 BLAKE2B c8f4bfd36aa1e660190dea24bbb42c5280c15f625f79863f0b03e29df6b8f8afa65d3aac08f1c6be1a0e9326d9a3425512d9e319ffdeefaa2a826d8bcef84649 SHA512 2c61b42043cc65a04e98453338ea16b38acebab94fed8ffbcc91abdbabf067948dc8e4d3bcd21288f21c5ff4d6adc29906b7ba92c8261885923a89051d13621a
+EBUILD mobile-broadband-provider-info-20190618.ebuild 441 BLAKE2B d9ded965878f821ed011f934132418729648413be881123bd91e48c6db1e25305f2b5393c10131d877c057958c79c50d45fa20b3ab381e74f9a16cf7207d39dc SHA512 1ef9872af4c53385124f30725daadeaf603aa1e78550f5cd0c492957bc9d3b9429b5da4403601cb8594dc44e3d56b0bb1c8c5d81a4f6e64b76719b7e5e42aea0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild
deleted file mode 100644
index e356471e6a3b..000000000000
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org
-
-DESCRIPTION="Database of mobile broadband service providers"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
-
-LICENSE="CC-PD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="test"
-
-DEPEND="
-	test? ( dev-libs/libxml2 )
-"
-
-DOCS="README" # ChangeLog and NEWS are both dead
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
index 0cd0a8925e4d..4b4321836f0f 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
 
 LICENSE="CC-PD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index b61e85d3f916..d4fd86bfdc00 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -4,6 +4,6 @@ DIST mosh-1.3.0.tar.gz 356220 BLAKE2B c0a74243f7f54e24b2ccc326f89cff87f2772bf98b
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
 EBUILD mosh-1.2.6.ebuild 1421 BLAKE2B efaae0cc26ad8542351721bd8a82e33241175170b5883b40f2bfb8cf8b6b55209b7e526087ec4104f5eb3a27328844c0f59aa70379ef3d950945259147f8bf86 SHA512 116498494644dfe64dc2764d33e4ee567b7e67ea8fc538ce17eec31243a739d2f5c7ad046952be7b01119fbf1635a44807284694e35ea0ffa56c2520c59646c0
 EBUILD mosh-1.3.0.ebuild 1425 BLAKE2B 8244b7496ab7091af92ff8ddf6d0f702c5d75ae9a647baddaf514fa67fe3532fb3c645cae287dde5da6d226e9d64a005427d656c5121dc7ad53524a552547662 SHA512 aa1d9546fc5a8ac7b58951e54e343a567b1afa63ccccc740e431b716c9ba58bac6ad5e27b4c07b89618ae56ade77d73a7da9d29b99d43b63179683913ce074ab
-EBUILD mosh-1.3.2.ebuild 1495 BLAKE2B 8726361ddd15b620f13c3c011955ec28280c8c2ef03c3d9a7c67568d0736d3e003ca6579f0dc71103d0e19fc7f771d9a73de0d93f3293b3ef50e8ada5564b945 SHA512 3e3cd120664e9817970546b0238bb880d6d0de340b30df782b8232426b01bddf5de9fbdeb564604385f8f023f8133a499b5c3017ee58d1960cb7e7c6f2db3242
+EBUILD mosh-1.3.2.ebuild 1522 BLAKE2B 9fdfbc5762acd2b8897db9c01f89646d74b65312968f3f778e89511a58d5ba8d54907a5aeda3d33d839801148d755c710ba53eb21f42e0f234ef7b74a1a8c0fd SHA512 bdfec478e306626b6a79026c866e572c5e5adad61617e956caaaf68c0e63a008b470a15e739c59f38b713dacb94758c68d20a0b133776df361cd02df5f463f5c
 EBUILD mosh-9999.ebuild 1474 BLAKE2B 752b071131e7a0f33587374e8a2150c62570d2c6c70f9c5ed44efe629230202dd2bce07acc40f3cce14eed60ef467df3fc1d78e2fc2be7bc005c8f550b0a7036 SHA512 c7e8cd3814ec54f377472285f7f9c47737bd2dedb596a97551959c3332dfbee5c129cb52c41dd1f1649aa38aa1db38b45793e9d4af42f97d479d2dfb13c1fa0e
 MISC metadata.xml 1054 BLAKE2B 88f7bb070bcd535ba07cd1897dbf27bd2a5081f367354f67943e22148b2ce4d0c9e8b9ba5c1d4906057d4a015f69af2836abb69bd9e656bfd66ad483592cb843 SHA512 48fd6dc4aa24de61a6951b49cad3db41c084a0ec985af53d13d78c7bcae801152afcc7930eae5a0b6393cdcf844f0986f4a943d7d6f6193b950845e9da509ab2
diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild
index eb607fe4305d..4eea0ddd9726 100644
--- a/net-misc/mosh/mosh-1.3.2.ebuild
+++ b/net-misc/mosh/mosh-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+client examples libressl +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
diff --git a/net-misc/netsed/Manifest b/net-misc/netsed/Manifest
index 88327d330e41..62e42c7750d8 100644
--- a/net-misc/netsed/Manifest
+++ b/net-misc/netsed/Manifest
@@ -1,6 +1,4 @@
 DIST netsed-0.01b.tgz 6352 BLAKE2B 0aa8ed9f282f32d139e50af1a1c8d1aae118ff6e892475774125b45c229707c40544199ea70708827636a50e43b8f652138b244cb2f3857c854d49018b996fb7 SHA512 edef6ef6e39a17a46a3b4d8019ba2e742b2b5852f804df5e952461a792e3ba7a49fcc33353abf7e532e51586927f28f4b7c6da4f4fbd34a32cdf093f26163dd7
-DIST netsed.tgz 6352 BLAKE2B 0aa8ed9f282f32d139e50af1a1c8d1aae118ff6e892475774125b45c229707c40544199ea70708827636a50e43b8f652138b244cb2f3857c854d49018b996fb7 SHA512 edef6ef6e39a17a46a3b4d8019ba2e742b2b5852f804df5e952461a792e3ba7a49fcc33353abf7e532e51586927f28f4b7c6da4f4fbd34a32cdf093f26163dd7
 DIST netsed_0.01c-2.diff.gz 3140 BLAKE2B 211c7f71a76b74fc47cc32dbd5e9ad05a2c7c67bd95de73b0bdb09249f245ab8b0190ee79b51cf1d2f2bc99cc0b7fdf8d358851fddafb2815adc640260122c77 SHA512 5a729e9800051449f7f52989cb65232e262ac6023f21b8ec688f3ce33ed4be79f9d00993aed7773d83dbe109927a5fc6c64e4775d4958136e5c891b6b82e6b83
-EBUILD netsed-0.01b-r1.ebuild 543 BLAKE2B e3188985cf509cd621ffef839525a1a7d92f54b0dff06eb31c901401a6301d9ed1e70e4d9e2c3949c66d2beecbaafff9e00d5489bda76621e02cbfc3b65a5fb7 SHA512 a8ff862ff7314cf6a3316b9f85f8c0b634e62557a879e91d08b3f1ce0277cd01d24c42ef61a230c194deb064134d1dd5079d6889b558cd7dd1c6da469bc21817
-EBUILD netsed-0.01b.ebuild 662 BLAKE2B c2cb326d7eaeac16c23eed475a6c0169582d5ae537dbcd7e7d1ce3166a3b03186d0c2adff2b643579c8629fbe88a7f5132a6498be1128058e46daf95d31aa1cc SHA512 dfbbfe4d6b5f25c9b05ca1f0bded9650a7eb60db74ab7906732a52e25eb0b4204d2a0cd5abe4dd42b94726bd92512ad383072c3052ccfe61c228395ffe3c8d6c
+EBUILD netsed-0.01b-r1.ebuild 542 BLAKE2B ccb708488b5d60157afb379c08a29012f188cdffcb2abd1fd90f0754e89e1842255b6c3d98f236fb85bbc0845d2316946ca3ddd345a416dcd8013cdf73fc54ac SHA512 f0c898c0cf65673242b8591283a042341792dd2bead9529db1f613e852c454d7fa97baeb1cc752c83a3d469074b94a74c9e3477fbcde8ccf7c6f5f7303bdb764
 MISC metadata.xml 246 BLAKE2B 51e0781372b853df95595d4124ba0f81cb5fab4dfb78745aeeebcc0728617634384d5f9a90f02b50c13330b29651450eb18dd782e1c485bea5bdcb5017fd1d63 SHA512 68010e77c1c73aa0f8b81bd63ec9734de511e7b3fef0edd156df2584f25b6d485656a4d11f200af89e53a1b3ece9d6d15e93a2d1ba63f83adf944841183cdf00
diff --git a/net-misc/netsed/netsed-0.01b-r1.ebuild b/net-misc/netsed/netsed-0.01b-r1.ebuild
index d1c95a069071..e47d88888bc1 100644
--- a/net-misc/netsed/netsed-0.01b-r1.ebuild
+++ b/net-misc/netsed/netsed-0.01b-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${PN}.tgz -> ${P}.tgz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/net-misc/netsed/netsed-0.01b.ebuild b/net-misc/netsed/netsed-0.01b.ebuild
deleted file mode 100644
index 4072aa1d0567..000000000000
--- a/net-misc/netsed/netsed-0.01b.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Small tool for altering forwarded network data in real time"
-HOMEPAGE="http://freshmeat.net/projects/netsed"
-SRC_URI="http://dione.ids.pl/~lcamtuf/${PN}.tgz
-	http://http.us.debian.org/debian/pool/main/n/netsed/${PN}_0.01c-2.diff.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	mkdir -p "${S}"
-	cd "${S}"
-	unpack ${A}
-}
-
-src_compile() {
-	epatch "${DISTDIR}"/${PN}_0.01c-2.diff.gz
-	make CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin netsed
-	doman debian/netsed.1
-	dodoc README
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 367f985ff30b..c0db81594cf1 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -7,5 +7,5 @@ DIST NetworkManager-1.16.2.tar.xz 4820392 BLAKE2B f85fa4ff27cb2f0fc7d58052c810d4
 DIST NetworkManager-1.18.2.tar.xz 4872252 BLAKE2B 8a3fa74837a6cf2a09af807b9bd164c949d31efb81fc212485f49e24f0a215ff06db10c4259712f6c51d7480bda1b53457bf50bda9b2df8330891e8c8ba394c8 SHA512 a220d856632693298af0bd23ae4393ee597684fcae400c8ed35bae5e543bcdbd0b0e879f4a7587b674ae86c5fdfbee955acd0fb6226cb95ed31372cb7c222814
 EBUILD networkmanager-1.16.0.ebuild 11106 BLAKE2B 2ad8ff5ee0069946ed60b644ac8beb24167ba6da6bb5d8ddcef09d7b4187974efb62ef867d98b746b7910005a3dc89ffba5b263ffdcb2260a92463658b4fefcf SHA512 db17cab0f2ae56802f57e5f785ba11f5b3391a6a595c9ff773ace9b75d0d36df260fd5ef1ba6ec5d5f3539645bc2c5c03af628df89cb830861526da078b6e619
 EBUILD networkmanager-1.16.2.ebuild 11131 BLAKE2B 0ce19eba230f3608d09c4a6664e4d877711e683b6fecdabfaf5876ebfe924f6ced3445881f99cd90003e17482f90cd6d8ef24d3c0b1541afe5cc9ee510ec1c47 SHA512 40f15c6ed60d0c931b8b882e99a32a4daf795f40939a8e8b8826ede4fdacfd204efbbc4e3f82ffec4e5ee6d4ad0c54b435e5d3301cf7c6486663ad3ce65b6a62
-EBUILD networkmanager-1.18.2.ebuild 11131 BLAKE2B ace4e19631cf2c5963c7c47669cf8e96fdfe00c6e3152d54a2cce5d1b1cd0822961a55f8d6ec1a9b3c9a2d7bbd0eb15775ed570203b45c3ebe4685e766e8ca5c SHA512 d6a6eb85fc9c30cf434c6ea841f49c4f6adf1fe2b2e6a4a10cc9e225956ff7ab1d0398f66fa21918106296b8880401fe7b4d1b57b7cc09bb04753ae8c34fe191
+EBUILD networkmanager-1.18.2.ebuild 11126 BLAKE2B 0490cfa37f7423edc94e7b5b650c6d1986c0dd450413bd5031add0b6585e134a26f29f3306ee6198feba3b22191d774cfba7bd73cabc87e359be2bfe8678ad74 SHA512 0f041e6faa53cd4ecd6a07c0b8aa7e4d43594d9a89d96115265a9198be5449e2cb3bbe8312f01237b7aabad5cb6853d8d56ef1803ce119f76c7b8d68f3c7a318
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.18.2.ebuild b/net-misc/networkmanager/networkmanager-1.18.2.ebuild
index e90575126d4d..0e98e4e8353b 100644
--- a/net-misc/networkmanager/networkmanager-1.18.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.2.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
 	?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc ~x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index da0516fab64f..4b4c8fca3962 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -12,12 +12,16 @@ AUX ntpd.confd 192 BLAKE2B f5387ba2571b238a3e4f78c11151153deb40ad0babe4728942ec0
 AUX ntpd.rc-r1 489 BLAKE2B 6d3fe11a2ba7d04d02b24ca3acbcae5419908d12e94118bf91fca825f7561304a01dc9085cdc371b91498f6b14503c94cddeeb462b23c2b4b1017d3bfd3bd3ba SHA512 d51856ebff9160a01e1331114c5a8ea7337f9c8b570da75f36bbb29dcaf1924a40cdbbbf56e03148fc0f540103846e58d15175acf2e9d83c6b68d55c1e199734
 AUX ntpd.service-r2 207 BLAKE2B 5df5cbdde640e2686b94bf5ae952f257ec6905204aade6e0c482623187456336a5f7e4dc89fe56d929f17b16a8016e775c83f8db0bf8cfc30a819cf79da16b2d SHA512 c6425efdc046f5a8981a2ec97993d65454fe4a0c4162f8e8d873abf91280a4263509657e1d582baf5b02ce0ba536b87ca49158725f69914c9b01502f8c0e97f1
 AUX ntpdate.service-r1 316 BLAKE2B ffa7df1f3cab697bf971545cf1c60394ea456f67e2013adafdab97b4f44f93851705c3bd60e0a075c8c2b3c2f2b5d89440d63db9617dc37ac07bafe015f89e8d SHA512 156a6e48be3534ddd6e699315fa65d7ea0ee070594d7b7049962adeb8b411c0f2b919b93afe3f2976392a300792c6e6139529cc576dab6af3f8b94919af27eab
+AUX ntpdate.service-r2 325 BLAKE2B 807cef41cdaf78e582f6e77b8c992c8fed048ccb64b01152111294e4f281858815d17d90318421ba6dfcfceb49dbbbd8ae691533ff5e06ed972fb298f17d0e02 SHA512 745a9b9dd3a440b41228b1139978782dc1c2dd9a0876b5c4f9b842570fab1a6c6fd8f9e1a8b638aa7113ec863cefc17d578d8497ef4ea685ad984fc4020fb2db
 AUX ntpdate.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 AUX sntp.confd 149 BLAKE2B 8ef1da02161b1b757dcf3f34934f2455499ad1f28b0691e4b49334c5900b936a96eb91bac371e756256678ff4fbcad30239fe8753d605fc8a9c498a2fbad72d3 SHA512 28c8f1fd3a69bbdfacc2379a3ce01f254ae21fd8b91d893600086d27e5fb9cccf05d1bf62022ab26fcb53fa2080d4178961619811fd7a56f4e7502893f8ea13b
 AUX sntp.rc 484 BLAKE2B b8d829c7f1f2f9fc5e4cfd584483f31843d5b5740cf2fd89a9718fc7db86fc540406dfbf1209fbd5a1a44b3c9a2e0ffc92b28d01310a2125507489f0caf3ec10 SHA512 17b48cf31f5b15f5219d4a7f69a5eb84805bea256f8ae5b4888e56ec4de7e9a2640c7a36e236a467ecc7881a1757a12c24124697694730341f24bdeb751d8d7d
 AUX sntp.service-r2 324 BLAKE2B c94e72170f46453e94d6fb48b3ee353ba2db1bdf1903f6521219975e9a456346f8525f8016dfb10779e474e9495d7dc37ebfbf6e23b4482a6ae2396e6456796f SHA512 8626967f3bf9ef01fa5a2b7268b220ed7c518974db450a6f56316ede7b57947351171fb8ae6d28d32599e50c1d5506b4547dfd03cdbd80c5b873efb7d606cf17
+AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b920aa400cbf7db4ecbc874e5cddb778dbdca07da9cb79be327c1c0f8f296d30bb20d6b886b41084e5f SHA512 607322b6b47fc3e64e16a91e8c4114fcc1c565769e08dc872be9d9eb7c747a42c52a3ac855544cd05a3ae232463d612c1e58fcfed2d5b8f6fbdeff076f490380
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2
 DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075
+EBUILD ntp-4.2.8_p13-r1.ebuild 4584 BLAKE2B 08f0a824000d854e3371c12848cb042860b155b57fbaa6f598c825de0c3ef924b9d581e98c270aaf2d9a695735086824a414f893f52bd7a996b51c682fb0afc4 SHA512 1c84804f8efb04e601461dcac9187bf40a0d29cd716001d4721342f971b8abf9bcc12529c0c84eb6e8ecff53dfe58186ccc3e0c227d7d7e2deb886988b502ce7
+EBUILD ntp-4.2.8_p13-r2.ebuild 4587 BLAKE2B ad00e9a09745e16d9e227afef5f4f916db9b021579c8252c1caef10c0837f55a735b87be49dc97ef675a4f73d98943a847522e06011580b6598a66d7e8ec1612 SHA512 9ce56598d743a1a58880858c09e981d0b4255ffc5acca4f661ffa3cfd510b7690af835877b5947499109e30064f057dabd25853c0f4de5e1035b8742a5e8f129
 EBUILD ntp-4.2.8_p13.ebuild 4571 BLAKE2B 1884c38ee5b85477cfa32b39d6c42b0f24548cef45a8542d36b4ca39a5d3d3dc26e2dd964edb731e04e4ecb0eb7fbf2a4eec05254fcf04f5cac18266d6dcd4ea SHA512 ff1997994042aaf04638ad9a14c2c7acd05983faa2f21c78626d0d2596f82b73102082129804a465b4c3cf6974f1a1b510bacd36f639f5272543569de7bcf675
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/files/ntpdate.service-r2 b/net-misc/ntp/files/ntpdate.service-r2
new file mode 100644
index 000000000000..7ad294eccdee
--- /dev/null
+++ b/net-misc/ntp/files/ntpdate.service-r2
@@ -0,0 +1,14 @@
+[Unit]
+Description=Set time via NTP using ntpdate
+After=network-online.target nss-lookup.target
+Before=time-sync.target
+Wants=network-online.target time-sync.target
+Conflicts=systemd-timesyncd.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/ntpdate -b -u $SERVER
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/ntp/files/sntp.service-r3 b/net-misc/ntp/files/sntp.service-r3
new file mode 100644
index 000000000000..2ab722f2c6f1
--- /dev/null
+++ b/net-misc/ntp/files/sntp.service-r3
@@ -0,0 +1,14 @@
+[Unit]
+Description=Set time via SNTP
+After=network.target network-online.target nss-lookup.target
+Before=time-sync.target
+Wants=network-online.target time-sync.target
+Conflicts=systemd-timesyncd.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/sntp -s $SERVER
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild
new file mode 100644
index 000000000000..75150d171392
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs flag-o-matic user systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
+	>=dev-libs/libevent-2.0.9:=[threads?]
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	parse-clocks? ( net-misc/pps-tools )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-ntp )
+	vim-syntax? ( app-vim/ntp-syntax )
+	!net-misc/ntpsec
+	!openntpd? ( !net-misc/openntpd )
+"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
+	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
+	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
+	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
+)
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+	default
+	append-cppflags -D_GNU_SOURCE #264109
+	# Make sure every build uses the same install layout. #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
+	eautoreconf #622754
+	# Disable pointless checks.
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+}
+
+src_configure() {
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(usex zeroconf)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	# Increase the default memlimit from 32MiB to 128MiB.  #533232
+	local myeconfargs=(
+		--with-lineeditlibs=readline,edit,editline
+		--with-yielding-select
+		--disable-local-libevent
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--with-memlock=256
+		$(use_enable caps linuxcaps)
+		$(use_enable parse-clocks)
+		$(use_enable ipv6)
+		$(use_enable debug debugging)
+		$(use_with readline lineeditlibs readline)
+		$(use_enable samba ntp-signd)
+		$(use_with snmp ntpsnmpd)
+		$(use_with ssl crypto)
+		$(use_enable threads thread-support)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${ED%/}"/usr/bin/{ntpd,ntpdate} "${ED%/}"/usr/sbin/ || die "move to sbin"
+
+	dodoc INSTALL WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+	use ipv6 || sed -i '/^restrict .*::1/d' "${ED%/}"/etc/ntp.conf #524726
+	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED%/}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED%/}"/etc/init.d/ntpd || die
+
+	keepdir /var/lib/ntp
+	use prefix || fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${ED}" || die
+		rm usr/sbin/ntpd || die
+		rm -r var/lib || die
+		rm etc/{conf,init}.d/ntpd || die
+		rm usr/share/man/*/ntpd.8 || die
+	else
+		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
+		if use caps ; then
+			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
+				"${D%/}$(systemd_get_systemunitdir)"/ntpd.service \
+				|| die
+		fi
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "https://bugs.gentoo.org/41827"
+	fi
+}
diff --git a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
new file mode 100644
index 000000000000..40f035bdcd4d
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs flag-o-matic systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= )
+	>=dev-libs/libevent-2.0.9:=[threads?]
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	parse-clocks? ( net-misc/pps-tools )"
+BDEPEND="virtual/pkgconfig
+	acct-group/ntp
+	acct-user/ntp"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/ntp
+	acct-user/ntp
+	selinux? ( sec-policy/selinux-ntp )
+	vim-syntax? ( app-vim/ntp-syntax )
+	!net-misc/ntpsec
+	!openntpd? ( !net-misc/openntpd )
+"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
+	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
+	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
+	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
+)
+
+src_prepare() {
+	default
+	append-cppflags -D_GNU_SOURCE #264109
+	# Make sure every build uses the same install layout. #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
+	eautoreconf #622754
+	# Disable pointless checks.
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+}
+
+src_configure() {
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(usex zeroconf)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	# Increase the default memlimit from 32MiB to 128MiB.  #533232
+	local myeconfargs=(
+		--with-lineeditlibs=readline,edit,editline
+		--with-yielding-select
+		--disable-local-libevent
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--with-memlock=256
+		$(use_enable caps linuxcaps)
+		$(use_enable parse-clocks)
+		$(use_enable ipv6)
+		$(use_enable debug debugging)
+		$(use_with readline lineeditlibs readline)
+		$(use_enable samba ntp-signd)
+		$(use_with snmp ntpsnmpd)
+		$(use_with ssl crypto)
+		$(use_enable threads thread-support)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
+
+	dodoc INSTALL WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
+	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
+
+	keepdir /var/lib/ntp
+	use prefix || fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${ED}" || die
+		rm usr/sbin/ntpd || die
+		rm -r var/lib || die
+		rm etc/{conf,init}.d/ntpd || die
+		rm usr/share/man/*/ntpd.8 || die
+	else
+		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
+		if use caps ; then
+			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
+				"${D%/}$(systemd_get_systemunitdir)"/ntpd.service \
+				|| die
+		fi
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "https://bugs.gentoo.org/41827"
+	fi
+}
diff --git a/net-misc/ntpclient/Manifest b/net-misc/ntpclient/Manifest
index f8542b979971..fbf9f3862a0a 100644
--- a/net-misc/ntpclient/Manifest
+++ b/net-misc/ntpclient/Manifest
@@ -1,3 +1,5 @@
+AUX ntpclient-2018.244-linux-headers-5.2.patch 298 BLAKE2B bf39e7f0300b925a468c423d2ed6d41bb646ff4b034e264784e64fc6aeb9497c40154e21b1a76930104d2f62b8cdfa3d17ba3abdbbfefe95a3329438a009938d SHA512 dc92198426f3a859c5ff2618f754c279aa24e147ec0b165baa85af213c42bf011e7f2f13e33116839fc5b8fdc7e79405f113cee253bc5adbfb2fa40cbc6c3596
 DIST ntpclient-2018_244.tar.xz 108056 BLAKE2B 52c554fe238521e8820111a19220a532406137b2e21c67558fd8252ea2e4d60a7827f4acd1a2868f7a7f6f09c7b25c4267f4cd28773088a12132fa580b02bb4c SHA512 4c1c7e1088365679182507e21386bcf670713aed4b636687fbbe226219fdcbc25e27e2369912a78c662058cba9b6b409fb90978315806a3ed5ea59c70133e4bc
+EBUILD ntpclient-2018.244-r1.ebuild 829 BLAKE2B faa6abce18a23ee3d6c36ab7298a7f3b166503fc074ef4f21e34952cfd43e7dfa4b335a8e79899b0f007bd67597b18f1ee88afb84a19cd707dd8d4a9ce6ebf7e SHA512 c21047913ca423b15dbde991e4fc1984c6855047a94ea44b3a5075c827121cd40fded836ece3bf1143034186640759ef0d68a753d33f5ef09ff10d822ec4f450
 EBUILD ntpclient-2018.244.ebuild 772 BLAKE2B 8e0972d3e6c71a5f9378c842eb5021b8c769922e2a4774157741fff1db1efcb7347fa7bab932ab8289e3ac045de95b0ddde7b8e0f5cce3b848716de8f510ec09 SHA512 586bd3a631505608342bb6e10094d178433c7dc35e1fe7876c641dd7544817449aa3e2b0a5565efd6bda5807e85aebe86b296a6c2899cc775c9ce1dad23bba76
 MISC metadata.xml 1258 BLAKE2B 60a9f7c14c15b49d19acb728c55a2a695311d50232e6bb143315a81400cdc990af3b5e1f3699c7b225fd76f6c0725a6e7cd62f0c49091ccd47222bf6e96f0ea1 SHA512 dc7d72c25206360f89ac0b8cd210a6b13346a6a183a92eb4a279059cc07b372d49d7a64808d4db5fb638781d9c16fc33aca21dd02ee2fc40894f2ce6195e4a64
diff --git a/net-misc/ntpclient/files/ntpclient-2018.244-linux-headers-5.2.patch b/net-misc/ntpclient/files/ntpclient-2018.244-linux-headers-5.2.patch
new file mode 100644
index 000000000000..df87cb6ceb22
--- /dev/null
+++ b/net-misc/ntpclient/files/ntpclient-2018.244-linux-headers-5.2.patch
@@ -0,0 +1,10 @@
+--- a/src/ntpclient.c	2018-08-27 20:38:12.000000000 +0200
++++ b/src/ntpclient.c	2019-08-19 20:11:59.000000000 +0200
+@@ -40,6 +40,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #ifdef PRECISION_SIOCGSTAMP
++#include <linux/sockios.h>
+ #include <sys/ioctl.h>
+ #endif
+ #ifdef USE_OBSOLETE_GETTIMEOFDAY
diff --git a/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild b/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild
new file mode 100644
index 000000000000..a76559041406
--- /dev/null
+++ b/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/./_}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A NTP (RFC-1305 and RFC-4330) client for unix-alike systems"
+HOMEPAGE="https://github.com/troglobit/ntpclient"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug embedded obsolete +syslog"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-linux-headers-5.2.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug replay)
+		$(use_enable embedded mini)
+		$(use_enable obsolete)
+		$(use_enable !obsolete siocgstamp)
+		$(use_enable syslog)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index e9afb06b95ed..c7c4d9db513a 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -11,5 +11,5 @@ DIST radvd-2.18.tar.gz 224183 BLAKE2B 4bacf9e17b78286a032ca5e6b6424aa8742d2e42b3
 EBUILD radvd-2.14.ebuild 1763 BLAKE2B ffe1ecff2d2fa70d7bfb9e8dd20fc7e15a017d8ce363ed3fe36780ee803676aa6ab3d650ba8d48bd8f5fd1f2207a86486916edb831d16c723511bc9d907d71ba SHA512 7f7e28f4d4b84e088fb60a50c26ce2a42eb3ddbcfce094f035d779a01aa235b27e24ed590646ab186f2faec854e6d13f5b2c32e0e580d76dfc6d08ba5e4f9550
 EBUILD radvd-2.17-r1.ebuild 1575 BLAKE2B 327a7eb2dc9a567145a14f556e4e4bb7d35e0184b83d7336d963f3754c96cfc4d1bd8db85b074c6ccf547cf4331b2260ace20a05ee085eea895fd5088cd16e2d SHA512 d4df95d439844c4be3dd7df39609c762acb27a8f3b6db1dba081c1961e03289cf0fdb795bf1d10f20053bac9e587995944a70efa5c9d6e53ab0e7cc88c1d86b8
 EBUILD radvd-2.17-r2.ebuild 1628 BLAKE2B caaaedd5d8d132165e080f1ad9888c629a2cc44f7a75a0213cbd1ffa32fd50725ded8366eeb5ecf08ce2d3d5a8873730dca7f7aff7931e3aa2ea67dbaab4ef9c SHA512 7b1ca29b1537e18c66dcd7e6bf764df08e350b9006e589de9e5388684d12ff7532e1d4b86c36d1981da8760b766916ae33a010a1052c52d51010a4e3dd3a6206
-EBUILD radvd-2.18.ebuild 1591 BLAKE2B 10e840d56f020d2ec5bf82fe714023c78be8aa55806fceb28f38f80b077d18199484d6756b5eeee5612b0f157a516033713413b4106b59f287b252f96211836a SHA512 bf6c3400d7f37b82f4751780977e92500ea0a3f2b9876ea97ee0e4dc698898a1b4fa2a9bd755a144a757565f870a6820b0506f4cfed280ac80461df5b66cb780
+EBUILD radvd-2.18.ebuild 1585 BLAKE2B 4b7ee406b6a20b3ad44e1dbc01d47db91af0d6ea623e1939d6030c46aeeeb651a7d1e40ea1dc9a611c907ac77c7db34b0ec130b8946078c2bc6ab59d3fb568e9 SHA512 b715af5af67cb90b30e43f79392db9942124e099151c2411a885809f586eff843428a0546e7783971e9c535aba7d3e6131986cee511fc72d4f3ab3874f2c549e
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/net-misc/radvd/radvd-2.18.ebuild b/net-misc/radvd/radvd-2.18.ebuild
index bf7bfecda9dd..e42974c512d2 100644
--- a/net-misc/radvd/radvd-2.18.ebuild
+++ b/net-misc/radvd/radvd-2.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm arm64 hppa ppc sparc x86 ~x86-fbsd"
 IUSE="kernel_FreeBSD selinux test"
 
 CDEPEND="dev-libs/libdaemon"
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 89f1e07f4781..786c005646ff 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -4,9 +4,11 @@ AUX rdesktop-1.8.3-xrandr_configure.patch 666 BLAKE2B 1d2b0b57069b4e8a4eeed2d3d8
 AUX rdesktop-1.8.4-libressl.patch 395 BLAKE2B d7ae01de041bcba333c6c72348c28665a8b1cab12ace786848515b6455f189121c8e87a393255ac25b116d5027d0756a35b1de60007f37426e82f32c9cdc2f5e SHA512 dfc8b4af9d22d587846f5d18d3063c4932b3add419b60a01ff391e3ac5f7b1d6b40614e54cdff61c66b2690a879550d7ffad38c71188d62e598a8f63d347dd98
 AUX rdesktop-1.8.4-use_standard_gssapi.patch 2696 BLAKE2B 01f5542dc294d51f6d2fccf7141fc02ed199042cc25000bbc90d3387d6cd0b93ebce1a3ebbcaa1a8817bdd660dedd09d115f979fabb561b3ccc9e56e126bbd60 SHA512 ae91f4e0eb1e2c3141aedef660eb89628b334155c8c0559805cc4ac75274fff94101daf665052b27fe5074ce7468ff854fab865e7efd377d08d525319c7aa150
 AUX rdesktop-1.8.5-use_standard_gssapi.patch 1909 BLAKE2B 5e9b2b4b7bde0c38ba3302c780cbaec1a2ecea437fa686ce812c0e898427cac5e742ed69b96df9cbbc38378b99eef00f8326c25ed389461f689aab92f14e2a79 SHA512 1f886a23fd416f421bbab449b72fc889f60908b0408436f4c26229386d3baa48256bb78b4c72575ab9877932c634575345511f8418c20bef3345e231ef5d78ca
+AUX rdesktop-1.8.6-sec_decrypt.patch 1730 BLAKE2B 22b7c254b4fee01b72e51d28622795b622cc3ed495920780240afb153f14630b048d5e9592ec6eda1df7dd25e633c70c04d15aa286033397dc504d61826e7574 SHA512 a3a863afe18aea932a29b66f584d4beb7ceb8446522dccfde4251141ea56949b567711f69a849793e88bc12d65b8f93b659032478eebc2d8b5e61620e86044a3
 DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7ad0feb144746c904146c410c6456391eb3f2b7b9a6a40c2fb34515bb7518888c2c9da8dfcaf17c5309ff21cad3 SHA512 9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae
 DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee
 EBUILD rdesktop-1.8.4-r1.ebuild 1736 BLAKE2B 2683cb189864e5895da4d8252a96e6729bdf6484fab692c5b7922e9cfa4d66bbb2885fbcac7d7863d787d5ddd253faa05124bc712450b7a2d7a7f274242a39ae SHA512 16d5d030d96a6a27ef134e6d5f6b6a94a90034042f2dc02c587788f312403c1aaf9c71f0baf1001910053c703b96e009975d5fdc328a4114c0c511821117570c
 EBUILD rdesktop-1.8.4-r2.ebuild 1783 BLAKE2B 94a097e988cb19622eb8165830136f78f7ef6081914d64660974be4b97b861b4a01cd631a45009910cf27a2498c2e6f74e9be48ba0ccf8d4ea67a84eaba0fd93 SHA512 66a9fdc1e5c46fcf09879f482cb1b918614ed012373b776b05622dbc520d60d626a487422cf7ab0161886355fe17b392a64074da357e67a25c780cf625783679
+EBUILD rdesktop-1.8.6-r1.ebuild 1835 BLAKE2B b37022e869b06fddc2ff27f7b587c4cd105a58483b580be04e2fbf5a8568a491708d9db257ae88c16f5fe1960b17eb61705c94faffd4b65c1908a0b326ea10c8 SHA512 c089900c79fd165f66bb9c7d6d3706e41256b7360296fa644d594a1e62190ea007b406c1c057412b45b3b12cb50c46f5e63f3f7cbf18616c28ae1cc02c6c3a48
 EBUILD rdesktop-1.8.6.ebuild 1789 BLAKE2B a5981d395a82c55f364135084abf114b9dd620a8e6de31dd00f367a7adf56aa1d704472004448828160fcc855689abf8ce09f5b3081afb7871060d1cf1703ddd SHA512 1e868524b008638be1a472f9030bd11c1f6c744e7f40483d8233b5fbb58b734f48030e11c0b99b26049d06215fcd005377eb6e5bb6d5892007d111d67e716f48
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch b/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch
new file mode 100644
index 000000000000..dbb0d0e9baf7
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch
@@ -0,0 +1,59 @@
+From 7841030279c5300d5073b2348b58f3f41e136f82 Mon Sep 17 00:00:00 2001
+From: Markus Beth <markus.beth@web.de>
+Date: Tue, 11 Jun 2019 22:57:31 +0200
+Subject: [PATCH] sec_decrypt() the correct amount of data
+
+Save the correct amount of data to sec_decrypt() because after
+inout_uint8p() the macro s_remaining(s) will find nothing left.
+---
+ secure.c | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/secure.c b/secure.c
+index 8f65b3aa..9b301e1f 100644
+--- a/secure.c
++++ b/secure.c
+@@ -813,6 +813,7 @@ sec_recv(uint8 * rdpver)
+ 	STREAM s;
+ 	struct stream packet;
+ 	size_t data_offset;
++	size_t remaining;
+ 	unsigned char *data;
+ 
+ 	while ((s = mcs_recv(&channel, rdpver)) != NULL)
+@@ -832,8 +833,9 @@ sec_recv(uint8 * rdpver)
+ 
+ 					data_offset = s_tell(s);
+ 
+-					inout_uint8p(s, data, s_remaining(s));
+-					sec_decrypt(data, s_remaining(s));
++					remaining = s_remaining(s);
++					inout_uint8p(s, data, remaining);
++					sec_decrypt(data, remaining);
+ 
+ 					s_seek(s, data_offset);
+ 				}
+@@ -860,8 +862,9 @@ sec_recv(uint8 * rdpver)
+ 
+ 					data_offset = s_tell(s);
+ 
+-					inout_uint8p(s, data, s_remaining(s));
+-					sec_decrypt(data, s_remaining(s));
++					remaining = s_remaining(s);
++					inout_uint8p(s, data, remaining);
++					sec_decrypt(data, remaining);
+ 				}
+ 
+ 				if (sec_flags & SEC_LICENCE_NEG)
+@@ -883,8 +886,9 @@ sec_recv(uint8 * rdpver)
+ 
+ 					data_offset = s_tell(s);
+ 
+-					inout_uint8p(s, data, s_remaining(s));
+-					sec_decrypt(data, s_remaining(s));
++					remaining = s_remaining(s);
++					inout_uint8p(s, data, remaining);
++					sec_decrypt(data, remaining);
+ 
+ 					/* Check for a redirect packet, starts with 00 04 */
+ 					if (data[0] == 0 && data[1] == 4)
diff --git a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
new file mode 100644
index 000000000000..023a23ca970d
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://www.rdesktop.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.6 )
+	kerberos? ( virtual/krb5 )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+BDEPEND=virtual/pkgconfig
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
+	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
+	"${FILESDIR}"/${PN}-1.8.4-libressl.patch
+	"${FILESDIR}"/${PN}-1.8.5-use_standard_gssapi.patch
+	"${FILESDIR}"/${P}-sec_decrypt.patch
+)
+
+DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use ao; then
+		sound_conf=$(use_with ao sound libao)
+	else if use alsa; then
+			sound_conf=$(use_with alsa sound alsa)
+		else
+			sound_conf=$(use_with oss sound oss)
+		fi
+	fi
+
+	econf \
+		--with-openssl="${EPREFIX}"/usr \
+		$(use_with debug) \
+		$(use_with ipv6) \
+		$(use_with libsamplerate) \
+		$(use_with xrandr) \
+		$(use_enable kerberos credssp) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 8c39afbd7d95..cbf89dd5578e 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,6 +1,7 @@
 DIST Remmina-v1.2.31.3.tar.gz 1248295 BLAKE2B da748ceea5aa50702b060075c8e5c4aefe11ca1ebbc301b2951df76208da5998746631ef4c57f5692678e948839a8869a183b777f7046d416a55e5ac5b0d76d1 SHA512 f95c4dcebd833b590fbf0b418854bae66541743bc77cda4b0b97e1e49b158927fa859907619fd532b0660fc30eee80be472e02c38a2afe33e477c4a903a99e28
 DIST Remmina-v1.3.3.tar.gz 1362239 BLAKE2B 8ae5b72293ffe2f627a46aa9354256d84d318819b0d5c236f4d5628764eaa9e3a3d07f3130ae04ee271cbc6ac207ccfaf495533b3fa59ee184d3da19c8738bc8 SHA512 72d0303f922619c3842880365bb68b967eb2134fef7187d0fd83aeec2b50fb499573849f853d509216608eefc02db7ced91cfc65f89154b51d0657e42bd0d637
 DIST Remmina-v1.3.4.tar.gz 1365473 BLAKE2B f71a9c0a0fa9eafa547abf192972da39f0cfe1ca3745a87783d6a9ec5bab0674d93df8815b589b25659990bb345748f8f464f401c7efb934e8e71b207b0dab67 SHA512 212ebc6e08c694861522a05feb51e4efa012ef3361debf079384c07e4354370f6cf7d2880ff442bbe03782421bac7f33343d8049207073d90925d1c894d30e7a
+DIST Remmina-v1.3.6.tar.gz 1538166 BLAKE2B f3fc60df2a1a31bd5aae7d8de2d85cd579fa4cc35a0351fbce80433e21583b67cfc81665307d02fbd4863f6a55695be81f9c4d07423d6c8122d84dd625b69c3b SHA512 ce16379aa163467d05018c900d0dc7c2a7d73c1c22dd06a9a3092efa7675fda505bfa31b20131b9a3a10c74788377db17961c0bc9e59c47b1c7a15bf347f3bab
 DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e
 DIST remmina-1.3.5_p20190731.tar.gz 1475593 BLAKE2B 0a2ddb9c45474e65de9a5be28155ad45f06779170dc360f415ed7ce96fd8595d730eb5f89f756075f89ba5e8e124962fdd07f85d4ac90157eb1e0fae99169fbf SHA512 8b25dae17e13812184481d0640f44a253f0b66260e5e41b06d4e65e9d4dd673d0a17fab2453c9a29ba4691d53ac6e49cb35160931c546a7c68bc483e11eab987
 EBUILD remmina-1.2.0_rc24.ebuild 2035 BLAKE2B 7490ba779c88bf0caf7f1de2398dec1484acf428f3f1ddd06b021965d3ef255927d9637e24c56a71a3737707ef6a2df0257dc1a486c60e665e99721aaa5c1092 SHA512 058740deb4f072b8677fcb5bcedf2c870dccf748c166594cdf24cc09574b1fd1b8fb0157b89c82e43bd3dabcc892e72f561ed4db816ea269c40b2da9b73ce3cf
@@ -8,4 +9,5 @@ EBUILD remmina-1.2.31.3.ebuild 2239 BLAKE2B 65e7720bc587f060e1014ea7c35832a4eb3a
 EBUILD remmina-1.3.3.ebuild 2247 BLAKE2B 99065b1b37f957f07f0a16487f2dd4c9dc3f7c60cf9657584b6c0f1ed06b41602f8763d3e88f02234a42ad424080818e35df676e61dde7a6042d4934526ce65b SHA512 f80bf47e941b0c505610f757647c3260c7182d230e2f8067c3ed3781bd37c1ebcdab52aba279e9a51bda2f6faec78a7c0eb4e75c8c85f6fadb965ab0ff9910b3
 EBUILD remmina-1.3.4.ebuild 2245 BLAKE2B 256d9073a83f692a70c9db223a0d201f30100a5ff80d411f1990a53afd4954e6b96b8be0e9ef47600c4d3f2039b9250daf33fb9dc5ff6d6d74d451d860e52d49 SHA512 d2181e7130c47df3b0849936bea4cef88444ecbd2873a45b5f2f46e3269d310dc27d958138ecf7f0ed3d6929a82a8a9b0a3999838eb9dfb1646b137a481772d1
 EBUILD remmina-1.3.5_p20190731.ebuild 2530 BLAKE2B 88ee3101aa2954144e0e633a3a0f3e099b66eeb5451546dae5605176f8a8ae08a6619f51aca1f149ba23f33358eb63d7d958d9da189172183982d9a56ef384ab SHA512 ec5265dcf6489f7d0edd6eb48f2733cfc2b70ff208fb63d39af0e9e5a6b1908f646cfc431f039a53ee4df114265c98b458dc066dcc80e87131f10e5e9735800b
+EBUILD remmina-1.3.6.ebuild 2474 BLAKE2B 88edb239965f778136ffeda7464f73f5bec967e79309876ff8575c2573d91f836cfed7310f42dabf8f653b91b91e6c967415e28bd8cd22327fa4d955318a1728 SHA512 72550d956488a237ce029b3bf1fc61091820dd669804c2920cb83adb1167f55a2e6db212024dbb02cb511cb9a27c2afabc623189aa58a9fc47985fd1df5a3d73
 MISC metadata.xml 1310 BLAKE2B bcf7c45908f6d13c26cbb7564e78d925c34000ed1ba20f793ada10d34e0f5f8b7ca380cb2688029eb4bac52b8afa3ed06cf5e635d8789d64f4cb420d23167cd5 SHA512 8bc4313586204ce7d2e386815599ef8694b8e39816612b0bdc7984676fd17f0a78f94f96677c1a51b5bd8876402c0cfef58a629c60c091ebfed14912e4ca9bff
diff --git a/net-misc/remmina/remmina-1.3.6.ebuild b/net-misc/remmina/remmina-1.3.6.ebuild
new file mode 100644
index 000000000000..ca7ab2e53a71
--- /dev/null
+++ b/net-misc/remmina/remmina-1.3.6.ebuild
@@ -0,0 +1,95 @@
+# 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 kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libsodium:=
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	ayatana? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4 )
+	gnome-keyring? ( app-crypt/libsecret )
+	kwallet? ( kde-frameworks/kwallet )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4 )
+	zeroconf? ( net-dns/avahi[gtk3] )
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${CDEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+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_KF5WALLET=$(usex kwallet)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 2342d5dc05d5..924292b8a27a 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,8 +1,10 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
+DIST whois-5.5.1.tar.gz 103269 BLAKE2B c737c922b7ef5a8619e1778521da66b3507e96ed82b2fdde8fe61df22d7c40bd4494fa26b3de83e51cbeaf4811d912cbeff8de230f7bce9c0dbeb021567c2908 SHA512 bc32208e32f632b515792767c6c72a94cb66e7f42aed3dc5dc6ede3f5f28860cc279c5e6b1579db45b0f7dc6d55ec910b81cf1dfadb91354fb3833b1272b93fc
 DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084
 DIST whois_5.5.0.tar.xz 85600 BLAKE2B 37c90324e1b7c773793e1eaff70816f90a6429ab91bafcff36dfa02ea09b4eb5e83b8cd36e1ca0bc5eb3a043f1973f4479037de38cf41a7b7ac646845697636f SHA512 a26730613b8019385e48c7432bcc9871984a7035e53e56188a876e70e255a1adf23d546dfeb1706879af5c4a8f2231976fe89d2571b3d2cb6d615a7834a2d876
 EBUILD whois-5.4.3.ebuild 1583 BLAKE2B a143d22a2f6f7e91122449ee15947fad9d28cb57a7995af6068f36b2d06ee82090f501a86b3d5185b3471edad319f064c0b8c485a6cd80f5beb186d3fae38b6b SHA512 b6b2d2d1e38cfc198859c969de3c870e6624b2746cfb197726cc554b8036035a6bdc09f453997c9b49b8d7ba9cc523cb8fe62d4ed3332c6e573566f62be8458e
 EBUILD whois-5.5.0.ebuild 1624 BLAKE2B 5b6225e917c0746a4db7390d3a2871eb5701604d80747a1fab174beecc82bb08c6776f958bb907ffbfc78077b9035214716f6c7ae8babedb7808c4d49a1d5f76 SHA512 81be69cb9c3a681e371aa44080aa1fc8c89d718a5474072d472c99204a0ac2c78362f1e4a5d242912196ebfe7338c148adf1ab27c79cbaf4e401946639be9b2f
-EBUILD whois-9999.ebuild 1708 BLAKE2B cfb0991a873e3afe2f0efbc710f4e8883eb3bc6b01b248c9dec9369b590d7a3270ba568b774d7ac02f12a877027896e4e58cc6c33897484e5638151e3651f9c3 SHA512 e7a58163d0c63db79c05f7628bb867727143a7dc715f65658ead427f5e9ad6e21399769a5df564e9d491bc19c8a6fc74b64e88890a7a24c018e37b2f1528f42c
+EBUILD whois-5.5.1.ebuild 1790 BLAKE2B 35e07b65f4ae1ad45a8210e65956ec75568c638b91527d87e9c9ca49ed96667414eaafa4f91c4a2dffa388e6f75bfa3621286b08fa07dfd8ee3f0fcfb4cfffd8 SHA512 386833c1f4dababde9f75d8885828c84c0fdbe2697bef7418eb8784444b1b9719ce52171e9890b6ad5b95ea2008af766093756232f4774885c61b729ae70ab88
+EBUILD whois-9999.ebuild 1790 BLAKE2B 35e07b65f4ae1ad45a8210e65956ec75568c638b91527d87e9c9ca49ed96667414eaafa4f91c4a2dffa388e6f75bfa3621286b08fa07dfd8ee3f0fcfb4cfffd8 SHA512 386833c1f4dababde9f75d8885828c84c0fdbe2697bef7418eb8784444b1b9719ce52171e9890b6ad5b95ea2008af766093756232f4774885c61b729ae70ab88
 MISC metadata.xml 335 BLAKE2B 105a64d3c2f98d051101083c04232489e806ea86a66e27bbd33ebaf00cd7ce3cde1e4cce051adf86c6b61201973f9aec9c10f5b49f11586208260b7d7b40b292 SHA512 81d7c5fe370408b1cd3470c7e6b46127a8de700db07da3b0c7416263d7f0f7558da56dd2256cb4120a2fd398765d8a295436a517fbd0e9313d6abe9f5358d51d
diff --git a/net-misc/whois/whois-5.5.1.ebuild b/net-misc/whois/whois-5.5.1.ebuild
new file mode 100644
index 000000000000..f4e5388d3fd4
--- /dev/null
+++ b/net-misc/whois/whois-5.5.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${P/-/_}"
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="https://github.com/rfc1036/whois"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
+else
+	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="iconv idn nls"
+RESTRICT="test" #59327
+
+RDEPEND="iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+)
+
+src_prepare() {
+	default
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :; } # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	tc-export CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+
+	if [[ ${USERLAND} != "GNU" ]]; then
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
+	fi
+}
diff --git a/net-misc/whois/whois-9999.ebuild b/net-misc/whois/whois-9999.ebuild
index fbab7732283e..f4e5388d3fd4 100644
--- a/net-misc/whois/whois-9999.ebuild
+++ b/net-misc/whois/whois-9999.ebuild
@@ -12,7 +12,8 @@ if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
 else
-	SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index eda1125f620b..b2fe6fc5e186 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,6 @@
 DIST youtube-dl-2019.08.13.tar.gz 3177273 BLAKE2B 927b7bfe128738efbb5023817ccbcf635b6f7f3741f3f794bd8af377cd7c203ae4466818d03ee717f5196124c3a46c5bf9c1e1a92438a295a453786bd8ec3ee5 SHA512 0b5066f3ce93bc0ffa3f9c3aefe4154daae38e78449a8b5825ecf032252f8fafde893f1325809b3d9fecf28ca1c2539d941b90acf204c5bf68783e79fcd28c61
+DIST youtube-dl-2019.09.01.tar.gz 3179376 BLAKE2B 422e7f7f86d6486c45c2638b81a107c1fbf1aac4c05819b5d98185a403b9ed75be520e5711f42393ed4560b5828d10b6a55a633b55fa84d110f0c323bb159374 SHA512 327ef44180e2048045884d79de20541f81a4dbcee415c3fa15bcf333674f2b6e6c6663efa532b64e4f7078449af946479c98464ff9b54642e886f8c792f0b82f
 EBUILD youtube-dl-2019.08.13.ebuild 2124 BLAKE2B 608cd130bf27ff5253236fea27c22981fd804fa73e49ee6d0e67173d1840bd266349334f041307b4fe82c7a0708ae1a032d8f3d113dda7e0931197267f4b1246 SHA512 7ff84adcc79769d2acd9f9baa88e6f4222c65e8c892de335200e0f27d2aa15dc839241363bd2f58a6fe37e0af1345b072c5147a2205a927caeb9b9540dc17f72
+EBUILD youtube-dl-2019.09.01.ebuild 2130 BLAKE2B a6b9c8c31b6c7631f19183fccd1adf7b4c3ae5f5bc3108549803c83df78b66c2af9e04e1549a70b6f3bcca4cbc78a6e279f8aa063259c63e2fa464996ee69bcd SHA512 84f330ea104602ecd898906b7d33c98bd254715fc9feb5e71d35e34ac32466b56f178d22fe72dbea83f78ba45ffcd5fe73952c6d508dfc99bccec9a237daa155
 EBUILD youtube-dl-99999999.ebuild 1997 BLAKE2B 7b5974dc4df22cbb2fb7d87f60e73b2fddc7117331a6a81e8e9f0efef84788211d5fdefb1c96e9d4df0677fda2d264ef2846f36e60a890233fa79b06722b2abb SHA512 71019b536d5301dfbd5e9cb8085d1a001854f5bf204c0e76866c16a9553516a55081c17396bcc89c0128e44116b6e2dc451541b7e89d677822f3d541b316d5c5
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.09.01.ebuild b/net-misc/youtube-dl/youtube-dl-2019.09.01.ebuild
new file mode 100644
index 000000000000..89ac8f636eea
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2019.09.01.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+LICENSE="public-domain"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+RESTRICT="test"
+SLOT="0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
diff --git a/net-misc/zssh/Manifest b/net-misc/zssh/Manifest
index ff9981a137d7..52ed34a68628 100644
--- a/net-misc/zssh/Manifest
+++ b/net-misc/zssh/Manifest
@@ -1,4 +1,4 @@
 AUX zssh-1.5a-gentoo-include.diff 321 BLAKE2B 3daa9a3da6a58f90d176d0d68c054055f349530618179215ed5bfa49fc4262b0bc4d7d72608ca3b3050ec9ce870f23b8665c8f9e36fc18459044ab0ddb27e3e8 SHA512 e26c32832f537311f6804936a2ca88daf403ec5e8d263f3a84f29fadae68b0d35a514c97348867bbab584cbc845b1dfc5fb83fda7edad0714091e11165b965a2
 DIST zssh-1.5c.tgz 344964 BLAKE2B 35b41125ec7a49cae741666516b17e3f0b22b159d0fc2b490565e8eaef366bb4b418895ad028822647a4b946577b2ef9dc588e9dbfe657ce7c1c8300207ca603 SHA512 799ce3bbea5e94a800f61e6c38879746a579992396304861b7584b6bad967214b811b6bf9aecb36d9d60a15857377cb2fee80b495ad69778903fc45593efeebd
-EBUILD zssh-1.5c-r1.ebuild 891 BLAKE2B 60fced89c1ec43430b3fe86c46c68a61dec3fb7fd3ec14ecd8b6940446d9a49d6400b9a5fe3d0bc96406196bb99eb783aba209ec8747c30086efb1f2bd43a3a4 SHA512 43e9793f1f0de9aa998584babdb81140b9772237fb509ab333b192d3d813f5e91ded067571fa887ab6f38f9982f4d0f52369ec697ce95db871bc45ab5a88a728
+EBUILD zssh-1.5c-r1.ebuild 890 BLAKE2B bd4b6c34c2d4e5ccde331b8eef5a8146c5a6d0b17d80ab67001eed4e0c37f75ead5fee601ff61558c8303d53a3d8a169b965518d93cab749960569e5f0657661 SHA512 55af914818508272aaa017ba5bdbb5f425335818b58c571bce269581a8f8cf66440d869e9fcd6f6f83d962590e9d532a23c5cdccb5a01456c5091f3a30ef9b84
 MISC metadata.xml 429 BLAKE2B a25d3fb63a716299bd1df42df578ebb6aca4a82725acdff2530dce16383f6e464d6adbef6beec7bf687c1dfecce6daaa6897c385d02896552e321ef6240fd123 SHA512 dd4d5ff90a156df887316a4c6915cf23dd670ae81dfb8549fb7c2ec70bb2dd02cb1e039b9e262091673f25d4dcb728d5a1e5fff1322cba6dec358affb73d75ca
diff --git a/net-misc/zssh/zssh-1.5c-r1.ebuild b/net-misc/zssh/zssh-1.5c-r1.ebuild
index 31bceeeb6c2f..6ba687af4f6f 100644
--- a/net-misc/zssh/zssh-1.5c-r1.ebuild
+++ b/net-misc/zssh/zssh-1.5c-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="nls readline"
 
 DEPEND="readline? (
-		sys-libs/ncurses
+		sys-libs/ncurses:0
 		sys-libs/readline:0
 	)"
 RDEPEND="${DEPEND}