gentoo resync : 16.06.2019

31 files changed, 817 insertions, 150 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 25e14e369c0b..bfca63ffa8b1 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest
index 04b14e04ee48..712fbe8d8137 100644
--- a/net-misc/adjtimex/Manifest
+++ b/net-misc/adjtimex/Manifest
@@ -1,6 +1,9 @@
 AUX adjtimex-1.29-r1-gentoo-utc.patch 1053 BLAKE2B 1f17ac2e1a508a3b54f7a1bb59de0338fc2c743bbd3202b09fea4310e4af5e8c282b4c70300708eaa4fe5ae313246ba1b05f18d12d0c73861042ef00f13b2b71 SHA512 d9d47fc4648b51969b50545b8925848601f373ba89908cdcb95e37b6ec4489b0e338bed4debed9a5fc1fbb3fff6a87c27583a25a89028bdf69dc09602c67d728
+AUX adjtimex-1.29-r2-gentoo-utc.patch 1011 BLAKE2B c4e7f951ef316917630cfa122058e44a956b02830c80d3e2edecd5dcff9daacf869ff1f1e3613afb42c222287565a5c296f72d0729e5a928a58180039bc5e282 SHA512 7917ae69ff554c3b7de8be65f3758e9bcf80f5875afeca8d9ff81d1fa4bf4783f65c98b28d4d705fe585fb7a23b7e64af7d9145eb9286c24d7fdf2053a04e5f3
 AUX adjtimex.init 638 BLAKE2B 652bc1dd50a59bec204b669bb72ba3ca68ae65bc450d4ff662ba2af5f7d5f784f184a3cf7156439fdb72608ef46042d606fc4f1e9abb969ff3ce500f3db9cf6f SHA512 4d8caa72076ac8ba2c0f6cabb31a28254e609d2215cc8f830921e729013144fc10cb6a8796fff80ecc4bf1dc611652e81830e46e59c1726d3147cc1680017041
+DIST adjtimex_1.29-10.debian.tar.xz 33008 BLAKE2B b1da53008ef2373d9b450228bdb7f3378516880bf5b0d9b6d2c8aaa25880eea05954923e18497c42bf4e0f541dfa6c119c558b2712c5ed096a9c3e32dd3407c0 SHA512 4be30bdc63446259fe246e4d7fc0cb78fa40f40e9eb1a0b3a9d523d19ba0664be5e04f1803235a268eaae41cf4d88adfdbc6ecec86f8bd03703aca6c25ba9b8b
 DIST adjtimex_1.29-2.diff.gz 51735 BLAKE2B a59efafa03527ca8cb54994bfe49bec3638b2d76dcb505fcbe3be9e112326223c7f6009f7e527b0ff1a265e7af3c190894b8e3c41c6cf4e31dc2832a093bc38a SHA512 cc78cf9fd93cb243019952f877cb9730a5755d87336fc1a956162e957fd579de3770cb6bbba58ac9b6d350ee631ed294303360d0aa4153b12a31eb1bb4e35924
 DIST adjtimex_1.29.orig.tar.gz 85551 BLAKE2B 4e7784c3d3efa1f6ea226a7822de675a27c5be5d048664f8ff215eebe65b493e6dc0d004cc955c2e3b4e314e6283eafd628e92b611504b6ea92f4e5fe7d1a8c7 SHA512 5a48cdc538866c06562f62e369c08d60978c791ed91565262c0179c6fa25dd343963992d00e10f32475fdc00b458f81cf9c61adbfa9e1b7a8d4981ebeeff5649
 EBUILD adjtimex-1.29-r1.ebuild 1433 BLAKE2B ff7df3097d3f56875e11368ee4af2dfae5acc1552e1c7eadcf9acf7b22a5b653ccfdef3facf9c3e79fdd1726d88649086f8f0ce32efc34adc0ec2882aede9b26 SHA512 a2b56c1667fb329513638ed10d99e04ae14f6e374646b9802899f4094da2fe21e8d45e0d61cb422fb12f61cb40b9542d9ebe3ab6429504cd1a710408b9db6b6e
+EBUILD adjtimex-1.29-r2.ebuild 1701 BLAKE2B 9f8a6233fa3f4e0d73a796b453ed5fc98ddd9e644907ceec7857ad3d27e410b47e0c27ffeed7f379a521bfe57fc2d97f16ae9c9bdd3054c4aeb87daee62004f3 SHA512 3509d41b1a781edafd53ec7af7039fd6d680ff22880585e7008bc985c253d764c085da5d01fb9f666af3db702c482a7284d0e4f87a882cb6d1441a86469d9b9b
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild b/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
new file mode 100644
index 000000000000..c93afec77daf
--- /dev/null
+++ b/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils fixheadtails toolchain-funcs
+
+DEBIAN_PV="10"
+MY_P="${P/-/_}"
+DEBIAN_URI="mirror://debian/pool/main/${PN:0:1}/${PN}"
+DEBIAN_PATCH="${MY_P}-${DEBIAN_PV}.debian.tar.xz"
+DEBIAN_SRC="${MY_P}.orig.tar.gz"
+DESCRIPTION="display or set the kernel time variables"
+HOMEPAGE="https://www.ibiblio.org/pub/Linux/system/admin/time/adjtimex.lsm https://github.com/rogers0/adjtimex"
+SRC_URI="${DEBIAN_URI}/${DEBIAN_PATCH}
+	${DEBIAN_URI}/${DEBIAN_SRC}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND=""
+
+src_unpack() {
+	unpack "${DEBIAN_SRC}"
+	cd "${S}" || die "Failed to cd $S"
+	unpack "${DEBIAN_PATCH}"
+}
+
+src_prepare() {
+	# Debian series first
+	DEBPATCHDIR="${S}"/debian/patches/
+	for f in $(cat "$DEBPATCHDIR/series") ; do
+		eapply "$DEBPATCHDIR"/$f
+	done
+	# Then gentoo changes
+	for i in debian/adjtimexconfig debian/adjtimexconfig.8 ; do
+		sed -e 's|/etc/default/adjtimex|/etc/conf.d/adjtimex|' \
+			-i.orig ${i}
+		sed -e 's|^/sbin/adjtimex |/usr/sbin/adjtimex |' \
+			-i.orig ${i}
+	done
+	eapply "${FILESDIR}"/${PN}-1.29-r2-gentoo-utc.patch
+	ht_fix_file debian/adjtimexconfig
+	sed -i \
+		-e '/CFLAGS = -Wall -t/,/endif/d' \
+		-e '/$(CC).* -o/s|$(CFLAGS)|& $(LDFLAGS)|g' \
+		Makefile.in || die "sed Makefile.in"
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	dodoc README* ChangeLog
+	doman adjtimex.8 debian/adjtimexconfig.8
+	dosbin adjtimex debian/adjtimexconfig
+	newinitd "${FILESDIR}"/adjtimex.init adjtimex
+}
+
+pkg_postinst() {
+	einfo "Please run adjtimexconfig to create the configuration file"
+}
diff --git a/net-misc/adjtimex/files/adjtimex-1.29-r2-gentoo-utc.patch b/net-misc/adjtimex/files/adjtimex-1.29-r2-gentoo-utc.patch
new file mode 100644
index 000000000000..0038258b9d48
--- /dev/null
+++ b/net-misc/adjtimex/files/adjtimex-1.29-r2-gentoo-utc.patch
@@ -0,0 +1,30 @@
+--- adjtimex-1.29-debian/debian/adjtimexconfig	2011-12-23 21:29:32.962449759 +0100
++++ adjtimex-1.29/debian/adjtimexconfig	2011-12-23 21:30:00.610638657 +0100
+@@ -3,6 +3,18 @@
+ conffile=/etc/default/adjtimex
+ startfile=/etc/init.d/adjtimex
+ 
++# Get UTC setting
++params=''
++if [ -f /etc/conf.d/clock ]; then
++    #baselayout-1
++    source /etc/conf.d/clock
++    [ "$CLOCK" == "UTC" ] && params='--utc'
++elif [ -f /etc/conf.d/hwclock ]; then
++    #baselayout-2
++    source /etc/conf.d/hwclock
++    [ "$clock" == "UTC" ] && params='--utc'
++fi
++
+ echo -n "Comparing clocks (this will take 70 sec)..."
+ 
+ # Get the parameters
+@@ -11,7 +23,7 @@
+ baseline=`awk '/<= tick/{print ($1+$NF)/2}' $tmpfile`
+ hz=`awk '/USER_HZ/{print $3}' $tmpfile`
+ /usr/sbin/adjtimex  --tick $baseline  --frequency 0
+-/usr/sbin/adjtimex  --adjust --force-adjust >$tmpfile
++/usr/sbin/adjtimex  ${params} --adjust --force-adjust >$tmpfile
+ echo "done."
+ ticks=`tail -n 1 $tmpfile|awk '{print $6}'`
+ freq=`tail -n 1 $tmpfile|awk '{print $7}'`
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index aa2c63b639b8..b231f78622dc 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -7,6 +7,6 @@ DIST curl-7.65.0.tar.xz 2392324 BLAKE2B e5aec8c6cb6f6baabd035ce2ea159dba15410116
 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 6976 BLAKE2B 3514cca4b250cebd505d4f30a8cc99baf4675108e8912dc477151b9e2a3ac27b0da3741246340e4a4a57728f7615ba6b7d94e8c4370c259537d948f311b274e1 SHA512 c0a0848bfc8fcaa82a08c32636883bf6bfdfc74bbeb1e05186ea640558becfbb5df5ea331f1627de18b1196ee5a0b9538f26412e5a8b5dde0148477985a5ee7b
+EBUILD curl-7.65.0.ebuild 6975 BLAKE2B 3ba830aa65b0c9e98f5128289a7c8cef5c3cbc2ee91881f47bb9318c2fe82f5121942c4263cbcef5d6ab26c602e4a2b1ffca795e8253800c5318a3c4f6c16f23 SHA512 fef5557f9175b3a8c6240e6a89dfb994412948a6e44ec356e308f4fdafd0362df2f63400048c9ea0d6cece07240370965ba51d39424c3014ee761db1d799bc15
 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 919241dde98a..2288b6efa99d 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/ena-driver/Manifest b/net-misc/ena-driver/Manifest
index 33b25f8a20b1..3b17f27eaa4f 100644
--- a/net-misc/ena-driver/Manifest
+++ b/net-misc/ena-driver/Manifest
@@ -1,3 +1,5 @@
 DIST ena-driver-2.0.2-linux.zip 271852 BLAKE2B e2bf85a70abc0914fafb786bde2a24020ddf0e88e0a051f59938b0091e92fb8f11407567b384610f7838e85903eb734338f5af7f1045a05055566af83ddc1908 SHA512 8c1328ae6907f7e56d3398a6502db51dfb15772fbbb0eb075062ffa3f49b4b3697ec357c77f44701e33bd794e0b5858c619cad97581bbfb27ab010f7dd97da6b
+DIST ena-driver-2.0.3-linux.zip 446695 BLAKE2B 43d4dc947f53c42c6ccda7a0fd3e32cda2c49aadee67ac7d719739f49c91b704aff04fa47f943667c7dd29f6ee0a573ceb43001a9dcdc6492cdbeb85091dd957 SHA512 08e8c1caecff3d7e19fd847e102506e501aafbefec1867fcc88d535fa728abfa7f0d292bdc9c4dff6c3d4d303002ab8b9a62bfc855cfda5130880fb237eb57c2
 EBUILD ena-driver-2.0.2.ebuild 871 BLAKE2B 0e73e54e2b3ce04eaf4077bc8405812ff2748efc20d9f583e7355181716d6790e0dd60e8747377a21a5c113ad5f7a3ca44aa3bd5919fbab39501e6c6eb480c93 SHA512 c5c743f8b5dc8829e76cd608759e85723a3eaeb67d5e776ddbfc6eb33312ec7a5a9e6a25f9bc53399d7975d53887b62153a4a1b6ef201f4d8249ee2d79a72b3b
-MISC metadata.xml 260 BLAKE2B 93b4bac4246e017b0dc21599f85ff5d0d22ac2691acdeca76c67b1ea14c46d8764b5d52c370af28e44bdec84de9dfc5185136b143fde3d36859ba8f4900ed71c SHA512 5f4bd0763a9f614ca74f08969dc67a7e4221c5491922dc844942bfb5c01815ea30bda1cc352a4be4ef977200cd90e6f3d06555c9d151205ec245527920b83f70
+EBUILD ena-driver-2.0.3.ebuild 893 BLAKE2B 8206c7e71f08c03fb2908a0de8da0cd42d12499b8e8d2b08f8ad6359db548d8b31e17eee7e735e2dd49a4d1edac4ac911f86b90f41044dc726d63d66ba55a801 SHA512 45f828a496371489102214d177aaea7ac5b85e40cf552f9da323b484462206d399751dbba9c20332105561a97ccdd503f72825b16b96acb5c3dd6a1dcce58eea
+MISC metadata.xml 346 BLAKE2B 52871ec0869c595fe75316469f0ad9174ebf75131f1d894ee9ce31c44ef34869c834c95ddd59efa150a80c086c9c1c5beac71089727359e9594c32687735c9ad SHA512 89d1251ed79b0ec69632b6f672cc4282ff6e10ba42bd6b8f2affe3e59bbd066cbee11d82fcdd136ca2eaba12965ab5f8ead246b69907a99c862a561171d83b1f
diff --git a/net-misc/ena-driver/ena-driver-2.0.3.ebuild b/net-misc/ena-driver/ena-driver-2.0.3.ebuild
new file mode 100644
index 000000000000..02e0ca271853
--- /dev/null
+++ b/net-misc/ena-driver/ena-driver-2.0.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info linux-mod
+
+DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver"
+HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html"
+SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.zip -> ${P}-linux.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena"
+
+MODULE_NAMES="ena(net:${S}:${S})"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CONFIG_MODULE_SIG=n KERNEL_DIR=${KV_DIR}"
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's!/lib/modules/\$(BUILD_KERNEL)/build!$(KERNEL_DIR)!g' \
+		"Makefile" || die "Unable to fix Makefile"
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc README RELEASENOTES.md
+}
diff --git a/net-misc/ena-driver/metadata.xml b/net-misc/ena-driver/metadata.xml
index 31521abd4e5e..3a5763bb8cf6 100644
--- a/net-misc/ena-driver/metadata.xml
+++ b/net-misc/ena-driver/metadata.xml
@@ -5,4 +5,7 @@
     <email>dilfridge@gentoo.org</email>
     <name>Andreas K. Huettel</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">amzn/amzn-drivers</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 9690a2607e59..1d202ed322f6 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,5 +1,7 @@
 DIST mico-2.3.13-gentoo-r13.patch 133254 BLAKE2B 71e22f8bd7491b6aa594a32d7d2a5677b3fc1376bb8ff11eae20e6749ec9c582b99704030c2178f81f1b1fd4ac8f4c2b14e3c80cdf9769ed49004c5a4bab761d SHA512 4e4c60c8e3f6e303b136d17cc83cd5bb92a2b23c0a843721ba74e62d6c69224719bf254a5d8c028df0166c36a07ef349e98f4244b4d208e689c3b6c382c1b906
+DIST mico-2.3.13-gentoo-r14.patch 136291 BLAKE2B 3416fe0fc2e0b9243d22c9cf6a0dffbf14c99846d1b064b3df6496c2d1b9021de0268d0543f566d13425d4fef29626829359deb133ce678d299627f93b0461de SHA512 3ec284442ac00bf429f633dddcaae46a83b720045bc93a177a609255957956aaccb188b0e858ac88b3d8b0c9be081501dcffabd86965b1a4b30a07d45aab0850
 DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895
 EBUILD mico-2.3.13-r13.ebuild 4328 BLAKE2B e569938f537160595c3a546a4da8a3f2a43283c580e11ee0975d0620e1c02720522251f302c4953ed2420fd75086cb24e6c8a7aab2ad13f0e85a33ac924283af SHA512 7ed391ebfd57867eee96ef417a7356721d7cd0fdd72c372844f1ea730dce327e66efdde00864bf894bd319abf044823d9752b5414069b2804cff0b6e0bb24319
+EBUILD mico-2.3.13-r14.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-r14.ebuild b/net-misc/mico/mico-2.3.13-r14.ebuild
new file mode 100644
index 000000000000..4b4032d1f826
--- /dev/null
+++ b/net-misc/mico/mico-2.3.13-r14.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs autotools
+
+if [[ ${PV} == 9999 ]]; then
+	EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository"
+	inherit darcs
+	SRC_URI=""
+	PATCHES="${WORKDIR}/${P}-gentoo.patch"
+else
+	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"
+IUSE="gtk postgres ssl tcl threads X"
+RESTRICT="test" #298101
+
+# doesn't compile:
+#   bluetooth? ( net-wireless/bluez )
+
+RDEPEND="
+	gtk?       ( x11-libs/gtk+:2 )
+	postgres?  ( dev-db/postgresql:* )
+	ssl?       ( dev-libs/openssl:0= )
+	tcl?       ( dev-lang/tcl:0 )
+	X?         ( x11-libs/libXt )
+"
+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
+	}
+else
+	S=${WORKDIR}/${PN}
+fi
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die #426262
+	eautoreconf
+
+	# cannot use big TOC (AIX only), gdb doesn't like it.
+	# This assumes that the compiler (or -wrapper) uses
+	# gcc flag '-mminimal-toc' for compilation.
+	sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
+}
+
+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.
+	# So we override the configure check to not find 'javac'.
+	export ac_cv_path_JAVAC=no
+
+	# '--without-ssl' just does not add another search path - the only way
+	# to disable openssl utilization seems to override the configure check.
+	use ssl || export ac_cv_lib_ssl_open=no
+
+	local myconf=
+	myconf() {
+		myconf="${myconf} $*"
+	}
+
+	myconf --disable-mini-stl
+	myconf $(use_enable threads)
+
+	# '--without-*' or '--with-*=no' does not disable some features,
+	# the value needs to be empty instead.
+	# 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
+	myconf --with-bluetooth=''
+	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
+
+	if [[ ${CHOST} == *-winnt* ]]; then
+		# disabling static libs, since ar on interix takes nearly
+		# one hour per library, thanks to mico's monster objects.
+		use threads &&
+		ewarn "disabling USE='threads', does not work on ${CHOST}"
+		myconf --disable-threads --disable-static --enable-final
+		append-flags -D__STDC__
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	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
+	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
+
+	# avoid conflict with net-misc/eventd, bug#632170
+	mv "${ED}"/usr/bin/{,mico-}eventd || die
+
+	dodir /usr/share
+	mv "${ED}"/usr/man "${ED}"/usr/share || die
+	dodir /usr/share/doc/${PF}
+	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() {
+	einfo "The MICO Name Service daemon 'nsd' is named 'mico-nsd'"
+	einfo "due to a name conflict with net-dns/nsd. For details"
+	einfo "please refer to https://bugs.gentoo.org/544488."
+	einfo
+	einfo "The MICO Event daemon 'eventd' is named 'mico-eventd'"
+	einfo "due to a name conflict with net-misc/eventd. For details"
+	einfo "please refer to https://bugs.gentoo.org/632170."
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 976e5b78a4cc..510fd4e9a990 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -4,6 +4,8 @@ AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117
 AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
 DIST NetworkManager-1.14.6.tar.xz 4426540 BLAKE2B 29709005f4143bb4a9ef2348c2da062ea741111bdd54400f199e057317dff12fe9b0d3ab7795b21e93217076a0b338a18d99c7d2c2514d138aaf5bf41aa71c5a SHA512 e5e11eed6366eb185691102c89732a458f3a01aa979e724f7415d237e0ba1a811ac78bb17d9cf1b11181ec6e3f82cb5f1c86b624d3c2b2c7c1b72549653309c9
 DIST NetworkManager-1.16.0.tar.xz 4793620 BLAKE2B 554559eefbfa489cf01067bd2c32e4b06fed076d38920b41f2d0005873ff913c0af2babcc3d9b463a4b636ca82e5c27ee20ab5768fcfb2c6b79e003d7fdc224d SHA512 e9d8365d8e59e5bc7c0bc13482139fb96b1d87183c8884e71e84eaf05fe121f2bcac519edd916bd242be4e9a9e2d2140a1065f529a9a02bda87b6d2bd4192584
+DIST NetworkManager-1.16.2.tar.xz 4820392 BLAKE2B f85fa4ff27cb2f0fc7d58052c810d4c20ca51d6e77e400c44270f941de6b4878b0c645053b9ffb02c3587b6c7b17631f9a6c6c15b630da4747051e1745d1dae8 SHA512 b3e874786d0bce58b967677fe82980aac58023fd4e913345acb63d7a7f253cd8fa6c044e788dd337a52f0fb026ce5fbd333d738dc9c3644d696e85498120f6d2
 EBUILD networkmanager-1.14.6.ebuild 10961 BLAKE2B ba38ca50957abd14cb4b965e72a1a249267d5ded23cc7d766f1cc2ff2bda6ff5583fb66124eddbd45c3f62eca650c6094d7a637196b0c4acf392e576445595f0 SHA512 6dbba3c0a1fa478b5f3599b97101eee08c7d347409235ce49b72d6cf857da064ceee394afd8820e59237f788b2442ab4e7f5bb411b659dbdb495fba190e567ef
 EBUILD networkmanager-1.16.0.ebuild 11116 BLAKE2B 6efd07abfefffa1e3ebc8b559ae37b6b422c809677cbdb970ce0a7ee2e4d36f3d0bfb63c6480424e18fd307c51e683932c51f1ef87be44fdcd7e5ca1431bdffe SHA512 289846ad13e61b095781886cedba698261070cd2091ccd0d6fc5b18d640cc49b6c4772adbd88e82b5fab9a35ee4913006f77094e13279e17433f8337ae13ebbd
+EBUILD networkmanager-1.16.2.ebuild 11141 BLAKE2B ea2d4c1560509c7707599cbd4b8b02d411f56779cc693fe5d9870fa7d2a24c26097d04930baa62174b7a9435cf414e9266151001c72ec437c06d5b893729c81b SHA512 78d82edf41f868f70ff3d74b6452cc3304fd83f679425f1a6bee11aa9a709b1075d2fa9f233282b76a3ee0309991b534169a9048d917691e85f753127371e680
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.16.2.ebuild b/net-misc/networkmanager/networkmanager-1.16.2.ebuild
new file mode 100644
index 000000000000..ba66ce187019
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.16.2.ebuild
@@ -0,0 +1,342 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
+	user readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( nss gnutls )
+	?? ( consolekit elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=[${MULTILIB_USEDEP}]
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-3.18
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		linux-info_pkg_setup
+	fi
+	enewgroup plugdev
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--disable-lto
+		--disable-config-plugin-ibft
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
+		# still not ready for removing that lib, bug #665338
+		--with-libnm-glib
+		--with-nmcli=yes
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-crypto=$(usex nss nss gnutls)
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		# ConsoleKit has no build-time dependency, so use it as the default case.
+		# There is no off switch, and we do not support upower.
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		$(multilib_native_use_enable introspection)
+		$(use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	if multilib_is_native_abi && use policykit; then
+		myconf+=( --enable-polkit=yes )
+	else
+		myconf+=( --enable-polkit=disabled )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+			libnm-util/libnm-util.la
+			libnm-glib/libnm-glib.la
+			libnm-glib/libnm-glib-vpn.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libdeprecatedHEADERS
+			install-libnm_glib_libnmvpnHEADERS
+			install-libnm_glib_libnmincludeHEADERS
+			install-libnm_util_libnm_util_includeHEADERS
+			install-libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmvpnHEADERS
+			install-nodist_libnm_util_libnm_util_includeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+}
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index a709a02d3f18..80ebaac87632 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 1791 BLAKE2B d804d858ac3f4fe20e86cb3a8a5747bf158bd45604b156cb97f7889cd942b77a06e2e319137672d50d7e2da73ff4db73befdec22c81610198c5b649219046c35 SHA512 786aef63e4fd3efc30a27c677b5ef4a6b6567cb29d4c4c0f42234c49e20a82833a4c2bdc30bcb404e3caf8e51ef2907b43059c08258f892b7e287e75ff86262e
+EBUILD rdesktop-1.8.6.ebuild 1790 BLAKE2B d8baac29890505e8066faf34207f06b0e0ed2c9206efa4049fcf98910ac5c6d95c5b57c82afe7db22a0614f2588727865edab49a720bd578d9c56d59ae48b858 SHA512 6bbe909dc5fecc0339b5610d35b50c3397d2b8537025d2d1483cb77b2c7cffc4ca2d0bf2e285a817e6f60bbbb230f06cdbd709be477fcf8bc5ead1885ba2d44c
 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 aca399e7a9ce..c24c7b2360cc 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/smb4k/Manifest b/net-misc/smb4k/Manifest
index 61cea3815fb4..bc3b70ba2bbe 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,5 +1,6 @@
+AUX smb4k-3.0.0-fix-mount-readwrite-shares.patch 4702 BLAKE2B 762b5023d8249b5c35f53ac34d6b779b8464384d08957c3c8ee1f3bfb9ab78d052f0570e47a2338296ef4a70c02ebe93fd7822b480c51325639f7eb4bbae52e7 SHA512 1c6ec72764ea682b6a3e97c857eb86e497f02cb2e525cd92baab3249cb967d836f6aa52a00c41bec2da6349eb7855b8f1911cec8a98ed6cb1e4356fa33720bfb
 DIST smb4k-2.1.1.tar.xz 3718220 BLAKE2B 99258ac57d3b8ff2861b8635b6a0799a347f3934c8d070d41c09f49b69caa7b59f502db9041d1bc4f875ae15544254faaafaae6429200ddf5526a06812983e1f SHA512 d69cb9f4c22e2afdd111e73c3d99d6868f959aa5476ffe10620862d3659b5a4f3b814856b17a9dced7bf6dde524f5bcf224e62d413d2aa92b0bcc2272ddf22b7
-DIST smb4k-2.9.90.tar.xz 3846724 BLAKE2B 644c08fe6d052d9cbe7d24c228d808a6087d63d8426dd442580e78938c2f1255cb1b381cbf88b495f000d77ae231759ed4adc17dd907e620229063447dc64b4e SHA512 b95d798bee22fd77d0f16deacf329ebd58ac651c99a97ec7107544ac873737848c256b3559e307b0cd63bd593aa0713a307520d533e81d4b40edb42a500f2803
+DIST smb4k-3.0.0.tar.xz 3825920 BLAKE2B 5439caa8f02fc93cd2065384e2b502abdca328fd186cb10ac0837d7eb289a2d62bedd81439a6d5b0e815edfb7fe168fcb70f0e645f3bae2d39a391d0688487f6 SHA512 b32a7151adb46b93e2c245136752435d3842e135baeb2b44343287d2eaf9f2aa5622a28b19df7d821390a35994f3ce204fdf20aeeac6ad67e9eb3b144ee22e33
 EBUILD smb4k-2.1.1.ebuild 1352 BLAKE2B 98f727608542565fb7d3ea95feb5519dbc4c14ca6545ac332e5cf41495bb73f592303cb20f9d9d8a6466674aac6ee79f8f1c9be35fed91fc0b1639b7d2e38959 SHA512 fadf1efd2d4ceb8fc733397435d4ca39d8d336dfd47b6430cfa3009e02169450f47f06a651313056db1bc3e3f119ea375a0340a1727b4961e54da6ce373c45db
-EBUILD smb4k-2.9.90.ebuild 1360 BLAKE2B 0100fc6dad643df05d01a270aeeb62c7d4b798fc154fd8ba916b36718a8306834e8e2f9434b501ec665cbae8591f4086131979e5dfa998f180c9c383633b3690 SHA512 1dec88f0346b8737a2e3834c60a1b55c61d45b02bd95746dc8c34ddc853cc29c57c39363630ee098efbaffd67ee4937da4a196bf04a4dafc46acc8c7c6414066
+EBUILD smb4k-3.0.0-r1.ebuild 1709 BLAKE2B d29e564e1db91c9ffe2b0c0fc2dd19661e5c7ee697be1b7bf1ffc5ef9790ebb6ba44ef8a02c57a0e746cc7b802d2402bda054896676958b50550227e8e5c06dc SHA512 b0bb163c2f74ae280813c82031ce1fb3766bb74c582ad4e5c55699b8fd68003339e6d64b049ac47c5acebea5d67e2b68cb3ba0bf6ba2fb38ddbc1dfc3e581ff8
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/files/smb4k-3.0.0-fix-mount-readwrite-shares.patch b/net-misc/smb4k/files/smb4k-3.0.0-fix-mount-readwrite-shares.patch
new file mode 100644
index 000000000000..84d50b75b463
--- /dev/null
+++ b/net-misc/smb4k/files/smb4k-3.0.0-fix-mount-readwrite-shares.patch
@@ -0,0 +1,61 @@
+From 886af393dab0f6efe0f8bafc03522f25c15e0ba6 Mon Sep 17 00:00:00 2001
+From: Alexander Reinholdt <alexander.reinholdt@kdemail.net>
+Date: Thu, 13 Jun 2019 20:57:38 +0200
+Subject: It was reported that Smb4K mounts shares read-only that were
+ previously accessible read-write. It turns out that the default for the "CIFS
+ Unix extensions" setting were not chosen very carefully. This commit changes
+ the default values back, so that mounting should work again as expected.
+
+(cherry picked from commit d3b89af5410ea8d4cb5f34921d48fdda486990f2)
+---
+ core/smb4kmountsettings_linux.kcfg | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/core/smb4kmountsettings_linux.kcfg b/core/smb4kmountsettings_linux.kcfg
+index 4ad329c..7e046dd 100644
+--- a/core/smb4kmountsettings_linux.kcfg
++++ b/core/smb4kmountsettings_linux.kcfg
+@@ -11,12 +11,12 @@
+     <entry name="CifsUnixExtensionsSupport" type="Bool">
+       <label>All or most of the servers support the CIFS Unix extensions</label>
+       <whatsthis>Most versions of Samba support the CIFS Unix or POSIX extensions. For these servers, some options are not needed, because the right values are negotiated during the mount process. For other servers, you might want to uncheck this option, so that predefined values can be passed to the server. Please note that if your computer is located in a Windows dominated network neighborhood with only a few Samba servers, you can safely uncheck this option and define custom options for the Samba servers.</whatsthis>
+-      <default>true</default>
++      <default>false</default>
+     </entry>
+     <entry name="UseUserId" type="Bool">
+       <label>User ID:</label>
+       <whatsthis>This is the user ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the user ID is forced.</whatsthis>
+-      <default>false</default>
++      <default>true</default>
+     </entry>
+     <entry name="UserId" type="String">
+       <whatsthis>This is the user ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the user ID is forced.</whatsthis>
+@@ -25,7 +25,7 @@
+     <entry name="UseGroupId" type="Bool">
+       <label>Group ID:</label>
+       <whatsthis>This is the group ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the group ID is forced.</whatsthis>
+-      <default>false</default>
++      <default>true</default>
+     </entry>
+     <entry name="GroupId" type="String">
+       <whatsthis>This is the group ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the group ID is forced.</whatsthis>
+@@ -34,7 +34,7 @@
+     <entry name="UseFileMode" type="Bool">
+       <label>File mode:</label>
+       <whatsthis>This is the file mode that will be used for creating files. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis>
+-      <default>false</default>
++      <default>true</default>
+     </entry>
+     <entry name="FileMode" type="String">
+       <whatsthis>This is the filemode that will be used for creating files. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis>
+@@ -43,7 +43,7 @@
+     <entry name="UseDirectoryMode" type="Bool">
+       <label>Directory mode:</label>
+       <whatsthis>This is the directory mode that will be used for creating directories. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis>
+-      <default>false</default>
++      <default>true</default>
+     </entry>
+     <entry name="DirectoryMode" type="String">
+       <whatsthis>This is the directory mode that will be used for creating directories. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis>
+-- 
+cgit v1.1
diff --git a/net-misc/smb4k/smb4k-2.9.90.ebuild b/net-misc/smb4k/smb4k-3.0.0-r1.ebuild
index 578795e8d724..fd64fcc60aab 100644
--- a/net-misc/smb4k/smb4k-2.9.90.ebuild
+++ b/net-misc/smb4k/smb4k-3.0.0-r1.ebuild
@@ -50,9 +50,21 @@ RDEPEND="${DEPEND}
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-mount-readwrite-shares.patch" )
+
 src_configure(){
 	local mycmakeargs=(
 		-DINSTALL_PLASMOID=$(usex plasma)
 	)
 	kde5_src_configure
 }
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "Users of Samba 4.7 and above please note that for the time being,"
+	elog "the following setting has to be added to or changed in the [global]"
+	elog "section of the smb.conf file:"
+	elog
+	elog "[global]"
+	elog "client max protocol = NT1"
+}
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 45da27ff3f11..835067a7824f 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -11,7 +11,7 @@ DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1
 DIST stunnel-5.51.tar.gz 979334 BLAKE2B d01f2667691e7bbb8bd0cd0d625d511462d53a2061d3b3d774a8efaa832370ee5111c941f8f0875fd13a91620887aae0eb76c17a30bc9d37d8b77aafda2414b4 SHA512 ae135b0da789b3daf2114ebd2af50c376c34d5e911189d71af2a350f6f413b8642027027bcd5a9d547169c8ee2e05f4f9558b3a669842e5c0542dbe85f79229b
 DIST stunnel-5.54.tar.gz 985587 BLAKE2B 3f736301f042387bfb1b892bf33b1baa1b93459db84cab61844bb19a423a4cced65fbc6f5c1bacd0a638596553e5f9a08ea72175c8fc31195e103615ff9fa591 SHA512 3c8f782c48fbe2dc4909e8d4c5db6491cd9c58fe0763107546d8420b8b49a02a4a1258e88282d07b31e784111c7f167d66c7c2af92f347685b393d443a653cd9
 EBUILD stunnel-5.43.ebuild 2908 BLAKE2B a0013d9661c772464743069e4e80ed3713fd8deb39002d1594581601e2f39dbfbe77196c5dcc03f19c66b9d693e5a7a6e4f3ded589976b3b181e9af3471e1951 SHA512 7f1336affe6ff12f4a6eb173a9e0f24a955fcfcfc6ff9650aafe66a4fc0724147473a9ad6056ea4b30489ac795224ee5302c67518c90307e1b69a89dda5bdd96
-EBUILD stunnel-5.50-r1.ebuild 2891 BLAKE2B 0fd609cbe4542c98b2da12e9f5b10a9c7b78b193b64b1bb6b9c949556a5fce5a05719455876932f759abb300e1a0c9a737f5715c856f80504ba82c5dba9a82c2 SHA512 4ab5d9f3986182beb5fe5e1f32a1cf1e164eacecc4295dba1194a24db2dfa58a63af0d547487029b5245885cb9e87a2bbd93bcabde58b49bddc1c12445bfdf22
+EBUILD stunnel-5.50-r1.ebuild 2890 BLAKE2B ffa69c7b02614e5e43164dade91920f81f2cba817c0e8c057bc9a795c667f3f6f045697ff00499359b444c3f9e226c0ee044debee52cc2e9dea6c0bb233c637b SHA512 bd837960737a05e94d0905663ccc58d7216a054222af31b6ebc907e7855e5d6e2c995f0fb256b89df08dd77d7b8af0f0f362350f8e3f2f02ea91c6feb00853c4
 EBUILD stunnel-5.51-r1.ebuild 2907 BLAKE2B 2aa8773750af083b3db5e5a232915c73e3985b8a32424ef6a6c0660f51a33b8c1049ef48e272e889e386fcd98c0e8464e22fdfe26309b0df37ffa0912c61557d SHA512 2e45350897ac5423492a0e90a6cdd80125a5aab49d9db9ff29701f63604559846be9b95ee5f58698b7c210758b1f97a9d0991055c2d509497285204e6ca59419
 EBUILD stunnel-5.54.ebuild 2907 BLAKE2B f2f85b3b178486d0c6720cbab05be44feeaaf238e476bc43b216bf181435b3b092ce55b4fa2ef40592f06b8f84c0f7d705335c782df9fbc7dc9c6daf4d328d32 SHA512 ae6df10bc5c499b3a8e4835334358df143fb5da32b8c578ed7dbeace2b8d297e27315b0d1639b4eabdabe91a145c9a11d1b9a0e9ba761abfeeea411e3b045f04
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index 952a61ec9506..ee1ce7200b6b 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 9ddf02be0a7d..74450f614455 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,7 +1,4 @@
-DIST wget-1.20.1.tar.gz 4392853 BLAKE2B 5740fa70064e24a699ba5fc0b6262b372fc877e86fc74bede07bcfe7dcdf6d4a15db7686fc900d8ec90ad3adce8c4af1c00460601c1845da7907f929d8d48447 SHA512 855c7e3c45f9020a9fdb30e286ee6a0bdcaa780be3d0dda9ffdae73b562ae1012d4550242f66240407a28076a7054328d4f08a469a0da227a9e3410b8d5f46dc
-DIST wget-1.20.2.tar.gz 4486237 BLAKE2B 7392e445cb801ac5fafee804e6b0459d0a001b91b5b413f1a5592da6bea690a2d6b864b64a1add1c4114085def7a73312a88cd1cf1c12434c6535f79de222d9a SHA512 42d59ddb3abec6ff30e2be890ceeec35fc144acd8e2def25f5280c2f8c21e6fd54dc71217e9ca7fb1d4f0470716bf288e90501e8e6e39b09938e3f5710a3016a
 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 3195 BLAKE2B 99634e4899ab9fa5ecacf4da2b52515f460a332c7fa0c3d6ee03b4738f1c81c8ed6548d42af428b96009ef4428d43610af3be3912e607528154922dc02151c23 SHA512 4f2db0c0c1baa073cff43ae5d32ebd6a6b9f7cffff4587e2fc1e24b057e035fc390372ecd4bb9cdea366abb5a16632cd487b082eead018bd981465291cd02969
-MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
+EBUILD wget-1.20.3-r1.ebuild 3214 BLAKE2B 1b910aac7b541f7412f253af9296bdcf3ebb3891004cefd8df2f0a28ccc9406768a910718cd21a12a4f3724fecc583bc41f671c76677ec441d1c3831dec2dd1f SHA512 eb0f81e9e0792137f01d9e7d783e0cfa2768acfdeaa36c3bb758e642607cb88950e9f3da1108c432ec1a09c021204519cd663fc6dd9da13ca9c27003b2dbab19
+EBUILD wget-1.20.3-r2.ebuild 3282 BLAKE2B ff7eeeaef719110f60e3686f9f25137c4aa59c3542cfdffdcefb4942e4cf1f19547a18e153a7bb6a0c666e48ebacbe409ec8729f389dc9abbba86d0cb4603dae SHA512 4e255cf3df386504a8040c1d9baf3bbd919f2239ca7e33aa560f7fdc9102e51e2621d8179393162ade6a19c10015e4db314c76260a05cd0a58f893321e7ab7f5
+MISC metadata.xml 656 BLAKE2B 0616f06a26ee8dfa23132a9abf38e1a156da6365b9ac202ff1a0985c0f19b1965f156c68fea81958fb86d3282aa1b6732087060c781bfcc500efeb8bffcb5098 SHA512 9d0acbcaccf5107a6b98e460cd6dd848b2e1f4f7bae5963a65e36919ed062563854a5f4315bd1f0903f6fb7b37d7fc58bc63c05efdadbc5644f6916c8858d068
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
index 85b6f1cfa8ce..d0383b4091d2 100644
--- a/net-misc/wget/metadata.xml
+++ b/net-misc/wget/metadata.xml
@@ -6,6 +6,7 @@
  <name>Gentoo Base System</name>
  </maintainer>
 <use>
+ <flag name="cookie_check">Enable cookie checks via <pkg>net-libs/libpsl</pkg></flag>
  <flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag>
  <flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag>
 </use>
diff --git a/net-misc/wget/wget-1.20.1.ebuild b/net-misc/wget/wget-1.20.1.ebuild
deleted file mode 100644
index db7181db9c4a..000000000000
--- a/net-misc/wget/wget-1.20.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
-REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-# Force a newer libidn2 to avoid libunistring deps. #612498
-LIB_DEPEND="
-	idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] )
-	pcre? ( dev-libs/libpcre2[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-		)
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# revert some hack that breaks linking, bug #585924
-	if [[ ${CHOST} == *-darwin* ]] \
-	|| [[ ${CHOST} == *-solaris* ]] \
-	|| [[ ${CHOST} == *-uclibc* ]] \
-	|| [[ ${CHOST} == *-cygwin* ]] \
-	; then
-		sed -i \
-			-e 's/^  LIBICONV=$/:/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-
-	# There is no flag that controls this.  libunistring-prefix only
-	# controls the search path (which is why we turn it off below).
-	# Further, libunistring is only needed w/older libidn2 installs,
-	# and since we force the latest, we can force off libunistring. #612498
-	local myeconfargs=(
-		--disable-assert
-		--disable-pcre
-		--disable-rpath
-		--without-included-libunistring
-		--without-libunistring-prefix
-		$(use_enable debug)
-		$(use_enable idn iri)
-		$(use_enable ipv6)
-		$(use_enable nls)
-		$(use_enable ntlm)
-		$(use_enable pcre pcre2)
-		$(use_enable ssl digest)
-		$(use_enable ssl opie)
-		$(use_with idn libidn)
-		$(use_with ssl ssl $(usex gnutls gnutls openssl))
-		$(use_with uuid libuuid)
-		$(use_with zlib)
-	)
-	ac_cv_libunistring=no \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED%/}"/etc/wgetrc \
-		"${ED%/}"/usr/share/man/man1/wget.1 \
-		"${ED%/}"/usr/share/info/wget.info \
-		|| die
-}
diff --git a/net-misc/wget/wget-1.20.3.ebuild b/net-misc/wget/wget-1.20.3-r1.ebuild
index 624c485f43ec..d71dbd3cf2a9 100644
--- a/net-misc/wget/wget-1.20.3.ebuild
+++ b/net-misc/wget/wget-1.20.3-r1.ebuild
@@ -88,6 +88,7 @@ src_configure() {
 		--disable-pcre
 		--disable-rpath
 		--without-included-libunistring
+		--without-libpsl
 		--without-libunistring-prefix
 		$(use_enable debug)
 		$(use_enable idn iri)
diff --git a/net-misc/wget/wget-1.20.2.ebuild b/net-misc/wget/wget-1.20.3-r2.ebuild
index b9c1aa3290a5..59a3d90a05dd 100644
--- a/net-misc/wget/wget-1.20.2.ebuild
+++ b/net-misc/wget/wget-1.20.3-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
@@ -13,12 +13,13 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cookie_check debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 
 # Force a newer libidn2 to avoid libunistring deps. #612498
 LIB_DEPEND="
+	cookie_check? ( net-libs/libpsl )
 	idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] )
 	pcre? ( dev-libs/libpcre2[static-libs(+)] )
 	ssl? (
@@ -34,8 +35,6 @@ LIB_DEPEND="
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="
 	${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
 	static? ( ${LIB_DEPEND} )
 	test? (
 		${PYTHON_DEPS}
@@ -44,6 +43,10 @@ DEPEND="
 		dev-perl/HTTP-Message
 		dev-perl/IO-Socket-SSL
 	)
+"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
 
@@ -97,6 +100,7 @@ src_configure() {
 		$(use_enable pcre pcre2)
 		$(use_enable ssl digest)
 		$(use_enable ssl opie)
+		$(use_with cookie_check libpsl)
 		$(use_with idn libidn)
 		$(use_with ssl ssl $(usex gnutls gnutls openssl))
 		$(use_with uuid libuuid)
@@ -111,8 +115,8 @@ src_install() {
 
 	sed -i \
 		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED%/}"/etc/wgetrc \
-		"${ED%/}"/usr/share/man/man1/wget.1 \
-		"${ED%/}"/usr/share/info/wget.info \
+		"${ED}"/etc/wgetrc \
+		"${ED}"/usr/share/man/man1/wget.1 \
+		"${ED}"/usr/share/info/wget.info \
 		|| die
 }
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 4221120f69b6..8a71218e6153 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,9 +1,9 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
 DIST whois_5.3.2.tar.xz 82984 BLAKE2B 2e2d9ebf2e93831a1fa3e98a2f8922e531592b95175c9280358a37160a9033ee805baa6519304350399c112e619e293a2746df527ef5c580afbdde1542cbef06 SHA512 27d9576ee7b701778cac0dd7d4df2c4ae2d152fa5dfb3f84d7d5d592314e45872b2f3d6eca0754923ec3a0741e5365bf2238b2c0b366403c35e8a5b046e59434
-DIST whois_5.4.1.tar.xz 83748 BLAKE2B acc3267a78c22937967cea92b542d92e99dc135a70550f242b098e0a459193564514c6b28c0290a82b9321a6a081793f64d51157c75cbe852fbb91a7cd353310 SHA512 8036679be4b5cd7ab67903ca1c949e0261bd2589f5a4efa18b10ecab8a1e13d99e5e8b839a4974af22c6afcfff74f7bd1c4361ef1aa3ebf7621a7c8a6bc98c25
 DIST whois_5.4.2.tar.xz 83832 BLAKE2B ea217d44c87fd92b6e005f344b31424a3a9481f6a892b911dcbe7794ab6e28229bb74bdea02be05ece9b18a5bd4802a4c7ab0433eaa3edcd18bb5bdd06cfe3d6 SHA512 09b10529a4cc1305802a4dcaa5090e05a4abb20863a622dcad3d1f0759d56c0604280fea703a1522af1e2ddf42e5dc34710c411f306debb420cda9e1956b3cde
+DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084
 EBUILD whois-5.3.2.ebuild 1577 BLAKE2B fcafe5e78eaa79b02d6ee03ffc964307687eaccae5bda1959c63542389697c016372c3718e02478d2bf70aa91d9e4a7b3b7a1df35f5aed02acec48c85af74965 SHA512 0d524bc8e5ac35c3034b34f402ffca1e2004ea03f7b75986fc09f1c8ce5354a08834871767b2d9e5a6063ff2fde258c90d22778cf9ef66811c84ddaa7618a5a3
-EBUILD whois-5.4.1.ebuild 1590 BLAKE2B 210332c4a24726612faa28d07d33079c949821614725351fa6d4a72aeab39f373230fa84cd69cda09065bc068fd9a5b007bbaff361ec0fd4bbc91ad25d4f10cd SHA512 ea9ba736f4e5e1870dbaa6852a6d40e16ba5c23c8442c0c8166c17f84d3314ad0c990cbdbb0260f3fa3668e093831d8e4373f0a2161bc5eb31efb24c45a66aa5
 EBUILD whois-5.4.2.ebuild 1590 BLAKE2B 210332c4a24726612faa28d07d33079c949821614725351fa6d4a72aeab39f373230fa84cd69cda09065bc068fd9a5b007bbaff361ec0fd4bbc91ad25d4f10cd SHA512 ea9ba736f4e5e1870dbaa6852a6d40e16ba5c23c8442c0c8166c17f84d3314ad0c990cbdbb0260f3fa3668e093831d8e4373f0a2161bc5eb31efb24c45a66aa5
+EBUILD whois-5.4.3.ebuild 1598 BLAKE2B cdef56fdf0815b5d0758fcf61bfcbefbb2d71f5e65200321041d700c2d6f15b236fe017c590413a9c30486d585549f04ce0ec45923a260d78c1f87897701a8dc SHA512 90a12f87d32e638db88fe81e23d1b21fa6650158f7f77ca196ea57d2254f5deaa8e01014debf6e1daf10baf3b6e830e25d4d34b4b10d2e18b6cd5645213500dc
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/whois/whois-5.4.1.ebuild b/net-misc/whois/whois-5.4.3.ebuild
index 05fc6a779ed0..48a22010a162 100644
--- a/net-misc/whois/whois-5.4.1.ebuild
+++ b/net-misc/whois/whois-5.4.3.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit toolchain-funcs
 
 MY_P="${P/-/_}"
@@ -18,7 +19,8 @@ RESTRICT="test" #59327
 RDEPEND="iconv? ( virtual/libiconv )
 	idn? ( net-dns/libidn2:= )
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
 	>=dev-lang/perl-5
 	virtual/pkgconfig
@@ -59,7 +61,7 @@ src_install() {
 	dodoc README debian/changelog
 
 	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED%/}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED%/}"/usr/bin/{whois,mdwhois} || die
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
 	fi
 }
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index ff5ee5c74e66..aad1a9921557 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -7,5 +7,5 @@ AUX wicd-init-sve-start.patch 317 BLAKE2B 12fbe09fc6649b24b9f5c11dd867a8f1c5f88c
 DIST Icone-Wicd-Lucid.tar.gz 9015 BLAKE2B 20c55968fe2be08a6dc5e2b3584f9c4294c69a988789bcaad80bed02daf0cc971344578eac7a69208fabb0c5faefb47891dec0977d04d7bcfcb24c9ba7394385 SHA512 0df0dbdf05b462264dca2dd9955454a82f688b0fbfa7c2ad70a424df57eb27b35561d37819fc88b5746cff8a54de5b7b43ec325d2f98a4a1a30e4d500e86d2f8
 DIST wicd-1.7.4.tar.gz 547393 BLAKE2B 045073781eb81a29754a238c0fded5d3225727497ea24c6cea58a1c72b83da76af6fc40a8e7345652c2dc9eb68ed24e0d97e421fd8c9e4d909a2c8f9460881ea SHA512 1e99a45daa858eba634e60e50c22aa2fab3fc4d643979a6741b6164bf500bd6db285d11c12ccd164ab6cf0792284e319e3c3447804088e74b4fc67bb6f431959
 DIST wicd-mac4lin-icons.tar.xz 53136 BLAKE2B 5064546c2aebda92ce168847f2821ff11653939c21667f7f48263d3be0a9100dffa1322b9b2842cb92a2ca50dec39114b1246b057663ede8708db17271f16af3 SHA512 98ed3f92ec361aa8651c64efdb5128b8f73068f1cf2423640dafc4b46889ae32c1d1f56f509ad609b2bf98f634f8ada4c501f2294e3a64affd1befd4400498a8
-EBUILD wicd-1.7.4-r3.ebuild 5090 BLAKE2B 2fe420a60cb589c681935c7adb044e67a7fa7f503dba37088890b43887e1808a1b868dc54da1a08793757e040e2f8fbbd91607ac07b3174141543a0bf6f55764 SHA512 70de74c229f32ef67472b5e4bb90e11aa6db3c964cb2e584128c73217ede9e7b01d307e5d488ae7808fd33c8d2eea753e7e7938c70012d1fce5f861454da5248
+EBUILD wicd-1.7.4-r3.ebuild 5063 BLAKE2B 64b0a6b00f68c554b240bfff6572e766d9ea88928896c68dccbcaac37d1bd56328ea032e6a6f4f554400bb301ed8362c735772540751edbbfedd2d2b4a51c2ca SHA512 defa56dc408a9175a0ca806c66056ed97d3972910284887a177e0dc312ec70b434b8b7ecbaf10cdac29b825796b2ca064892925b0f24f0dbd6a1e0e3485c9b7e
 MISC metadata.xml 913 BLAKE2B 8e18aa7554e1bafb89f90f6fa27bfbfedf76d3cc63929311d2ad4c87cd13869dcc2cc90c126c9ef61ebba5ff765e59656a5516cb410fb365beaa97dc47d54e11 SHA512 2cc53e7e0f14169b88d26324b071b2078012cc57bd9ddae0b14f18efbe2d1bc1ef0b66122c178b0e3019a48bec2ba87fc09186b4d8a96e8e7d8e51a997c09d69
diff --git a/net-misc/wicd/wicd-1.7.4-r3.ebuild b/net-misc/wicd/wicd-1.7.4-r3.ebuild
index c06f9fd6f0ff..02aec4da7736 100644
--- a/net-misc/wicd/wicd-1.7.4-r3.ebuild
+++ b/net-misc/wicd/wicd-1.7.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,6 @@ RDEPEND="${PYTHON_DEPS}
 		|| (
 			x11-misc/ktsuss
 			kde-plasma/kde-cli-tools[kdesu]
-			kde-frameworks/kdesu
 		)
 	)
 	|| (
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index aebf31ebf105..77417613325c 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,6 @@
 DIST youtube-dl-2019.05.20.tar.gz 3167834 BLAKE2B fe5501380b5134665b3c5c31a7b703832d7c7d9675c1e7c20bfa2b4ebc175e37521b423b68d3701a3637e047e3d4f12e54786f7d6f23e896f0a9da93c39be6f5 SHA512 c50661585f987a6c2abc7b9940749a2ba8e9a534d66f0846dddb265be3fe5a58ba8009fbad44c2551c7574b73bc21aa35f7d633729c0090c46e5818199dccb1d
+DIST youtube-dl-2019.06.08.tar.gz 3169571 BLAKE2B 4603e19e80921b12526575bd13a0b43ff98d871e7a40415dd5b09bb2a0b720ffd60f4d54eecbf44b7144146a6f64d9692a1aaa42c06e4944f5a5a00667c411c3 SHA512 6758d629ff0b56ed6589d024f29761cbe4678154316a370090d6eca62611791b79b8662a70c54e333362db0495131935d47bcbfcb40ae6dcf1cc0c8808790799
 EBUILD youtube-dl-2019.05.20.ebuild 2119 BLAKE2B 82163aa22bf146600523fbb31e67d22af5a7a591e6b0c3900ca992f89fb45ec4536000872934b8a2d3beeb0a2d25ead1e8a500878c4db5dc70611d7609e00a0f SHA512 93ba6d18d95c861af5a8224e7ca8ee9947198e3e0b3a66e0bb70e5beb12a2b0bdbd004c5f619a97e6b30985ef3581ebaf163ca69a2dc1d2345de0ebb3c01f81c
+EBUILD youtube-dl-2019.06.08.ebuild 2125 BLAKE2B 50e06196444aee277e8bc2a72c762b76b7de6a9616f3ec6ccd76cfff696c4fcbb6e2c64022fcd5536708441a9009fb06b424fd7cbd86b7a58cee8108f908c6f0 SHA512 ee93e8557d67c11a7ead1bc1f0fefaec1f331aeea30a2fe93efd913d5a866380b62ba8a02d1115fb257d1989818a06eeea4e00d9acc35fe8feee147b8d6ed5b5
 EBUILD youtube-dl-99999999.ebuild 2014 BLAKE2B 55abeec62089210469af6edf2cde4f8764eb1a5d20a3cd96985dce8a833023e5dd2e44cc893a7db99d9002fc671601fabd1c26cdbfa0fc0411a9ba11e1715b78 SHA512 bbbfb4e6e8319e383eaf4db4dd4056f34374eb6f1527c6cc1c6ee0d9f61199a913bc99f929bd91ef80aa744ba9a865833395460d8b94125c362c59372f738346
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.06.08.ebuild b/net-misc/youtube-dl/youtube-dl-2019.06.08.ebuild
new file mode 100644
index 000000000000..a8b1afbfc11a
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2019.06.08.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+LICENSE="public-domain"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+RESTRICT="test"
+SLOT="0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}