gentoo resync : 18.11.2018

76 files changed, 990 insertions, 462 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 492ae7c4d698..3dca536dc38e 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index f60386c9e612..6240dc5cc2f8 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -18,9 +18,9 @@ DIST cfengine-3.4.5.tar.gz 4671628 BLAKE2B d6964631ef6a6ba2fab661c5d0b287f8a5fb8
 DIST cfengine-3.5.3.tar.gz 1542468 BLAKE2B e7e4fe1194563cc9e72e4262c934f7ce73c0a74749b131a424201445b954492d90dfc6a8b0530d5f9bcd2852b41b32ed25dc43e70b525dafc9c4a111b7c4990f SHA512 20ead13d5290905dc51567887807a0c2c5d9d753cb48ffe2859041b75239698ad0f4bee1ad0eac4eee96122b3a5a475d516566c1571c4fcbc460be757583da18
 DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc
 DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7 SHA512 ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9
-EBUILD cfengine-2.2.10-r4.ebuild 3245 BLAKE2B 20d109c7d4c315d5d9cd3e9b06784476f365d556bcf5476e353ec62b95dfa07662aaa22c9ba6b156dd4de1b063d22d24087e65295218735c2620a0fd76cbc29c SHA512 c6879fd4efd6fa430e730fe80db44da0a19543c14a3a5dbe366343ed3ddc7067ebe6f1e33418109a2f31026540d0d6ad1bff1f11ffe27136940a9beea12943d6
-EBUILD cfengine-3.3.9.ebuild 3519 BLAKE2B 3be8e09e3e0345eec2e83aed2dee2b8a37c71d5f6b3296e4585e9755e43536d330d1cebdaf2999c42234f24f2199c24e1fe81ec72731cef8dde24f8bda667577 SHA512 34b5cfedcde9f47894146e4f528e928cb31777ca36c9951f69fc937de19d80a9c950493d8351e13406e99a1c4eeb060527d6f17597fa5f6598a7908becd0a2ed
-EBUILD cfengine-3.4.5.ebuild 3745 BLAKE2B 8bd609d245891a3139fa3e98425bc960436e6a8d95e7d31153b9fb0ce4cbd5a9886804751954dc1bd3df47942cb1d2545b1e7bbddd86488f29e8554a60643f29 SHA512 285447ad8239f57f076ebf10224e5582414be174b4f1f35644dff2f170e2032a65fa76aa2877c22fdb6681abe855492a1cd7da13409563a1d83ef21b45871e89
-EBUILD cfengine-3.5.3.ebuild 3812 BLAKE2B 70b4bc5c20970c2da13c36880cb40e6a01b7b75b0e4ce070207234575bb62285dda049805942d8ff388c5ff9db73a93655fce5a6fba9d8d7fe9ad7a153d0ee97 SHA512 d0bec07edd75d17705894a9d771feb112f7fb892cbdae8c341bac6290a82eeef5e90187fc6dc7d7f1b911c5f020d30de9b8f043d196f663805eae628701656b4
-EBUILD cfengine-3.6.2.ebuild 4254 BLAKE2B 2215d2dc3d49105049e1eea181b52e22b051820f9a8c8ef8b961e2b4d2e786a97ff0ae1a6161e3e71d595499a67216affbe6cfcca745f78e0113dfc7f63cbbb3 SHA512 30d2adfe8aa0ba9e42daeff457d12d881e2d059781343da9ecb7b6a7fb5f2ce1238e8c33277179396dde2a3a310f2d36a210d770843fd8552e9b4bcc61291733
+EBUILD cfengine-2.2.10-r4.ebuild 3259 BLAKE2B 44a97cbb3ee1eac5145b4c5bad3b3055a79f870f4ccb0c9f7480c8d26137f558c227a17f9804aeb71b2bb9341f6d5a4666cd2224834db7830f1079df6ca041dc SHA512 8677db197908832d122a5670666f8ae335ad2501fe0cb1afca99f728bf97bb41f8f5bfce0325344efb98eca5c371f337f65b50423c24d3ae92d9e239dad138e0
+EBUILD cfengine-3.3.9.ebuild 3533 BLAKE2B ad0ad3ba282e9d595d6f5e6b049d8657171f0365125e0659c19ed0916671f84d6f2021a7f6480df675b152d4d5051a9746038392d1e0584e9efd3e8f1d732447 SHA512 a7b32de25e48d8ef00bda6d6dae9c5e734afd3511602d2c3f80a3a632d339eb811a0ebf39cc71a48b88492295f3210fa69f2fe16b9a0ebe929b0dbcca5e5a4a3
+EBUILD cfengine-3.4.5.ebuild 3759 BLAKE2B c661c7270bb701b4b5b6438bd6a1bbed609637aab9c9000e9b0daf3ba3a702d2d5953d51be8dc6e56a04bfe42583205ccdf8b26213de7be678d8ee254c75aed2 SHA512 c588abc9740b0ced92e16b2862cba76d6c12622d9d4965bca43ad5519e6e0d0e205ac1e3879af7f55fff6eea55feb07f6b17d9e69dc913e949490b85482e7de8
+EBUILD cfengine-3.5.3.ebuild 3826 BLAKE2B 9c78d56b8f52ccb0f28ebe9d432af2d486913b6f808c324ff99b2c2a0af6fb852dad3c3800b0a35bdadae2a97e8bb75ae516f64137062dc086dafdab91a4f0b0 SHA512 612841631d6587d12e0f3bb3867139bdb1719778d14c464b47226ea88c7063e9a4c1408c52068c9f43297a635addd20ee3f14ec1c9b49739bdd8939a5e6a7d08
+EBUILD cfengine-3.6.2.ebuild 4268 BLAKE2B a6b0f6b30ca2f8f9547af38256957f4334773a3fdccbd3c32d577064bd9e17ea84ebe8d13c091b40a17f4517dbaf1c332e30342dd0326464a9e7db446433803b SHA512 5d5d7caf6ed9e7556319800c363b8dc1ecaeac11de314d0872a0f0f320a83b5c73ae5f3f2fd6d32c47fe564a333fc41dfb8ed1a25bd7dadfc2d7f1603d4d9760
 MISC metadata.xml 2159 BLAKE2B fce780617a458d494a437239729a7841c860e797e66f1a8c783c4ffce62bef89b92ef644fa8258cf4209e44aa56b566e9df493a1ba34667611b47bf274cb7bd9 SHA512 c30ddd7fce32d4e7231b860d64940d9368085bc8f65851fefa886b312995512c48f7a1291afcfb80921fac64f2a676946c286723483294d13d4a9c89c01659e4
diff --git a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild b/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
index a2f6f9d7afc1..0c4a8b4c5523 100644
--- a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -17,7 +17,8 @@ IUSE="vim-syntax"
 
 RDEPEND=">=sys-libs/db-4
 	>=dev-libs/openssl-0.9.7
-	app-portage/portage-utils"
+	app-portage/portage-utils
+	net-libs/libnsl"
 DEPEND="${RDEPEND}
 	virtual/yacc
 	sys-devel/flex"
diff --git a/net-misc/cfengine/cfengine-3.3.9.ebuild b/net-misc/cfengine/cfengine-3.3.9.ebuild
index 907365bda35c..7588c8da106d 100644
--- a/net-misc/cfengine/cfengine-3.3.9.ebuild
+++ b/net-misc/cfengine/cfengine-3.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -26,7 +26,8 @@ DEPEND=">=sys-libs/db-4
 	qdbm? ( dev-db/qdbm )
 	libvirt? ( app-emulation/libvirt )
 	>=dev-libs/openssl-0.9.7
-	dev-libs/libpcre"
+	dev-libs/libpcre
+	net-libs/libnsl"
 RDEPEND="${DEPEND}"
 PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
 
diff --git a/net-misc/cfengine/cfengine-3.4.5.ebuild b/net-misc/cfengine/cfengine-3.4.5.ebuild
index c377a81c5a5f..074d4d8593a4 100644
--- a/net-misc/cfengine/cfengine-3.4.5.ebuild
+++ b/net-misc/cfengine/cfengine-3.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -31,7 +31,8 @@ DEPEND=">=sys-libs/db-4
 	libvirt? ( app-emulation/libvirt )
 	xml? ( dev-libs/libxml2:2  ) \
 	dev-libs/openssl
-	dev-libs/libpcre"
+	dev-libs/libpcre
+	net-libs/libnsl"
 RDEPEND="${DEPEND}"
 PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
 
diff --git a/net-misc/cfengine/cfengine-3.5.3.ebuild b/net-misc/cfengine/cfengine-3.5.3.ebuild
index 8f39bfb0f9b0..1afbf48c234c 100644
--- a/net-misc/cfengine/cfengine-3.5.3.ebuild
+++ b/net-misc/cfengine/cfengine-3.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -29,7 +29,8 @@ DEPEND="acl? ( virtual/acl )
 	libvirt? ( app-emulation/libvirt )
 	xml? ( dev-libs/libxml2:2  ) \
 	dev-libs/openssl
-	dev-libs/libpcre"
+	dev-libs/libpcre
+	net-libs/libnsl"
 RDEPEND="${DEPEND}"
 PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
 
diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild b/net-misc/cfengine/cfengine-3.6.2.ebuild
index 75f021ada089..fd0b75a9d5c7 100644
--- a/net-misc/cfengine/cfengine-3.6.2.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -30,7 +30,8 @@ DEPEND="acl? ( virtual/acl )
 	libvirt? ( app-emulation/libvirt )
 	xml? ( dev-libs/libxml2:2  ) \
 	dev-libs/openssl
-	dev-libs/libpcre"
+	dev-libs/libpcre
+	net-libs/libnsl"
 RDEPEND="${DEPEND}"
 PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
 
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index 4245988018bd..b847760f905c 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -1,7 +1,9 @@
 DIST cni-plugins-0.7.1.tar.gz 862546 BLAKE2B 9d13c616396017e3cb54dfdd5bde2c06d2ad572e55009b883d82757c173119694a40157f28fce5818bb8bd33325f2edb0ec197ff77aa2ab08615bfc55ce2bbe8 SHA512 23d3b35c22fdc85d087922fb59c63622a9283ff11d34d1a1043c323f9b07b3837418f333d2f2ab9c6a22514351d71aeeab6a57234b14f53ba29847cffa382ea0
 DIST cni-plugins-0.7.2.tar.gz 862552 BLAKE2B 6dfa8842fb86a50610d1d4b512a0d6199ac8c4981dfe609b0be544e1a37b696f15dec2431b6030a4238926685a5f0153840345093e34b1efe218c58a410dd9d5 SHA512 d73a0ffb8e5977781a3f9fa93c1615633f74dfbcfeb78eb4c877992ed30d62b782714620667f14b133348d3c253df3e4219dc7ed5f353c7ec6df6c11c25905dd
 DIST cni-plugins-0.7.3.tar.gz 863596 BLAKE2B 8a4eda2b4ac9b6f53fda5a83cdeab4da862f5e48ddc9ae7c08f8ffa4c65c600543fcb968fa42182051a21a7233ea4e3a613aa6ff60d0e971284703de634e90d0 SHA512 d5c9744de2075270dd2a3e87ddf183c12e9f77b2d9df954d266105285042475b2f1f068f0024671f855c3aecc1269e49d6a146dd2f7647df0208aa8a9ec5195f
+DIST cni-plugins-0.7.4.tar.gz 862510 BLAKE2B 7ec9ec84614caecaca1583430552bd93606ae1f178f92cb4f7047ab47292084c5102437fbc9fdfe0ebf7043c94bb1b9fbb9d2ac0bc78abadb40da11cdd62b512 SHA512 2ffe18353b525d90679eca4950e96afcaadd7c387956ef5baaf4ce97c0550315fda63403161ab8f23df086955dc2a47da612fb8d0cdd30ccfe12649393e2242c
 EBUILD cni-plugins-0.7.1.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
 EBUILD cni-plugins-0.7.2.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
 EBUILD cni-plugins-0.7.3.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
+EBUILD cni-plugins-0.7.4.ebuild 1064 BLAKE2B 57a11bd2def29f78cae12c5683f7514b65650a872e2fc39000e27cfb3f5d3cc2f197f63048053038293646cc8afa8e7dfa4b8267d1ce81856821e8d3ddd039a9 SHA512 b5639bbafb522a0e2161d98a37b19a28aa89796b61cc840f5ff4e99d673783b15453419041cce365f8a2d325e9db9cb280154e70871307aaff337283203263ce
 MISC metadata.xml 347 BLAKE2B 3028c057ca5c58bc39b10c01e9989088f0a2498a5a95a1ada88517dffe62daba52c8e6ead2fc8a7245ae06a95ffbc9306de03eecc82464ae0a6d2fbb4cdfb99b SHA512 b977f4287446648ff730c36e71002f524ae9a96c3fb104ee8542da90f6f996926a9b9809007f285e930d79842d9663cf4e462e8ee50da8319dcd3e07cf6dee05
diff --git a/net-misc/cni-plugins/cni-plugins-0.7.4.ebuild b/net-misc/cni-plugins/cni-plugins-0.7.4.ebuild
new file mode 100644
index 000000000000..33c40be3cbf2
--- /dev/null
+++ b/net-misc/cni-plugins/cni-plugins-0.7.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="Standard networking plugins for container networking"
+EGO_PN="github.com/containernetworking/plugins"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+src_compile() {
+	pushd src || die
+	local i
+	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}"
+	done
+	popd || die
+}
+
+src_install() {
+	exeinto /opt/cni/bin
+	doexe bin/*
+	pushd src/${EGO_PN} || die
+	dodoc README.md
+	local i
+	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
+		newdoc README.md ${i##*/}.README.md
+	done
+	popd || die
+}
diff --git a/net-misc/dmr_utils/Manifest b/net-misc/dmr_utils/Manifest
new file mode 100644
index 000000000000..357086058870
--- /dev/null
+++ b/net-misc/dmr_utils/Manifest
@@ -0,0 +1,2 @@
+EBUILD dmr_utils-9999.ebuild 448 BLAKE2B e59dae74b82f90ffa88358b406d1196d70b12270a3db49d39447489d0b85f3370e9fa74e638b8a7f103a7f714da9d91de01bec906159f6470729cd9303509421 SHA512 8e7bbc93dd0658bbf95c87611b38a327c42363047150a64acd7e7e2f659f1829a2cf4f36107acabccf979756302a1d01f76edb1b5bcb5e427f10a69988bd0a96
+MISC metadata.xml 247 BLAKE2B 0f6116ad1a6532d4d062e4e8dadf00f3053ccd4408f030535d3adc5f0399e43ac1682b3786a1a321ba7dd8c1b448cebc5938207a5af59fc033e0e6cf4c654c40 SHA512 8111616dc98858617382132291d5d7a4900eb04643a2c67d4c2eae21dbd08e2fd5f73d533befaa5a0c6a074b04046f1e5bf7a139386ca10ffffef329825d0514
diff --git a/net-misc/dmr_utils/dmr_utils-9999.ebuild b/net-misc/dmr_utils/dmr_utils-9999.ebuild
new file mode 100644
index 000000000000..dff3e7fd70b0
--- /dev/null
+++ b/net-misc/dmr_utils/dmr_utils-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+
+inherit git-r3 distutils-r1
+
+DESCRIPTION="Python utilities for working with DMR"
+HOMEPAGE="https://github.com/n0mjs710/dmr_utils"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/n0mjs710/dmr_utils.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+PDEPEND="dev-python/bitarray["${PYTHON_USEDEP}"]"
diff --git a/net-misc/dmr_utils/metadata.xml b/net-misc/dmr_utils/metadata.xml
new file mode 100644
index 000000000000..f4c696b2c619
--- /dev/null
+++ b/net-misc/dmr_utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Rick Farina</name>
+		<email>zerochaos@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest
index 737692e50135..79917856d8ae 100644
--- a/net-misc/geomyidae/Manifest
+++ b/net-misc/geomyidae/Manifest
@@ -1,3 +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
+EBUILD geomyidae-0.32.2.ebuild 1031 BLAKE2B 04a3cccb671609ed69f0c715edc73f6f5ae9522d225f375d5cb58827fe864b1e3a66aacd467ecd32ee85503748237a2410477bb100f6963838f8b393748fa8e4 SHA512 e3ff159000ca3068d6a2583071944af7f87d530ef5482d79ff7c7037a5efa460f3902cb88abcd9e9b79b238c628df3553783973456b05ad5aa519e6126c1aa7b
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/net-misc/geomyidae/geomyidae-0.32.2.ebuild b/net-misc/geomyidae/geomyidae-0.32.2.ebuild
new file mode 100644
index 000000000000..44ee5a8e613f
--- /dev/null
+++ b/net-misc/geomyidae/geomyidae-0.32.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs user
+
+DESCRIPTION="A daemon to serve the gopher protocol"
+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
+}
+
+src_prepare() {
+	# enable verbose build
+	# drop -O. from CFLAGS
+	sed -i \
+		-e 's/@${CC}/${CC}/g' \
+		-e '/CFLAGS/s/-O. //' \
+		Makefile || die 'sed on Makefile failed'
+	# fix path for pid file
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		rc.d/Gentoo.init.d || die
+
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dosbin ${PN}
+
+	newinitd rc.d/Gentoo.init.d ${PN}
+	newconfd rc.d/Gentoo.conf.d ${PN}
+
+	insinto /var/gopher
+	doins index.gph
+	fowners -R root.gopherd /var/gopher
+	fperms -R g=rX,o=rX /var/gopher
+
+	doman ${PN}.8
+	dodoc CGI README
+}
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index c11d6ee1f9c3..d20dbe92d45b 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -5,5 +5,5 @@ DIST gns3-server-2.1.3.tar.gz 1658657 BLAKE2B 4ce83aceff8f70f93032b2baafb0dd5c94
 EBUILD gns3-server-1.5.3.1-r1.ebuild 1583 BLAKE2B f609acbb3ad6df54f9c01a6bc0553d59732a4b591d81d8fed3896dddc4c6985be2eb56acf14efbcffa405ed41e91dbb519c499f563ddc8dcb85ccb168e29fd95 SHA512 52a2ce317b0c3586a63be29bd358e0a3271474ae9fb11f87affb82f8fc8797a9696308483dd8fae75d2b409dc1e2ee98e4d27c9588885bccf8a557103781399a
 EBUILD gns3-server-2.0.3-r2.ebuild 1644 BLAKE2B 0437d9b2d7f0a199de1ab40391dd42c506b019ece76fcb0cdda18d2e969d9e59486601c51e2f5bc7f8c280efb9c1299f212c76d4a8393e72fcddace949e9db2a SHA512 b241a4d568ecf9405252087aa8b3240ab05071f64769f1bd5547dd602af24077fee6e0c5eb97330bb6471b698a19bff0fac6a7685d947947ef1b0cc5ba88ac59
 EBUILD gns3-server-2.1.3-r3.ebuild 1887 BLAKE2B aac42a46ac5c720c83931df923bd75fec153477c7764829c068a20d1d4433f84a11d1302228008901598b53926ce383fb8617ebda1ff9918e6856f1aeb62d45d SHA512 a6ad54a38c85a180757e60c47d04cd857f98a089e5510a19550a04ff5deecb2809cbf3c06271fe7676544d47bed0c4037f16b4bba6cd8a1db7d59a2ca793ecbd
-EBUILD gns3-server-2.1.3-r4.ebuild 1884 BLAKE2B 18bbd7a7c90e84289c39f4aa51648f00dc637c21b3eac7da240b02598595eb96257c7ce2cdd1f7106488b838d00d27f978d73c12ed29526c42e31adba8b0591c SHA512 555522c18d7fb0160fe98cad5f60a5e0daa2f7a0043e3105eb5e003d5ff90cc2155f7d82808c9363501266b92546ed53eae647e4ae97bb794a10702397d818ae
+EBUILD gns3-server-2.1.3-r4.ebuild 1889 BLAKE2B b6203b65418462d4eb1f1b74306afc626b884da93e967807215a8ab7bb3d9db3830d492eb0de8506a38c62781b4847fa438e4086d042cb3d5e6d96b65ab8d6bc SHA512 32b2abd246d424b8be859e5e4551da367db4d3921e3388bf969d3e5f922b62eb9228f8bc12270195fef84cc72bc8cbbc6dca7c01c45635c76ae65a5f971dfb2d
 MISC metadata.xml 361 BLAKE2B 52549a2862a4e5aaf855909c27ce68640e52549b8e56a2284081cc1eedfe5b5e6e95c3f957f2d34022c43ce541ebd9c6cf94ff723d2843fc85732b76d6358d7a SHA512 10af38136367903504fcc02e0e3cce154283979bcf4c3398d4fde8fb48fc6716448fdece6a74bb240dd74f37487ef07e1ca0209f4c2b567b4f5f3c67c8ed7a4d
diff --git a/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild b/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild
index 0860f06ff843..204bff3696be 100644
--- a/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 
 RDEPEND="
diff --git a/net-misc/hblink/Manifest b/net-misc/hblink/Manifest
new file mode 100644
index 000000000000..e63983a731e5
--- /dev/null
+++ b/net-misc/hblink/Manifest
@@ -0,0 +1,2 @@
+EBUILD hblink-9999.ebuild 1245 BLAKE2B 67d220cd1afcb6a1e20c82ae23cdf493d1e15900b148c63a00ef00fb925acfd8a57f5b38414d64367f4c898651d9e1fb4742f3f1da93747d3e3e9ae8bc1d9660 SHA512 aa5e2651e709de4d78f7aec4d2c3cd50cb404ec70886e4b3f28f827eb725d63062ca3a01bc4a13dbb0fac41903c115502c769e4be15f44d28eded7737941eba9
+MISC metadata.xml 247 BLAKE2B 0f6116ad1a6532d4d062e4e8dadf00f3053ccd4408f030535d3adc5f0399e43ac1682b3786a1a321ba7dd8c1b448cebc5938207a5af59fc033e0e6cf4c654c40 SHA512 8111616dc98858617382132291d5d7a4900eb04643a2c67d4c2eae21dbd08e2fd5f73d533befaa5a0c6a074b04046f1e5bf7a139386ca10ffffef329825d0514
diff --git a/net-misc/hblink/hblink-9999.ebuild b/net-misc/hblink/hblink-9999.ebuild
new file mode 100644
index 000000000000..c616379777ee
--- /dev/null
+++ b/net-misc/hblink/hblink-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit git-r3 python-single-r1 systemd
+
+DESCRIPTION="HomeBrew Repeater protocol as used by DMR+, MMDVM and Brandmeister"
+HOMEPAGE="https://github.com/n0mjs710/HBlink"
+EGIT_REPO_URI="https://github.com/n0mjs710/HBlink.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="systemd"
+
+PDEPEND="dev-python/bitstring["${PYTHON_USEDEP}"]
+		dev-python/bitarray["${PYTHON_USEDEP}"]
+		dev-python/twisted["${PYTHON_USEDEP}"]
+		net-misc/dmr_utils["${PYTHON_USEDEP}"]"
+
+src_prepare() {
+	rm -r retired || die
+	sed -i "s#/opt/HBlink#/usr/share/${PN}#" systemd/*.service
+	default
+}
+
+src_install() {
+	if use systemd; then
+		insinto "$(systemd_get_systemunitdir)"
+		doins systemd/*.service
+	fi
+	rm -r systemd || die
+
+	insinto /etc/hblink
+	newins hblink-SAMPLE.cfg hblink.cfg
+
+	insinto /usr/share/"${PN}"
+	doins -r *
+	python_fix_shebang "${ED}/usr/share/${PN}"
+	ln -s /etc/hblink/hblink.cfg "${ED}"/usr/share/"${PN}"/hblink.cfg
+
+	dodir /usr/bin
+	for i in hb_bridge_all hb_confbridge
+	do
+		cat <<-EOF > "${ED}"/usr/bin/${i}
+			#! /bin/sh
+			cd /usr/share/${PN}
+			python2 ./${i}.py "\$@"
+		EOF
+		fperms +x /usr/bin/${i}
+	done
+}
diff --git a/net-misc/hblink/metadata.xml b/net-misc/hblink/metadata.xml
new file mode 100644
index 000000000000..f4c696b2c619
--- /dev/null
+++ b/net-misc/hblink/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Rick Farina</name>
+		<email>zerochaos@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 6afb7edccb08..6a6edea6f060 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -2,8 +2,12 @@ DIST httpie-0.9.2.tar.gz 73153 BLAKE2B 53ca1f5dd683d68ff6416a297bb45a2827f516a64
 DIST httpie-0.9.3.tar.gz 73693 BLAKE2B f188a7fe5f63b39022d2a67e8f9dc2582ce8e8d4860b880b2e26403149361b999294bf0e55b41bf1773e73c0ffe81abd01c6c1e2ddaf755dfc31ab7e463b8516 SHA512 a98aa19ddcc5223133f1081ce22457d21b838b5779788a08d0b65ea80f903ab577a55e0c73b3656486eec08c3c0910d3e987aed0f117c5f9b3e005c6001000cc
 DIST httpie-0.9.4.tar.gz 79889 BLAKE2B 13053cb3389a03ecbd90caba85801772cba9f09a03f759d526256fc0195a31824408a02b004d3af50a1fbcaca7c02128b438ce341464825a08e4dbd5177ddf99 SHA512 eea4e0fce334d12f9438d89f87d119bc569f8042d95c87f6898b9110030674f49361bf8e119d815330aa117479557766d614510d81c42c9c3a6803c769f38b26
 DIST httpie-0.9.9.tar.gz 85006 BLAKE2B c5412348b3add127a5d5dfc04fdc13a47f82ec65634eedefb55a0cf1ce182a49f81a3a68c0cbb5e8c90b53efb165c89b7444d23328e545bdbf92d69d1de9c921 SHA512 e9adb1ecf9a25b57c634f35199bf1f8fbe4136179c0ba0d6032a41ae786da9344f54436f91d89e624c154bdca325f94c637364a934fc2d5742b83056434f7e4c
+DIST httpie-1.0.0.tar.gz 268982 BLAKE2B 36ae23876c995f450ac4d814a56a79db7aee175f3b6b060bf08049cd2ea5ec5000c91bf49a12eae8a2dff2c91e5d5200d3febc4cdd50d0488db35eb96777ed14 SHA512 9a68746636e367d1131069787f4a4a199b6434b828fe58fecef70e810c1d63c662c790fc45fd955a390113920a29d0116cf29d1167d638debe6b9419a4ae2d48
+DIST httpie-1.0.2.tar.gz 765210 BLAKE2B 6eb6975aa8f9d2c27762ead5d49db25ba26ba82e21d696c3e5bfa19710ef2a7efbce9d74cd39a22282018ca4f9573c92d99b465c470adf5f04bed75f0416c693 SHA512 2b57164f4b20ef2033d527a3dfb9191b68fa95f419cde2c7e52ec47cf74540d0a2356aeee8669d4b43ab6feca80840be6ad6a8481930ddf3acf9ac3ef0b2c569
 EBUILD httpie-0.9.2.ebuild 513 BLAKE2B 0ef3f7c0982b62a15c03d68c4faa8c07ffb7e963dc168de7df85dd81611d24ab5a024fefbfc2c472ffdaf37ef9a6010f390fcd189cc29c86210e279a61fc8c41 SHA512 e165ab8295fcf1fbce4a4d96bdf17bae10c8e03aa2dd7f86c480b6f6305dbb298dc5f951bcd8eea2121944bcfb675228a57439d277b57bbb103e1663269c2350
 EBUILD httpie-0.9.3.ebuild 513 BLAKE2B 99f82860ce3d48cded0741a60a36aad1e0d1ace53e70ab4ba747612a482b8c5ccc3a554461ed17f69213441933dd91b1e976c32c897a7c85530daab0862f2af7 SHA512 a09ba2e049fe6d86db465913264fdf6cb41ba0efcbd228a5f9441429b796ec46401c29500490934a56d96e0eb231b30e491e75286a9b2b5faf22fd90592f3918
 EBUILD httpie-0.9.4.ebuild 513 BLAKE2B 99f82860ce3d48cded0741a60a36aad1e0d1ace53e70ab4ba747612a482b8c5ccc3a554461ed17f69213441933dd91b1e976c32c897a7c85530daab0862f2af7 SHA512 a09ba2e049fe6d86db465913264fdf6cb41ba0efcbd228a5f9441429b796ec46401c29500490934a56d96e0eb231b30e491e75286a9b2b5faf22fd90592f3918
 EBUILD httpie-0.9.9.ebuild 528 BLAKE2B a4ac87148c52f7ef3e7791dcb2020d5e62709c6dddb9e0a5bd40eb4f4dc771f95dfc9464aea36a3b2de47f119de1429645e2f2837cd510bf0b7ece38c84065db SHA512 50a576fec9d8d50315d47182113de5ce003fa1e7fe8302f72e5193b54ac2a7c8be183d881254a7010adb2fee2139f60758ef1f63fe8c6d987bc9e3aaaa9573d7
-MISC metadata.xml 745 BLAKE2B 0098cd25d82585135fdbf7c900d4e9cfa673d157917071318e7eec94169dd17c187d5a46ec78d19e1eb7197c6742183960904a30a7ce288832fd9ca1b36c089e SHA512 6db1abbb2a02899c6ba440780f4035f05da80dfdbf4ccb2484ab8141db77afba021cb9709802679e25038513511fa4a47b64ed618b4e70fe6ccd548290511c03
+EBUILD httpie-1.0.0.ebuild 799 BLAKE2B f111df6110cac99f4a9527e0b93a7e0fd8d1d71aa8ad819842fb15391297653434d8ccb27a8a93d46e34084938fd7e1166aa759f518988baa65f7af4532c5174 SHA512 6587b20b20e029585ea87dd76efe063cdd65ffad8e619e26a29eb0c5123f048c0d95e3470bed65eecbf76cde0a9e1ed733d5b716b9ad4f8b8fdf128efa46d786
+EBUILD httpie-1.0.2.ebuild 1044 BLAKE2B fe6a14736fa78a5e6cf3ccdb5220655566c4784c71f098e2eca6c23f5346507fb3822e529eacd56152be318d4ac129a8ba364f80832534e097aba2b144724ac1 SHA512 52aeb058f5a92e71828a782199f3f5c65a2283ec82f2e61010eee146961e81c7a157c94b61c41a50eee84ff460ad739caaf94b3046f4b03e77fd38769693b07b
+MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb
diff --git a/net-misc/httpie/httpie-1.0.0.ebuild b/net-misc/httpie/httpie-1.0.0.ebuild
new file mode 100644
index 000000000000..64a41d2bfb6d
--- /dev/null
+++ b/net-misc/httpie/httpie-1.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Modern command line HTTP client"
+HOMEPAGE="https://httpie.org/ https://pypi.org/project/httpie/"
+SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	newbashcomp extras/httpie-completion.bash http
+	insinto /usr/share/fish/vendor_completions.d
+	newins extras/httpie-completion.fish http.fish
+	distutils-r1_python_install_all
+}
diff --git a/net-misc/httpie/httpie-1.0.2.ebuild b/net-misc/httpie/httpie-1.0.2.ebuild
new file mode 100644
index 000000000000..af224843dd8c
--- /dev/null
+++ b/net-misc/httpie/httpie-1.0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Modern command line HTTP client"
+HOMEPAGE="https://httpie.org/ https://pypi.org/project/httpie/"
+SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.19.1[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/httpie-completion.bash http
+	insinto /usr/share/fish/vendor_completions.d
+	newins extras/httpie-completion.fish http.fish
+	distutils-r1_python_install_all
+}
diff --git a/net-misc/httpie/metadata.xml b/net-misc/httpie/metadata.xml
index 34aed7f5eb16..a054286ef778 100644
--- a/net-misc/httpie/metadata.xml
+++ b/net-misc/httpie/metadata.xml
@@ -2,18 +2,24 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>vikraman@gentoo.org</email>
-		<name>Vikraman Choudhury</name>
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
-		HTTPie is a command line HTTP client. Its goal is to make CLI
-		interaction with web services as human-friendly as possible. It
-		provides a simple http command that allows for sending arbitrary HTTP
-		requests using a simple and natural syntax, and displays colorized
-		responses. HTTPie can be used for testing, debugging, and generally
-		interacting with HTTP servers.
+		HTTPie (pronounced aitch-tee-tee-pie) is a command line HTTP
+		client. Its goal is to make CLI interaction with web services as
+		human-friendly as possible. It provides a simple http command
+		that allows for sending arbitrary HTTP requests using a simple
+		and natural syntax, and displays colorized output. HTTPie can be
+		used for testing, debugging, and generally interacting with HTTP
+		servers.
 	</longdescription>
 	<upstream>
+		<remote-id type="github">jakubroztocil/httpie</remote-id>
 		<remote-id type="pypi">httpie</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index 8ac67d40915d..bc4154f31e1e 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -4,8 +4,6 @@ AUX icecast.initd 431 BLAKE2B cbbff709fc0e8c4bb83410639e20500d212ac781c55590adfc
 AUX icecast.logrotate 140 BLAKE2B e42003ef1902b876df9c90fbbe15ebfd41fe6b38d989d22b9878097de3bb7634bd713a8704074f3b065fb57d20827da7c022c1591512fd03822284d49572726c SHA512 8aead6208b97b1d1cbd5d17a61dd3dd2493bdf68bfefc3ab6f9ae3e1acc856435942de7a129ef701c5379450428b9718e50701636e16d9e1ddccc8c752c2ccac
 AUX icecast.service 185 BLAKE2B 342bfd8bb1c906ae6184ae56469c7fd484b09d55da9d552cd1e8ec32865bc8756608f2962fc63810fe3fbd1936819d36207926c80e5eb1796ec7dc742f56d075 SHA512 a1e662f9b39ecbd35f28e849c5ae9db314d12e8fcefb152660180e9b51fe538197522c5ddda4908a4012ebe73ac4f9a6c12543a01548e9c41f17b5a17b942f51
 AUX icecast.xml 6775 BLAKE2B 2e63a21250cc0e3e580ee1bda7a188d295e3ce81de9ebb442bcd17c4ca5ed6edc0384bf03128e9b680b399feabb4272b7d56940f8732f3ca8da9a5fd68c6c11e SHA512 72620980b9213aa3570b9e4e803cb901f0a3770b081721f0f4e01ad9a0af0cc8a7f6242940b1ac9941f51320ab8c3e97245cf8e0249c5bf504b8f3a01c250a96
-DIST icecast-2.4.3.tar.gz 2393358 BLAKE2B a2b34eeb7c94974e13250620f9a19ed0165ec0cc676c5947edf8f88cea76240ab5eb90807d598c29944573c3717b8b7951261434521bc81100c3a6ba22d85840 SHA512 70e755ee935e738f2b7310333823992517747897692d101b67d73d5cd40d6385a20c25d089a0430806c116021e6e2055761efee9fec27cd9bccb2b58a2bfd446
 DIST icecast-2.4.4.tar.gz 2360592 BLAKE2B fd4034749feb4bf38c684ac6d8de572fdebce875843dc1be286264c8fe8d38feb24ea889b07ec79aada34cf16dae46eb21a8c5470f67c08f2dd56dc04c12130f SHA512 e9ffb478cac2570891787455591d881a59185e067bb36f51706a7070cd9d82d80425ec8cf151f5ebb17d1b75654449fc760f8b82a1bb05f020b47ec09e46b4d0
-EBUILD icecast-2.4.3.ebuild 2193 BLAKE2B 2ea2134420764bd2f9b9036a192fc2df7aaca1a32ca29be6326f0cd8427af608bb2e50a0e029aec3faa09d4c588fd1bfc71566b7970f00658332d7871ea52285 SHA512 a687f8a9b909a0beb8fb6dd533b8393668ec7d02faed1aaeb2245966ebfa6cd5bbe1d6ef147602ee71b27e4ca8e9df7252f00559d0e65c035a6eea4cdb7fe8fe
-EBUILD icecast-2.4.4.ebuild 2226 BLAKE2B 597483a56de0e1dd417906aea1715e497235e917796681ba54c5b839267a0da7296851e664df4ebf85c8c8aa1f730d58d1b3f145d4fe2ec246e4448ba34fc82e SHA512 149a40d6627c260c5dc9f1b7552402e4af05a952b499b5ff5c1e5b5e3ec20e48bdcae6655201c680b888bbedd2cf6604f5879711d00ac6d8112e7a597cc1bcc9
+EBUILD icecast-2.4.4.ebuild 2222 BLAKE2B 937ef133aebf2d40cace835c1b987db433ee5fbbcf2b41c6aa83606e1f372ae4c572daa62fc00fb895f4b7f65c8bea9904efecb6b2f55f270feaeb47f460a1dc SHA512 c8df48f631fc6abf6bf47e6573ebf9c2889612c488e8d08df94bfead8f4ca91b8e62bd67143ae26bbc40b1d45036da75af669c38344f906b56797372c5a3bc54
 MISC metadata.xml 512 BLAKE2B d4478aee58c5ea15615899722848ee4e84025febf3fdff1203cdc68cea5b7f9021df8995bec3d25bf8f06953dfb3b4b6f2621fae904be59cc88c78732a0ac79a SHA512 73beb97a44390ef3aa35ef29f473397886d8af1f02e8b76924697d8e86df99238010ae63b392e9eb8cd5e6d7c634e380a51c5e298074cd7ed8256649ef6bfc62
diff --git a/net-misc/icecast/icecast-2.4.3.ebuild b/net-misc/icecast/icecast-2.4.3.ebuild
deleted file mode 100644
index 0bb95c586543..000000000000
--- a/net-misc/icecast/icecast-2.4.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools systemd user
-
-DESCRIPTION="Opensource alternative to shoutcast that supports mp3, ogg and aac streaming"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="kate libressl logrotate +speex +ssl +theora +yp"
-
-#Although there is a --with-ogg and --with-orbis configure option, they're
-#only useful for specifying paths, not for disabling.
-DEPEND="dev-libs/libxslt
-	dev-libs/libxml2
-	media-libs/libogg
-	media-libs/libvorbis
-	kate? ( media-libs/libkate )
-	logrotate? ( app-admin/logrotate )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )
-	yp? ( net-misc/curl )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewuser icecast -1 -1 -1 nogroup
-}
-
-PATCHES=(
-	# bug #368539
-	"${FILESDIR}"/${PN}-2.3.3-libkate.patch
-	# bug #430434
-	"${FILESDIR}"/${PN}-2.3.3-fix-xiph_openssl.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--docdir=/usr/share/doc/${PF} \
-		--sysconfdir=/etc/icecast2 \
-		$(use_enable kate) \
-		$(use_with theora) \
-		$(use_with speex) \
-		$(use_with yp curl) \
-		$(use_with ssl openssl) \
-		$(use_enable yp)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
-	docinto html
-	dodoc doc/*.html
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	insinto /etc/icecast2
-	doins "${FILESDIR}"/icecast.xml
-	fperms 600 /etc/icecast2/icecast.xml
-
-	if use logrotate; then
-		dodir /etc/logrotate.d
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${PN}.logrotate ${PN}
-	fi
-	diropts -m0764 -o icecast -g nogroup
-	dodir /var/log/icecast
-	keepdir /var/log/icecast
-	rm -r "${D}"/usr/share/doc/icecast || die
-}
-
-pkg_postinst() {
-	touch "${ROOT}"var/log/icecast/{access,error}.log
-	chown icecast:nogroup "${ROOT}"var/log/icecast/{access,error}.log
-}
diff --git a/net-misc/icecast/icecast-2.4.4.ebuild b/net-misc/icecast/icecast-2.4.4.ebuild
index 6c599a6c0cf2..561df4885c27 100644
--- a/net-misc/icecast/icecast-2.4.4.ebuild
+++ b/net-misc/icecast/icecast-2.4.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="kate libressl logrotate +speex +ssl +theora +yp"
 
 #Although there is a --with-ogg and --with-orbis configure option, they're
diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest
index f75377c43c62..c6f71a47fa86 100644
--- a/net-misc/igmpproxy/Manifest
+++ b/net-misc/igmpproxy/Manifest
@@ -5,8 +5,7 @@ AUX igmpproxy.initd 439 BLAKE2B 05673b50c7a055dfaa9011a21ab761a0ed87d142773bbbaa
 AUX igmpproxy.service 155 BLAKE2B 7cddd2b54bc632b16ec7ac28665dd752d5e8090741adff7da2d9085b30d7cdd8428d4525bf0ebeabd99663a246a86e45d0958792e04f52e3f798996a5dcabd74 SHA512 e50a6ba9c29e49ff243f3704033a3f4b1167281e6b8270de324a8f8f2646ff063fac0ef90d19196dbf4c8b39e2474e831f1ac2ac35f1a6b85e83e3f9f3d319be
 DIST igmpproxy-0.1.tar.gz 140159 BLAKE2B d4a0fb0f69f1e8c7221ecd2842e95cfa390f54885d5eaaa5c69a32563b318a05540e123d4b19cd63a930d17934c1344fdf6467fad5c1de333d03e0a802e7912b SHA512 1a569814d8984610402313d8c4adb78ff362f82ae28c968a8ba0fb411e12a704d1b51b387111b51517ab8fb2e86952bbd196f27eccd311c11ce288fc6fa25ad4
 DIST igmpproxy-0.2.1.tar.gz 166951 BLAKE2B d47a2b236679c7d05cf453fb5d6dc3a9e4174776845e2a1f71ca28e02c6e6270b5db09eaf5a48581dd85ecca8ff198a3e4b7f84fd61e455fe33c4f60ec079c15 SHA512 17f6891bf49d3e70cdf3930ab1abe6a0ad7b9f12ff2d1cdde3761771988585301f459995ba5ea956c742597de4ce13fbf0ba3c1ae37d13b2eee2a09f16f51ae2
-DIST igmpproxy-0.2.tar.gz 170705 BLAKE2B a2a13399995f283fb77b500140c1750ed306511eb5f51a71491edc245c8d8f873809fac9a82dc7ba0be7a7390643d85d7f4a2a8521b3c2c20fb8f09ad33b507d SHA512 a06f95c912456191d0953c08058ccb987120f6b11426d15e329c2de95878b9fc6ee5742b253e2c06b8002771478c382a58a14a0af76fb835ebb1d132b9f34e4f
 EBUILD igmpproxy-0.1-r2.ebuild 587 BLAKE2B d96e2871845a21ddbab6a481915a82f5de977ff0e36d2c9c72cfc1d55a5bbf706349079151ada0f7b44a348a3a137c902dce9b4d88ffdfd96f3a1a8936ccf79c SHA512 75036b6de777dd630a89c6d08f729cb6c51c591c9ec9b206f492e081914f6c49ecb93bc9dd6e7026703a72b8adb1a4596d7c9aa326ab72b7e5cf72aa29ab3b86
-EBUILD igmpproxy-0.2.1.ebuild 598 BLAKE2B 1bf3249e8ea3c27b7630581cc41a687d11097ba182b042bdda71b5426ca699ffdcac22bd1f541a272c526eebec7ea6235f7d719709b3ae9b15f1ca5edab59aac SHA512 a8ff0939b0f5ca1e5d546ca15233fe6caaa62668329b700de4e69c93231b552a9b8924df66db5e93ff463dabab92897244cab3ca5f84ef86dee8135a8d73860a
-EBUILD igmpproxy-0.2.ebuild 623 BLAKE2B 1712e810c9dd4e4420744c8d43a8887f6b505d68888d2febc0ed279c3761acec388725ab6e71ffd8c8ad63dbf03501b72754e7d68d358b88f1065541ac6fbc0e SHA512 dbe1f4d9674952c00cd625bdb0c598d0241d2c6075aeb16c56ce5798fbd5dc731c124223fa557439a6c11d829cac67161aba89cbbba0d73aeb4ae10014ee341c
+EBUILD igmpproxy-0.2.1-r1.ebuild 601 BLAKE2B 5b54a6d5950b0fb740d992eeaf0cea15716025b04b0459f6fc5aa1123cd39b1f107ee4b41d72da48039c48332f5772299351a3e9a7fee2f79959ba5160772ac0 SHA512 0b967134c5d086a82f02e52c51906894dda755fc60d6f34a763696b5212e4aa6d2fdd322f70125bc6fc402e3fc21275fd26cdb94e69c033215a83ab322b6ddfc
+EBUILD igmpproxy-0.2.1.ebuild 597 BLAKE2B 1ddba0a3cd604825d5f751986de268a9b26cfb1dde3f0ec03672c0c0452f7a5f3799e097dde6268e1095ec3d92ca7d0c1e31c1783713ae8bf02d66c5ccf0e610 SHA512 b01483610c5cc085a99cb1d1e554745fc71d9cf0b2599a1a9973d90f20547c02c5c7553ac0e9df715ee7194fe750cefbfb284bc6f261a8f559dd490a8e266479
 MISC metadata.xml 712 BLAKE2B 265497a27d79fceb3e2ea9cb44c1ec4b5dfc29876e5816041840c91cd1af9f3302eef4acb5b6499667f0a60c6758e56eb64725553bbbc524906c3796c6703748 SHA512 fde844efe66aef823179827b96541c8242f132bec2b58504848d332872c95b0007133f76806121a6285f305f9d7e773b166e7e4c634681a29d1c17576a843e40
diff --git a/net-misc/igmpproxy/igmpproxy-0.2.ebuild b/net-misc/igmpproxy/igmpproxy-0.2.1-r1.ebuild
index 92b9f1240bdc..06a8c2699a05 100644
--- a/net-misc/igmpproxy/igmpproxy-0.2.ebuild
+++ b/net-misc/igmpproxy/igmpproxy-0.2.1-r1.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit linux-info systemd
 
-DESCRIPTION="Multicast Routing Daemon using only IGMP signalling"
+DESCRIPTION="A multicast routing daemon which uses IGMP forwarding"
 HOMEPAGE="https://github.com/pali/igmpproxy"
 SRC_URI="https://github.com/pali/igmpproxy/releases/download/${PV}/${P}.tar.gz"
 
-LICENSE="GPL-2 Stanford"
-SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+LICENSE="GPL-2+"
+SLOT="0"
 
 CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE"
 
 src_install() {
-	emake DESTDIR="${D}" install
-	newinitd "${FILESDIR}/${PN}-init.d" ${PN}
-	newconfd "${FILESDIR}/${PN}-conf.d" ${PN}
+	default
+
+	newinitd "${FILESDIR}/igmpproxy.initd" igmpproxy
 	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	newconfd "${FILESDIR}/igmpproxy.confd" igmpproxy
 }
diff --git a/net-misc/igmpproxy/igmpproxy-0.2.1.ebuild b/net-misc/igmpproxy/igmpproxy-0.2.1.ebuild
index 8a4c5726ce7d..5afc1befcf1e 100644
--- a/net-misc/igmpproxy/igmpproxy-0.2.1.ebuild
+++ b/net-misc/igmpproxy/igmpproxy-0.2.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A multicast routing daemon which uses IGMP forwarding"
 HOMEPAGE="https://github.com/pali/igmpproxy"
 SRC_URI="https://github.com/pali/igmpproxy/releases/download/${PV}/${P}.tar.gz"
 
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
diff --git a/net-misc/jrdesktop/Manifest b/net-misc/jrdesktop/Manifest
index 0d6a7112fddb..178e40a1bc07 100644
--- a/net-misc/jrdesktop/Manifest
+++ b/net-misc/jrdesktop/Manifest
@@ -1,3 +1,3 @@
 DIST jrdesktop-source-0.3.1.0.tar.gz 228134 BLAKE2B d40fc0e12908bc535aa2be32962f30c41b4b7244363bea23fac983db9f25cde942da7ede23895d3c5c7f283dabc00331659567e76ba8357b850a655462a593fe SHA512 dc18187349f2526c027bf45acffa638d4d32692fdcf60b016a540a9245269e4ef49e4893fd666b8ad084dff0c83eb05a0549bcdf112c038f29224ff5a451cca6
-EBUILD jrdesktop-0.3.1.0.ebuild 739 BLAKE2B aa95eb295910f9e631b3a007c67dc2fad10666b7a802ce080e7d3f2d1e4a3f56360fe0f1edf200a4a03084a6d52e48bf0a3c7fb17d73fd3825e43312142c5131 SHA512 fd53d277da1407dc3f05d20754fc2598f4950fe81baa7a7bf9c1cdc00b008cc6ce1297851b3492d3300645dd57250b86b3cc3ce0dec134ee2aaf86cc983391d8
+EBUILD jrdesktop-0.3.1.0.ebuild 708 BLAKE2B cdeff9fd8a71cd50ea698d01499b51e47a65d92aaadce12f894761d685948ae2577ae7fdc02886184d5149e8584e969f181b2ca38d020a93708a1c09df9166c8 SHA512 d41e5921c559748a8431cb7e11792c0b5e193b1681364691604997df78a6fbfa4921b894e7d2c565ac1e521f4402f2cf8e135010fd1a2736aa7420707d2986e1
 MISC metadata.xml 771 BLAKE2B c60c6c579ffa99d9f26c30c21055c8ae498bec8c8658d761445bd30ec2d3400c26bc84db5b888d266972cf2857b4b669cbc9e6db0bf09d44c8fffacf810fbac5 SHA512 78cc2e431a41c93973fc11e2a345d56fd8b6a3a564871866802d089015c981ce45efa2f70295e8ccde06cf3255d4592de7e396956e659801857fc7f1860200ae
diff --git a/net-misc/jrdesktop/jrdesktop-0.3.1.0.ebuild b/net-misc/jrdesktop/jrdesktop-0.3.1.0.ebuild
index 5b4c244fd94b..c08f30174db3 100644
--- a/net-misc/jrdesktop/jrdesktop-0.3.1.0.ebuild
+++ b/net-misc/jrdesktop/jrdesktop-0.3.1.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
 JAVA_PKG_IUSE="source doc"
-WANT_ANT_TASKS="ant-nodeps"
 
 inherit java-pkg-2 java-ant-2
 
diff --git a/net-misc/mcproxy/Manifest b/net-misc/mcproxy/Manifest
index a8816ee3664f..97315a333f46 100644
--- a/net-misc/mcproxy/Manifest
+++ b/net-misc/mcproxy/Manifest
@@ -3,5 +3,5 @@ AUX mcproxy.confd 160 BLAKE2B 5c2e387bbcb5de69412b1b08b63bedab8346363c4d303336c5
 AUX mcproxy.initd 580 BLAKE2B aff88e8962c7861140f4a11568cab5aaa17df153bcd88b6057f3f17cbad2ee46693db681f1307daa569d4c67e258ab7ab8123c18bffd39fc924b34dd483ab2af SHA512 9f5eaeb39ef5a5cbd8af70f23f17e609f783204ee2dc458128f41a4327eb9f5b8f7f77ae1d642121e7a4af4f6778e65bc97bf0c0b800606c0ce2d6ec79c18f95
 AUX mcproxy.service 161 BLAKE2B c218284289627ae733746263662c16579a617b740825e8b6e0032e9531e17c4c4f0d6bc88d6db2fd6ebbc4a9dcb6bb3dc181fea859e152eef8c53978944a6c0c SHA512 a8298d9278ee934289832d360e502268739e415681c8ecf1c69b93d80ec75094ef32e7f9618ed243a6c05a8facd7aee0b5be591aa6dfce0fcf4658bed845b830
 DIST mcproxy-1.1.1.tar.gz 3373209 BLAKE2B 0b54f7c20b9d6d66c5b88daeaa00901918057b449b932656355303a83c4e4f1feb370de0c55e55484b9bafc63bfd82b8ef8179144529f3074e3d94e147cc8ff5 SHA512 408bc27169c9c90080c7842aaeaf260d5349b735e017d1750118f190124f48743fbf15fc05eee16290e38cc2f752e27b28548714a3d0cd2366dfc53dafcda0bb
-EBUILD mcproxy-1.1.1.ebuild 1070 BLAKE2B 69ce9ea37e22eeae0cf7d4952a463ea6c9ea808a34b8b76f1a56d3c2044b6fb462cd9dd8070a1e90014096140951cfa3b86d594ea288fbb23f57f64e712c718f SHA512 5c116fed92133d3245f401b5412d7c6dcd87818f5c1e7e4a7693bff04281fa10d388311876e258b4e85cdb80e59a2975289c6a4bfe2b9fec604e35bd5f941392
+EBUILD mcproxy-1.1.1-r1.ebuild 1070 BLAKE2B 31d974cbd89b8dc3d47ea69cd6f19f8fd2ffea8fe32cfb92207e9417adeb9ed8372851843e6fbeead14a8f3b05657062448e8e19003a97d83dea50242aa256ff SHA512 d638516485e41c0c7355c840bc414de7f0db87a27bf036b1c58a3d7a0c0c49d7bf5117abedd7dfab43cd9d966edb0032cabaf9a7c229846ffaf30b54e89396b5
 MISC metadata.xml 1382 BLAKE2B 5c7f722ba8c8886c41ee6cd5fb894e60d259718cc33b1898049f71cff039872272b6120faae28378c4f3722e5cc97154577899141caf2c6c0792443a67dbaad0 SHA512 99b20c4f17439db3e04cb85c2355a2944353adb3015b627f9f91836d9ae49efa54d044e153ec73980cab04ee78bbf1c1a9e38bb132284b46fce31859a7c9a3f8
diff --git a/net-misc/mcproxy/mcproxy-1.1.1.ebuild b/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
index 463944737b3b..5ba92c33d17c 100644
--- a/net-misc/mcproxy/mcproxy-1.1.1.ebuild
+++ b/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit linux-info qmake-utils systemd
 
@@ -14,8 +14,10 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="doc"
 
-DEPEND="dev-qt/qtcore:5
-	doc? ( app-doc/doxygen )"
+DEPEND="
+	dev-qt/qtcore:5
+	doc? ( app-doc/doxygen )
+"
 
 S="${WORKDIR}/${P}/${PN}"
 
diff --git a/net-misc/megatools/Manifest b/net-misc/megatools/Manifest
index 2f6ba8c8c065..feb424ef42fa 100644
--- a/net-misc/megatools/Manifest
+++ b/net-misc/megatools/Manifest
@@ -1,5 +1,6 @@
 DIST megatools-1.10.2.tar.gz 103868 BLAKE2B 102cc4249706e199f23be3d91372d98dc9d74389c79796638e77fb65886c3561eb589717e00d724de0fb81bfb59acec8207ef4782f6037b34a0bad8d76ebf5db SHA512 6b8a5e92f24c9396a5f6572a0c67144216b75f9af9888dc41273d866d692eeb1f61d9337f74bd4c9e175f79f658f0f41de186147a4ede858797f2dacb98d0b97
 DIST megatools-1.9.98.tar.gz 83684 BLAKE2B f5c2a8559c7d4eb79eab2719fc63fd4a8c8d2acbf1d14e9de9d966a32043f291822bc5c67c9a5a63d5f9612ae3b3e3e3054ddf2f6b7695710ac6460021f5dc75 SHA512 0610809e16d135fd7cc3be45517a342f9800b098ed306b4341205bf0359832b4cb2a64220c84d5879cea6c4074229920dffd461824c93e08b492080ce87e012b
+EBUILD megatools-1.10.2-r1.ebuild 731 BLAKE2B 604b2136c05fe4cbba9c9f239594dcfbb27c8298790d57fad65eac6dee29fc731dc213a6cb025b9762ff593ac8bc0ff7c4618f5694fce12db4c1f4a47ce23265 SHA512 4c45a1a41ca31eea69b5287f0f65d408d4ad38d181be29e50e61ca113c29b26ef9035c1693a6fdf7e9a86528f2984d95364a8641fbe664c6f5e767c2dfd8b40b
 EBUILD megatools-1.10.2.ebuild 795 BLAKE2B f36f8518b874bbea386451307a0b90c5a29c6da745bdeb014596ec5a5994e190225e18165cb17380aaf662cb86b1517845dd567c96dc71e1ce75725821abb20e SHA512 3077a23921e59316543ac3e5aa881213636f22aadb8a762c33cd7048d8db113eed5e3b6d2c06e0578f10073f4b6154583d395c524b357f80e90a7f4c0aa22896
 EBUILD megatools-1.9.98.ebuild 798 BLAKE2B 0f6c5d4fc2b8c5219ddc6c9f139601105430a066b41b2ee034d833bad57bebcb7012ba99e63ae8071ecaf9c58cf7f29ce3a1c5266f08cb1a585661755ceb8fa9 SHA512 21b483593d1c135208303350f36d8542bcdaa88d897c92ab5962d7c9fc23efa61d7207b1b3f97a4d277e48087687147dc6cffecef81d3b34d60eb2fe442bcc70
 MISC metadata.xml 531 BLAKE2B cc1cb4fb594ec4ad7a48eb547e2d15a3f060b000596f81dcafc23d0ae50ee1a979a18f65747ace522ebaa315ecb863697280f09e9bccf01c4c695ccbf29b76ce SHA512 b6dba0febd0344a6bf61a64809b60cc67ed3ebbc48a363206ac5c86547f6da6cbf573e3e55734f6f966820ba01654109e9e0535a5434e62c461fb87866bb6c8f
diff --git a/net-misc/megatools/megatools-1.10.2-r1.ebuild b/net-misc/megatools/megatools-1.10.2-r1.ebuild
new file mode 100644
index 000000000000..1d9b22e67f63
--- /dev/null
+++ b/net-misc/megatools/megatools-1.10.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils
+
+DESCRIPTION="Command line tools and C library for accessing Mega cloud storage"
+HOMEPAGE="https://github.com/megous/megatools"
+SRC_URI="https://github.com/megous/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2
+	dev-libs/openssl:0=
+	net-misc/curl
+"
+RDEPEND="${COMMON_DEPEND}
+	net-libs/glib-networking[ssl]
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	app-text/asciidoc"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	default
+	econf \
+		--disable-maintainer-mode \
+		--disable-warnings
+
+}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 04d8398604ea..53eba4670a32 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -8,9 +8,11 @@ AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd
 DIST memcached-1.4.39.tar.gz 403751 BLAKE2B fc6082eb9b6dc5ee41c42ded9bcde03ebfe87d1c8ed9acbc6e61cb8889604c6c2715e49556473a1b9215974150b0ccb03d5dbb7210108c87d8e67f19eaccbd87 SHA512 055d39d9d681adebb9a6a255bce5d550b61df0a1981f0105f8ffcc936e2053bca60360d755b65d79af836ba1ca71d4c739c67e20a2e0e7110ada183a7b0b63d6
 DIST memcached-1.5.10.tar.gz 465169 BLAKE2B cfdd4cba4baf3c628b6cb655bbc91fc493b7183c2b403516cd68f7d7deff3ce2f9ba6bce2c92d9b1f0863d2da593f7f51def50afd7827996c109641efa71eaf1 SHA512 5b6217ab90492cb4b3f6597c935a4028697f1d071516d647a70f6ba9353db16184ef229935733e669d4120d34d72f6f2415edcfd3ec899e06eab9d3f494f11f1
 DIST memcached-1.5.11.tar.gz 457692 BLAKE2B 248e1b1e6aa54db06d18086add51964b8fc6b9966875de35fcdc322631e276becbc9bd694e1c7ea04822ccabd5796422f1f505bc046a08b3b69b76bf9fef1b42 SHA512 1d641383a9d5c6a1f074a1f30493d50fb3384f29d07078dc827fcb1f9e70f6c07f12a3c6c2a128905ffddf2c414998afbbe3456d8cd4fe43e43606bf9933d822
+DIST memcached-1.5.12.tar.gz 457719 BLAKE2B 6ad223cc62b3514f42eb91851cb906aa6c22f1bed65aed8b9bd5f11d8201bd1e946ddf980e26f4a2a8380f1da03ad7a4e9ad68f2c830bbfa948fe117b2689c3c SHA512 95927fcc06e83e46a050dd50c85e50faf41e6d1f6901b757f7a842b7727a596054082a512a3b830729171556e8a995f037d39d991df2198a80a4e61a6efa1fd8
 DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff33cd21149cf4a8fd234c383382b83a089196fd168f178aaaa7f764ac4b0b72a4bf8f50867bdc377e95a622f399a1 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d
 EBUILD memcached-1.4.39.ebuild 2873 BLAKE2B 1862c2434c8b711d22d97d827a79a484c1e0f682e92f282d61c10d78d6c6bb62af86519a59d3e3f715f9eae6fb8af2ee92b7705f9c987ca01f35f64ec87c08bd SHA512 2980ce757bbeb1cc401cd91473dbb4a76bce44407f0253aba2f05353426e87022cf40fcb2d584eae9d8bbd930f901e65030b86842936cd48b7425ce7163d78d9
 EBUILD memcached-1.5.10.ebuild 2933 BLAKE2B 53ed1e26ad2f3d60088b0f0eb4020d8338fcf27bca4a72224ecf61f3c9b31421ee1d6480f1aba03c7dfe07948fc0b7112f3442655ec27762d4dcc543b7d3c630 SHA512 450b27248f092e78827d95e7fab3276112b2da4b907339519e5afaaf3ce3902f2a5ac082db187d68fbd1c26874450596d5d2b42df4d6e96bcbf442b56e08f0b4
 EBUILD memcached-1.5.11.ebuild 2932 BLAKE2B 694ee35427d6009183f94e438b3ca51d2cb4bfda1c1bc0e93fa7e18b823c9291440698ffa364fe40fea6621248bfe87c6d789cb943dab9ca634550613e26fb4a SHA512 db18f156d71c8d7f31228669109ee1448ac6df8722b9f11ac02dcdcb0c33d4b367d1540c4cc5b3d1f036118c482a6e61a8672b3cde0c27c6f091a94d8a864475
+EBUILD memcached-1.5.12.ebuild 2929 BLAKE2B d8c109281a5a6c19a17f3509decd8ca554412e97877307bdadf70916c030e4d32a1cb9c8de8a7647e9d8505f0021ca9d70c73ae51afb953dbac3c2bf8aa52e3e SHA512 f087ea922838269561df7a6522afbff9b07f2d7c722f627f78ccd7373d4e32c0d8b4396e980a8b9d555fb8eac7e6ce24a805325336ce8677e460e7d1ee8f025d
 EBUILD memcached-1.5.2.ebuild 2882 BLAKE2B e92dbd6cde47898797b2225a09a560651dbb3a9fb9cf603d2b5aadecf25472a02ac33771369855deca687e80fd38c53a263f4affeb92ffb60719d5a64f381deb SHA512 187509aef05b0c47ca2f8ef26bcf9ec813d5fd2a859482a2ce95907b1dba05d4c7d0091542c9e85cc4605e679600bfe7a2260cc3a3b150d3a5a608729d75251d
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.12.ebuild b/net-misc/memcached/memcached-1.5.12.ebuild
new file mode 100644
index 000000000000..fc7181e4c8d3
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.12.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 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/mindterm/Manifest b/net-misc/mindterm/Manifest
index 5a9d04bcfb2a..d7acc7eddae4 100644
--- a/net-misc/mindterm/Manifest
+++ b/net-misc/mindterm/Manifest
@@ -1,3 +1,3 @@
 DIST mindterm_3.4-src.zip 1224973 BLAKE2B fb42de3cf163cff2ee4b4912a519e16eac92f011be25c63186d06ead0b442309eb0b6d59a9806c9c7b0485114aaf02f368ee82acbbdccc17b7749a530d6e24aa SHA512 6c274aea32622517f07010d496f97010a0a7e17fd769a85e928ea0794b20daddb785a5cf4fc954dd2f6e863bc3f90422714392f995d040f4cf3f1230fb14cb07
-EBUILD mindterm-3.4.ebuild 1320 BLAKE2B 75f4f7e5e687c6d3067584aa34ac9307a98934f5d0ca88ecbd5ec870f4ba46dca688a5b5b4fbd90b34b3f1da8150624bd5e7da85ead7d4effaa2f1a45f0e5793 SHA512 c7c501c626ca2d169588f4b251d10991e4eef1c3e5c79f346ae5f3b43e442aa905eb5532379d0d0b1837f5cb59a30a1d3bb0370b4a76fb83445fef495d59c40d
+EBUILD mindterm-3.4.ebuild 1278 BLAKE2B 20a9f963ded5fb2522f5f20c048cf0f6afa2812abbb81368a2c98a0a8c324f924c87c55df07cf91e5112f7cf643f11d4dcfcdb76ff149cf4555ce8b78c4ad25a SHA512 416d440569afa2ee74f9914924c0788e440ea892c718bde6c6e0262f0656fea31977307ca92ad23c80f452b0f9194140bfc04ab15667835a322cfe0704d21c02
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/net-misc/mindterm/mindterm-3.4.ebuild b/net-misc/mindterm/mindterm-3.4.ebuild
index 456655a8cd16..d19408b6b94d 100644
--- a/net-misc/mindterm/mindterm-3.4.ebuild
+++ b/net-misc/mindterm/mindterm-3.4.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
-WANT_ANT_TASKS="ant-nodeps"
 JAVA_PKG_IUSE="doc test examples"
 inherit eutils java-pkg-2 java-ant-2
 
@@ -40,7 +39,7 @@ src_prepare() {
 # Don't even compile
 RESTRICT="test"
 src_test() {
-	ANT_TASKS="ant-junit ant-nodeps" eant test \
+	ANT_TASKS="ant-junit" eant test \
 		-Dgentoo.classpath="$(java-pkg_getjars jzlib,junit):mindterm.jar"
 }
 
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index c632279a7d5a..6e3cdca97e0d 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -14,4 +14,4 @@ EBUILD networkmanager-1.14.0.ebuild 10955 BLAKE2B c7f6e7e1308dac603b48984d7910ca
 EBUILD networkmanager-1.14.2.ebuild 10956 BLAKE2B c83081c6d85a512d3c2cc4d7fe7dbc1fa309e062901c226c093ffa7a845057716a1521965b42bad595576670f8df980575205dd2de64a400e117260867291646 SHA512 c24174a3a5b67691eb07bd543b38d591cad6a5816cf457beb9618e5b043b2c9977582613f40417fe39f34bbd1dc5c23c239a5eedec40369a81d2eb3b3f974593
 EBUILD networkmanager-1.14.4.ebuild 10970 BLAKE2B 7ae274e086ac610398a3a3c1c3d98733fc69efa8a1289a0629d8f2878fc38889c146d2101d666b2114bbf926498d9f6644422764f5d9d27012ffb9164657022e SHA512 2c2b8091275214266e4274d818bd9418fd3471b428fc4911760b943e033bbd3c4313506012e14264ec3bc2544d758c6d7a2677e0f4dd8da24382864b186e0613
 EBUILD networkmanager-1.8.4.ebuild 10683 BLAKE2B 2c60630cbefd554f11e77b18a3bde0e0cc0dc361410ebcf36cb8e4223d715516268e862377fe2d2319ba67e9121153e6b6ec140254fdc159757a1d4a2e95b2d9 SHA512 93d62548e37ae437d7cd04801fdf723ba9e61034f605ab2e966a8958ac75d02ee210e6e7241ebcd7b47e6e9cca5212f0596421bacac7b07a6699996b0546bed5
-MISC metadata.xml 1808 BLAKE2B 836dc65487a0e7ab3e527726f7d34698b48ac1529f9d87113b4cfb8c3330449ae3c3c61b11c9b37bd62884e9ab9f2cd8a3aa6abf7272b0836cc24b395990f32a SHA512 9088a30ef5c513348e76303a00e6e0cc4c8fc82d03d52d4c55a9bd27d1bfdf9fc1a08037b162cd6bd28ca68afc50cf2c8f7aafa69c1fc441eff0355e8e189661
+MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index d2f416137039..3345447e4f99 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -26,7 +26,10 @@
 		<flag name="ppp">Enable support for mobile broadband and PPPoE
 			connections using <pkg>net-dialup/ppp</pkg></flag>
 		<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing
-			DNS information</flag>
+			DNS information in /etc/resolv.conf. Generally, a symlink to
+			/run/NetworkManager/resolv.conf is simpler. On systems running
+			systemd-resolved, disable this flag and create a symlink to
+			/run/systemd/resolve/stub-resolv.conf.</flag>
 		<flag name="teamd">Enable Teamd control support</flag>
 		<flag name="wifi">Enable support for wifi and 802.1x security</flag>
 		<flag name="wext">Enable support for the deprecated Wext (Wireless
diff --git a/net-misc/ntpclient/Manifest b/net-misc/ntpclient/Manifest
index 50de92789b8d..451ed9e37a1d 100644
--- a/net-misc/ntpclient/Manifest
+++ b/net-misc/ntpclient/Manifest
@@ -7,5 +7,5 @@ EBUILD ntpclient-2010.365.ebuild 704 BLAKE2B 25b14f9088e389f0580dbb85272ff8d773a
 EBUILD ntpclient-2015.365.ebuild 700 BLAKE2B 4c23baca82e100dd31156534e1d1b15c6b9b7ba7a8adb590ff527508f831975fd1aaa1fd06ffa8ecde1e33eadc18315648a47e3e37c9650edb6b1e1c765c59ce SHA512 0220d85794028d9daa151ad2cc1c2e6e707938ebe5076c5bcb5f0ef2d954855c81f140ce845c6b6737fd8293e3510d53d26a4184179bd2fdfc76c91e6e181d74
 EBUILD ntpclient-2017.217.ebuild 655 BLAKE2B 0770499a3105930e5ed01ba5d3c9c75e537568a9ecb5ae4d30a497e31831eac52303545bca975313fe3a2d5fe9b90220973a19976732f4b6694f35bfca7e1e51 SHA512 b3e1d7211c99d2659ae925ff8123b49d10f1cc66057b0db2d51935829b49b5da04153b8fc3102386699fc0a9e1801df4afb12103c8f42728e0992bc6598b724e
 EBUILD ntpclient-2017.246.ebuild 626 BLAKE2B 080ccdf5a2ddaa15ae72af62fb0d1804a75f03a7b14de177f304c4177e50d67b073d0f6019a13ab4945ad7ab7c5522e93e70636f35895b12a43714520ce2c38d SHA512 6ea85f9ac17b4fdc091c46f5b01ddd10dd629eeeadf8a02decbf1ba36f7dd5954c6c5a9b3aef29ae4c5d789ade9a52aca7848f533d6b33afd2c5be81ceed96fb
-EBUILD ntpclient-2018.244.ebuild 766 BLAKE2B 94db3d53ebe8587a9fe34e3ac94a55cd114befcaa76977f49d63c13ca7521a6c43eeb3b65045371f71e0b990042233c682cd437e66d7b5c82026523808e13c0a SHA512 2faf1a89ea25323b7fe941f3c1687ff33ffb7033c3bdd167d8bd2f6e908917a96bdbd7cfc92b5a6b00ae3b2f7773012ae89fab43ceec05e21307d59c48247be2
+EBUILD ntpclient-2018.244.ebuild 765 BLAKE2B e09055ccd0a2ecfa73a0483bd3d69fd15112564562ecdaaa67b22aaca72e56680afd57d6907b63fb36fbfbbc84ef1263fae2aff35dad170047004e12ac89b357 SHA512 f8135e6e64bf44e9d7bbc9a2d258c691c8477147002f286bff961ec6828d479d3c84577639d033c71a303c344d93619b9677f0929a0d44edca60423913cfd3a0
 MISC metadata.xml 1258 BLAKE2B 60a9f7c14c15b49d19acb728c55a2a695311d50232e6bb143315a81400cdc990af3b5e1f3699c7b225fd76f6c0725a6e7cd62f0c49091ccd47222bf6e96f0ea1 SHA512 dc7d72c25206360f89ac0b8cd210a6b13346a6a183a92eb4a279059cc07b372d49d7a64808d4db5fb638781d9c16fc33aca21dd02ee2fc40894f2ce6195e4a64
diff --git a/net-misc/ntpclient/ntpclient-2018.244.ebuild b/net-misc/ntpclient/ntpclient-2018.244.ebuild
index e184aae73f65..250810343f15 100644
--- a/net-misc/ntpclient/ntpclient-2018.244.ebuild
+++ b/net-misc/ntpclient/ntpclient-2018.244.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/${MY_PV}/${MY_P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="debug embedded obsolete +syslog"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 4b80983a44f7..c03019e876ba 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,6 +1,9 @@
 AUX olsrd 479 BLAKE2B 188a78f7193a30cb63fda354ba92e162ba1bd56933c376998703c7f2cb9bee94a99f086d4cde6d0a437a9df064a21c16a77e973c9dfa68459591aa1a7294eac4 SHA512 8fab5fc2fda925a346d8f61f5be31bce666a2922c66bfb8c6a48a9943673b5be713cd5a93dd96b3d06d470793dc6136d624efb52ff1c58c8f5e6887336bffe38
 AUX olsrd-0.9.0.2-gtk.patch 926 BLAKE2B af444d476ed31190454fc89bd6802a6c41f33625eb05e62338efce126fe06e7c59f021848ba12247d35196864496cab3ac9414bdd9cddda54ea6fb5deb2360e2 SHA512 191bb1cb0da122a9b44a9297e78998f9b1ecc70948dd9ee216b5d4fb56b41072c53249b39a6c0584366c7518ee2d4b161833be2e5289d707693dd0d87f2e6791
 AUX olsrd-0.9.6-gpsd.patch 537 BLAKE2B 841d0d92106a620aec47d781cf0a79e669e4aa3e6ba304c023a98c7776fc1df53e6bee5c080deb784106b05273a702d093617c9dc33bfa427a6f3b20c444234e SHA512 d3f89ead360acb8d1c26884ec7559c21dd1b7fbc40eb17d7d3fc2313e17d4f160b507d4b6271ed458d7b74fc7a7f1d9482fcb953d2762734fc963a1fb0e94f88
+AUX olsrd-r1.initd 95 BLAKE2B bbb1cf7ab923be8ca24ae0735b38a80d1ec5c531d7334492346e391034938c2180d55f66e854f867db46e745fb0baff1ffa71a21b2822c24ecd7fb4878febbb4 SHA512 ecbf343ec1086b4678c12d070cad8c6e9e7b8b87865c2aebe973271950fc255c64960b477eb25628809f99bebefec60724c7fa4667c820abaf1641402550175e
 DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B 180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9 SHA512 06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a
+DIST olsrd-0.9.6.2.tar.gz 20466227 BLAKE2B 45d90393814ac7cbd6b86fc532d560a415e80ed50be78ad9e55abe44d17a456546820897edcfb6cc8a05fbb6d8919dec9c413d0af7194cbf810bb8e621d66edd SHA512 fb0ff8553f33339f38338ec3f0d15aa7ad17ee30d38437a6e23c96f5a310ee7e1c907c8d8deea58e90181d4ed89f190e042fea6cb03d47adbf4851b6a630b810
 EBUILD olsrd-0.9.6.1.ebuild 2237 BLAKE2B bf4718bcc51719389fa7ed9beadf69134336304b719f5a289c615bea47aa5d22305bb79b2e1860edf9a9e358e409fd6bd456d36958f43d633d4517e1a0ab1f6c SHA512 8bb1a1917fe2472222ffb5c8f7dc8303894d813b6708cef05436636e4ca378170e45f635752babae7a47510bfeb8dc1fc3f5bf888062f0ff34317f8a31e6ce68
+EBUILD olsrd-0.9.6.2.ebuild 2548 BLAKE2B d96a89a164d4f24dd565ea4d222ed21c733460eee4653c1bcac2a25ef35cbeedeaf999cbdb7455af3936e90d3b63439e32da13556034634a4e686fe44012a286 SHA512 0ab7947e9fbcd1dba27150754e8fb2b46c8a31a91ed26c43100e663898cf254103a791d5c5af38819612fc6840d5ce2a608bfd569072b1a49c5b23ae91b5c6f0
 MISC metadata.xml 289 BLAKE2B c88d8f719ab7ee520a042f4a45a60a8e797eeede9823b1d21ec5e12700805666e81e96be90b9d961cdbde662ee813a7f68949cc477c40f17ace6902abfc9627e SHA512 11297ae766f53af46dd2eb5ddc9458cb3b7c4d6edb6f47030373e3e251a282ca7f0ceaa9e99bb2847c15ccba9cbd5ace0313c248a69ad6975c3bc6dbc6056520
diff --git a/net-misc/olsrd/files/olsrd-r1.initd b/net-misc/olsrd/files/olsrd-r1.initd
new file mode 100644
index 000000000000..9bca9b37074e
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-r1.initd
@@ -0,0 +1,4 @@
+#!/sbin/openrc-run
+command="/usr/sbin/olsrd"
+command_background="yes"
+pidfile="/run/olsrd.pid"
diff --git a/net-misc/olsrd/olsrd-0.9.6.2.ebuild b/net-misc/olsrd/olsrd-0.9.6.2.ebuild
new file mode 100644
index 000000000000..f52b1c40cc98
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.6.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit multilib toolchain-funcs
+
+DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
+HOMEPAGE="http://www.olsr.org/"
+SRC_URI="https://github.com/OLSR/olsrd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk pud"
+DEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	pud? ( sci-geosciences/gpsd )
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
+	"${FILESDIR}"/${PN}-0.9.6-gpsd.patch
+)
+src_prepare() {
+	default
+
+	# fix parallel make
+	# respect AR
+	# verbose build
+	# fix default prefix, bug #453440
+	sed -i \
+		-e '/@echo "\[/d' \
+		-e 's|$(MAKECMD)|$(MAKE)|g' \
+		-e 's|@$(CC)|$(CC)|g' \
+		-e 's|@ar |$(AR) |g' \
+		-e '/^prefix/s:/usr/local:/usr:' \
+		$( find . -name 'Makefile*' ) || die
+
+	# respect LDFLAGS
+	sed -i \
+		-e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \
+		lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die
+}
+
+src_configure() {
+	if ! use pud; then
+		sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die
+	fi
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake \
+		CC="$(tc-getCC)" \
+		VERBOSE=1 \
+		LIBDIR="/usr/$(get_libdir)/${PN}" \
+		OLSRD_LDFLAGS="${LDFLAGS}" \
+		OS=linux \
+		build_all
+	if use gtk; then
+		emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)"
+	fi
+}
+
+src_install() {
+	emake OS=linux LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+		DESTDIR="${D}" STRIP=true install_all
+	if use gtk; then
+		emake -C gui/linux-gtk \
+			LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install
+	fi
+
+	# decompress default compressed man pages to honor user wishes
+	local compressed_man_pages=(
+		"${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz
+		"${ED%/}"/usr/share/man/man8/olsrd.8.gz
+	)
+
+	local compressed_man_page=
+	for compressed_man_page in ${compressed_man_pages[@]}; do
+		gzip -d "${compressed_man_page}" || die
+	done
+
+	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
+
+	dodoc CHANGELOG \
+		valgrind-howto.txt files/olsrd.conf.default.rfc \
+		files/olsrd.conf.default.lq \
+		lib/arprefresh/README_ARPREFRESH \
+		lib/bmf/README_BMF \
+		lib/dot_draw/README_DOT_DRAW \
+		lib/dyn_gw/README_DYN_GW \
+		lib/dyn_gw_plain/README_DYN_GW_PLAIN \
+		lib/httpinfo/README_HTTPINFO \
+		lib/mini/README_MINI \
+		lib/nameservice/README_NAMESERVICE \
+		lib/pgraph/README_PGRAPH \
+		lib/quagga/README_QUAGGA \
+		lib/secure/README_SECURE \
+		lib/txtinfo/README_TXTINFO \
+		lib/watchdog/README_WATCHDOG
+}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index cde680707b89..b7618deb4b92 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,7 +1,9 @@
 DIST owncloudclient-2.4.1.tar.xz 15403164 BLAKE2B 0ab1ffbe2179fe04efc7977972d5941a32bc20cd73e310fa72e2a3cf341f7223911fd430f4d34f7e265819acb68d8576e2687a7bfe4ab7140b4c9e9381ea863b SHA512 5b0ceea299078efbc92c1abe22210a93df44bf98094bf4cf8a0c5138f0b69a6719fdc88ef2d5674d49c0ec18ffb12493319eb84616c3e4b8666171cb1a52f0b7
 DIST owncloudclient-2.4.2.tar.xz 15409188 BLAKE2B 89ae891479f29c8637843e14e3aa58d91769393dcfedcfaa415a601962eabd4d1760250fa57166fde215e5c0c5b5799b72dc4f1b52814e59149b778d92d5eb93 SHA512 17f857354b270ecde75cae81557adb78dab830589b32df0b3cf96667010f02501d793609cddf57223d1dd3d9cdb493f1f55bcb04a09d05c467afaddfeb2210b0
 DIST owncloudclient-2.4.3.tar.xz 15406724 BLAKE2B 1e8790f9ebb96ba7de5350c3f7be01f6e0a06e66de591b598795c2ea6787d0caf238daae4f56fad5a8695b8c4eeeea62e36b469fecfdc2df7a90f110a7c7a1c8 SHA512 072fafe69a962f3f0892706f8fff9a9af643b479229dc99e95c712071f11942f75ecc08e7a3470a9ac49f0564da23f8fb21097064c9fa8c6ba1c830c32a6c01f
+DIST owncloudclient-2.5.0.10650.tar.xz 16651172 BLAKE2B 98b928963f3327bdcddaaa61eadcd73422e982cda11c4a4791987eb34ce692258af47649dcaddaefd01097bbc3aa514a56726dce52ce6f51eb61bdf493bca37a SHA512 61f355e514306ce0dec628ac8af7ba004158a890bc40c3905e5aa7705aff753a3a723ba4a0727625327b399cc71bb6c1ad2b415acc760c551eea1bf2590392f7
 EBUILD owncloud-client-2.4.1.ebuild 1977 BLAKE2B ce1731892cab01d405f6ed07d94cbaf567b85c8bb94b0d49b6eedd158a0721efb821a3f4fa2385b3c5f500d5755c29bbc2b6dbb92d0bb7d65996bb5afad150c0 SHA512 74259af9e1679515592c929687a92dcbde906da7d14c4d6bf5949bfb7d38acb60827e9705b11d1cf37380794bf47976390b862cf457c3df5f33c10da50a86af2
 EBUILD owncloud-client-2.4.2.ebuild 1977 BLAKE2B ce1731892cab01d405f6ed07d94cbaf567b85c8bb94b0d49b6eedd158a0721efb821a3f4fa2385b3c5f500d5755c29bbc2b6dbb92d0bb7d65996bb5afad150c0 SHA512 74259af9e1679515592c929687a92dcbde906da7d14c4d6bf5949bfb7d38acb60827e9705b11d1cf37380794bf47976390b862cf457c3df5f33c10da50a86af2
 EBUILD owncloud-client-2.4.3.ebuild 1964 BLAKE2B 5f76eaf7e9a235a59ef092b870dba42de326def85549ebacfe9e903f5f192c8ec82ce5f19a3d349b2017a8b2f36f47209fb45b203933ca92bbf220fef9f68520 SHA512 731ec31418bc8ab853fb2015baee798ae9473500c0aecd0078526a9e4fbb8450f623e19e6f465cf3c02c4fbe2832d41c12a41dd4764ad98b0e42b4fc8ec36b9f
+EBUILD owncloud-client-2.5.0.10650.ebuild 1961 BLAKE2B 1febde1d3ca49b463c6f05b45e42178a6bab1b104e3cc00986a29d3f3037bc05a9ddc7df94fc0e3d0c3742cc02af0a6b1975fc8857ace251a28ba27fece66061 SHA512 7afaae30ccc8fdb53e812f54c2d2c01c1960d07e990cd470a067a0679d6c005f38791c8333954a75d9c3dd4e99560d5e0a4d7a39ad1d5d33c50e715ae87c6498
 MISC metadata.xml 508 BLAKE2B cbba1d7edcfe92d38f2f0d959695cac4f2c1eef8949e9816a995b18432a5c372185094cfa2548787ee63d58175b2110792f5e51688bc456c6376d86a7e8d9864 SHA512 1e757d6db30a7d5d90f317325fa96a1bdf46029e79846d17637f699d07ffa9f489f2d66855c647896a7b932e545b91242cc9df1dbb4bcce83e266c13c8fcf6c1
diff --git a/net-misc/owncloud-client/owncloud-client-2.5.0.10650.ebuild b/net-misc/owncloud-client/owncloud-client-2.5.0.10650.ebuild
new file mode 100644
index 000000000000..221362c5f1ad
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.5.0.10650.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="http://owncloud.org/"
+SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	shibboleth? ( dev-qt/qtwebkit:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/ocsync
+	!net-misc/nextcloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/${P/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/proxytunnel/Manifest b/net-misc/proxytunnel/Manifest
index e7498b7c8a05..c62ada3a21a0 100644
--- a/net-misc/proxytunnel/Manifest
+++ b/net-misc/proxytunnel/Manifest
@@ -1,4 +1,6 @@
 AUX proxytunnel-allowTLS.patch 592 BLAKE2B 2c48bb1a1c2e2374043d9bc73e653a5f87f5bbda6a64a5572cbe3bdafe533205f619b7248c8f7b6cecf7de8c72940a6ccf64e054c5419e9ba656f773e9d7d346 SHA512 67b0103054c56c69cd9c0d1aa144498151f105004b400bcdbbb3df519d37424630554e101e5617faf075fd978edddfc4d06cca7524c51e28cd33c1165b6a22f9
 DIST proxytunnel-1.9.1.tar.gz 48025 BLAKE2B 5a844d8fdbb9a1eae9c40c7621086b873ae89813b7c596da4416efcb777a8110ad7d224a0efa2e193cfbbb82dbfe69d44d4dd36db080b8e902630a464a85b953 SHA512 819dd11bc13fc279d2d475b89909c0eea414ff71d772d4bfed742dd8d425669dc502f2c22d983bb8c58e426a2bc7209526cb21492ca5f8e92ea1b9ea961fcfdc
 EBUILD proxytunnel-1.9.1-r1.ebuild 1062 BLAKE2B 456dd113a2b48783723fdb5493e891db17654ae9a7fc4bdf5bb6254ae46d1c6f059df4c42a17f82fba569cd84496d3cc3a6f1f95b3353d379eccdfff25641187 SHA512 8bc963c149db9d497a969d6f24b3cedd64d0a9d099d94825cf85b89415e98d9b11defc545f424dd1366aa1c28f089692f2efd0f8bc3e488341d7b09bdddf1518
-MISC metadata.xml 722 BLAKE2B 577965e10bc1b8d5c67a892fc50ea97721bc122accbece1b3f42eecdd505add994c74b7d9aa6fc66710af6893389c4ebe1dd4b44ac64d5fbf2e0c2aab6b75a97 SHA512 b51f63b3865144d4a4f21f851d7316ebab5e2c194e5019333ce80d6df7f41bf1b9217ba864dafbc8db7569a89a22861fc0a6bd07664040172e472fe9de00c7eb
+EBUILD proxytunnel-1.9.1-r2.ebuild 1158 BLAKE2B 3f5a88d370e82f690cb1a109d963a7b9a1442c8b8f3516a92a2ebe274a9dbbb7f05d5748a074afbc35fa0d6c54f99a1937e02b7726a670a18e7c42c9a6ab077b SHA512 aa7bc374946215f40263f9f868b160d181b26e858db5d23d3909e8e0415dbffb50a484e827a3b1f0237122edc5c6017bc4dc92ebd0fa9e97139ea905c9a4503c
+EBUILD proxytunnel-9999.ebuild 1110 BLAKE2B bf3f8dac9a9c63691cf961f2ad29d335c872df7cef1680ac1acfe6119628214214d329cdbe981248bc77ad0ec826b1ca97eacdbb0f1859c04ef203f92f875977 SHA512 92b3595da31853468a24aa0d5468d2d26e2d03e5851c695b2d4445c50d06faa4c4ce0d21a54f70824c5ae5e539ba09b520e62da0633fba4f98c725e882a63870
+MISC metadata.xml 717 BLAKE2B da3b819d7e0caeee376359837cf0a6294eee0363ad857369816fbf595e6add90666feeea356a9864d71a3987f7393ac7483bd4fe800bae67364291da420a2c39 SHA512 ecf80d876bccd3c2c98cb6a46e543e6adbe5a52a1666b6678cd86def313593d5200189f67cec5d85150e7a308139089786c416ee0a2d6bfe58d800b0fc7a18da
diff --git a/net-misc/proxytunnel/metadata.xml b/net-misc/proxytunnel/metadata.xml
index faa64f120cb8..9dec21f8f5a2 100644
--- a/net-misc/proxytunnel/metadata.xml
+++ b/net-misc/proxytunnel/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>vikraman@gentoo.org</email>
-		<name>Vikraman Choudhury</name>
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
 	</maintainer>
 	<longdescription lang="en">
 		ProxyTunnel is a program that connects stdin and stdout to a server
diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
new file mode 100644
index 000000000000..c3a2f9493841
--- /dev/null
+++ b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Connect stdin and stdout to a server via an HTTPS proxy"
+HOMEPAGE="https://github.com/proxytunnel/proxytunnel/ https://proxytunnel.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static"
+
+RDEPEND="dev-libs/openssl:="
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-allowTLS.patch
+)
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+src_prepare() {
+	default
+	sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" || die
+	einstalldocs
+}
diff --git a/net-misc/proxytunnel/proxytunnel-9999.ebuild b/net-misc/proxytunnel/proxytunnel-9999.ebuild
new file mode 100644
index 000000000000..16a4a63d0bb9
--- /dev/null
+++ b/net-misc/proxytunnel/proxytunnel-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Connect stdin and stdout to a server via an HTTPS proxy"
+HOMEPAGE="https://github.com/proxytunnel/proxytunnel/ https://proxytunnel.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static"
+
+RDEPEND="dev-libs/openssl:="
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO )
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+src_prepare() {
+	default
+	sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" || die
+	einstalldocs
+}
diff --git a/net-misc/sgopherd/Manifest b/net-misc/sgopherd/Manifest
index 188e4d0bb1db..35cff283c76e 100644
--- a/net-misc/sgopherd/Manifest
+++ b/net-misc/sgopherd/Manifest
@@ -1,3 +1,5 @@
 DIST sgopherd-17.09.tar.gz 8855 BLAKE2B d79b6f2d6c19e0ec2878ff44c56d739863a74bfc967098d4e51d4b9a723fed587d5d52f78aeb5e915e466f43a28ac443b39e8b79e6a8e8fc82c4c049be7b8cb4 SHA512 7f3ef37d5ec08d21e7945f0327ea50697237461f717a2ce3c5a0fe9c077effe26710013725a59a184564e028f249f7b53087752410600da0f8feaf9cd1b9c7dc
+DIST sgopherd-18.08.tar.bz2 12777 BLAKE2B dde415822f9e4a41463fa6d2622b59adc5676b88cb5b5831ec3396869f6b2bfa4d605b92bd56c24d9aa1b8d4a0198c4f2f46a6141f5f2c913cde1cfb9e99d3db SHA512 830558f2be0763550f0229bfa22524de81c9ea119b2d0f00e465f76ba343d4f488e5595851bbf13697b270d7dc611eafb36a320b6dc2c7d27ad854bd14f4c10d
 EBUILD sgopherd-17.09.ebuild 881 BLAKE2B 385053740a10062f894ce1e44834785d4f1fc93679a18198ad08411b165c17387f09212ac0b75a5dfc10e49eb8a4a7e7d802733ba4a587728cbba71a9274c32b SHA512 5097bae8034d6cb3eb680dc42956880dcf38dad2afc460ce5281dcc54999e6fa70b3e4a1cb9f83bac377be19f4e11933d6f3e986bee98f0edb7e11d38a35aa1c
+EBUILD sgopherd-18.08.ebuild 872 BLAKE2B b1d6b50cd57b0df8d29c80ccdf49bd35ab8f74e3842ff59a7194e43044c4661eee31fe3d40426b57abd8c68e98e9796aed7ceaf950e576dd06c3aab01883472e SHA512 c2d08328ed56c5dd1887614f7805a593576708a1b1695db0b30058db653895b3ddac40f7e6a7e31e375ca0285f95c47884f0de0e62e72a99589181d73e873306
 MISC metadata.xml 325 BLAKE2B 466851c33b7e7823dfc601e38bc23ff344e623acda48d749a33ad70fd12623ebf2120fff9e7a67ccf48edd32b08088df3ed85de7f2a1ec8aab6b759932d9e123 SHA512 b0da1cc0212383ff00849f6c9b3cf1e96713d1db19e21711cb8147b43ac8dc696fbfb5ff4703f8b25f73f051c25d3f05dd3e59bf229528cc0a6652b57c2b19ef
diff --git a/net-misc/sgopherd/sgopherd-18.08.ebuild b/net-misc/sgopherd/sgopherd-18.08.ebuild
new file mode 100644
index 000000000000..d83915c04118
--- /dev/null
+++ b/net-misc/sgopherd/sgopherd-18.08.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Small Gopher Server written in GNU Bash"
+HOMEPAGE="https://www.uninformativ.de/git/sgopherd"
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="app-shells/bash
+	sys-apps/sed
+	sys-apps/xinetd"
+
+src_prepare() {
+	# Set default user to run sgopherd
+	sed -i -e '/user/s/http/nobody/' xinetd/xinetd-example.conf || die 'sed failed'
+
+	eapply_user
+}
+
+src_install() {
+	dodoc README
+	doman man8/"${PN}".8
+	dobin "${PN}"
+	insinto /etc/xinetd.d
+	newins xinetd/xinetd-example.conf "${PN}"
+	# TODO: add installation of systemd-related files
+}
+
+pkg_postinst() {
+	elog "${PN} can be launched through xinetd"
+	elog "Configuration options are in /etc/xinetd.d/${PN}"
+}
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 69057dab4d0c..bb001fb4bd2b 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -4,7 +4,6 @@ AUX spice-gtk-0.34-openssl11.patch 518 BLAKE2B d9c692996f64ccfb61f16f2c8b620559d
 DIST spice-gtk-0.34.tar.bz2 1480566 BLAKE2B 35350cf930d091fa11df1d573f9eff23696745a20e88fcd20783c108b6ddca9064bc4e75d414f23bd94318e37d509e581866c5dcc955cd21ca7c9384b492f0ec SHA512 17ea737511855b47f5eaf5143756483542cf8ee83f8d276cbfb2c0407355f68ed329fcbed8a67737179f3e53587710634d6faa856590234ee68be7b4b13f2689
 DIST spice-gtk-0.35.tar.bz2 1437231 BLAKE2B f2731a794cf22b491bf858fff44506288af730b37f1c37e16ac3042d662373b4e4021808d5ca72440012fb36a5119ad11858cb8cf872b04376518487faebef49 SHA512 f0914a4a9baf892e39dab7d51aa9f5ab4dbb4ef01f09da158b20756f890745837d0a6c8c1f7897844e695be2ed01f3b1d04ada1cacc958b5cfadb0d4bf7c4729
 EBUILD spice-gtk-0.34-r2.ebuild 3752 BLAKE2B e27f8a92b0284f6fa2296f0a5f7cb38d01eec7e7502e6730186094835d9ce3b397f002206a976a861ef9e2ef904b8256d696c6e46783c30875b16781df597875 SHA512 1c756aa20ca07af0bf3796b7e42bf76337a15ac3d5aa794eee24649ff9f503e014e7bfc8ac815b6117f5ceca3c2f8461af94cdb89b8119217ab21dff78bd7b1c
-EBUILD spice-gtk-0.34-r3.ebuild 3838 BLAKE2B 6a3789e5ec78191addbda947d680fe0adf97970c7a2b47f0b9f015e29d1b9c159f23820a025149dc78df56d0d2c46480a27e53651891413a53b7022d78477b10 SHA512 8f9de4514153f47b1c26fd586dd4cd56a9c68140892d194950fa510755ae2f979ccc75d9e4a696a57ccafa0108464e758fb93216cc8f940debb47d7f0c8623d9
-EBUILD spice-gtk-0.35.ebuild 3809 BLAKE2B 8bd08c0129f60b4a12f95b166b7f773eefc32452a5490350e0002577e4325b6e94249297526099126a95bd25e3a36b6765066248fb590789d1fbce65306ec4a2 SHA512 b4a0eaba4761d9cdd99fbc8d8c81593084f21a62c61961dcfd44bcdfeb76bfddfe4b89cf22966c58359e2e3c712336fe6233f0d3f66844b0e53c2be780db1ec0
-EBUILD spice-gtk-9999.ebuild 3693 BLAKE2B a85fb7bd44fa36252f13c6d5a25fba4eb213e41a0c5b6d77c2bdbfe4e250981970f42c359175d1de41d81feb86e59ce6e524304eb8e3d8111181f1ec36f2e848 SHA512 3dc59d0315a6e4786a9af9d662647dfc056ce4ab4d2f57c1e308f767e19cd49a769b4fbbc9c8bb985f8b873569641f95e7099719df7fea02c894ecb00d4c882d
+EBUILD spice-gtk-0.35.ebuild 3804 BLAKE2B aa969c2458a6b0d1b7343b9d7522adb72035a3d4e1f653e3d41d1a309246957ab2f061e385f4730de0ff2648090f9822476474b06be1dc0aae987f05bac07e02 SHA512 b2a660c9042a1d388a46b9a89ec9e0ea4ad8b209358fbb95bed23f8c735ac3c3c761f7e8e7a262a9fd01a38d1b7c2efdcf99d6de597272072d80095856d6d01e
+EBUILD spice-gtk-9999.ebuild 3690 BLAKE2B 21d8b47a79d30bd04c866f34cc108928e35657024dd82ad5ed9745fd68d1167b0af3cdf49c6386e55e2492d44253503b7ec2aea8df473645c1810c4eade83cb4 SHA512 f828c3f844505d214aeef9c05db82c547ae21415e34653dbf2e0d2157aaed5ddb4d8c2d94f1537980feea69b8d9222292cfd7cf7fbabe5a76e6d88b8c0298e39
 MISC metadata.xml 1166 BLAKE2B 37cf826a7a49dc48170fb99e05b191964810eacbf8b13db383a37e70faed6a2b4b70acfd724eeffbbe10d97fab27bfec7d56cfb2cbc2537ac4df7612afdbe8d2 SHA512 5229ddeaf19765abee5b0120b066ac2049f77878b1b8886e2b552f2c56d6049df297b227f0bee36bbe6be7041b9d8e1c1d3d868c34b1e39b49a5c0bc16b2c947
diff --git a/net-misc/spice-gtk/spice-gtk-0.34-r3.ebuild b/net-misc/spice-gtk/spice-gtk-0.34-r3.ebuild
deleted file mode 100644
index 3bba2079f5f8..000000000000
--- a/net-misc/spice-gtk/spice-gtk-0.34-r3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils xdg-utils vala readme.gentoo-r1
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
-
-REQUIRED_USE="?? ( pulseaudio gstaudio )"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	gstvideo? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		)
-	gstaudio? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		)
-	>=x11-libs/pixman-0.17.7
-	media-libs/opus
-	gtk3? ( x11-libs/gtk+:3[introspection?] )
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/cairo-1.2
-	virtual/jpeg:0=
-	sys-libs/zlib
-	introspection? ( dev-libs/gobject-introspection )
-	lz4? ( app-arch/lz4 )
-	sasl? ( dev-libs/cyrus-sasl )
-	smartcard? ( app-emulation/qemu[smartcard] )
-	usbredir? (
-		sys-apps/hwids
-		>=sys-apps/usbredir-0.4.2
-		virtual/libusb:1
-		virtual/libgudev:=
-		policykit? (
-			sys-apps/acl
-			>=sys-auth/polkit-0.110-r1
-			!~sys-auth/polkit-0.111 )
-		)
-	webdav? (
-		net-libs/phodav:2.0
-		>=dev-libs/glib-2.43.90:2
-		>=net-libs/libsoup-2.49.91 )
-"
-DEPEND="${RDEPEND}
-	>=app-emulation/spice-protocol-0.12.13
-	dev-perl/Text-CSV
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libressl.patch
-	"${FILESDIR}"/${P}-openssl11.patch
-)
-
-src_prepare() {
-	# bug 558558
-	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
-
-	default
-
-	eautoreconf
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# Prevent sandbox violations, bug #581836
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	# Clean up environment, bug #586642
-	xdg_environment_reset
-
-	local myconf
-
-	if use vala ; then
-		# force vala regen for MinGW, etc
-		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
-	fi
-
-	myconf="
-		$(use_enable static-libs static)
-		$(use_enable introspection)
-		$(use_with sasl)
-		$(use_enable smartcard)
-		$(use_enable usbredir)
-		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
-		$(use_with usbredir usb-acl-helper-dir /usr/libexec)
-		$(use_with gtk3 gtk 3.0)
-		$(use_enable policykit polkit)
-		$(use_enable pulseaudio pulse)
-		$(use_enable gstaudio)
-		$(use_enable gstvideo)
-		$(use_enable mjpeg builtin-mjpeg)
-		$(use_enable vala)
-		$(use_enable webdav)
-		$(use_enable dbus)
-		--disable-celt051
-		--disable-gtk-doc
-		--disable-maintainer-mode
-		--disable-werror
-		--enable-pie"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prevent sandbox violations, bug #581836
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	default
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	# Remove .la files if they're not needed
-	use static-libs || prune_libtool_files
-
-	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.35.ebuild b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
index 707c9f7ae81b..07085d1e6183 100644
--- a/net-misc/spice-gtk/spice-gtk-0.35.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-g
 LICENSE="LGPL-2.1"
 SLOT="0"
 SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
 
 REQUIRED_USE="?? ( pulseaudio gstaudio )"
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index d489cfc08da7..6e44cc0b2cb8 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -63,7 +63,7 @@ RDEPEND="
 		>=net-libs/libsoup-2.49.91 )
 "
 DEPEND="${RDEPEND}
-	=app-emulation/spice-protocol-9999
+	~app-emulation/spice-protocol-9999
 	dev-perl/Text-CSV
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.40.0
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index f6d1a930db46..5cba1b52baab 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -1,11 +1,6 @@
-AUX sslh-1.18-systemd-generator.patch 603 BLAKE2B 87116f0332cc6d4076c8d6b4b14c89377d18d2e27b977bf864ce6d88d0bdf1576c556e1729f5821f9e101ff2a5538bb05cbd1db3135ab70847233256f240b861 SHA512 71bfc4fe78d7b2b1c6a131533029c1ad9a676989ca9821e1c798109c9f9ce43809ad504aac262a20ed7babd3349485887947f9ccb26cba1803fe3fbd0afe79b9
-AUX sslh-1.18-version-deps.patch 256 BLAKE2B edca1e2490081b845efc08867d5368e52bd72c7414db4fecd8b081e952f558f975cb9d0b1e5b9ca72875cc0abf216a2d0351c40e1e887bc1d983ce3652a9b71b SHA512 2f438df2777cf4811f7d33769a403f90d3cb7fc0b4e9eeeafe0cf2b29f203b3a0a0503729894103c0efde3ac1ff0d9253c7fd4b09627fedd3fefd18b595df87a
 AUX sslh.conf.d-2 297 BLAKE2B c59d4eb8dfd4c2ed6f3a952cd2764c11aea21c1c62e5a4ffc584500cc29d62867d6852e700eb3e6c339f3456d39bcdff16a476dfdbe5705dea5934460769fa22 SHA512 580114cef9356d66ec1e6c306837d44dc3098e8f3f805eda20c5d8f81f087bf295b25801ee64ee2bc667ce7324f510ff6f4fc7e222d1431ec3d4e82bbcfb160f
-AUX sslh.init.d-2 465 BLAKE2B eb34383ade0d3fe778d11d098129f5466df15816ca8eb8eb7c5b2cb8eebee91195b0e3e9f9be4fa5f941f8aacbfbb4d718876a8e8af0c9a13c6dcdf2dc6d104b SHA512 73b38af0142f6d591d71531e03aca3ddf625faa7825a9951dc31112fa1bca5b28f8074a3f9ca565b2cd3995b635cc7818d899ce099d64d2eb97ff9cab2e617ba
 AUX sslh.init.d-3 273 BLAKE2B 01ba7f4347989a6bcf829139ce3a51e7b14265eaae2e32617933c29c5d195a6a3bbe0674a13d52f02e2c418787ed3976987dc79d9c9045b0c7ca6285aa86fb55 SHA512 1508a137c5bc962e1dfa780334c015fb63701867261fc335920fa1847e2ed2093cd02657fc9d2f633382db15bbfd87bfb65f698f5f76aa777aa947ddf39ca10a
-DIST sslh-v1.18.tar.gz 53170 BLAKE2B 8d26bdc9950b9017279b36699821b756ea0507949edca90758cd4149aac56fd1a12e0192009ce2154af09818a6aa009fd2009f88d89dae8f76525d7aacc4a830 SHA512 3f0f61c340b689fb30015d5c73d6c29398b5c6a115ae9089d0b3c0230e99c90049df03133e4b0c3668fbfe995ed40cd3543c5764171c57e632e75bd5c3548fea
 DIST sslh-v1.19c.tar.gz 57418 BLAKE2B 97af9d8f79c54f1ba11476a142c762c69a16b6fdd48ead167c56c217a556183e3fda777f217c09d3bf6a5705d5cf491b68c282b626f70d42512d147d98b6f87c SHA512 14529f1fc1488b10e660fa85f5d8bb642a0e119a15ca44d492793153447c9414ade5a1925fbbedd19c5d26662aa1bafd9743ab5ca11324632269110406fa8ce9
-EBUILD sslh-1.18-r2.ebuild 1761 BLAKE2B a112f1d45b4290e4230a0262ab3a44b96139e1cd158bff8900861bdf7dba63d62c50dcf30af9f17b982da87d601a23739d2835138d5cce3ac6b99aa9d7ee19a9 SHA512 5b66c76b78e0f8bcc8ad5d7c1986e0429c06149e6021280bf6094e480cc8730e30c558280c9243c5bbb336560848f38e683c329d11fe80febef2c56fdf5f897b
-EBUILD sslh-1.19c.ebuild 1936 BLAKE2B 0f91af8934fecdb8da30340aca3d7bb123507e2ddbcd8e345f46a045ad70d71a4d734e62656f8fed6b3d63bcfdc10aec6a82709178422763d3300024bfa46d99 SHA512 5ffb55731ea00f59011dc64597ed970568bdb58ba4ce7de50964d2c44173ec5500df386411bb13dc3593021b74e99c7519a914e899ea7c64b05ddc2818397f90
+EBUILD sslh-1.19c.ebuild 1931 BLAKE2B 5374fa4e57249b1d5b89b80460e6487f6e5f74bc29d473eaa161c786f467b2cb7474af00fcd28073aa1583a1958966c6ae8b16c9460134f6c22716bae1a039fe SHA512 989d3f47f06fbdae7bf2964dc90e49d2652080bce56a6f2f15ed7bc8e7afc57d109c644655bc71dffe290f1493fe02fa21f2fd48beb44fb41b92cb7fc006a6c5
 EBUILD sslh-9999.ebuild 1936 BLAKE2B 0f91af8934fecdb8da30340aca3d7bb123507e2ddbcd8e345f46a045ad70d71a4d734e62656f8fed6b3d63bcfdc10aec6a82709178422763d3300024bfa46d99 SHA512 5ffb55731ea00f59011dc64597ed970568bdb58ba4ce7de50964d2c44173ec5500df386411bb13dc3593021b74e99c7519a914e899ea7c64b05ddc2818397f90
 MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da
diff --git a/net-misc/sslh/files/sslh-1.18-systemd-generator.patch b/net-misc/sslh/files/sslh-1.18-systemd-generator.patch
deleted file mode 100644
index 476de2a4c1e1..000000000000
--- a/net-misc/sslh/files/sslh-1.18-systemd-generator.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://patch-diff.githubusercontent.com/raw/yrutschle/sslh/pull/98
---- a/Makefile
-+++ b/Makefile
-@@ -27,6 +27,8 @@ CFLAGS ?=-Wall -g $(CFLAGS_COV)
- LIBS=
- OBJS=common.o sslh-main.o probe.o tls.o
- 
-+CONDITIONAL_TARGETS=
-+
- ifneq ($(strip $(USELIBWRAP)),)
- 	LIBS:=$(LIBS) -lwrap
- 	CPPFLAGS+=-DLIBWRAP
-@@ -54,10 +56,11 @@ endif
- ifneq ($(strip $(USESYSTEMD)),)
-         LIBS:=$(LIBS) -lsystemd
-         CPPFLAGS+=-DSYSTEMD
-+	CONDITIONAL_TARGETS+=systemd-sslh-generator
- endif
- 
- 
--all: sslh $(MAN) echosrv
-+all: sslh $(MAN) echosrv $(CONDITIONAL_TARGETS)
- 
- .c.o: *.h
- 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
-
diff --git a/net-misc/sslh/files/sslh-1.18-version-deps.patch b/net-misc/sslh/files/sslh-1.18-version-deps.patch
deleted file mode 100644
index c6108ffb1e9c..000000000000
--- a/net-misc/sslh/files/sslh-1.18-version-deps.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Make sure the files using version.h depend on it being generated first.
-
-Gentoo-bug: 594586
-
---- a/Makefile
-+++ b/Makefile
-@@ -59,7 +59,7 @@
- 
- all: sslh $(MAN) echosrv
- 
--.c.o: *.h
-+%.o: %.c *.h version.h
- 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
- 
- version.h:
diff --git a/net-misc/sslh/files/sslh.init.d-2 b/net-misc/sslh/files/sslh.init.d-2
deleted file mode 100644
index 7e4b2cb578a4..000000000000
--- a/net-misc/sslh/files/sslh.init.d-2
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start \
-		--pidfile /var/run/${SVCNAME}.pid \
-		--exec /usr/sbin/sslh -- \
-			${DAEMON_OPTS} \
-			--pidfile /var/run/${SVCNAME}.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --retry 20 \
-		--pidfile /var/run/${SVCNAME}.pid
-	eend $?
-}
diff --git a/net-misc/sslh/sslh-1.18-r2.ebuild b/net-misc/sslh/sslh-1.18-r2.ebuild
deleted file mode 100644
index afc382f87c0e..000000000000
--- a/net-misc/sslh/sslh-1.18-r2.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
-
-MY_P="${PN}-v${PV}"
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
-HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
-SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh x86"
-IUSE="caps systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/libconfig-1.5"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.18-version-deps.patch"
-	"${FILESDIR}/${PN}-1.18-systemd-generator.patch"
-)
-
-src_compile() {
-	# On older versions of GCC, the default gnu89 variant
-	# will reject within-for-loop initializers, bug #595426
-	# Furthermore, we need to use the gnu variant (gnu99) instead
-	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
-	# to be defined.
-	append-cflags -std=gnu99
-
-	emake \
-		CC="$(tc-getCC)" \
-		USELIBCAP=$(usev caps) \
-		USELIBWRAP=$(usev tcpd) \
-		USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
-	dosbin sslh-{fork,select}
-	dosym sslh-fork /usr/sbin/sslh
-
-	gunzip ${PN}.8.gz
-	doman ${PN}.8
-
-	dodoc ChangeLog README.md
-
-	newinitd "${FILESDIR}"/sslh.init.d-2 sslh
-	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
-
-	if use systemd; then
-		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
-		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
-		systemd_newunit scripts/systemd.sslh.service sslh.service
-		exeinto /usr/lib/systemd/system-generators/
-		doexe systemd-sslh-generator
-	fi
-}
diff --git a/net-misc/sslh/sslh-1.19c.ebuild b/net-misc/sslh/sslh-1.19c.ebuild
index f58bdffe2ceb..c163c7b5f920 100644
--- a/net-misc/sslh/sslh-1.19c.ebuild
+++ b/net-misc/sslh/sslh-1.19c.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
+	KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh x86"
 	MY_P="${PN}-v${PV}"
 	SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
 	S=${WORKDIR}/${MY_P}
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 0d7c5d0369f8..42c57edbd3b7 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -12,6 +12,6 @@ DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdc
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 EBUILD tigervnc-1.8.0-r3.ebuild 4311 BLAKE2B 7335c1bcb3093a44483c6962edcec9809ae0d7cd65b9f565c87cb433572a93085214ece4e804222d7ed354c20d0cd5c168ccc197b0c39860b2188448b2eeba0a SHA512 bbc5b8d0b91cdddfd801f08a9f7432f57dff70d21a3038107ff2cfce15e10e23b31104e59fc0465d7404656a6083a45b0c5431be7ca9d33d761dbd5236a0df62
-EBUILD tigervnc-1.9.0-r1.ebuild 4382 BLAKE2B 7611ab58d21ed0686b543aabd17df9b4db99c727e31db68a0facba3883e9c608787fb3d4ef5c27deffac7a8489a48e1b6ee217fa9a0ecb23ceed75137fab40bd SHA512 6c5bf8262e7796fd4d9aeeed993235ddbf584229a2108a3c99d32a7cd3a3a8a74ec423c1e26f3d71e57e3c909e0306c2d5e149cf90979377b569b54a55e38d8d
+EBUILD tigervnc-1.9.0-r1.ebuild 4374 BLAKE2B d3964c3a3ecaf0bd8c6bda438487929bfdee3709eea301663c066ce9e41f134d4120238a92e0a20a4ba53ad354709752fe1c2554d06fc5678ae523c5578cfe3b SHA512 e6e078769748a6121d5f65a5c9a77646c80268a6be29819184bb6f5cbb3d9625e576de9a76df605173895cb61871044b47559bb28d1973eeedd13a9df42cb6ff
 EBUILD tigervnc-1.9.0.ebuild 4372 BLAKE2B 4023fa062416384ff05bd6c91cfda9ff646fb5b7f71be98a84691e946c1e688e051115049178e1e9c6e60bfc73da01fb443f6564920baad11c629b0924822fa5 SHA512 6f82c8338003a3cbfc06d9fe8cf3ea3bc102eb1b6ca7a56f7954c70e4c999381ff54961385a4543f74bf3e3585bfa566a28ac44871ba1a062e9ac1f69c610d30
 MISC metadata.xml 750 BLAKE2B 2a76715a23dd2d3797ae85c20ef7e08854ebfcd74f42969d10bc2605870dcd69a03806437483eceeebc3dfbd52006091609e7464a9278aec2d938295b230cab1 SHA512 768e087e274e83dc9347cf719e61db39597d2ab07aae24ab6158fe9851d93f9594e74ec66579b0da2abf9bc839d9d28d3a31f207d7274bc0a9e1e9c8bbee9997
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
index 5719977b3a3d..55f1c8a54861 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule"
 
 CDEPEND="
diff --git a/net-misc/ubridge/Manifest b/net-misc/ubridge/Manifest
index 83b46f502223..0e29d1fa5050 100644
--- a/net-misc/ubridge/Manifest
+++ b/net-misc/ubridge/Manifest
@@ -1,4 +1,4 @@
 AUX ubridge-0.9.14-respect-flags.patch 395 BLAKE2B 746f481789bca31b87759eb879521288e27b4cf16d3e2d83ea593d76bf03f614ecad6a0f2c0b001d47c08ca57ab898b2c4c9d475d34bd0b54ce7da4bdf507746 SHA512 4a86af19f8462ff3d81d509e6d264240cb3769f3175e0b1c0142cee30d7b61354c86ffec57d31f0bfbca46c0dad078efa6d3c61d19e29ca9ab6dec43f401eccc
 DIST ubridge-0.9.14.tar.gz 63492 BLAKE2B 4c19bb79c264c9bec2ca39fea8b386817f6eb41d23b35f9fbd0a1407b45398ad5362bd76cbb81597438367a2af8d80308f13d3e8faa4e75c6173bbeb23da177d SHA512 7e92ca6ee8dd5815991c5d157278487cfad69710f0a63fc217d5d0e61678d272bf5a0d31b6afe25b1060df1ad13e229f1d573c03fecb1453167a9ff364283a5f
-EBUILD ubridge-0.9.14.ebuild 1001 BLAKE2B 3af76665e4510eade129a154e5a26ef4bd0157274c12bade0c8c67c1ccf66304c370c3db27540cd85c74a7bd7e60ec9583158557cd5c4d16e4fb087b8f77bc1d SHA512 15c4857aa4f987487877e99a7cb385883c55b0a55353cc130de1df1db305bf8480ddea2a9c06541d5e00b295394de5d95c2235849253b01cad9345c377c0ea78
+EBUILD ubridge-0.9.14.ebuild 1003 BLAKE2B ef1bf86ff6eb34a06748f14a98bc086a9ed39247d4a649feff896c06a210c3cc78d7e644be9e9c5f9412cd1b731abc2b7acb8445acf23b8f28182f3ed48f634c SHA512 9fea9b1c5270159bc592d5ba42e14ebd037bce7660fb38b59c02a72184833d48956f4ea53b1c4ded2b1c7dce19beb177fe5a79f1632d87fa532e7da131401109
 MISC metadata.xml 620 BLAKE2B 0b56364ec1f6e18cc56a58c0ed36480114d4ff8b3ef90963d1b964f5dbdeb1fa905336e8fdf0014476927b9b530e9f0be9bf70810d02b8437253813d886e7005 SHA512 ab05ab88363c0d3fbb703af5e98180ac925331b81a50061a53526dbcbfe28ca0aae1dfc2b74e0689a494068251f834e54917e9557eb4e00cf52e69a48b998f19
diff --git a/net-misc/ubridge/ubridge-0.9.14.ebuild b/net-misc/ubridge/ubridge-0.9.14.ebuild
index 48fb218aebb8..4ae6e8746b18 100644
--- a/net-misc/ubridge/ubridge-0.9.14.ebuild
+++ b/net-misc/ubridge/ubridge-0.9.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index e6178e0d8cd5..ada24f1ae74b 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,3 +1,4 @@
+AUX wget-1.19.5-fix-dot-prefixed-domain-matching.patch 1077 BLAKE2B 09a341db55d4c0e47007060ba743f11a509526c01cf9815ee4eb9d21c8ae821f122b3ae10047fbfa69e1da407baea799663661e9dbdba0d6a6ddcaf4eda4eef1 SHA512 971b13380dd0a8f60a8ae423ce98798105cbf5670b86445bec67a869ffaf891be7b48a0a6b02e3575459b64f586b2748be8077925f873dc2e1a4bc5467a95392
 DIST wget-1.19.5.tar.gz 4455797 BLAKE2B 988b80090ff1f62cb527afb33c03b7c6a68bbc1649d42f62061e05e416bebf5b2e9546ebafad3c9cdbf1199a8d2b84f4427c921f23338b02631da357da9b3d61 SHA512 0d4964e0f5adb0c023edc831bde9c9f13f3222f6efc1ce93250d234ab937e92b53921624532fb0e6586151ddfdee6df9a7ca91a2a99b3d16e2e68401c625301b
-EBUILD wget-1.19.5.ebuild 3163 BLAKE2B e0300678d97d7b02bf0c0ab13b7c18d7d808b29bbf47f12612b47aed1636772127d141fc3908fe54ff374ddac20dacd01e59dfbae4fac369d0e69d72d423871d SHA512 9c9ce2698901b8342f3db2bf641a35c430c572bf1ab58cffa210a9801c25fbb9e7ec83a363d47d4f5863ba788ad3d1ef676c96fcfcd10c576564034be9f4d89e
+EBUILD wget-1.19.5-r1.ebuild 3231 BLAKE2B c3c1c75e7f9d2df4e40959c481c1266f78a216a7600788bbebc0d51b0c9203f773b469df6e2797d98b71c0c5a5cbf5146134312af7bcbaf2945c5ded3604f984 SHA512 694cedb34e2687c1e69212b96808251446618669ef947c410852435063a1daea0000d3a883edf86fa552ef7e0ee104ed250ee0ab125f1ded47f9112002959156
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch b/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch
new file mode 100644
index 000000000000..129f0b675414
--- /dev/null
+++ b/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch
@@ -0,0 +1,33 @@
+From fd85ac9cc623847e9d94d9f9241ab34e2c146cbf Mon Sep 17 00:00:00 2001
+From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
+Date: Thu, 25 Oct 2018 17:39:52 -0300
+Subject: [PATCH] * src/host.c (sufmatch): Fix dot-prefixed domain matching
+
+Current sufmatch does not match when domain is dot-prefixed.
+The example of no_proxy in man (.mit.edu) does use a dot-prefixed
+domain.
+
+Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
+Copyright-paperwork-exempt: Yes
+---
+ src/host.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/host.c b/src/host.c
+index b42cd6e8..2bf848f3 100644
+--- a/src/host.c
++++ b/src/host.c
+@@ -1033,8 +1033,9 @@ sufmatch (const char **list, const char *what)
+       /* Domain or subdomain match
+        * k == -1: exact match
+        * k >= 0 && what[k] == '.': subdomain match
++       * k >= 0 && list[i][0] == '.': dot-prefixed subdomain match
+        */
+-      if (j == -1 && (k == -1 || what[k] == '.'))
++      if (j == -1 && (k == -1 || what[k] == '.' || list[i][0] == '.'))
+         return true;
+     }
+ 
+-- 
+2.18.1
+
diff --git a/net-misc/wget/wget-1.19.5.ebuild b/net-misc/wget/wget-1.19.5-r1.ebuild
index 15bbc3803482..6db7c1194b03 100644
--- a/net-misc/wget/wget-1.19.5.ebuild
+++ b/net-misc/wget/wget-1.19.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,6 +49,8 @@ DEPEND="
 
 DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
 
+PATCHES=( "${FILESDIR}"/${P}-fix-dot-prefixed-domain-matching.patch )
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index fd4aa7cfd9f1..670c91cf4a3e 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -4,6 +4,6 @@ DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c4
 DIST whois_5.3.2.tar.xz 82984 BLAKE2B 2e2d9ebf2e93831a1fa3e98a2f8922e531592b95175c9280358a37160a9033ee805baa6519304350399c112e619e293a2746df527ef5c580afbdde1542cbef06 SHA512 27d9576ee7b701778cac0dd7d4df2c4ae2d152fa5dfb3f84d7d5d592314e45872b2f3d6eca0754923ec3a0741e5365bf2238b2c0b366403c35e8a5b046e59434
 DIST whois_5.4.0.tar.xz 83576 BLAKE2B fb21094227bc254e7901d0af667206f742657093b2dc25dc066ccb727d07fbc9cef7443f29d0bd22e307d2127689f9fe33e55282e0311f968039bb0fbe48417f SHA512 d6b8f097eaaab216d862503c96aff32777caec3597b357fb2589b86e98c6ff52f35b18ea5f33d1ece23250c61f849daf9943a2895fe563b05fcbd26718b3b80e
 EBUILD whois-5.2.20.ebuild 1503 BLAKE2B c8f9f004b15d47af335cbb9ef8e8504fa5cf1e91c3c8dc35117df6772a3831081b51fd5379a93ed65119219f6657c6a2dbfade35dbdc39fa1080e203aabf82e7 SHA512 ef0fcf8e2a3d4b439644112a2b8e69f56e652f6afd19172d550c7669a34be8ee291944ae7bc74feb0fadaf346eadd9e64d192205b6d3b46a6efd1684268f2452
-EBUILD whois-5.3.2.ebuild 1583 BLAKE2B c2f14b51bc9fbfafb9fb3e7932d511070021e6a938f40e0c6a7cb6162a3b7cd5818de75412150cb8af375cf2e5979ec81d03df1a944564fe559f4e1171e016b9 SHA512 b5c9a274a929b0baf0f7449220dc02979be48825f1b1560a71bb679adbe9c15303fb3a95425ad8a506692fe535232b8542ad445add1cc7597f7dab7b9867e89e
+EBUILD whois-5.3.2.ebuild 1582 BLAKE2B e843a267973f2b3901cc43b931922a8c4d9dcc36971d6bc29f7cd244241a617c67807e5911ad91ba0d7e56bc364dc8a4be7bcdb077a826063ac93e0de5a03a61 SHA512 9dc0fbdec6222d539f01382a694ceb519bb541530eb77ed6bbdc3f93efd817bf699edb6a5576de510dfeb993c4b4f90399cc74b091f4d350ecb6cd2077f980f8
 EBUILD whois-5.4.0.ebuild 1590 BLAKE2B b832b7c82c05efff9136bd6f4ca02c9b482f141fdeff38aa6b72ec5ef5b3cefe74b9a8711f4f358bac380d0c34f2ecd0bb92203c40f0912aecbdfedbd64834cc SHA512 6251dd887631db7394f43ab322d733b4da29f5c012c8398de2f79c83ba57bde18dea0ead4fd6eef8005e48373946ac6ebe88e468173c59d6735175eec65be37e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/whois/whois-5.3.2.ebuild b/net-misc/whois/whois-5.3.2.ebuild
index 1a2a41bfc449..bdac1924f285 100644
--- a/net-misc/whois/whois-5.3.2.ebuild
+++ b/net-misc/whois/whois-5.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index ff2006e10f86..108e1a19a058 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -2,9 +2,11 @@ DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e
 DIST youtube-dl-2018.08.22.tar.gz 3025389 BLAKE2B e8d2d8bccab8c169d08de35544e5efb05c65799c26894807e075edfe090d36de30fea787f54d59e4fc8b671356ce2e1d9002627948fb05becc9d2e3bc634164c SHA512 ef17c744ac27b3bf547124f18a155908a66ee75f3f6fb5d7dd8a1d8da61a5a598bbade6cf0362e8c93c337dcf47750db5f56357919226430f02d0b764011ffb5
 DIST youtube-dl-2018.10.05.tar.gz 3044157 BLAKE2B c65651eebda6bd9c28245415f7aa804c78a74fa33a9717a3e9589734334ed8d12d5432eadd18d55ee46d4b51b1cacbe458c2ad175ed2e135b838fac54d468192 SHA512 b581372522d467b3277d81bdc9978352c720d4f33e0d8249cd0271eb1814a153324a5b34608d88d392bb52b1c57d0a6f425baf8377d5609810ef770839586714
 DIST youtube-dl-2018.10.29.tar.gz 3045428 BLAKE2B cf21d3113c07b7d62a373ada4a366fa61231eb8aa7f14192683451c99cf3f4f59d1abc04053359c2c3b40e7f80cfc2c5325f66a1b73196bb561a2244988f5114 SHA512 86f94acc888084348466d8aabc3711f25cbeb28c9a7afe08dcf23034d3b43d0e0a9c58dab60fe9c7eb2ab8ce2e3ce97b849e1eb11f547d173bb25dbb9df1b39f
+DIST youtube-dl-2018.11.18.tar.gz 3057924 BLAKE2B eb995cd269c3febcda950d87466df85a31128aaf95dbbd1cb9ee3d329610ffae3194c57f5063b47e49de3e387b5f60a5e10c237dc5d944ce47a6cffacab31935 SHA512 47e503c18f2db948beeda6a61b034953fab61d7d122641be7564a0f6dc0fe66ff93d6ef436c2acbcaf7255248a0b53e4df8c5ed1efca1139dc518a3ffacb737d
 EBUILD youtube-dl-2017.11.15.ebuild 2365 BLAKE2B cff79a16ba920a6b85b9e7970a12065fade413701a7b0fbd86e739887ea86dde832e7d9344f73fef2480e32d689c8c89ed3926afc9f2cf702b9385550dd38c04 SHA512 5be26dbc448c37d37db450f7b70aed88124794e7f80ba584485ee99fdb6288093e5bae05ca8b2e58eb783b7a398fc5b866728711588d43da6bf46c07f47bf1fb
 EBUILD youtube-dl-2018.08.22.ebuild 3286 BLAKE2B 998db6c1bf8f4bdb39152fa75712e4ebe98a9d69422b464328da90fb986e8ea07ddeb9e90cbff52dcd8012cce96ab06e48d7e4c87e6a660cc5fd90dfa5bd731a SHA512 927eab9548db77ce0a3455023a2f85bab64a0dae9a03d09d8b1ce96ec891bf32e49b2b2292abc5688db940eefae51473918df6449469f054a859820398782a11
 EBUILD youtube-dl-2018.10.05.ebuild 3439 BLAKE2B 2e9fcd2e40f815a9d75bb7adff01f12afa5345c027f5dc55b9e20b30a3055bef402d66361048a9cc6cb71e1e6b3982e3b059bee837fb8d36c886be616d078490 SHA512 b46ab94dffbea58076d3b83de105a1c51ed1ae2213ff9b26b074cdcc41ec8ed97223baf92aec78ca2c56d0614826893a01ee0ca8e2e5667561dc43fec12ebbca
 EBUILD youtube-dl-2018.10.29.ebuild 3439 BLAKE2B 2e9fcd2e40f815a9d75bb7adff01f12afa5345c027f5dc55b9e20b30a3055bef402d66361048a9cc6cb71e1e6b3982e3b059bee837fb8d36c886be616d078490 SHA512 b46ab94dffbea58076d3b83de105a1c51ed1ae2213ff9b26b074cdcc41ec8ed97223baf92aec78ca2c56d0614826893a01ee0ca8e2e5667561dc43fec12ebbca
-EBUILD youtube-dl-99999999.ebuild 3306 BLAKE2B 7bd4ace3451b5edfef9e1ec119fc76b903aff5263e56a556334ccdf9df33fb223f3490de38edb61ce60e78efa5bcff7b8b3de144152db729b25b9ff58d9fc51e SHA512 ce0d4ae78c44450821d42948736ff85c78a84a1f96857588d18d0c43ac82dc55514c5d3b4b489ba6684565c800676231badab8e892f5b7110831432d6bf8807f
+EBUILD youtube-dl-2018.11.18.ebuild 3441 BLAKE2B ad19ee4cbb330369e7a007d43d9c44c3cf2ce2f2ecf6d0900d47aa8bff6940a5a6700e600391b2b155b0dc4128dbcc9d779ef72cb647c34f523c715dd22c8e2d SHA512 549810dea84371496b5d4c284949c9d5f3fd6aebc126223a1f7b03b92dfe1f4f2920c15224b774bfbb1ed0278256dfb4c8b1df86e70cdb4ba83cc5906c228c04
+EBUILD youtube-dl-99999999.ebuild 3308 BLAKE2B 6bf8e21c62c0da4f88a67f785a7304ea014022db3872fd1ff678184e2142e4d9337387287c925a08d783b5b5a0b9cb679320df27abb3f1145f577b7370c42c1d SHA512 31c0050ec83f3261432c8fccfcba7986019ee8e72655ded191053d08c7d209f7cf74fa6455d2565fcde061cc31a2e9f03fa550d24aed3090c672064731536410
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.11.18.ebuild b/net-misc/youtube-dl/youtube-dl-2018.11.18.ebuild
new file mode 100644
index 000000000000..c28ce5a6c074
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2018.11.18.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="+offensive test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+python_prepare_all() {
+	if ! use offensive; then
+		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink camwithher chaturbate eporner
+			eroprofile extremetube foxgay goshgay hellporno hentaistigma
+			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
+			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
+			slutload spankbang spankwire sunporno thisav vporn watchindianporn
+			xbef xnxx xtube xvideos xxxymovies youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	eapply_user
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins youtube-dl.zsh _youtube-dl
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins youtube-dl.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index 62abae9c2005..4de5d95c46fd 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
 inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1