gentoo resync : 08.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
commit: 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree: 2878053f3e7faed19a1f82c733d3bd29df69991e /net-misc
parent: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)
50 files changed, 613 insertions, 1004 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d6750277d8b4..25e14e369c0b 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index 58b1bdd897d2..6fbc75f83e6a 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -1,5 +1,7 @@
 DIST cni-plugins-0.7.5.tar.gz 862670 BLAKE2B 17734beabde562cfd52efd479cb24805681a3d8a8abd4fd9fdcf9dbd891b2d5b3026b84a880355388c893db147fd0952786a86716438e140a46cc9a2dfffe0c2 SHA512 7ab43f88b4763907f56ff26d684385e5a3f6314ffb4bcbe356ec33a014fc15207392bd26e2d3041e117c604a386d21841a37d093b04e003303554b03721b32c6
 DIST cni-plugins-0.8.0.tar.gz 3249919 BLAKE2B 78c0b20c3745d8ceb3596b65a57323cc3baaa4ca02bed6de2bffeb5dbc7075f86f536faa5b75ad1bc05c359b2d9add8e6084831110337c0df08665b252eb8413 SHA512 de685a66e0e875e8a2209b76c5d1f5fd0e426804e3db6084cf2e89695a8b1876eae47ff1fcfdf065a3b027918fe7c4775d2321358402dbd1206928538edb52b4
+DIST cni-plugins-0.8.1.tar.gz 3253670 BLAKE2B 7de5b53e310b496137c0ea0d6b4d22d5604e49fb4ada456eaad377a0b20d0b8883e7420a8d5f8cf92922e98b493608d495126772fd4205e4efb42b784fe3cea7 SHA512 ed57162fc3d014c897ee2f7f82b738624ca42ad7c238ac6ac5c1eb9ac865fe27f8ded1510cfb131f7b43e44f6cd0366ab83011386bcb6add36ea11235767760f
 EBUILD cni-plugins-0.7.5.ebuild 1070 BLAKE2B 752d58ce8af422059a73dba9dcf25c3695f63fc12b66ceca111c16b0a82b4c419256e454f6ef2618d2b2766d9419ab8fcd8b18c2115542e8c07be98cbc6f7d9f SHA512 da1505026c64b785ea08445748b5f262a4b1a078a220781f367ade8d7b61774829b6c0beb277cb9a6a53a9ad946c1538cd2d6c7e6b23de29c222bca03e7d9364
 EBUILD cni-plugins-0.8.0.ebuild 1131 BLAKE2B 16a64477e9238bacf2d3826ea9da620b2fea26dcb1f49fd61779f3c510d936f81bb7c9c8e82da7e2eb411eb6d276a4522d8e6f050175e45a82e27694ce4e6920 SHA512 2c8a59a874f191a5a6a7d6d367472ada15ff09c65c734df2943897398dbd06f4f6cec975ebdf2eee3c1fab2daa538f290c44c817151a2375a1cc4ccf83d0d495
+EBUILD cni-plugins-0.8.1.ebuild 1131 BLAKE2B 16a64477e9238bacf2d3826ea9da620b2fea26dcb1f49fd61779f3c510d936f81bb7c9c8e82da7e2eb411eb6d276a4522d8e6f050175e45a82e27694ce4e6920 SHA512 2c8a59a874f191a5a6a7d6d367472ada15ff09c65c734df2943897398dbd06f4f6cec975ebdf2eee3c1fab2daa538f290c44c817151a2375a1cc4ccf83d0d495
 MISC metadata.xml 347 BLAKE2B 3028c057ca5c58bc39b10c01e9989088f0a2498a5a95a1ada88517dffe62daba52c8e6ead2fc8a7245ae06a95ffbc9306de03eecc82464ae0a6d2fbb4cdfb99b SHA512 b977f4287446648ff730c36e71002f524ae9a96c3fb104ee8542da90f6f996926a9b9809007f285e930d79842d9663cf4e462e8ee50da8319dcd3e07cf6dee05
diff --git a/net-misc/cni-plugins/cni-plugins-0.8.1.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.1.ebuild
new file mode 100644
index 000000000000..c8c1659634b8
--- /dev/null
+++ b/net-misc/cni-plugins/cni-plugins-0.8.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 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/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}" || die
+	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/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
+		newdoc README.md ${i##*/}.README.md
+	done
+	popd || die
+}
diff --git a/net-misc/connman-gtk/Manifest b/net-misc/connman-gtk/Manifest
index 5febe08dbaaf..894fd5f5b223 100644
--- a/net-misc/connman-gtk/Manifest
+++ b/net-misc/connman-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST connman-gtk-1.1.1.tar.gz 61789 BLAKE2B d04d508b5bb03abe78c9b6734df919b6589cea9e7f38c41059210e62795ce79a17b6ba8b3ab1b0c403a43fa2712893bc0d00b1e5f15d9910ca45108b9e760e12 SHA512 78fd41a37370c76f118e3fb8a707b96fd6bf1234a8832d047302d4b0fa350f87316f6e2e749860b2cdf0ff6e6eb76e4d7d398dc7fc084403ca2f8682d2907553
+EBUILD connman-gtk-1.1.1-r1.ebuild 929 BLAKE2B e6996df7e8ff5b678c28f2377c20ce6eb3ce3b3d2667b0ec28c3aad8811a5136dfe3936d49a0e3aedc5555836aa6c2fcf11b28f7e9756d2ce45a6537250e49a6 SHA512 ca4578d8d480b9a59d67297ecf4620251b540ffc38a9d6d022c7485c9698f8b0e26a48b15d50a388bd168c2ef638b34528fe628535fa88f23655dcd71cc15464
 EBUILD connman-gtk-1.1.1.ebuild 939 BLAKE2B fbf8d281f22cbddfcac61b734121df5479d89e3c4c8027751d49d5bec9cb835a9afa81143cea2986db16ca44e0567ba618898d85be6be070ea66f5e462211aa6 SHA512 628b59ca685ec0d8007fa244cf893f7b05ba44e89ad1d10f5cedb7ae9b02a58ebf3151f0dd2e2f532bf8d3f429f75f5d31651dea086257450756bb40270f5296
 MISC metadata.xml 488 BLAKE2B d55fe987103c9440307fc9db557cbb4c6add9b960e642b0d6f5735aafec2a29156a0a4ca6d51bb71c4e238bd897430e4e4065383b88ffde803bf53aae99d1314 SHA512 f84f35958b032afd49633c59fac3474148d01becdf968d62747c8a2d99aeec4f90cae7242b7f7fc00cee2903a9188bdc206308a7d692e136317959ebf9019867
diff --git a/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild b/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..3888b84171b9
--- /dev/null
+++ b/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools gnome2-utils
+
+DESCRIPTION="GTK GUI for Connman"
+HOMEPAGE="https://github.com/jgke/connman-gtk"
+SRC_URI="https://github.com/jgke/connman-gtk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="openconnect"
+
+CDEPEND="
+	>=dev-libs/glib-2.0:2
+	>=x11-libs/gtk+-3.10:3
+	openconnect? ( >=net-vpn/openconnect-5.99 )
+"
+RDEPEND="${CDEPEND}
+	net-misc/connman
+"
+DEPEND="${CDEOEND}
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	sed -i -e '/^Categories/ s/$/;/' connman-gtk.desktop.in || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-schemas-compile \
+		$(use_with openconnect)
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/net-misc/connman-json-client/Manifest b/net-misc/connman-json-client/Manifest
index a9eef2b8d808..995df32838ba 100644
--- a/net-misc/connman-json-client/Manifest
+++ b/net-misc/connman-json-client/Manifest
@@ -1,3 +1,3 @@
 DIST connman-json-client-1.0_p20150721.tar.gz 55520 BLAKE2B 81f81721563bb8a7c4e604e8a036b162329f1334092f345438c34f787bceb8e548d69e0c206773b880799d1327858275bbbade59d1b84271e4fc05372937ce7a SHA512 77cfbc9f1b57ff5ce73a80f42198bbdb7120db6510f3f33251465ed83d1fac3b2bb41e3959f43cc8d274d37c8da375009a07e9003664482136eed64f5b32c0bc
-EBUILD connman-json-client-1.0_p20150721.ebuild 632 BLAKE2B 874ff335e644331f90cb87c7b4f2c1ad859a9aeda24308b120fcbc30e744547b809eacb1238bb6d42cf1ab2005cbb15e1000b76e550de36ab4a32646db9464a8 SHA512 b903f479f5527ce6b63810427551925695c92aa306ce1b074e8200e721e5097ef0b91a507e37f501ce26a23c2330dbde2a243e22571cb088d641917488de9980
+EBUILD connman-json-client-1.0_p20150721.ebuild 688 BLAKE2B 8ff4b658ab133591302bcaad1e0b326e3526e7322538f63350edbf0e94818bad9cfc74f3cda28cebbd50e52775400ed5c026cfc1e3124a7fcbe847f290964d17 SHA512 c7cd3fcf259ad093dc6ce3390ffcce967955207792aaa58f6ada4ea26d1bb3b01abcc0ae126d78b0a28062ff40591eaa36a8f8b6e584986b4ca4dc094ac9527a
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/net-misc/connman-json-client/connman-json-client-1.0_p20150721.ebuild b/net-misc/connman-json-client/connman-json-client-1.0_p20150721.ebuild
index 7b6aee326311..72908de1c1d7 100644
--- a/net-misc/connman-json-client/connman-json-client-1.0_p20150721.ebuild
+++ b/net-misc/connman-json-client/connman-json-client-1.0_p20150721.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,7 @@ DEPEND="dev-libs/json-c:0=
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e '/^AM_CFLAGS/ s/ -Werror$//' Makefile.am || die
 	default
 	eautoreconf
 }
diff --git a/net-misc/connman-ui/Manifest b/net-misc/connman-ui/Manifest
index 4d7bcb847770..34f78cc20314 100644
--- a/net-misc/connman-ui/Manifest
+++ b/net-misc/connman-ui/Manifest
@@ -1,2 +1,4 @@
+DIST connman-ui-0_p20150622.tar.gz 235391 BLAKE2B 93f3afd3e032dceece8b57c7bfbd2de29c321b9c19b9ee6afe162e78dd0fe47cb2e86c49f585970dbb69dddbfdfc0e824cbeaeef61c3ac4809332dbf458f950c SHA512 2cb8d9620e8b695d59782ea6ed0a1f550f61e1ffd2ef5cb3c239b0ed1050432e4b09265e655a41368a933f164df09cd5491dd970a36528c33c0d1b0c4a16128d
+EBUILD connman-ui-0_p20150622.ebuild 674 BLAKE2B 0c8ac2632ecda19eeec1f6daf2961284edad6ee7b02605f99cf51ba63bf6d880378e892464584f7fe2cbec19d30f970c2c523b1f34913f7df5f424cd61558142 SHA512 769defaca0158a60c32566c25d52adb195a247f9b1ef085abbbaaae803b98197a9267c5e9155e8d5af8081f61c23dd56e2b691e6aacb8fff80868ba99d235124
 EBUILD connman-ui-9999.ebuild 578 BLAKE2B 0e72abb0744a70b0b630cc36a40d5c44e464c9f3797561933816e110f659993c5651a06265536b242d8a9bc6e8fcfae74c997c6989c4af2432e52bd3f632d68b SHA512 2d0373cc51dea97eb2fe0898c5a80ab0c736305975ae19f5cc081f52aaeb190261281eb66148f7056a57a0aaf3003eb8bed024f538ad5922fb4f5454351eda12
-MISC metadata.xml 999 BLAKE2B 445051f73d5754d4e0e8d0ba155394ee3963672ac03e424224eb47c7178dda1400788264223a524c758ab36db2fa3d54784d553881533d612a2d30bf4a582a22 SHA512 f2ee1dff0f52ba40b32b987ec10d561e0761768253ba48152e1f189a362b2f2f6f2a15a81f63dd972765bb397976f618cc3899178de304f9e645a987e59a46da
+MISC metadata.xml 1076 BLAKE2B 74f5f03bbe8d2883fe6321699fc0d6b7efe724458446015c34384d0ab18e09491f3b28436781e3ca7c97c3b829ca6edf7941676174a94d1f68e1e8f55dbacb3b SHA512 acf7e7b3b4dba13c1e7a410ad48adee2a8dd5ff60cb7dd898ead26552c5f6121b9e26180ff1e5cee981ef15185549ac983dbd125027ebfafc2e3616f76ca36bc
diff --git a/net-misc/connman-ui/connman-ui-0_p20150622.ebuild b/net-misc/connman-ui/connman-ui-0_p20150622.ebuild
new file mode 100644
index 000000000000..a1a5d26d62e8
--- /dev/null
+++ b/net-misc/connman-ui/connman-ui-0_p20150622.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools vcs-snapshot
+COMMIT="fce0af94e121bde77c7fa2ebd6a319f0180c5516"
+
+DESCRIPTION="A full-featured GTK based trayicon UI for ConnMan"
+HOMEPAGE="https://github.com/tbursztyka/connman-ui"
+SRC_URI="https://github.com/tbursztyka/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+CDEPEND="
+	dev-libs/glib:2
+	sys-apps/dbus
+	x11-libs/gtk+:3
+"
+RDEPEND="${CDEPEND}
+	net-misc/connman
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-misc/connman-ui/metadata.xml b/net-misc/connman-ui/metadata.xml
index 4788bbcee525..6e06e1680923 100644
--- a/net-misc/connman-ui/metadata.xml
+++ b/net-misc/connman-ui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
 	<longdescription lang="en">
 	A full-featured GTK based trayicon UI for ConnMan.
 
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 6dccbd44d114..b1d7be96c3bd 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -4,10 +4,7 @@ AUX connman-1.35-include-ifbridge-before-netinet.patch 259 BLAKE2B a6c5ae9bfb61e
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40
 DIST connman-1.35.tar.xz 686092 BLAKE2B 706d8333dc2fcbee8d0ef3849325c4975dfe312a7a542ee96859a1724e05b1302c244a0108ab70033b398301c235fb13cb9509e9147dc2bb049e900f3799cd98 SHA512 2234b4d18b038f9a33939035cddebd31c74ce962e5616c2c30b2912476612ef3f7d5b9edca64bf6e69fa358252ed432124e036ac3516b291b86695cb9a96c6a8
-DIST connman-1.36.tar.xz 692616 BLAKE2B 7d8cea55365fbfe78cd897b5b65d8edf475a737220732c46c95dda4c6b12badddca38150dbedddcc95c29bce486d86fe130a9d65043c6e18ed6b1eba3fe5aec0 SHA512 c0b9e924a28d58539d44c314168ae7aa46dfea8ce9d125198f525a6d6ef95ca77fd0357c4c4c7548b362b9de8e6f85c7915b1a4cf89b65116c4cbc4df75318e1
 DIST connman-1.37.tar.xz 707752 BLAKE2B ad8993764a444d205b0a8cf1ad38acc249a1a28014e6f4e5a89c8662194ad2e2ee6091b51445b88a885808461413b3aaf88eeb7b75a32f417b578d2da80a2e9f SHA512 5d5363105aedd0c9d609dd5c64eb832d9ff80923a944d9d3738337a61f180ded227f2ae1ff7912bed8826b35f0cfd20488e3ffd3801f0e53e90f98498e19efb6
 EBUILD connman-1.35-r1.ebuild 2555 BLAKE2B 7369ceafa9bd072bd8020da45453bd07ddacb10606bb3d61ceddfd3367b15bdbf890a00aa579536d548b52fd6c6656d79cdb31d290d2ac6301a6f04ffbd0724d SHA512 640be0029a8c6568a47973743f968cc641a579523f4288cc5ac0347b72721f547f608729c2865b2a31e15394e2c85a18b360936e082ac3f7069296e9977870b8
-EBUILD connman-1.36-r1.ebuild 2587 BLAKE2B ed3365fca807716a3e51e4ec9dc6b24baa144bd9f48d72e5d68b30a512663e9ba0d3497d1f8532a3b3d260d546df37f489b1c7fdb7f1d70931bd3043a9a881ea SHA512 4ba0e07568052cea00aeb6ccb8dbccc4e339712ddbb8c2b22716659298afd09863de1a2b3f1f3325b0ff40e24d8345fe1fc408085874a8ee5897be861df3bfdd
-EBUILD connman-1.36.ebuild 2568 BLAKE2B 902e767beeeb20850f0387485444905ac4b607dbdcca5fe73b4db808df7534829d2a2ccec1636c1ecaf8cbcc0c60bea9dc8b8865d8da13b1d748fd778a62d551 SHA512 f9c93a7263ce7d683dcfb6e1fc2d6798a222159bdcaf432ab75fb37d5c8a37e200ad6ad2ba5efef8438eff2eaa486545d4593817aa9ff3532833c1a15f9acb27
 EBUILD connman-1.37.ebuild 2585 BLAKE2B 2424e663462e696811a50892a495837113fb013f3ae3220763eef2a1794608a3d904f505cb775734eadf69731a965dfe1a0b397162a45e5f306399910e3abd32 SHA512 b946271739eddfa7451d1da1e956a485a9fe201ccd7cc8a90b82751fc0fee9d4ea0285feebd8825a1a3b50780c75533ca53a3e111e9855eeb9f573e95985750d
 MISC metadata.xml 1158 BLAKE2B 57d083417dd0b186b1d45368f1ffab64d6283535ae6f25adfd6cd85d26f535544f0b89d7f731dbb876ba7acd1973abdd26ac7643c050adc9a433d321ffc9fb57 SHA512 2d272d638d9f9f06eb900736815eb0e401520f3ad86082beea541932626c5758e220f692931772ecafffbd60798f0df38e8c9e8a02b58c03743ed984955edb8b
diff --git a/net-misc/connman/connman-1.36-r1.ebuild b/net-misc/connman/connman-1.36-r1.ebuild
deleted file mode 100644
index 376b73082b7a..000000000000
--- a/net-misc/connman/connman-1.36-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://01.org/connman"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE="${IUSE} bluetooth debug doc examples +ethernet iptables iwd l2tp nftables"
-IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
-
-REQUIRED_USE="|| ( iptables nftables )"
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	sys-libs/readline:0=
-	iptables? ( >=net-firewall/iptables-1.4.8 )
-	bluetooth? ( net-wireless/bluez )
-	iwd? ( net-wireless/iwd )
-	l2tp? ( net-dialup/xl2tpd )
-	nftables? (
-		>=net-libs/libnftnl-1.0.4:0=
-		>=net-libs/libmnl-1.0.0:0= )
-	ofono? ( net-misc/ofono )
-	openconnect? ( net-vpn/openconnect )
-	openvpn? ( net-vpn/openvpn )
-	policykit? ( sys-auth/polkit )
-	pptp? ( net-dialup/pptpclient )
-	vpnc? ( net-vpn/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
-	wispr? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-systemdunitdir=$(systemd_get_systemunitdir) \
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable iwd) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable l2tp l2tp builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openconnect openconnect builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable pptp pptp builtin) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wispr wispr builtin) \
-		$(use_enable debug) \
-		$(use_enable tools) \
-		$(use_enable networkmanager nmcompat) \
-		--with-firewall=$(usex iptables "iptables" "nftables" ) \
-		--disable-iospm \
-		--disable-hh2serial-gps
-}
-
-src_install() {
-	default
-	dobin client/connmanctl
-
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	keepdir /usr/lib/${PN}/scripts
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf
-}
diff --git a/net-misc/connman/connman-1.36.ebuild b/net-misc/connman/connman-1.36.ebuild
deleted file mode 100644
index 78b5dc5b9197..000000000000
--- a/net-misc/connman/connman-1.36.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://01.org/connman"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE="${IUSE} bluetooth debug doc examples +ethernet iptables iwd l2tp nftables"
-IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
-
-REQUIRED_USE="|| ( iptables nftables )"
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	iptables? ( >=net-firewall/iptables-1.4.8 )
-	bluetooth? ( net-wireless/bluez )
-	iwd? ( net-wireless/iwd )
-	l2tp? ( net-dialup/xl2tpd )
-	nftables? (
-		>=net-libs/libnftnl-1.0.4:0=
-		>=net-libs/libmnl-1.0.0:0= )
-	ofono? ( net-misc/ofono )
-	openconnect? ( net-vpn/openconnect )
-	openvpn? ( net-vpn/openvpn )
-	policykit? ( sys-auth/polkit )
-	pptp? ( net-dialup/pptpclient )
-	vpnc? ( net-vpn/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
-	wispr? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-systemdunitdir=$(systemd_get_systemunitdir) \
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable iwd) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable l2tp l2tp builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openconnect openconnect builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable pptp pptp builtin) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wispr wispr builtin) \
-		$(use_enable debug) \
-		$(use_enable tools) \
-		$(use_enable networkmanager nmcompat) \
-		--with-firewall=$(usex iptables "iptables" "nftables" ) \
-		--disable-iospm \
-		--disable-hh2serial-gps
-}
-
-src_install() {
-	default
-	dobin client/connmanctl
-
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	keepdir /usr/lib/${PN}/scripts
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf
-}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 5163b2e42090..aa2c63b639b8 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -4,7 +4,9 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8
 DIST curl-7.64.0.tar.bz2 3012077 BLAKE2B 512edeaa7a4ff3a998903771307070b08f1dc53bf45b4f0c98edd78daa309877e1856e1253a3582b3db35d2ae877af5aeedf2fb2741bfd8faed3bc4525880581 SHA512 058da4c63a05f704de475271f37fb99ca90a67a919b168e07958ed45d10cb3d03898ea6e3452ffb1a1f1e5dd5915f08a2993024b12233919f3c46c036b9c07e3
 DIST curl-7.64.1.tar.bz2 3000536 BLAKE2B 787b9f9662dad4e3497357dc3f9cff0fb2c997e2603cf3c621633d9983fd011c346640be5227ddc4b363bdb7e1a64532a44ae9d5ccc27e405275e08f150d63fa SHA512 e04532d68896b79f28aea3b30aec2d5b53076d0d27c8f6404769618300828eed96633e7bd5945125bca76241bb1e169f5002ac9566108bcaddc8c51b513106b6
 DIST curl-7.65.0.tar.xz 2392324 BLAKE2B e5aec8c6cb6f6baabd035ce2ea159dba1541011658892bb883e917541aaffe6ebfb0d2b9f18e2357059a7bc1e3a8db47b2aed7a74597b21c14f0892ad6e9eb68 SHA512 032c065c1d4bd07ba028625f8fab6a09e7cb8505a5f19339b3abdee5a9cda7d091c11f075fe3fc227d082690a66c558c770a4cd9fb17b52acc13794976a770c5
+DIST curl-7.65.1.tar.xz 2392672 BLAKE2B 96519ad3b342944d2e6ae645a8435ba902e319830a95a2f873f4ab71cf2585daf98b5e44509dd394eaa6db71ac3d2cc6dd9e45deead7021e5d2e96db5de295ab SHA512 aba2d979a416d14a0f0852d595665e49fc4f7bff3bee31f3a52b90ba9dc5ffdb09c092777f124215470b72c47ebca7ddb47844cbf5c0e9142099272b6ac55df4
 EBUILD curl-7.64.0.ebuild 6857 BLAKE2B 768a2b4559ba419b7211ae44edb63eca018f2bb98a078c05c9eae2f5be74c76501dbe78eee0372e64bcbb5a462a698959533b57d944cf83d40c8140e59b07b02 SHA512 2aa729057a5fca87b89cc412a157c67a02fefc172b374592ffdf832cc8fe88f9648958abb7534bf57e96fab8f14c5f3034688c242d5c660d8d7841112d727cda
 EBUILD curl-7.64.1.ebuild 6976 BLAKE2B 703d33296158e3e7514588080c11308926d9ae246c416e993a23e623ea6c846e8ad50dff2624e4c9e7d2c228dd165716909c009a5f9a11243589f13d19dfa499 SHA512 5eac3bf04054a2b7bceb22a7840cad1b6c04743bf02d468e5ae9789318f3dd087ae0f8dd3dc6da0ce23c48261cb62d756c1b75cb92cc83f9ea22d21bfb0b4052
-EBUILD curl-7.65.0.ebuild 6978 BLAKE2B e8fe53f65319cebd690aadace6fba8e2baf5b1245f21c63f0b2d9cfa272232587b505d053fdd6bdcd6d2ef33bc8ffd71b201141aeb99c8c87337a182d0696b62 SHA512 8d22f79773511915adfb5da91425dbde36b5766f4dd8749a9a8b0de986e48a753d7818a9e8340ed0b0c8795c09bd3bf0738686cf397ef409811f7f514ef6184a
+EBUILD curl-7.65.0.ebuild 6976 BLAKE2B 3514cca4b250cebd505d4f30a8cc99baf4675108e8912dc477151b9e2a3ac27b0da3741246340e4a4a57728f7615ba6b7d94e8c4370c259537d948f311b274e1 SHA512 c0a0848bfc8fcaa82a08c32636883bf6bfdfc74bbeb1e05186ea640558becfbb5df5ea331f1627de18b1196ee5a0b9538f26412e5a8b5dde0148477985a5ee7b
+EBUILD curl-7.65.1.ebuild 6986 BLAKE2B b060aef8e919418996ed1815507b500c93dfb886565e184414ce968515f5ef8316cafb4232228fa6b3466583adc613f1fd6f55e83580d64862aff4e94c84fdad SHA512 ea65a7aaa2ba8b3f2931a4726cb3756fe14adcb8a44293ca3bd09d4b2482c272470e5f7b89f818a9a88866e81b1602049a0cd34678f7a4599c0705b383d3ae3b
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.65.0.ebuild b/net-misc/curl/curl-7.65.0.ebuild
index 7af6f7acd4a8..919241dde98a 100644
--- a/net-misc/curl/curl-7.65.0.ebuild
+++ b/net-misc/curl/curl-7.65.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/net-misc/curl/curl-7.65.1.ebuild b/net-misc/curl/curl-7.65.1.ebuild
new file mode 100644
index 000000000000..3c1b6b01820d
--- /dev/null
+++ b/net-misc/curl/curl-7.65.1.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-alt-svc \
+		--enable-crypto-auth \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-amissl \
+		--without-cyassl \
+		--without-darwinssl \
+		--without-fish-functions-dir \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-schannel \
+		--without-secure-transport \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest
index 5cec39b83bf7..a7879344c8e3 100644
--- a/net-misc/ices/Manifest
+++ b/net-misc/ices/Manifest
@@ -3,5 +3,5 @@ AUX ices.initd-r1 307 BLAKE2B 3dc8638cb74d79ab772c3618812fac27ab856f74e39c8e5b6a
 DIST ices-2.0.1.tar.bz2 273805 BLAKE2B 9001a37e6b0536575019c15fb5ecf63abf9bfefa2acdef3de29fd9a639e930fc904f50a8654f38c0a9b2f716f5d01732ec3c0542224bd17c83e8c6732e214315 SHA512 324a50c01513221617921805e0d2d37170751a7bbfc331c988eeedbddebc2dcc62aaa1ac75c3ebec253589ba7be7dc6580c0c57689450730a68f99e6bc1abcf8
 DIST ices-2.0.2.tar.bz2 293818 BLAKE2B d037c6ce6e5d009a12fd9d8efba321b87562a0d492a5191a93b3ff991c1252af1aaa21c41b8171d6eaa9f518712d893b187765cab5a7a9de3560231ec4315b67 SHA512 ff257b478a7237886ba59bf7d1a494ebd4c7c12fd74e8e10c00ea65710249ead1b5b1ae8d9540fab05f2e4486949c6e350f3da59a1d1bf261397ca257806b2c7
 EBUILD ices-2.0.1-r1.ebuild 1011 BLAKE2B b763f054f1a86bff645c4518af413d80259db90e8c94fbb79fcee9c6bb64607ee55558f5a7ec435179b4dfc26de35ea9c9caae8ea4f54bd7b839c92a0062d338 SHA512 6233805e0aa9245fc6ea061b4c3cc4ff131e5fab5d618dd226c6e3e0bbf6d28af30e7da4e12e7fdfe9436cb50fb523107b5fc83cf6a6c01ca1f949984a8d41f8
-EBUILD ices-2.0.2.ebuild 875 BLAKE2B f97aa4f3e18f8c43755140fa60eef43d6cd171cacc2279473e30d414d457c029222b7a6b65c0eabd6c879ede833fc4474a580099558a1cdf518513f6489a58b7 SHA512 d639be1d54b8f1813adc1d10ddafcfbed7f12ff5cbddeffab346a44a539d1c4429b6fab15df9fb72b94f0c7496c29cf066f69f557bdac8d97f382cba16c2b265
+EBUILD ices-2.0.2.ebuild 874 BLAKE2B 5e1af207345457c8bf52f773e1a019a9f585b307f602328bff741af237212bb4e9ed534d0a5fdfd127473c11c627c48e3d12a923aee155ebfb3a56aa4c3ec460 SHA512 66b4fffeba2a8bf562a3a60f426ae0f50f96b745f6b19e0cea65e05266dde4d3453d82cc9452d6741ef1cc535b97e49303941b89930d99a11db10be04873e812
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/net-misc/ices/ices-2.0.2.ebuild b/net-misc/ices/ices-2.0.2.ebuild
index f4104ba1d73a..823347eb42e3 100644
--- a/net-misc/ices/ices-2.0.2.ebuild
+++ b/net-misc/ices/ices-2.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-libs/libxml2
diff --git a/net-misc/istioctl/Manifest b/net-misc/istioctl/Manifest
index 00e02d9a5d45..a46a6c5714ff 100644
--- a/net-misc/istioctl/Manifest
+++ b/net-misc/istioctl/Manifest
@@ -1,7 +1,9 @@
 DIST istioctl-1.1.4.tar.gz 20705247 BLAKE2B d3727dafcfa8a630a02040fe452a3a2b6c89d4dc2ede4128b9906adf21d97e68f8b126783d248239416a459357bee72ca0f2af19a6d34039ad59b3ade6f3b6d1 SHA512 e866fcad482ef605e4126fffe421eff7fbc1733e5d949e2ebe846f790d8825bb79d5360fe48d29913f0b015c15bc1aac224ac9f39e4e7d5948f2dcd5042570a8
 DIST istioctl-1.1.6.tar.gz 20707819 BLAKE2B 0ebd34873e6ff1fec2413afed8b4fe80baee8e9bec55bc2fab15b25266b404fb05fce6bfd0e122c5eb3fa661f5633a431aaa3042ad6d12caf2c4feb58bdbaa5e SHA512 62b9b96547af6f8050f934e4d620ab1990afc805c0abbdbc7933220d28676542222b4452f8207dbe5976116bfe8ae557ee7545e1859b0ab22d9c0c2510950fca
 DIST istioctl-1.1.7.tar.gz 20711283 BLAKE2B 5c6d54ab033f0dba19377d0ca1a88a57e319932c91d3c2c1f3ad9fc112f11aec481e4421b958490e5b3c24d3be6ae68dbc7122e17a7463585a052e225f77ae5b SHA512 8a00efd3fea05d3b28225bf6d58d46769aa7576851df849185d62a14ef368980df765d3c5b1d9c59dff7f0034259e62fe57bc119b66cecb220513f7b94500cef
+DIST istioctl-1.1.8.tar.gz 20718514 BLAKE2B 20b492932906bab3d8fd2e66452acf42a3b8fc07bb42e95217410b32ede68f2dc4256f4e33b104428996a3cfa2f30c798ccf2cc3794079c8936d353330763c88 SHA512 907bff4a7239e0e615fcc3ea92c98d944916dc88c744d574b5362e622729e8fb5a79e549a7f0beece5235918d7891ef6283e6b1e3f789980450d7eee1e131e2b
 EBUILD istioctl-1.1.4.ebuild 881 BLAKE2B 2469a8a5e01cfd03c46dd36ccea76f55245d0f5c6f4138dd091344d78e6e6bc3012b1865bc8b3544b50e20d2d90b256ea50e49631d5bccea32feaad198e77673 SHA512 42e2248f54be2b555c8b3fb5b889edbb999979b97b75feb0595c9974345c04fab4475d60fc0f237701af8d4001a6c8099db5a0364c684739c891331528b65c5d
 EBUILD istioctl-1.1.6.ebuild 881 BLAKE2B 3d0da6dcd771988cf424595f1909c2801a792aa84077e0d384e6dcc10b090a5551ee9c564fe4478fee21303c46bf2b3d8a777bb992696e8ed8d3a10a98973e6e SHA512 d526bcc73da7aebf102533e6f87e20b59da33a94efefcb218353085a097b2d61cb2cd77e98b208d7bc7212d2439389834678110b0c1c7599af169f959c5aa72c
 EBUILD istioctl-1.1.7.ebuild 881 BLAKE2B 7f43a2eb6cdb29533b604826aa7051c24fd51690afe8972bee6de9bc9ca8605243fbd740b74e550a12cc54db7b4fdc5c754c8f849cfc0156a141d98ac486ce6e SHA512 9f1cb38ffd5cebca846d843f255a419588544ef7afb99c3d1a67816db69dfdd00a0e9d4e4d5c27f66328f21430ef1bdaf6b0ee3d0ffc23002095365aa3f40e04
+EBUILD istioctl-1.1.8.ebuild 848 BLAKE2B 685fd155192b5f99a7f04ecde94b2cc0c019dad6ca36aacd6e427ae56c4df599e3364ea4b1b932ac8b09d3aeab8e506322e163837cc018611fc41bbf2cbaaa65 SHA512 2d7ec1b4e628855aa31efde1db7316ec9bb8829369f91ae0ae95cb0ef593573696332cca5cab2b2bab54fc0d78f32e46219ff10e04eacf9380a18cfe3e50acc1
 MISC metadata.xml 321 BLAKE2B 46078d652e4352893c239c5e6b7d30a160f48b370f932357a5c2940c67ddae2f6c932ca6dd1b0b784b0e2a03a7649936ebe317dc95da5ad7a9acbd2e497a01d1 SHA512 cb45dda3fe092fbc1d18cdd21f44ad5cd89c51fee4e10aee6140bd66b25e46c9253672b8f36fe0ae6a83ff9a76c9b1bd35de59846abb9054b1f5095e33858d88
diff --git a/net-misc/istioctl/istioctl-1.1.8.ebuild b/net-misc/istioctl/istioctl-1.1.8.ebuild
new file mode 100644
index 000000000000..bf2567f64cbf
--- /dev/null
+++ b/net-misc/istioctl/istioctl-1.1.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+GIT_COMMIT="145b18a"
+
+KEYWORDS="~amd64"
+DESCRIPTION="Istio configuration command line utility"
+EGO_PN="istio.io/istio"
+HOMEPAGE="https://github.com/istio/istio"
+MY_PV=${PV/_/-}
+SRC_URI="https://github.com/istio/istio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	BUILDINFO="istio.io/istio/pkg/version.buildVersion=${PV}
+		istio.io/istio/pkg/version.buildGitRevision=${GIT_COMMIT}
+		istio.io/istio/pkg/version.buildStatus=Clean" \
+	VERBOSE=1 GOPATH="${WORKDIR}/${P}" TAG=${PV} emake istioctl
+	popd || die
+}
+
+src_install() {
+	dobin out/linux_amd64/release/${PN}
+	pushd "src/${EGO_PN}" || die
+	dodoc README.md
+}
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index 302cbd6ab66c..a23b142b8640 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -1,12 +1,7 @@
-AUX lksctp-tools-1.0.13-build.patch 972 BLAKE2B 9b8d69a5de91aa21019b592b5040b061d37529d2226e7beee92624739f443c03972b0ccde4ed20b4785ac87ef59c9bea1d9588add6aa602173632b9c2de2acd1 SHA512 7db737b2e369e85f4e97c167bf8ca52d004fb19b3fbda7cc538cfcdbec19320ae94fb97e83451143eba91e1b44f11f11d4824511e203b85d2fa329d7aa66cba6
 AUX lksctp-tools-1.0.18-install-sctp.h.patch 335 BLAKE2B 513aca706f701591bca2e0814bcc6e7748fb4b1ffa97e8832e9fdac8dd62fd4ea5d60b2e385d5b8be0eaaa6e60b32f6ebc2f3962b43f6d6a39b14bc14eae7e08 SHA512 042611f2c2e7605e96552dc5bee79e014b9ba2db4e08fa7a5c5c821a86d22d970bfba40a477249aa6e9149a997aab1d48b133b97ec353d4ab22ed9e2de6f9096
 AUX lksctp-tools-1.0.8-prefix.patch 332 BLAKE2B a83cc8172bb96f7cade25b049608ef46215fcd8bb4f1b7cf9e860f9574c14d4f96f5f535f969aa827296e38017f3c56831ce820a2c5469ff9ef6b0afa39b553f SHA512 f64962208c270fbf39ba73b71801c27f5c2e45e4382c53bf3728e14c1300970b0d2a86d34132a4e8d24f8eb694bd234b11cefb7cc31eb232557d090c34d830e5
-DIST lksctp-tools-1.0.13.tar.gz 564530 BLAKE2B e9d374910e7acad2ce05f336e8f66c8ef22bce85912a02cf23c7f691b949b681e75cd9031cf676cb1f4911f311f0153e3a68730f3faba47714f020625924b5e2 SHA512 bdcf06223641ca062fd528ad87efbd3ac2a4e721b691bade528ae6d2ad8eaee5a6c0516eff42c83a3afed812c378f3ce782b93efe8ec830d91280b7419ce17b4
-DIST lksctp-tools-1.0.16.tar.gz 565446 BLAKE2B 2eff562809f24b76b8f129698c8fef30f9612706482e3061356e3a6fef2503c677421de4e7cb0ab30c8830cdccf7541f67234469920394554fc574fe45833a88 SHA512 ea771f3ffeef4630638ee9cbdf01723d01b1b0ca2e8f147a2b61b907339bd1a0c5d621a58638a3b700b6ffc41de06c7b9002645254a471e279663b64b313f467
 DIST lksctp-tools-1.0.17.tar.gz 795762 BLAKE2B a37b653b1f9effd039c5241669c767d8b0918bf4790d9f017c70eefd4ce1efdbe5d76f6e88e15ddf214308267ee62a6004d2af781ad720ef847e8d99ae5a55f6 SHA512 055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4
 DIST lksctp-tools-1.0.18.tar.gz 560302 BLAKE2B 6151109a0f43044048ff64a6ca021710f28e695017b79513412a44999ec67bdbe7cb0bbba7d5e0deb28b8fdd097379100046ef77508678f726f18944b9799f22 SHA512 1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055
-EBUILD lksctp-tools-1.0.13.ebuild 1325 BLAKE2B 2abb94d04bc857ce825ac73d11aa3eb0edf212f2665734e154196ffe7a420dbf50aac450de9b50710df6fadcb56e1b59a7f0f0c7e21fd41746e3be892908d35d SHA512 056d22e86c97ebab6a4b782ac069a18df5f3f023188e064ed0c600859dcb4c2a5eda9dd87e1caa0b733da3f40887afd02ab8c3835a745ea03b83567154de5586
-EBUILD lksctp-tools-1.0.16.ebuild 1262 BLAKE2B 5a1d23239b5a9db76cad9c1cb9004d70ac5bf0cdb7c5bfc6f40fae6a369668bda47943020d3412277540d73cc9cabf30eb4cad7eca2908070b05d7ee423a01ff SHA512 895d27b5a9250d835f9327ae66d45c05a0c714dc85c227c767bc255b7139f8beb46469c1201b293b482074722bee68a5f6d71648b9d91f85c1d5da67297edb5f
 EBUILD lksctp-tools-1.0.17.ebuild 1258 BLAKE2B dfa2c9b65e53a0eb8d139778206d33183ecfcb4981f9d06fde840e986457499afecc4c8b4c718725962fd4693f514d2d439dfd92cfae0de4393e0a871ecec762 SHA512 e187fe17a57dc5497ad8d89c78e61bdf30ee037071ac69e215b3b28d705d4b6c6ef6e2bfeb434d1a442224059a0be30326af24b446a52a4cbdc383e9f5929ea4
-EBUILD lksctp-tools-1.0.18-r1.ebuild 1396 BLAKE2B ae0f85a309ffebd703898bba5940d2162fd71beff5d9884326d61690457337aa3cdfef4249c453e93c7c77d18ed3fdd50ab828c91265419b512f00765764e2be SHA512 b51278536bb807ab01c9994377368a6987461f1795ffa9aa5c9262e6909a92594d12be5530a76b9650deb155970b60190a5aaca754e875a8697d9bcb3ae8b113
+EBUILD lksctp-tools-1.0.18-r1.ebuild 1394 BLAKE2B 168a0cb546e02c506cc09a555f0127116c3323c4d3b60ced90c054102d9c30fbc1f3035ba65e7692214d046b0751c399cfdb9482aa21a120c54795260ad3b90a SHA512 1f34875e1b056f9dafe6550733ce1e61d09d1672bd4998b482ae98b11a63eeeac6065d187dc2daa317809507955f840cabc5ffad6fdbdf5e6534af2a74fa10af
 MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff
diff --git a/net-misc/lksctp-tools/files/lksctp-tools-1.0.13-build.patch b/net-misc/lksctp-tools/files/lksctp-tools-1.0.13-build.patch
deleted file mode 100644
index 919bb1728aee..000000000000
--- a/net-misc/lksctp-tools/files/lksctp-tools-1.0.13-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2f2ba4e271b91535860705ca5911a3a6e1f64121 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
-Date: Sat, 23 Feb 2013 23:08:49 -0800
-Subject: [PATCH lksctp-tools] build: fix out-of-tree build of withsctp.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
----
- src/withsctp/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/withsctp/Makefile.am b/src/withsctp/Makefile.am
-index e091049..cecf606 100644
---- a/src/withsctp/Makefile.am
-+++ b/src/withsctp/Makefile.am
-@@ -10,7 +10,7 @@ include $(top_srcdir)/Makefile.rules
- bin_PROGRAMS = checksctp
- bin_SCRIPTS = withsctp
- 
--AM_CPPFLAGS=-I../include
-+AM_CPPFLAGS=-I$(top_srcdir)/src/include
- pkglib_LTLIBRARIES = libwithsctp.la
- libwithsctp_la_SOURCES = sctp_load_libs.c sctp_socket.c sctp_bind.c \
- 	sctp_sockopt.c sctp_socket.h
--- 
-1.8.1.2
-
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.13.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.13.ebuild
deleted file mode 100644
index 993649af9366..000000000000
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.13.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib flag-o-matic autotools autotools-utils linux-info
-
-DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
-HOMEPAGE="http://lksctp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="kernel_linux static-libs"
-
-# This is only supposed to work with Linux to begin with.
-DEPEND=">=sys-kernel/linux-headers-2.6"
-RDEPEND=""
-
-REQUIRED_USE="kernel_linux"
-
-CONFIG_CHECK="~IP_SCTP"
-WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.8-prefix.patch #181602
-	epatch "${FILESDIR}"/${P}-build.patch
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	autotools-utils_src_configure
-}
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README ROADMAP )
-
-src_install() {
-	autotools-utils_src_install
-
-	dodoc doc/*txt
-	newdoc src/withsctp/README README.withsctp
-
-	# Don't install static library or libtool file, since this is used
-	# only as preloadable library.
-	use static-libs && rm "${D}"/usr/$(get_libdir)/${PN}/*.a
-}
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
deleted file mode 100644
index 66c6d4a85974..000000000000
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib flag-o-matic autotools autotools-utils linux-info
-
-DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
-HOMEPAGE="http://lksctp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="kernel_linux static-libs"
-
-# This is only supposed to work with Linux to begin with.
-DEPEND=">=sys-kernel/linux-headers-2.6"
-RDEPEND=""
-
-REQUIRED_USE="kernel_linux"
-
-CONFIG_CHECK="~IP_SCTP"
-WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.8-prefix.patch #181602
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	autotools-utils_src_configure
-}
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README ROADMAP )
-
-src_install() {
-	autotools-utils_src_install
-
-	dodoc doc/*txt
-	newdoc src/withsctp/README README.withsctp
-
-	# Don't install static library or libtool file, since this is used
-	# only as preloadable library.
-	use static-libs && rm "${D}"/usr/$(get_libdir)/${PN}/*.a
-}
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
index 74d6a748084e..393bfb7c43c5 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sctp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2+ LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc ~x86"
 IUSE="kernel_linux static-libs"
 
 # This is only supposed to work with Linux to begin with.
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index a73fe2f4073e..53556fa9bdec 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -5,20 +5,8 @@ AUX memcached-1.4.4-as-needed.patch 1135 BLAKE2B b290f928cb0c280742eb95b69e1fdec
 AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034ca92b0e26280cbd99db3c487f57ef8f1d6ebfae49db44852b88018a95f8d2b0e0a1c6ce16bbaa5c0 SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63
 AUX memcached.init2 2205 BLAKE2B d27dbf6fb4d72ec49ff89cb3957770a25afe467c96c05648e75dddea47cdacee09d073e138e72d3b8671c3538e2005049dcd05440083b03e25136b3fd206c4d9 SHA512 b7b68362a4e4b24e9db893b85c3959184d17ea0bf8346a38561235461cfc8c94cf6d546f1c31bbe34bb7ca3409db2209171dd08214d5f057d00c65885663992a
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
-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.13.tar.gz 483697 BLAKE2B fb4f58cbeb518941a92dc213ce2d30dda501bc84c61ae5fa520c1a3a5cfd58ed92128ea098430d57b2a3db69f0d8e8a77dd38ea7edf4440b3f6c484d3b3fb966 SHA512 77ea80135f572ff49d030ea1da01b31aa6513589e75c370ef306a986a79129358062730dfebe6801487eeb20b1367aed4096514e882ef35425c764434493fa7b
 DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed
 DIST memcached-1.5.16.tar.gz 487868 BLAKE2B b9889866b8adbbbf23785f0da35f6f6b3cd5c842c6167beab3dd5385d6ed53e4607a2ffc18cd815005f2a1d67a3a549c780411b93d34335c541f4999d793b8a0 SHA512 999872c4c68e0210feab76f74c9487fbfb652cf3e6b7fa347f882767aad41ea6d8ba3ee056494409c054d673fc209032d8a890605810b2c6c9048d26d50751a0
-DIST memcached-1.5.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 2923 BLAKE2B db692987cbde108325f1a634338339a33cc05994a3dbc9d5ee30a096b5fac6bf91779874257a217b95ae6266a29c6c821798deb20821f42be92b71c6945dfc04 SHA512 f32c20794b3385d881abdcd109c1569d725af77e4d08ce384e1ff10c55ca330f9fb200a5c9a8f1353f36d650633a8e110a1af3ddc54d7c6a446ab181caacef29
-EBUILD memcached-1.5.13.ebuild 2921 BLAKE2B 2b1c3a401a1709575ed32394830c0e8c155962ed8762d5645983437aaf55eb97ecc04c29dc8bb4d85601a019034e7187ad8cfc0ffe50531c9303969e4f103d62 SHA512 d2aa1b965e03d0242265b151dd29c0fd1dab9858c650eace0a1a931a24b6ecb5e5adda22993d738eb8bf06c62a8db3ca6f2e002aa0378f5847ecd4010e756129
-EBUILD memcached-1.5.14.ebuild 2914 BLAKE2B 340b10974394fb77b2b4c04c0864675374c466ea93b853d4e5f042a0de7759f9d4fb09f2e4a73120716b58e8d7887ba4322cc38d533ae0783e1e486ec1abce29 SHA512 2b63ffb131a7a499610cb4b51f83478284f5c20b468147a3b23158b7380b52f86bdd007269d76e75936aec901652dc206ebab508435e814f2ae32034b61df663
+EBUILD memcached-1.5.14.ebuild 2912 BLAKE2B c0fd78c76871cb26f9c8375d9b22d6073f6f81d8daedca76b0398de33fd1d2665dcdbcbddbacba4419747e16b3a379dcdefc1da99167826d68f6829e04072846 SHA512 795f3933d27879e5102773a7527b129a1de60a61f4c53acae02d5229fc37efe8cc2e0055e1cd829a958e4f7681d9b0785090c04a8ed2f261a4253ccdccf99bc8
 EBUILD memcached-1.5.16.ebuild 2922 BLAKE2B e2dd55a2876f4ae53465b2df1aedac099e496227b4ae56c00a9c081a8069d2e6ad4d489b8414865a431101db52dd32f50a65e2245122e3a484d3b3afc2800a1d SHA512 45cff587c952d530c1c986789ef6b54f5cd177b238e2941f8ea604412374b9fbdc09b4fb0a676914f6d54edfbde3a463d2fa94a45a70876a20ba89166e4af251
-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.4.39.ebuild b/net-misc/memcached/memcached-1.4.39.ebuild
deleted file mode 100644
index a9ce2f91be30..000000000000
--- a/net-misc/memcached/memcached-1.4.39.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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="test slabs-reassign debug sasl selinux" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-		 dev-lang/perl
-		 sasl? ( dev-libs/cyrus-sasl )
-		 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
-}
-
-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/memcached/memcached-1.5.10.ebuild b/net-misc/memcached/memcached-1.5.10.ebuild
deleted file mode 100644
index 3a72e14b2f82..000000000000
--- a/net-misc/memcached/memcached-1.5.10.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/memcached/memcached-1.5.11.ebuild b/net-misc/memcached/memcached-1.5.11.ebuild
deleted file mode 100644
index ca83bdfe6a22..000000000000
--- a/net-misc/memcached/memcached-1.5.11.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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/memcached/memcached-1.5.12.ebuild b/net-misc/memcached/memcached-1.5.12.ebuild
deleted file mode 100644
index 58651a0f4976..000000000000
--- a/net-misc/memcached/memcached-1.5.12.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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/memcached/memcached-1.5.13.ebuild b/net-misc/memcached/memcached-1.5.13.ebuild
deleted file mode 100644
index be11449af3c5..000000000000
--- a/net-misc/memcached/memcached-1.5.13.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic systemd user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-	https://www.memcached.org/files/old/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-	dev-lang/perl
-	sasl? ( dev-libs/cyrus-sasl )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.5.14.ebuild b/net-misc/memcached/memcached-1.5.14.ebuild
index c1fbb16c9220..0563663b1646 100644
--- a/net-misc/memcached/memcached-1.5.14.ebuild
+++ b/net-misc/memcached/memcached-1.5.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${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"
+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:=
diff --git a/net-misc/memcached/memcached-1.5.2.ebuild b/net-misc/memcached/memcached-1.5.2.ebuild
deleted file mode 100644
index c3a62d5ae798..000000000000
--- a/net-misc/memcached/memcached-1.5.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="test slabs-reassign debug sasl selinux" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-		 dev-lang/perl
-		 sasl? ( dev-libs/cyrus-sasl )
-		 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/mico/Manifest b/net-misc/mico/Manifest
index 97673984bf12..9690a2607e59 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,6 +1,5 @@
-DIST mico-2.3.13-gentoo-patches-20170529.tar.xz 15196 BLAKE2B a25371cc1b7d0ee912aaa694943e9faa87f9c3df1c85186af1ab0d328bfa3138ce82381e1c91c732ae4b4d9d9b394058a1666af3b8547da675948aa556176a26 SHA512 ea7cbf00b33ed5eaacc5418539562645cecefc6f2ee7929d58517f7775fa62ac07a26967cd84570410281930b7a4570302f4edc9a9cc76661a99a5f28bce37cf
+DIST mico-2.3.13-gentoo-r13.patch 133254 BLAKE2B 71e22f8bd7491b6aa594a32d7d2a5677b3fc1376bb8ff11eae20e6749ec9c582b99704030c2178f81f1b1fd4ac8f4c2b14e3c80cdf9769ed49004c5a4bab761d SHA512 4e4c60c8e3f6e303b136d17cc83cd5bb92a2b23c0a843721ba74e62d6c69224719bf254a5d8c028df0166c36a07ef349e98f4244b4d208e689c3b6c382c1b906
 DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895
-DIST mico-9999-gentoo.patch 66675 BLAKE2B c403d2e6fe3b3e9a77f7a4d73b6152b73ff3eea76e35e16f705ce8da5935fdc4a0fd4b1136437cac5a0fb0b81f00f0461cba0d45e9cbf0d88f3ffc5faf1e7967 SHA512 2d709b90cc8c8873eca8df94acbb24cf484305dbadc8d913dc58912349677ded633e92faac4944076547cb064329d7a3dfc79a43ce9ff15b238d989f2bdd4a6d
-EBUILD mico-2.3.13-r12.ebuild 4199 BLAKE2B 0baa83f3f5fb24fff5ff7c5778751aad2dedf78a107d06bd93a545823cf72f6f66e73e5eec8100f503550902f3e7e119d0faa1fc0ae1e5ee968c4aa334fd4a80 SHA512 2563faf67faadd1b382b766131ac003b1862d132628ceeab9872abe3f7450569c7a8ef6e0aca73ee961534478f418672da1f7ef61d9e4e24f45355d98b1e9870
-EBUILD mico-9999.ebuild 4131 BLAKE2B f4a40e64ee6499b8d5520f2634f72b00410a33853f93bf003bcb79ec0178bd18148a6c3a66924a7a3b5111d18784d8de5a2bf93729b75001e4b9efceb36a5961 SHA512 05c1e23b787a5c31714fe9bc2ba4a28617c8febf554a5c9bf697de5f3fdda8f277fb2ba178d7cbf223def4e232c9c5d73b6a915cb559e6358588464af9b02906
+EBUILD mico-2.3.13-r13.ebuild 4328 BLAKE2B e569938f537160595c3a546a4da8a3f2a43283c580e11ee0975d0620e1c02720522251f302c4953ed2420fd75086cb24e6c8a7aab2ad13f0e85a33ac924283af SHA512 7ed391ebfd57867eee96ef417a7356721d7cd0fdd72c372844f1ea730dce327e66efdde00864bf894bd319abf044823d9752b5414069b2804cff0b6e0bb24319
+EBUILD mico-9999.ebuild 4328 BLAKE2B e569938f537160595c3a546a4da8a3f2a43283c580e11ee0975d0620e1c02720522251f302c4953ed2420fd75086cb24e6c8a7aab2ad13f0e85a33ac924283af SHA512 7ed391ebfd57867eee96ef417a7356721d7cd0fdd72c372844f1ea730dce327e66efdde00864bf894bd319abf044823d9752b5414069b2804cff0b6e0bb24319
 MISC metadata.xml 631 BLAKE2B bb0a1ee82b5b74160096ad9652a933f25c51f192ff30b3ae18d477aacff13a1021aa959e238b9103957ddff622b40f4ec8269b35b114d2325e3f75f90891c580 SHA512 111d8d30478b2647475b075f3c16f49b14be2bbde9e55b0b9efde42c0eaa8da128dd6801a914a898a8500d705d034d50ad05f7b41da5ec644f3c1bad12f21840
diff --git a/net-misc/mico/mico-2.3.13-r12.ebuild b/net-misc/mico/mico-2.3.13-r13.ebuild
index 97281d44bfd2..4b4032d1f826 100644
--- a/net-misc/mico/mico-2.3.13-r12.ebuild
+++ b/net-misc/mico/mico-2.3.13-r13.ebuild
@@ -1,32 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit flag-o-matic toolchain-funcs autotools
 
-PATCH_VER=20170529
-
 if [[ ${PV} == 9999 ]]; then
-	EDARCS_REPOSITORY="http://mico.org/mico-darcs-repository"
+	EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository"
 	inherit darcs
-	SRC_URI=
-else
-	SRC_URI="http://www.mico.org/${P}.tar.gz"
-fi
-
-if [[ -n ${PATCH_VER} ]]; then
-	SRC_URI+=" https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz"
-	PATCHES=${WORKDIR}/patches
+	SRC_URI=""
+	PATCHES="${WORKDIR}/${P}-gentoo.patch"
 else
-	PATCHES=
+	SRC_URI="
+		http://www.mico.org/${P}.tar.gz
+		https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
+	"
+	PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch"
+	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
 HOMEPAGE="http://www.mico.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
 IUSE="gtk postgres ssl tcl threads X"
 RESTRICT="test" #298101
 
@@ -40,13 +36,15 @@ RDEPEND="
 	tcl?       ( dev-lang/tcl:0 )
 	X?         ( x11-libs/libXt )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=sys-devel/flex-2.5.2
 	>=sys-devel/bison-1.22
 "
 
 if [[ ${PV} == 9999 ]]; then
 	src_unpack() {
+		wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die
 		darcs_src_unpack
 		default
 	}
@@ -57,6 +55,7 @@ fi
 src_prepare() {
 	default
 
+	mv configure.in configure.ac || die #426262
 	eautoreconf
 
 	# cannot use big TOC (AIX only), gdb doesn't like it.
@@ -67,11 +66,7 @@ src_prepare() {
 
 src_configure() {
 	tc-export CC CXX
-
-	if use gtk && [[ -n ${PATCH_VER} ]]; then
-		# need gtk-1 wrapper for gtk-2
-		export PATH="${WORKDIR}"/helpers:${PATH}
-	fi
+	append-cxxflags -fno-strict-aliasing
 
 	# Don't know which version of JavaCUP would suffice, but there is no
 	# configure argument to disable checking for JavaCUP.
@@ -92,8 +87,7 @@ src_configure() {
 
 	# '--without-*' or '--with-*=no' does not disable some features,
 	# the value needs to be empty instead.
-	# This applies to: gtk, pgsql, qt, tcl, bluetooth.
-	myconf --with-gtk=$(  use gtk      && echo "${EPREFIX}"/usr)
+	# This applies to: pgsql, qt, tcl, bluetooth.
 	myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
 	myconf --with-tcl=$(  use tcl      && echo "${EPREFIX}"/usr)
 	# bluetooth and wireless both don't compile cleanly
@@ -101,6 +95,8 @@ src_configure() {
 	myconf --disable-wireless
 	# But --without-x works.
 	myconf $(use_with X x "${EPREFIX}"/usr)
+	# Same for gtk after patch 013, searches for gtk release.
+	myconf $(use_with gtk gtk 2)
 
 	# http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
 	[[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED
@@ -118,24 +114,25 @@ src_configure() {
 }
 
 src_install() {
-	emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=:
+	emake INSTDIR="${ED}"/usr SHARED_INSTDIR="${ED}"/usr install LDCONFIG=:
 	if [[ $(get_libdir) != lib ]]; then #500744
-		mv "${ED}"usr/lib "${ED}"usr/$(get_libdir) || die
+		mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
 	fi
 
 	# avoid conflict with net-dns/nsd, bug#544488
-	mv "${ED}"usr/bin/{,mico-}nsd || die
-	mv "${ED}"usr/man/man8/{,mico-}nsd.8 || die
+	mv "${ED}"/usr/bin/{,mico-}nsd || die
+	mv "${ED}"/usr/man/man8/{,mico-}nsd.8 || die
 
 	# avoid conflict with net-misc/eventd, bug#632170
-	mv "${ED}"usr/bin/{,mico-}eventd || die
+	mv "${ED}"/usr/bin/{,mico-}eventd || die
 
 	dodir /usr/share
-	mv "${ED}"usr/man "${ED}"usr/share || die
+	mv "${ED}"/usr/man "${ED}"/usr/share || die
 	dodir /usr/share/doc/${PF}
-	mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die
+	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
 
-	dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO
+	dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO
+	[[ ${PV} == 9999 ]] || dodoc FAQ
 }
 
 pkg_postinst() {
diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index ba56c4b4614b..4b4032d1f826 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -8,22 +8,21 @@ inherit flag-o-matic toolchain-funcs autotools
 if [[ ${PV} == 9999 ]]; then
 	EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository"
 	inherit darcs
-	SRC_URI="https://github.com/haubi/mico/compare/gentoo.patch -> ${P}-gentoo.patch"
-	PATCHES="${DISTDIR}/${P}-gentoo.patch"
+	SRC_URI=""
+	PATCHES="${WORKDIR}/${P}-gentoo.patch"
 else
-	PATCH_VER=20170529
 	SRC_URI="
 		http://www.mico.org/${P}.tar.gz
-		https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz
+		https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
 	"
-	PATCHES="${WORKDIR}/patches"
+	PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch"
+	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
 HOMEPAGE="http://www.mico.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="gtk postgres ssl tcl threads X"
 RESTRICT="test" #298101
 
@@ -45,6 +44,7 @@ BDEPEND="
 
 if [[ ${PV} == 9999 ]]; then
 	src_unpack() {
+		wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die
 		darcs_src_unpack
 		default
 	}
@@ -66,6 +66,7 @@ src_prepare() {
 
 src_configure() {
 	tc-export CC CXX
+	append-cxxflags -fno-strict-aliasing
 
 	# Don't know which version of JavaCUP would suffice, but there is no
 	# configure argument to disable checking for JavaCUP.
@@ -131,6 +132,7 @@ src_install() {
 	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
 
 	dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO
+	[[ ${PV} == 9999 ]] || dodoc FAQ
 }
 
 pkg_postinst() {
diff --git a/net-misc/ncman/Manifest b/net-misc/ncman/Manifest
new file mode 100644
index 000000000000..b3336633207a
--- /dev/null
+++ b/net-misc/ncman/Manifest
@@ -0,0 +1,4 @@
+DIST ncman-0.0.1_p20190327.tar.gz 51925 BLAKE2B 020092e64ccb55563cc891699550911411b67b749a49fb6bab4962857b59c93fb05109afacb88a5e42abc9030683af66aed2e44aaf0bd1cd8931c9df019bdc52 SHA512 24a3b3eec57987e290cc319e409e8da00f14e260360c606b3a89ee2e092976d0b1c256a4b1be40870bcaea620a482477c4aed53fa0e1719c297fc9edd524235e
+EBUILD ncman-0.0.1_p20190327.ebuild 536 BLAKE2B 55e75c03200470f58100bac93c67877aa380757a4715a12b14aaf572f6524e115d799c2d3c80a60a6469647c7a44f55853ccb221d26205bf3896d6c952c6896e SHA512 d480d1afc2c4909802177bc39c2326877775d02567b9e748cc4d8cef50b5d5996a534dda0b27936a9dfd064e787a6f5fcad97793350247e30c0a9001c833d124
+EBUILD ncman-9999.ebuild 487 BLAKE2B 5053e65e76f7e4bee0ddedf8297633252ce43539def4d979d8aae3b9badd84bf28e62819144530c85e0450f98d511c371b0a621c3b10d58f50eb9b2ea1a91791 SHA512 94392c706462a03c3ae0b495c8b88a22ad6b6d2e5e52e44184d69f4a8477b88cb79fcb07207212126786ad7a6dfa6410f34880b4f8e0caf6832da26429469669
+MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/net-misc/ncman/metadata.xml b/net-misc/ncman/metadata.xml
new file mode 100644
index 000000000000..435234188908
--- /dev/null
+++ b/net-misc/ncman/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">
+	<email>bkohler@gentoo.org</email>
+	<name>Ben Kohler</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/ncman/ncman-0.0.1_p20190327.ebuild b/net-misc/ncman/ncman-0.0.1_p20190327.ebuild
new file mode 100644
index 000000000000..7228d80a8178
--- /dev/null
+++ b/net-misc/ncman/ncman-0.0.1_p20190327.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson vcs-snapshot
+COMMIT="21a55145ddbc5d085e91352586875abe92cff73b"
+
+DESCRIPTION="An ncurses UI for connman, forked from connman-json-client"
+HOMEPAGE="https://github.com/l4rzy/ncman"
+SRC_URI="https://github.com/l4rzy/ncman/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/json-c:0=
+	>=sys-apps/dbus-1.4
+	sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
diff --git a/net-misc/ncman/ncman-9999.ebuild b/net-misc/ncman/ncman-9999.ebuild
new file mode 100644
index 000000000000..54dde8ba11c3
--- /dev/null
+++ b/net-misc/ncman/ncman-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson git-r3
+COMMIT="bca0dc0a835f8a267be28d32b49775a50543d081"
+
+DESCRIPTION="An ncurses UI for connman, forked from connman-json-client"
+HOMEPAGE="https://github.com/l4rzy/ncman"
+EGIT_REPO_URI=https://github.com/l4rzy/ncman.git
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="dev-libs/json-c:0=
+	>=sys-apps/dbus-1.4
+	sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 86c3ae735558..479937b969cd 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,3 +1,4 @@
+AUX 0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch 3129 BLAKE2B 5beafb31039c384adaae1b8c95077bb9c1af250e78447a1cad78fbd689ee3465fe321a80ca55b91a41e3ca1ef72cda44602dd3494dd5e368e58346e02eb88ed5 SHA512 3153e2335be9dcd4f07e4b7a84d4755d15c4d7e28735016901bb5c63ccf4e4b3c66fa200907720dfd2b4e0a011ed812b5c52bfcf9b38f9aeda5781c0d71ecd9b
 AUX openvswitch.tmpfiles 40 BLAKE2B df482f24d2c48d54b6cabb1f0a37fcb193c9da71d9ae2eab0dd9a15209462e118a7160411d6d0cdb10f1721f0a86b689dd9c286325ed965ac1a510ae0af791a1 SHA512 020aaa9599b853d75a612f7bbd4ef8ea024908f283afe5c727f5d2a1f3a5a98634f82d840b3ebf886b9a82e9c60c237ced2fb13057bc7bb9ab5c449e11b51997
 AUX ovs-delete-transient-ports.service 272 BLAKE2B 4ee3767f84b4f47fe0d01aa9aaff35c9ca2be5afa6ba0f595d37ab0cdb4ccbdd7abcfb2a9c91a04d7820d1819f7757c7de569dd62cdc6c76cf533c27908f3471 SHA512 045f9c59275c555eb83c15e7cc0af4db3e9cd834385b4bbca35f5863e8432a0cf2038d10b8a55ad90a180b386a4bd0962ddcc401b4f3cf55b7e398e0683cc0f8
 AUX ovs-vswitchd-r1 436 BLAKE2B 3660edee0906e3bd7fb1715601eb08567fba2ccb20a9b25b7ef250f130737d903acd187b35cb487a4141396ef3b7746d296ab613477b7fe907f1c6bb4c3da85d SHA512 7a98f85251a7b60d93a28ade482669537585fc05265cc51eb61e283739537df980230bd5f9dccfdb60772afe3f0bf2493eed9a25b289c7ef37d998e8ca5ec4df
@@ -22,6 +23,6 @@ EBUILD openvswitch-2.10.0-r1.ebuild 4699 BLAKE2B c9de21a5bba881e69a2741419ea0435
 EBUILD openvswitch-2.10.1-r1.ebuild 4461 BLAKE2B 9d229b86adf3261b3761f0c92e3a41839dbaec4fdf6c35939fcb5915b0232c87dd2a25bc78b04b37729a2a9d3adfae7195a6666d5b043d77f418f31af76add62 SHA512 c660b92275b577385952c24f817fdb8dfe110158f49dd2cd62506a8252cc5181f0f43c76236287a7c8f53601e33fe5d3d5eb0e46f95fc0ee7d00f7a92d598a75
 EBUILD openvswitch-2.10.1.ebuild 4263 BLAKE2B a6e844947f481d7beaf79172d90f09f52770514d5e203b10548783efccfcc791465a75a4d4796889f8f0ba53f74a6beb21a9d8478dc7f4ec25f2ec6e8a5ae09d SHA512 3cbc185a839a30d48262552b7d2ab8604353a3c2c12fdf42b3f558c1521d58dadb2e465494a0babd03fe0a7c435215916c30df996842e5ac15e63d0188d50270
 EBUILD openvswitch-2.10.2.ebuild 4461 BLAKE2B ce73d782dcd586facd60189ec0b6c459b96fff110e56dee1f447fb608534d5410bcfae158d8c6d2f87fd7f279e586207ee594763cd462f6902253b61c7759060 SHA512 befd11f9f14266ca500ae649a61357eedbba502dec865102fccfa05be2989675345d0da771024822150d967ba0ff64ef5dd7e4b4017a4c8831b459c680336f39
-EBUILD openvswitch-2.11.1.ebuild 4461 BLAKE2B f4dfa13c33ee0a14d81fb42e7f780d6609a244fc2886b5cf5639f60694d7b96392474d603e546f1681fb04671331006669beb2a292a921cb14e0c86b8c5b4ded SHA512 bae4fec83d12bf3c6d9d04bf9e8ed0e6b06646ba068eb1f7ed6c8fa3cb6d106990de499aeb8790f282f2be775bf1fee6e832be2cea0a0c71dc3892d5b9e0d98b
+EBUILD openvswitch-2.11.1-r1.ebuild 4541 BLAKE2B 12599af7675b2f4d7bbc09875f90b752561aed6cd05093b4de43f659e2fbf86978a8ed9cefebc46bddd57e065efebc8dea3bd1a9130e012203bece86292603bb SHA512 8838b8938115a019fbcf4933bd2586fceb21494ece22ccadafaae79e21825add2e489e3e99df541f097736f1ad34facb07fcf2186f6ef9d9f195efc8b5dd98e3
 EBUILD openvswitch-2.8.1.ebuild 4446 BLAKE2B 68da5d17271fe0c59d7a6820836c56f39a35d7c151a84108f594eaaef3edf7838d80d3dd6c7d521cea09d692cfb89c00ad9eb2d58045167a21b22cacfac54724 SHA512 21edf1a60d31999eff602af6ec6fc8141a55c266d2076f8dc2a4aacb632dad0ea47375834048084642989b02a0f2f1dbce4ab4baef7e4afc37844f88528e1cd9
 MISC metadata.xml 538 BLAKE2B c5bb1d88b9923e4df32eebb70ddbe96fc7ba60ac17e2a84515a69ab9c3f90b73dc429797a23d1a13ebec9ae4def24a04b4cb0e8685159a7ec01fb905c2ab0cca SHA512 79f8fecddfb657298b4c261eb8c6d502cf5e320764acdc92fb97ac6f67379ec10faf553e8a3a0a37d4d650b52c0fa827e485655dbaa126f97d19fbf7b8fbeffd
diff --git a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
new file mode 100644
index 000000000000..1f77ab54b0ad
--- /dev/null
+++ b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
@@ -0,0 +1,46 @@
+From b89f391203c4420eb454cb321e799a64de809f52 Mon Sep 17 00:00:00 2001
+From: Yousong Zhou <zhouyousong@yunionyun.com>
+Date: Fri, 3 May 2019 15:03:24 +0000
+Subject: [PATCH 5/5] datapath: conntrack: fix include for
+ IP6_DEFRAG_CONNTRACK_IN
+
+The enum definition is now inside include/net/ipv6_frag.h since upstream commit
+70b095c ("ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module") which was
+backported to stable trees (4.9, 4.14, 4.19) only these days.
+
+The error message
+
+	  CC [M]  /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o
+	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c: In function 'handle_fragments':
+	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:8: error: variable 'user' has initializer but incomplete type
+	   enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
+		^~~~~~~~~~~~~~~~
+	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: error: 'IP6_DEFRAG_CONNTRACK_IN' undeclared (first use in this function); did you mean 'IP_DEFRAG_CONNTRACK_IN'?
+	   enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
+					^~~~~~~~~~~~~~~~~~~~~~~
+					IP_DEFRAG_CONNTRACK_IN
+	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: note: each undeclared identifier is reported only once for each function it appears in
+	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: error: storage size of 'user' isn't known
+	   enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
+				 ^~~~
+	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: warning: unused variable 'user' [-Wunused-variable]
+	scripts/Makefile.build:326: recipe for target '/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o' failed
+
+Reference: https://github.com/openwrt/packages/issues/8548#issuecomment-488871090
+Signed-off-by: Yousong Zhou <zhouyousong@yunionyun.com>
+---
+ datapath/conntrack.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/datapath/conntrack.c b/datapath/conntrack.c
+index a7dc9e0c3..69bda5a9c 100644
+--- a/datapath/conntrack.c
++++ b/datapath/conntrack.c
+@@ -31,6 +31,7 @@
+ #include <net/netfilter/nf_conntrack_seqadj.h>
+ #include <net/netfilter/nf_conntrack_zones.h>
+ #include <net/netfilter/ipv6/nf_defrag_ipv6.h>
++#include <net/ipv6_frag.h>
+ 
+ #ifdef CONFIG_NF_NAT_NEEDED
+ #include <linux/netfilter/nf_nat.h>
diff --git a/net-misc/openvswitch/openvswitch-2.11.1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
index a36bb2cdaa1c..f2304f6ae354 100644
--- a/net-misc/openvswitch/openvswitch-2.11.1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
@@ -31,7 +31,10 @@ DEPEND="${RDEPEND}
 	sys-apps/util-linux[caps]
 	virtual/pkgconfig"
 
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+PATCHES="
+	${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch
+	${FILESDIR}/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
+"
 
 CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
 MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 7eb7fd1bc701..a709a02d3f18 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -8,5 +8,5 @@ DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7
 DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee
 EBUILD rdesktop-1.8.4-r1.ebuild 1736 BLAKE2B 2683cb189864e5895da4d8252a96e6729bdf6484fab692c5b7922e9cfa4d66bbb2885fbcac7d7863d787d5ddd253faa05124bc712450b7a2d7a7f274242a39ae SHA512 16d5d030d96a6a27ef134e6d5f6b6a94a90034042f2dc02c587788f312403c1aaf9c71f0baf1001910053c703b96e009975d5fdc328a4114c0c511821117570c
 EBUILD rdesktop-1.8.4-r2.ebuild 1783 BLAKE2B 94a097e988cb19622eb8165830136f78f7ef6081914d64660974be4b97b861b4a01cd631a45009910cf27a2498c2e6f74e9be48ba0ccf8d4ea67a84eaba0fd93 SHA512 66a9fdc1e5c46fcf09879f482cb1b918614ed012373b776b05622dbc520d60d626a487422cf7ab0161886355fe17b392a64074da357e67a25c780cf625783679
-EBUILD rdesktop-1.8.6.ebuild 1797 BLAKE2B bd91ea20abc67be28637e2d3c85978ce78093616961fe869f354f588ec59a1884a30876e2f9bf658f7d82e38e8184a0a75556765383db8e30894159fdecce056 SHA512 9be7a905e9d00bf2ea20546f7b62d1dfca701ede55bee99a944b573b8584431e3b21701071440ddb63047186e35cb31a10680aa4a06544d1dbf1d273345e2d25
+EBUILD rdesktop-1.8.6.ebuild 1791 BLAKE2B d804d858ac3f4fe20e86cb3a8a5747bf158bd45604b156cb97f7889cd942b77a06e2e319137672d50d7e2da73ff4db73befdec22c81610198c5b649219046c35 SHA512 786aef63e4fd3efc30a27c677b5ef4a6b6567cb29d4c4c0f42234c49e20a82833a4c2bdc30bcb404e3caf8e51ef2907b43059c08258f892b7e287e75ff86262e
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/rdesktop-1.8.6.ebuild b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
index b47bffbf7f4e..aca399e7a9ce 100644
--- a/net-misc/rdesktop/rdesktop-1.8.6.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/smbc/Manifest b/net-misc/smbc/Manifest
index c65e53425a05..52afe1d7bc8f 100644
--- a/net-misc/smbc/Manifest
+++ b/net-misc/smbc/Manifest
@@ -1,5 +1,5 @@
 AUX smbc-1.2.2-cflags.patch 323 BLAKE2B cd95f0d01e1a0f000c362544420fb55e9fed0b2786a05c2ecf90ce8066ea94c4e0e949f8b9cbdac2471ea2e5599675a51c2176c1c2a303eb3d04160d959935dc SHA512 c9cde82726e201c3a9b118ef5c34816cffc82c00b6122352797f57f5366bc8fd12d4827bcf0f895056dd8417f4ecdb48d1e607046adca62fbe2c5fd8adcc75f9
 AUX smbc-1.2.2-size_t.patch 551 BLAKE2B c4cd80f4af3285cdca7e6a5c9812742d6a662856bb986f11d395a5d4a44e3210c1087c976b4e0055768401b99fda6de081c330a1429a901fb4adcd461108934f SHA512 f445ec293a0bda038493faca823266aff96d4e2f41cf8ed5a64beae2b4e1e941ab8de9dab966328f77be9199ba5f8655006d5aabbfcdbd28cb842966f068fbaa
 DIST smbc-1.2.2.tgz 977908 BLAKE2B 481bf7e16b8f6d89abd62e619a13a8692ce1f3ed169a1b3c35864a2a66f2cf10753d7d4151f95acc3428ad628b5888a12f452836297d18f9c8b3ce1d17550010 SHA512 4625ba6bb6b3ffe818826d4af4da0fcb2e516e1ed62ee15ace4cf04d5176d238c5107d349f595809048bafc38d571448e1f1f170ed061dfc8f698836b52e2b84
-EBUILD smbc-1.2.2-r2.ebuild 857 BLAKE2B c65364c31744acec2518836b8364eec64df29cd35a3f745fbb1aeb5882f7cb20a22e6170be75ca6e490701d27a5dab133f80dbaf25e96e7cae2127ad1ea050e3 SHA512 3fa5ea27c568a2ebc3fa4a80d1e7d18d0530449ea0a084ef0ac9a3116989f77211884c8950ec87b2633fcb106618f292dd3645c8f848e9f461b505789094a0ac
+EBUILD smbc-1.2.2-r3.ebuild 811 BLAKE2B 58380c2cfe43601fbf9f0a318d93bc9ea93a17175fc75e49bd8ef49d9dae47b1a9286d1f6ac18bc7c3eff09158216c4f4df127447542a57311c865916a7f8fdc SHA512 6cafd0ab443524469b05c1f567bb9a77e56534506fc13eef9b0ba243984602494eb150e3c6c964a2376404b7b1149a27784be7aec138506f34fb84da68667c60
 MISC metadata.xml 651 BLAKE2B 5652ecdb82d14bf2869137a0402c790038200dcfa06ed593c6abf8e7394181e947f995df2d11f6cbfe1a53e8a596af406c9eb493f171103d4336c14fdcd5e70e SHA512 217963f6fdf491a8d76aceb10febfc3f376fee89172f68042460258ee73c492302d7931683697b74e04d7271a256efea2c5697f7fb1da9f659750eb4b9838fb8
diff --git a/net-misc/smbc/smbc-1.2.2-r2.ebuild b/net-misc/smbc/smbc-1.2.2-r2.ebuild
deleted file mode 100644
index b81b29cc204c..000000000000
--- a/net-misc/smbc/smbc-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="A text mode (ncurses) SMB network commander. Features: resume and UTF-8"
-HOMEPAGE="https://sourceforge.net/projects/smbc/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=" ~ppc ~x86"
-IUSE="nls debug"
-
-DEPEND="net-fs/samba
-	sys-libs/ncurses
-	dev-libs/popt
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	epatch "${FILESDIR}"/${P}-size_t.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with debug) \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	mkdir -p "${D}/usr/share/doc"
-	mv -v "${D}/usr/share/"{${PN},doc/${PF}}
-}
diff --git a/net-misc/smbc/smbc-1.2.2-r3.ebuild b/net-misc/smbc/smbc-1.2.2-r3.ebuild
new file mode 100644
index 000000000000..87ebd6eea0a6
--- /dev/null
+++ b/net-misc/smbc/smbc-1.2.2-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Text mode (ncurses) SMB network commander. Features: resume and UTF-8"
+HOMEPAGE="https://sourceforge.net/projects/smbc/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="nls debug"
+
+DEPEND="dev-libs/popt
+	net-fs/samba
+	sys-libs/ncurses
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eapply "${FILESDIR}"/${P}-cflags.patch
+	eapply "${FILESDIR}"/${P}-size_t.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with debug)
+}
+
+src_install() {
+	default
+	mkdir -p "${D}/usr/share/doc"
+	mv -v "${D}/usr/share/"{${PN},doc/${PF}} || die
+}
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 9e3a02798a40..9ddf02be0a7d 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -3,5 +3,5 @@ DIST wget-1.20.2.tar.gz 4486237 BLAKE2B 7392e445cb801ac5fafee804e6b0459d0a001b91
 DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
 EBUILD wget-1.20.1.ebuild 3186 BLAKE2B 0d8a494f8eedb24e7d24b963f489615ff61b1197e36ed588539c39835ac237b0c2bc7291ecec9e77b477a44addc0214dc84776520b3466592ce5c9d50e70d741 SHA512 fffa7b02c2c8386889d205e1e85d347d582fce184953deed59022d1918e5b64f818272557e0d7834843d89e5b6457e766bdbe0b0c5c759f43da19e30509c9b3f
 EBUILD wget-1.20.2.ebuild 3199 BLAKE2B b3bdf8e617b23ce92b23e9f958c5f3523666832760f5d4341067dcde3489d7d5c3cf10149b187181ffc08c55b67b5ea89b58009c66529407b18a25e01eda256e SHA512 10ba5b18809aed13e07d4e71cf2f0b3073d0f5ece4c2401b3d5e8dbd07f42d62d6776d163ed2daee39fc2bb1bf90bcdae712b3a1d491b94b45ea35ee9d05e5ee
-EBUILD wget-1.20.3.ebuild 3196 BLAKE2B c1dceab8d96452f70b796c95f98faad98e0cfd7f2077ff90b8a0cc9c15df8be0f848f95074610696add37c99781b3c3fc748bf4522e0b926c8a42d8a094f37ea SHA512 23d65856802feba733fc9ec36bd123e137a587b7de05b77b83a38d0c66abfe73f49ca0a2a15f3337531f282d2b28a162983653a5fa82cadbd645a9ec41441e12
+EBUILD wget-1.20.3.ebuild 3195 BLAKE2B 99634e4899ab9fa5ecacf4da2b52515f460a332c7fa0c3d6ee03b4738f1c81c8ed6548d42af428b96009ef4428d43610af3be3912e607528154922dc02151c23 SHA512 4f2db0c0c1baa073cff43ae5d32ebd6a6b9f7cffff4587e2fc1e24b057e035fc390372ecd4bb9cdea366abb5a16632cd487b082eead018bd981465291cd02969
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/wget-1.20.3.ebuild b/net-misc/wget/wget-1.20.3.ebuild
index 733e3b4504ed..624c485f43ec 100644
--- a/net-misc/wget/wget-1.20.3.ebuild
+++ b/net-misc/wget/wget-1.20.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
commit	73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree	2878053f3e7faed19a1f82c733d3bd29df69991e /net-misc
parent	2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)