gentoo resync : 12.01.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-01-12 16:58:08 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-01-12 16:58:08 +0000
commit: c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch)
tree: 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /net-misc
parent: 2891d29af8907ce881662f4a02844926d7a293c7 (diff)
58 files changed, 458 insertions, 1349 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 2ab609cc6a2b..e98b9fbe79a5 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index eaa754792784..4213be046cd9 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -2,8 +2,12 @@ AUX initd-v4-bird-1.3.8 801 BLAKE2B 09d9045299972580280fbb6d8745378a75b3a9e647b9
 AUX initd-v6-bird-1.3.8 802 BLAKE2B a9dc698f9dfde93314fe1b0f4c8005d9b5f14e4133ebad124f4283a50d990c946bda88b1d55227ed6bf9f33caf0d716b0a8540adf592fbf156297c20ab8a3b1c SHA512 6adb2b7c22696e53644bb5331bcb1b6e84026e41086f6f538c40073a7daa3b0ce3a14e041c2615a72cbe151d6fa8f81b543f85d421f019440ef5b6fd0a556ad9
 DIST bird-1.6.3.tar.gz 1337198 BLAKE2B e1a4a5ec4f46980f77f7c69860343da50eadea54129f20b52302aca5cdf63b19370f8cc2642b480af621772ed7b49ed7ed61a38c486f22c055abbe6be210aab9 SHA512 d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df
 DIST bird-1.6.4.tar.gz 1018874 BLAKE2B f6ef0b952f6b00008fadcaa1c1a32ac31b42a9804e221edb75073e23ff942276bf1beee6d3f4c9d89f90339e99bb82a5953c17ff6963e5ff60d29a50f45e06d4 SHA512 5034d6bdca40ecddaed57bd4ab6e700828b89221bd3ce6d347aa9caa4dca65880c080ee3f276a8c31adde2de16402c8b7e7fd32dc4463d29d63b3f16b833b2eb
+DIST bird-1.6.5.tar.gz 1114984 BLAKE2B 15b2a432e467a8ce81acc4d3d5cf7dea865cf7d3a8c893ab348916fbf60104a5606a6cbc2fcd647c102f3177f0d04d2f046860da244f26a7357f321285f1e295 SHA512 a86c340f4acd9d90b5babe8f19dbd753b2ad94db2c92181bf969244c1d7b20aa825a0311c13a1e19b019019b91af7827775970fd39e807ab32da690492ce356e
 DIST bird-2.0.2.tar.gz 1015224 BLAKE2B 3931c0431dc6511596e7214f6e2099548aafa69c951a44cd628443701eac061e8d95c387d74d81ad889988750c5bdb32a69ed77bfe655b161932017f1a1266a1 SHA512 aef96f246484a52269b44963df033ccc584e62d50d1ae31a97a97b9c7375e576d70d00f61a0f6da336e60cefc4c921945df0cc821d5fd1c737b19f508e65d30b
+DIST bird-2.0.3.tar.gz 1141917 BLAKE2B 14b51a4195003ddcf848be45755057ebf835edf54f35208f8d80121c22eeb83c9afa0c0c1ab269c376da59f5d07843054b08e1679db873a0b8121aa611b9202b SHA512 c88d0119dbebf4b2224ff7c6555e1ebf516748611e3544e7cfba47adb60c45a996efed7d2dc2b8fd849f15689e5d3c2624c4019c4a9a5a356d551a35db8fa0e2
 EBUILD bird-1.6.3-r1.ebuild 1285 BLAKE2B 6d118b27f8bdf9ecf5ea2b5a4302c7c1c1bdb46ae3e266da97eb369532f9d815b718fd9cc211515a37b7027a1cb6f1571258c593641a0299bc7a5a90a3d21da7 SHA512 65dcb46fad1912e8d7f26d9597e7dcdc5f78e10d82fcc3cc4a211c03f2d395614d363b98c00283ca09704e0fe52a245f67e0ec41680eaeacbac931cd52d00bc9
 EBUILD bird-1.6.4.ebuild 1285 BLAKE2B e728912943f43f666b0a96430cb48f9d4028627492ce03c87557af59cc78e5af6ac5f152fe63f7a1ef989b4028ec918fccda2f21b27c57f1e8530c2e3ec3ba56 SHA512 f94a5f28cc72dd35a853c5763fd28842cfd34ab0a8063db01e756e021c80191ac4cc40cc83f5fc980d93a5d00e2b777a9e902052db8fa9c50db5905d4a4bbf0b
+EBUILD bird-1.6.5.ebuild 1282 BLAKE2B 08adb25747149de95a2b3c806db82a199044cfe2eff8887dd1394700ba7c35d25a7ad48eb5d5129220618daddf1dba526948efa56962e970da452c48f7374b9f SHA512 daeb190612f574a628d99e3d2a28187c686c87fbf454aca050719c77624cc2dd04513d084257ab6e3282e7dd5006016fdbc1261e89780b4700fc8c41f8fab07d
 EBUILD bird-2.0.2.ebuild 774 BLAKE2B cdb92e8ef96464851c1b4d37b916ea705fb5b880cb89df18a093c411052e8363f15321da2bc400fd99cb8d33af5f6ab33668939a759e27028bca043961dc46bf SHA512 a14f8b83bf5d68a1c89c1ac8ab64f6f597893ea9ff004c904c7a3d009bb5ba4007a9607a30f987f423cf95aa7b8dda5040b94929d7a8e9f63f14e7775fb3f53e
+EBUILD bird-2.0.3.ebuild 771 BLAKE2B 9adf75165ef2ff7721d62a1ff062338e8119b32bdb8e8390b9e9b294ae2900f58d872252070b0ea1983526db6693e5fd8438cfb086e901fdf6c6a44a26cdb3e3 SHA512 8bd4530fa36b6e9476539bea7e37fa4a16d07aa1e1e60b1c63f757d545174a7bff163860b81f261a1b7f06dccc4f756e96d5fe134aff91f9c7dc3c33619f045a
 MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-1.6.5.ebuild b/net-misc/bird/bird-1.6.5.ebuild
new file mode 100644
index 000000000000..f4ccc176494b
--- /dev/null
+++ b/net-misc/bird/bird-1.6.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug ipv6"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_prepare() {
+	eapply_user
+	mkdir ipv6
+	tar c --exclude ipv6 . | tar x -C ipv6
+}
+
+src_configure() {
+	econf \
+		--disable-ipv6 \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+
+	if use ipv6; then
+		cd ipv6
+		econf \
+			--enable-ipv6 \
+			--localstatedir="${EPREFIX}/var" \
+			$(use_enable client) \
+			$(use_enable debug)
+	fi
+}
+
+src_compile() {
+	emake
+	if use ipv6; then
+		cd ipv6
+		emake
+	fi
+}
+
+src_install() {
+	if use ipv6; then
+		if use client; then
+			newbin ipv6/birdc birdc6
+		fi
+		newbin ipv6/birdcl birdcl6
+		newsbin ipv6/bird bird6
+		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
+	fi
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/bird-2.0.3.ebuild b/net-misc/bird/bird-2.0.3.ebuild
new file mode 100644
index 000000000000..298936acd43d
--- /dev/null
+++ b/net-misc/bird/bird-2.0.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+}
+
+src_install() {
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 23f2e7e5ea98..518bc605bb5b 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -4,8 +4,8 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8
 DIST curl-7.61.1.tar.bz2 2965173 BLAKE2B 16ef6962f64e18a4b67c3cccff78120084a2660207f512974f9827c53037a95b935a6020620f926eee85339fbc558be5585f2a4c001bd287c4d33795e6a6dab5 SHA512 484d33c0d32109539a95309cdb4404c03c0e7164fdbf7a4724a5b01aa20e2d48fbe6363c7cc53060d4d28050cfa6b43f9ed220ab65d4d389eb00efff5db1bfb5
 DIST curl-7.62.0.tar.bz2 3014762 BLAKE2B 0cc9ef5d19004dc5cc69444cac3b2fb4fd82ba470a831b761c147e45826fc26087f4e07da76ee0b6a070f6125a1423927607a257786387326f4c9f4e3953d5f7 SHA512 83ca5c2757745f763316eefdd4c3f0e8a211a7f0db6a708b67ae2133ad41fdf17dd2230f9283a4778c9c866126d407454a090291cd2bf274371d0a214c1c13f5
 DIST curl-7.63.0.tar.bz2 3001355 BLAKE2B 7925825f606d7eb474fb73aeec52353d3a3bf8827b34457493003ef2e3c1aed5350d849fdbd5624f148c6bb776aad318f1f49ec1ca57690f5dfb21b12fcbdc16 SHA512 2873ef57b15cf12e508626f4546f6e06450cb87b239be1d26d9b3a22f7533d76eebabb5fa00e7b8c5d7fc9854356997ce164afb069411d079b2b9f0bdb00db25
-EBUILD curl-7.61.1-r1.ebuild 7220 BLAKE2B b022dceee6068aa31e3fbf8b792b554e32647da47ed863b35c11470a494c0ae6f51a1a243eed73589113d19a4ea52e601a6142a7b55e31cc0e52e0d9b28de7db SHA512 fbd4cb210b96c45d73ad053dec8d2f59550568f079787c38c22df208395205cb4d56dfc1891f115f349e05a10a67416bfebe0bea5f3761cab6d534da1bfaca55
-EBUILD curl-7.61.1.ebuild 7190 BLAKE2B 526a2302f0c6fc7f7ea05320497d9a481c456b962680355094f63d37c59cbd79f014e2569e5e423e508406d287fdfcb18134eb40b256fb5c4a2bbe308e0ee204 SHA512 666d3c972e2f9cebc462bd27a1651465a8ce4105587e5d77a95c0564d377baacc09c024b8f12dec06698f0a2bb6d8b07a6a2e42cab328c18cf425968b6121fd6
-EBUILD curl-7.62.0.ebuild 7209 BLAKE2B a3d63692307eebc03e29cfac59332fb781eb8c406e3b635d06c1be985be0fa8c6fc59169cda9ec37e9d2dc55baf6dc7c26b2e98d3b6e808454abca15ad13d149 SHA512 81edc02ac0a7a6f374c352a3703b062f4e513ad865d16857ec9cd83a4a0297c2ce6e0829769cb113972017a5a99cb534055cb1a9c33b1c4cdcfc95d58b082a4c
-EBUILD curl-7.63.0-r1.ebuild 6972 BLAKE2B bd64ef5fcdcb86e40b6688710b74d91f5c4b10fd4cd7d0481d9c02b4e96eac03df3f31639d2568c885f8b2656fbbd5d5df8cb91ed569d4aa0d1ab559b832ea5c SHA512 c6c9bfc4a02b8381eac498d429cdc685e6ff0ad8ac4c694c06032f211fe2ee737931770bfd61a4b9626140c59662c541838526c4e58691e8f9f3b8001e0c182c
+EBUILD curl-7.61.1-r1.ebuild 7221 BLAKE2B f62d7c0eaac984bd8f98040eb6c3fe76de792cb19cc3fd5043db3b42c8a65dca81e112aa0117840bf2ecacfef29f87ad64fb3e1d78be11c99c3d435eec2f8916 SHA512 d40b1bb3884e3a4953d6ecd37a078411e252f3a84aae18aa9ed6dcb0ffb2ad5cdfecde841e0543a8ecd780b649ee3120c6047ecaa7468b7503922f72d17fedeb
+EBUILD curl-7.61.1.ebuild 7188 BLAKE2B 0c8aa08db582fe8d02a1edaf5227fc7b0fd9784be455cc55125f29d3f1008fae07642a531d91771d3866e5a84c18b1fb5cb7d862648586916234a20d781f2f43 SHA512 ba13389aee609f13643fd6472c16a8cd8f4b6f11aadebc376f98ad7af0a515452ac5d3d73051cfe0d974d67753f67404e8f77a410948824b0324eef1f6a8ae20
+EBUILD curl-7.62.0.ebuild 7210 BLAKE2B 59d3807676e597d4ccd39a261578bd8a33d2bc29c3cd30dca0d359928a8e073f7831191a9f63db9272b3ab993773db986438e55aab4b3a5078c1e61cfc56c03b SHA512 371f4932ff242ce5abd7be2f9cbae1d1a19e74b9822435d989489601d0b3082a6ea5fe954c822c4970cbfe10e7652437bd16bfb3333ef924770782bd79d5516c
+EBUILD curl-7.63.0-r1.ebuild 6847 BLAKE2B d52226c50765c986e0edfa883009390af00eae62019ad8bef0e7a17f6db400662a6dbdec4f2d550c0e87ede84f692d64edcf16d310cfa8e2d21dca488283ae3c SHA512 417e746879161b9a6034dbb889184809a7684cabb7c1fe2669b8c639e20fa8130d95e8204c954f43e171140b09876ec98b998a5f41dc7efdd3f7495189d4ce96
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.61.1-r1.ebuild b/net-misc/curl/curl-7.61.1-r1.ebuild
index d13d87e7796c..29e3e4618832 100644
--- a/net-misc/curl/curl-7.61.1-r1.ebuild
+++ b/net-misc/curl/curl-7.61.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -47,7 +47,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 		)
 	)
 	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${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}] )
diff --git a/net-misc/curl/curl-7.61.1.ebuild b/net-misc/curl/curl-7.61.1.ebuild
index 568697aa80e0..726cd4a808ba 100644
--- a/net-misc/curl/curl-7.61.1.ebuild
+++ b/net-misc/curl/curl-7.61.1.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"
@@ -47,7 +47,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 		)
 	)
 	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${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}] )
diff --git a/net-misc/curl/curl-7.62.0.ebuild b/net-misc/curl/curl-7.62.0.ebuild
index 59ea16793b7f..25fd30f2d3c8 100644
--- a/net-misc/curl/curl-7.62.0.ebuild
+++ b/net-misc/curl/curl-7.62.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -47,7 +47,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 		)
 	)
 	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${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}] )
diff --git a/net-misc/curl/curl-7.63.0-r1.ebuild b/net-misc/curl/curl-7.63.0-r1.ebuild
index 6370a878f7bf..525bbd549f48 100644
--- a/net-misc/curl/curl-7.63.0-r1.ebuild
+++ b/net-misc/curl/curl-7.63.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -43,7 +43,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 		)
 	)
 	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${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}] )
@@ -101,16 +101,11 @@ src_prepare() {
 	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
-
-	if [[ ${CHOST} == *-darwin17 ]] ; then
-		# https://bugs.gentoo.org/show_bug.cgi?id=637252
-		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
-			configure || die
-	fi
 }
 
 multilib_src_configure() {
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index 594d83ba6eb7..c85b93c7149e 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -2,6 +2,6 @@ AUX dropbox-cli-completion 129 BLAKE2B 6e8c72ceb1ad993c90178c3aa99b7da861ed3ea4d
 DIST dropbox-cli-1.6.0.py.xz 17632 BLAKE2B 244e36ea2b1f3a7ad36884de227933f91ca94dd907fadc300cc599336b4a09efec54e9f4cd26aa922609755812cfcd0f506866d0a66e74700c1b90a8c4347683 SHA512 06fcbba67031c18fe1840f592d04039a7c78848d6e77ae8cca04881f5f72ada7fb368921e2ae3b92d161e49bf91eae0f41b559a210eacd0dc203c51134597857
 DIST dropbox-cli-1.py.xz 17580 BLAKE2B 9bb165f419df716acfb485f40e3b40238d06db1448cf12731499f8b891d1a2b3de57ae405807c9b61316bea65eca133c95a88a475db210173efb915707e2154d SHA512 d5510a66a5605e474059bb761cc2f33cd4d23481e85f040b049c36759a030f1e7072a9ad2cc7f72e59507767aa375ff3ea1c06d7bf702eb7ba7d698db2bfefe5
 EBUILD dropbox-cli-1-r1.ebuild 558 BLAKE2B cc8d5071ae4c78a71532c2d614ba557ac1f3356a6bc3290f089dfdc2c3485641621045f06e7b6a626e69d423ab25af7f237f78d5ddb639bc299d325085d5d7d1 SHA512 f5e55ab6913334f11f28b41ad9387bb56d47d6a8636b85850630f2da40de83cbd9092ab5de265556491df73fd28ce700aab417c996a079c074d003ecb4613ef8
-EBUILD dropbox-cli-1.6.0-r1.ebuild 726 BLAKE2B 347b786c5cded9461e4dde1b737365caaaec6fde96136ad6bce0c2e888b7d348e411271800bdbcae050df1bfbf5854e54bc484747b985f7f3cd677dc2f6555b6 SHA512 f231633c6c3bb8592c0300d2994fdc2306ed02b012673af6768742ff2ba13aaeb6a11a58c9d22b8d9cce891c119fbd0c672fe845d3f231fc674935af2d1b0bc9
+EBUILD dropbox-cli-1.6.0-r1.ebuild 721 BLAKE2B 63464febf1675553135fa92bc0df4821015d924a26ffeb8d788057109c494340eba160bb24c96da991443772c8d9d73fce89b7852a64880be414f53c4c123ef1 SHA512 317e442fbdb8f78ff63a77ebcda2a33700ea1aa187c4d2c5fdb1d7e206153af32258d15411256eb74f4f96714e0e7011281cf039953086ea32cf4983c2177047
 EBUILD dropbox-cli-1.6.0.ebuild 577 BLAKE2B 39b17d38b78589ef96c5b0d488270ac3c872e97c402fb608681e1ef15eae835845c15e19e7c8bad4617028f456e8787a3dfe99f07602038e7af459b75847122b SHA512 fbceaac61478cc262a136c136d6f59bac4d12a7ac4bc245fc9f288fe2c17e552d664d24f3fab649de177d30dd3eeeae2e848d34ee9e84653ac7a1a1a1df008fe
 MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild b/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild
index f45f0bdbfc47..fe8d22897aae 100644
--- a/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.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
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.py.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 6b7fc7c6c9fb..aaf17b76e666 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -6,18 +6,11 @@ AUX 3.1.2-pip-optional-pkgs.patch 458 BLAKE2B 25f2ef7a37cb7e05fb0d4e9f70b6e4656d
 AUX 3.1.3-desktop.patch 683 BLAKE2B 15babc615c74152d5005ddc8dc644557fcaf176825fed335fa84168e66c16e2d3d946bd1be75bb15c78a06fc9efcb23a1797c6cfc74c821c2fe83044153fc6b2 SHA512 c05abf3d387143543ffec3342bdc6c820a56d82064f596c5e619286056f105c048db1947d13706d9aec45454f9133109bf3ec3de3ebf4aa4ace523f441a44b90
 AUX 3.2.2-pip-optional-pkgs.patch 725 BLAKE2B e0e5c3de68bc838665d818db491113c700e9512b6556ed2e24744f32c24f015ea4c28e93af16c25c04121b46e1c1275552100d4e65ae0491074870e46280326a SHA512 b85e11ada7e3a5849644262acf6a771f11d457ffdf46eaaf1f61183203bf8c7f7b07da54a57849198d2ea78d2fd43962970397d93af7a125bd9d381b0894267d
 AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd
-DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df8ca2e3204333e6edd7db98ecbeebdf81f4ac819de8b87c7593e83f948d091d48d55cdff08af76322d94bacec0fd SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39
-DIST Electrum-3.0.6.tar.gz 2640475 BLAKE2B 2e10417fb59629b9e3af8ba10893fb85b3b0d0ed9f7d7226a58dc7a2f91ed682423168092101565b00824bc62cae60d878de0d78271b716c027c8616419037a8 SHA512 4df9d81d954a008c3a14a89a7191b8af94393701b55651ad19acc75addb70fea942876a45c545c89b290cbdd7adb41b2d36e3cbcf73449eaa5d0a39e1529b2ef
-DIST Electrum-3.1.1.tar.gz 2722902 BLAKE2B 31628d18a26f552469454c4f2712eee1aaba6ff5114a7cf0b7f261def5ed5731a267ae369ec3460c7f9bb5ad2b1713b2b464ef05fadb5e0e9ffd563adeee0ce8 SHA512 d7f987dde4a4fe5b2b0e576328c20b56ca650047321ac101dc6c3edd5bcbeedd569870d951262583a5ef1d1e40d6107ac46aa4fe031cc63d3a759d332db056cb
-DIST Electrum-3.1.2.tar.gz 2800714 BLAKE2B 0932932125f1fd7099c090806c669a998c00a70a8f34b20d0afe4b1f6c5c24ced8743a60923e466c3507d29c75ac58e2e3e01b422701be76bbcd8abf54497276 SHA512 e4e6d674817bacefaf9c64acfdf16c4c215264e825dd8b1bcf1d99429963b0da18d442b966ba986cf0ad2d621543c3e0e68e8ba023cca23b6626781c2e69a61e
+AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
 DIST Electrum-3.1.3.tar.gz 2806178 BLAKE2B e03a6ee8d7b211b26d99adfbaf42a9d43317e5a4ca887f62f5ef0e57d8f990c18ff07e15d4ac8faea33322cd7ae25d7544e59e9ff1fbe883b3b7be138d990421 SHA512 745d00ec944e46040a4ae21d23c5919b943696a85baf84ee553616ca73cd21f2fa95999212a23f9a96ad5606def2890ee057e5f5f18e82591fd4a9e497ba5439
-DIST Electrum-3.2.2.tar.gz 5617363 BLAKE2B aae6e12644c55542fb1e0ff702e751dc5ebcb3d1da6ef58c3509be248208c38b10f43bed555a1228f9e9f397350765d24544d89f56ffbfccda71ec39fe2256d3 SHA512 32c4a24c2d3e2e38b9d66f6102176533a991b1c1fd25173bcd3bdd2e78cf42fc5fd2f0d2ee0c6a8d99db1b17d47bd3e7f3cf1303964f0566f4eef4edb3c87f15
 DIST Electrum-3.2.3.tar.gz 8311398 BLAKE2B 389f2ce2982d40f69c1fe3bfcac3ffb70d4fa09265f1a0567ecbdad21b53ebfdd2473e8e56e024add8cd52d24f690467441ffd33509cb0ef20c4f30bfcbba2a7 SHA512 a1620d2a0f28ee8c61e0ddd985f9e2a219f2b9fe0316042fbc88533332fd95709a9f4e60a40494a9cc5c2fad08c6f318f38bcbe91bbb88d20811953d514682f7
-EBUILD electrum-3.0.5.ebuild 4258 BLAKE2B c17c9fcdfec66850c979f0b35e8544cca75cb812052c6b437f432a5fb0dd102545c0082e2bbf210171fb379e89bc4f8ba1644a9d0687055c1f14ef272722912a SHA512 e8e97edc343ef92ff8f54c965fe1e9c1cb9428292425c67e591721c0d8d1d685c3cd144a31f96f3c24161d93dd82209f97643a9909bdf5b9b896eff9055ccb0f
-EBUILD electrum-3.0.6.ebuild 4225 BLAKE2B 845f9b71a1b9288b32110658f9d0aed5c841fbde6c3a1f7814a0f87130cb5bde5b8a7982a3dbe814d4901faa7ac92205fbed5e73b4102359841fa1bfa48a5d8f SHA512 488fce80e3ef95a47cc9198dd3c3df263757536a2adec499a33c6836ef391f8c0e9650e7445ac6572be26c9de1db00b8bb541884749a30e72c340068e319f1d0
-EBUILD electrum-3.1.1.ebuild 4266 BLAKE2B f2215c3d8fa7380a11d2afaac31c4c732363a6292f632cad6a4a2a0d7c62cf0e4a2c19925cb7e8c4a28ba01f63b51c684e5e672e701b922aeefb149e413626ef SHA512 dee404b782ec8bf6e67ea9a6ad18f1c84d34b1d2ec785b6e6f0324353ab34c08fcb42b9c25316fcc59960385b6a1f4b6f9ca74dd96f58f953785e8aba528c1a2
-EBUILD electrum-3.1.2.ebuild 4308 BLAKE2B 2c8bde9e2e8624a2a87881bc44197883ea9ae5e1a099452f24053ac753cfd34a66c5e44bd05d8dfa40c6337879754acee815101250aa980d59d9fe3c0b436e83 SHA512 602c93d714e71ac737ac3930f09fc0712026a4c1703923908c63531a1e2b5a52785fe7011ee814a1a715bfbc93efc836721a4ad893488ee4eb3b4dec5803b896
+DIST Electrum-3.3.2.tar.gz 8934781 BLAKE2B 1edbde4d26056b13efe84b93eb39ce0db4a20baf29367216c2cb4ac0e5c8887ca6be42e70fcfb095d7a2e80a539646c1a87677af82eee62a34380bc13b57600c SHA512 da8eca13c54eb12938ce204905df535cdf1402874109bee636d4c5acb106530463d6d96a636e7418b7635073491df6aaf50ea172e53b2c75ae6844f9f94eefd1
 EBUILD electrum-3.1.3.ebuild 4329 BLAKE2B 250c545a93aa26f86dad7d87049a9e407e124041fd46a07083368bf528bce23d4c0031123dfc8b05ede465a47da6290202d8fc4fd1026aeafbfc338eddd8365f SHA512 0412d8a4252480c6cc903353f3a6fb912e79967db24c75f4be12c55b0db4d3eae1ad8b5a7b6201a6a39ae1eb19d3c5df40e613d33280c357ea6ac0e6c29ef036
-EBUILD electrum-3.2.2.ebuild 4393 BLAKE2B 26acc075fd21430cfd08cb940ffac4c1217c1ca23f035e53a0edb4cdfe704fd239e93fb9a564486b6dc5cb36a56151eb867f85468e509d491df2c2d0ec96c1ce SHA512 5152ee6d100af50f2eef4c47c844adb50be11a397e0f81e20dfac9111b7bfb43bbd50adc8d77dabf41ae33993668f236b12ef4777f9e4a9932d0925b8a167dfd
 EBUILD electrum-3.2.3.ebuild 4431 BLAKE2B 73632ec671f7a2b95b39bf068f727fbc5d2007a58531fc827d1375a569b7a92d4cd99f3ec0be7984436b7160ea951de618bd21384e0aed437ece99435c911e6c SHA512 dd37f22a0462612f3723597815150a8516c822b5e45e89382355815fcca2c5fa0be02227dca8a6532e330a3c088a28af819d44bba7eb422293512194ca29e587
-MISC metadata.xml 1310 BLAKE2B a513446594197d15f1ef462faf8730b0a5b593ff280b6221e6086f8caec173c6e75389c0dbb7b50e2ee2eba236350ab0503b5b9c4cd68beb570847b81847cc3a SHA512 4b07d535c78c4a039a426be75450f7a7718396e265f0fe19d22250be4f0090f6cad0d9ba383765a7cfc491d3c863c4bf0189c6f4de5ee08430080ddb41d1519f
+EBUILD electrum-3.3.2.ebuild 4547 BLAKE2B 0434e4c617a94fbcbb523aff284292c733939fcf0746c93732505e10d26ca7b5dcf30791f85b1b8a55e0c7fa0502c44ffcbc2c9e3317470d523ccb18cf3bd866 SHA512 5fdc51e424941a1f5aa9e63e6804df091997c50b8e6649227ebae940d527de41d92626519fa036ecc46d77db1af0aea9d9ba8528c55bdee12bab1c35475bb0fa
+MISC metadata.xml 1464 BLAKE2B 702ecb52f960766ab9cfbf48af6bdec84ffe6374bc0bc7684aefd47aa36b569c2730205bd6bca9ebfbee168abf5478d263be5724e99c896c3a296d85bf3d2075 SHA512 e6142f8a9bb951a6dae009c542597ab47ef2398b8c119824e8e14575f02de2d776b3463035973e2da5f90d896417f00c3fe8533e2894e162e262def472531f02
diff --git a/net-misc/electrum/electrum-3.0.5.ebuild b/net-misc/electrum/electrum-3.0.5.ebuild
deleted file mode 100644
index 1f7968812019..000000000000
--- a/net-misc/electrum/electrum-3.0.5.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-#PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		revealer \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.0.6.ebuild b/net-misc/electrum/electrum-3.0.6.ebuild
deleted file mode 100644
index dc974d4c43aa..000000000000
--- a/net-misc/electrum/electrum-3.0.6.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		revealer \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.1.1.ebuild b/net-misc/electrum/electrum-3.1.1.ebuild
deleted file mode 100644
index ed1b46dc489d..000000000000
--- a/net-misc/electrum/electrum-3.1.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
-	eapply "${FILESDIR}/3.1.1-pip-optional-pkgs.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.1.2.ebuild b/net-misc/electrum/electrum-3.1.2.ebuild
deleted file mode 100644
index b10060186b9b..000000000000
--- a/net-misc/electrum/electrum-3.1.2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.1.2-pip-optional-pkgs.patch"
-	eapply "${FILESDIR}/3.1.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.2.2.ebuild b/net-misc/electrum/electrum-3.3.2.ebuild
index d6633f147754..e899d91abe8c 100644
--- a/net-misc/electrum/electrum-3.2.2.ebuild
+++ b/net-misc/electrum/electrum-3.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="ncurses?"
 
 inherit desktop distutils-r1 gnome2-utils xdg-utils
@@ -16,7 +16,7 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
+MY_LANGS="ar_SA be_BY bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sv_SE ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
 
 my_langs_to_l10n() {
 	# Map all except pt_* and zh_* to their generic codes
@@ -26,7 +26,7 @@ my_langs_to_l10n() {
 	esac
 }
 
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync revealer trustedcoin_com vkb"
+IUSE="audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb"
 
 for lang in ${MY_LANGS}; do
 	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
@@ -72,17 +72,17 @@ DOCS="RELEASE-NOTES"
 
 src_prepare() {
 	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.2.2-pip-optional-pkgs.patch"
-	eapply "${FILESDIR}/3.1.3-desktop.patch"
+	eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch"
+	eapply "${FILESDIR}/3.3.2-desktop.patch"
 
 	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
+	sed -i '/icons_dirname/d' setup.py || die
 
 	# Remove unrequested localization files:
 	local lang
 	for lang in ${MY_LANGS}; do
 		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
+		rm -r "${PN}/locale/${lang}" || die
 	done
 
 	local wordlist=
@@ -92,8 +92,8 @@ src_prepare() {
 		$(usex l10n_es    '' spanish) \
 		$(usex l10n_zh-CN '' chinese_simplified) \
 	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
+		rm -f "${PN}/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" ${PN}/mnemonic.py || die
 	done
 
 	# Remove unrequested GUI implementations:
@@ -104,7 +104,7 @@ src_prepare() {
 		$(usex qt5      '' qt   )  \
 		$(usex ncurses  '' text )  \
 	; do
-		rm gui/"${gui}"* -r || die
+		rm ${PN}/gui/"${gui}"* -r || die
 	done
 
 	# And install requested ones...
@@ -124,13 +124,14 @@ src_prepare() {
 	else
 		bestgui=stdio
 	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
 
 	local plugin
 	# trezor requires python trezorlib module
 	# keepkey requires trezor
 	for plugin in  \
 		$(usex audio_modem     '' audio_modem          ) \
+		$(usex coldcard        '' coldcard             ) \
 		$(usex cosign          '' cosigner_pool        ) \
 		$(usex digitalbitbox   '' digitalbitbox        ) \
 		$(usex email           '' email_requests       ) \
@@ -138,13 +139,14 @@ src_prepare() {
 		hw_wallet \
 		ledger \
 		keepkey \
+		$(usex safe_t          '' safe_t               ) \
 		$(usex sync            '' labels               ) \
 		$(usex revealer        '' revealer             ) \
 		trezor  \
 		$(usex trustedcoin_com '' trustedcoin          ) \
 		$(usex vkb             '' virtualkeyboard      ) \
 	; do
-		rm -r plugins/"${plugin}"* || die
+		rm -r ${PN}/plugins/"${plugin}"* || die
 		sed -i "/${plugin}/d" setup.py || die
 	done
 
diff --git a/net-misc/electrum/files/3.3.2-desktop.patch b/net-misc/electrum/files/3.3.2-desktop.patch
new file mode 100644
index 000000000000..e932623be246
--- /dev/null
+++ b/net-misc/electrum/files/3.3.2-desktop.patch
@@ -0,0 +1,21 @@
+diff -Naur Electrum-3.3.2.orig/electrum.desktop Electrum-3.3.2/electrum.desktop
+--- Electrum-3.3.2.orig/electrum.desktop	2000-11-11 06:11:11.000000000 -0500
++++ Electrum-3.3.2/electrum.desktop	2019-01-08 20:47:55.628978706 -0500
+@@ -3,7 +3,7 @@
+ 
+ [Desktop Entry]
+ Comment=Lightweight Bitcoin Client
+-Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"
++Exec=electrum %u
+ GenericName[en_US]=Bitcoin Wallet
+ GenericName=Bitcoin Wallet
+ Icon=electrum
+@@ -14,8 +14,3 @@
+ Terminal=false
+ Type=Application
+ MimeType=x-scheme-handler/bitcoin;
+-Actions=Testnet;
+-
+-[Desktop Action Testnet]
+-Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"
+-Name=Testnet mode
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index 41040e7157e4..b3234f5ca5c7 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -12,12 +12,14 @@
 	<use>
 		<flag name="cli">Enables the CLI interface</flag>
 		<flag name="audio_modem">Enable plugin to support Audio Modem</flag>
+		<flag name="coldcard">Enable plugin to support Coldcard Hardware Wallet</flag>
 		<flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag>
 		<flag name="digitalbitbox">Enable plugin to support Digital Bitbox hardware wallet</flag>
 		<flag name="email">Enable plugin to support emailing invoices</flag>
 		<flag name="greenaddress_it">Enable plugin to verify GreenAddress.it instant transactions</flag>
 		<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
 		<flag name="revealer">Enable revealer plugin for extra security. https://revealer.cc/</flag>
+		<flag name="safe_t">Enable plugin to support Safe-T mini Wallet</flag>
 		<flag name="sync">Enable plugin to sync wallet metadata across multiple Electrum clients</flag>
 		<flag name="trustedcoin_com">Enable plugin to use two-factor service by TrustedCoin.com</flag>
 		<flag name="vkb">Enable plugin for virtual keyboard</flag>
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 2c4362bd4ee9..065aae7f975c 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -2,9 +2,7 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e
 AUX gerbera-1.0.0.config 6164 BLAKE2B f16c1e32be600b778e6818267b76bff34a26653d8a8bb3958ff7096d95c96b225f679ceb3ffe306bb1b3a03c2300fa433c4edffd9cdd79fb2fac3ee2aa5621fc SHA512 5a4c44d71e7bb4f1e9be2de61ab831d6b8871ab432ed31b58799957e7812e23c382f81c32062c0db44712287643e495fd66e1fa214676df3e0b18d7e1bb2f23d
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.1.0-build-failure.patch 455 BLAKE2B f8c52b6d37b999f3ba6765fa61c732a8b5b00151a8b2dc4bb0292b39282e6cbc28b7348eca41b645fd95997731fa36cc628c8850d43366e048c91d57abcea079 SHA512 5def64f7d94b9005890d56b16385df8b78701fb139dbc379f29818413f4bea03eb1e2b87db0e4b4206b710d9e80f646061dd223f3370deced72667ece9b5f25d
-DIST gerbera-1.1.0.tar.gz 1308827 BLAKE2B bb8d59702fef7b1048cc11d19d5de73ad5d5ca92908831b3c0d7d075c2a3c00d94a6a6bb5f5ba45a6cf0ef688294d041e1b71ac98e19235bce0f050928a5f873 SHA512 975b6f2f5d7538d94eec55ef76467be6b2c94e78cc1735c364053f1cc08dc3b59f8d1c8987dbef3b8fc82896c433f69228d713f03addce5f3ddc643fe4c05d8b
 DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
-EBUILD gerbera-1.1.0-r1.ebuild 2568 BLAKE2B c9fefab7500b37b5e131e07aef0fd8bb0d1f42ada759732462d48ef24961521d96191b23468796eae11b81a52fe466bcd42c0e11f13368a027199b1b015228c0 SHA512 d06efa376c453b02e2288de8e759a675242b8b9c2940f2155072c1abf3c8730f6a22fbd5c4654600a18ca5f0ef1284dcafc8a94e9d2cab1aa53f5ecf7c53fcf5
-EBUILD gerbera-1.2.0-r1.ebuild 2550 BLAKE2B ee61c800fd3199a7ee85e6acd09b97ea4a2d0af54350df57ae757f042d0f985806db720edbbd24172e86117d93530f2d85b2564d0ed6857b526ab3b41e889074 SHA512 3e89539be06f7b0a735f8bbd7bd86d4241daebbd818ed6193a402466b85cfc80c498a7b9506c47222ad657182462717f1a914bc541e004000513c0559c55a97a
-EBUILD gerbera-9999.ebuild 2546 BLAKE2B e4aa8ba229f02ce99a5919efa5067b2949f46c2d1bc3550283d705789c1556746373a67650c68aec53726161d3bc8148833451cb40bb9fc5cda8d5965a311684 SHA512 40ec0a3190befc41b40a92a45971d9ced41cb76ea51719118a63ad7b557c5cc6c80e4d532b7198edcbc2a8d6aae75b780d6aabb70e43efe60bb04ee188ea8f26
+EBUILD gerbera-1.2.0-r1.ebuild 2558 BLAKE2B c5f81e11241cb74d63428c263cd0141d61a90f595f8c42ad4f2987d73f885ff6275b85f9ad772b8ff8862847119dd953206972ebe8461e659cf5bc9476b3da89 SHA512 57b790ea36d49c2ecff0116d0aa2e583a8a6bc9847e79396d93061156c06d2b9380f9725a543e4f1cd6f91574b6cd77c26fec65b77552308998b886f6f993495
+EBUILD gerbera-9999.ebuild 2554 BLAKE2B 24fbd4b31248cebce80d7732b5b3e884adfe72f83986e0d0b44f573ae856bc50170d3b253db0fb67848495bf44f1f1de389c389dbd84546a713f4da55d75fba3 SHA512 8082eab99d34aeb588f4ece501de7f45e8acd34eac5af3380053c81a1c96b97d768bba05301563f69b29b8e7e9ef74d56bb163542a6e4e5d3475952e3e51e086
 MISC metadata.xml 1209 BLAKE2B b724abc66f5a3111c66a94331e61f9a50ae67344dab4695e7fc68154ddc9843e0295c7a12438e342be409b9429a4f9c60abce02422594df708d7933521bf9673 SHA512 c91dddacee6beab0a3cec3ab317810f77d3715a84384ceeafd3bdc872fff6d352d6bd4312d8194b59a159604794b0197780db6c27b20a327afa1e7bb9cba6a26
diff --git a/net-misc/gerbera/gerbera-1.1.0-r1.ebuild b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
deleted file mode 100644
index efac2f23345f..000000000000
--- a/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils linux-info systemd tmpfiles user
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
-	KEYWORDS=""
-	SRC_URI=""
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${P}"
-fi
-
-DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
-HOMEPAGE="https://github.com/gerbera/gerbera"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
-
-DEPEND="
-	!!net-misc/mediatomb
-	<=net-libs/libupnp-1.8.2:1.8[ipv6,reuseaddr]
-	>=dev-db/sqlite-3
-	dev-libs/expat
-	mysql? ( virtual/mysql )
-	javascript? ( dev-lang/duktape )
-	taglib? ( >=media-libs/taglib-1.11 )
-	lastfm? ( >=media-libs/lastfmlib-0.4 )
-	exif? ( media-libs/libexif )
-	ffmpeg? (
-		libav? ( >=media-video/libav-10:0= )
-		!libav? ( >=media-video/ffmpeg-2.2:0= )
-	)
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	curl? ( net-misc/curl net-misc/youtube-dl )
-	magic? ( sys-apps/file )
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libiconv
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-PATCHES=( "${FILESDIR}/${P}-build-failure.patch" )
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CURL="$(usex curl)" \
-		-DWITH_LOGGING=1 \
-		-DWITH_DEBUG_LOGGING="$(usex debug)" \
-		-DWITH_EXIF="$(usex exif)" \
-		-DWITH_AVCODEC="$(usex ffmpeg)" \
-		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
-		-DWITH_JS="$(usex javascript)" \
-		-DWITH_LASTFM="$(usex lastfm)" \
-		-DWITH_MAGIC="$(usex magic)" \
-		-DWITH_MYSQL="$(usex mysql)"
-		-DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
-		-DWITH_SYSTEMD="$(usex systemd)" \
-		-DWITH_TAGLIB="$(usex taglib)" \
-		-DWITH_INOTIFY=1
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
-
-	insinto /etc/${PN}
-	newins "${FILESDIR}/${PN}-1.0.0.config" config.xml
-	fperms 0640 /etc/${PN}/config.xml
-	fowners root:gerbera /etc/${PN}/config.xml
-
-	keepdir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog "Gerbera has been built with MySQL support and needs"
-		elog "to be configured before being started. By default"
-		elog "SQLite will be used."
-	fi
-}
diff --git a/net-misc/gerbera/gerbera-1.2.0-r1.ebuild b/net-misc/gerbera/gerbera-1.2.0-r1.ebuild
index 80b003ed0721..c3f775019bbf 100644
--- a/net-misc/gerbera/gerbera-1.2.0-r1.ebuild
+++ b/net-misc/gerbera/gerbera-1.2.0-r1.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
@@ -28,7 +28,7 @@ DEPEND="
 	>=net-libs/libupnp-1.8.3[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
 	dev-libs/expat
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c )
 	javascript? ( dev-lang/duktape )
 	taglib? ( >=media-libs/taglib-1.11 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 50806deadb0c..ff9299acd184 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.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
@@ -28,7 +28,7 @@ DEPEND="
 	net-libs/libupnp:1.8[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
 	dev-libs/expat
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c )
 	javascript? ( dev-lang/duktape )
 	taglib? ( >=media-libs/taglib-1.11 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
index 820c190ca416..d80bb12f2612 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -3,5 +3,5 @@ AUX htpdate.init-r1 507 BLAKE2B facb31723331fd77ae24ff64753cc12c913e35b7ba979979
 DIST htpdate-1.0.7.tar.gz 16848 BLAKE2B 2e7350f186af09d8876c9caddf3d3bdd1b3d361169417e1c672eb04e499d07391ec93c56fad7e6d0f947a5bf60580a9f52ba564f213662a65dbbd67df875399e SHA512 83408545d1d2cc794f62efaf348e54cc2ce47dfb27815710e92d0c7d34360a581e637ef82424030c8a4fcabcc9a07205518fac08f426b37c7c4519cfa6696360
 DIST htpdate-1.2.0.tar.gz 13618 BLAKE2B a94f08738d08c0caacc876d2e25e1dba43bbe371b0a31f957a1d5ff522b0ae5bd7bf5abcde63802843b1c32799e4cc38bacda657a9efb3a56a1eaccdb4f8c35c SHA512 5447d54a54038cc3c33f7877410ae42022e01eb10a93bd79fe4937452a823c65c6bdb743213bc77a8506128d5b384e26812f1291a0ffa1aeafde0230c1b645d4
 EBUILD htpdate-1.0.7.ebuild 1104 BLAKE2B f8430b15362130cc425a75b6b296b274e8f26ae4bc30085bd9d4d5d7330fa16560e19809e65dbf55d346f96a7f70901b8165526a0842b0b3a9cc2d9bf21671ad SHA512 b94a56bd7230572bc2b52fcba820a7606abd26254b202ad2c7be1ccbe29bb7a4fcce4e211576e06fe08d04d7b88979e4116b823254d9dd406cff61dd9b21fed5
-EBUILD htpdate-1.2.0.ebuild 1008 BLAKE2B e8d1b72fa79229af5b9f2e9b9e08996e985ce68a34507dd65d4d8421e8f094b7cff5a7aae767e97c8529930aa578af9ddbc858d32a2b945deaedf6c77709a1e1 SHA512 0cd1b71a529c6255edf395d160ac4c229829597af5b9e140d18c187e36578704e60a215d2bf1eccab7601c99470a3d5a88a9a8f63073507a186cbd562b8449f1
+EBUILD htpdate-1.2.0.ebuild 1006 BLAKE2B ffd29371c97e36a023bbc436bc584bb00424cf1317e9fb2003e8d66f4ffaa971efba6e1244eb44807af776cdba3353a37232c774ac57b0c4e4e35e91ea996327 SHA512 d9a33a5e3ec3eb7f24e8853b3d9903f4206379ca94d49c80d7d74e5bf1628d5cd092545fd11e364d0a30d007cb8cc0ed18d06d5935a76ce2b455f9aa5aae0a7f
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-misc/htpdate/htpdate-1.2.0.ebuild b/net-misc/htpdate/htpdate-1.2.0.ebuild
index e9f1b6de4ef7..4e36dc3cd673 100644
--- a/net-misc/htpdate/htpdate-1.2.0.ebuild
+++ b/net-misc/htpdate/htpdate-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ~ppc64 s390 ~sh x86 ~amd64-linux ~x86-linux"
 
 DEPEND=""
 RDEPEND=""
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 105004cc52b7..2256476e68bc 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -3,6 +3,7 @@ AUX lldpd-0.9-seccomp-missing-syscalls.patch 1192 BLAKE2B 2692d29b9ffcd7edc09c96
 AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 BLAKE2B 47f508fd0894334cc4d00079c3c3907bbe419c1729ed54214dee835661742b8a904098a5a28a86bdf836becf10004942fe6159be29ff27adeaa8bc8258156681 SHA512 5b39207b33a5b419e1775bfbaa91f11b1aa07af786a4be7733f305ac5d5a7a1ef9e8a2eb91d023aaac005bc19c1445f864b5a702073892436b5e310fd4fa79dc
 AUX lldpd-1.0.1-seccomp-add-brk.patch 900 BLAKE2B 0bfbdc01382c8b96e6b266797110f5988f94abc9e40c19e0e2b7f24eebe07d91182629c8c2f06632360096b9f2509dbc0aea3f87e2152ca1ea264535c9c25f55 SHA512 8b51bce336da2151323f9fd8a48efa59684bc72450a49c438a4fcac81f64602f0a2777bdc8880b21541ac22760c7922b455225af7c27e8c392d70a651f84e752
 AUX lldpd-1.0.2-seccomp-add-misc.patch 789 BLAKE2B 49fb6cf10946154a7573778c558b5ac5754e1f2dfa87c7011c44b9515df5d4e06d6271e21e3a0104823603a6e5644cee944354621c937fe358eba79f5f03c8d8 SHA512 bcc473debe7f45c533057ca1ecd6ab717bbeb663aaee223045239152fcf7c92c1dcf5e77c5bd0d36f0dbc08739dc8fd90bfcc7c82c8019a3508f496cf7df2d34
+AUX lldpd-1.0.3-fix-fdp-without-cdp.patch 775 BLAKE2B 900476f2bd2e6671ed9fd1eb99f727d5b153681db85e83d28baaa6fef99bbb1e408488475b6370df337742e735b6d56f53183f1cd2072c1dbc9da5fb194bd7af SHA512 bdc0f61a467c5a5d5fddc64b3e9822a94fedc7d61cce96ab3996fd2b12e418453da27f9de7879f13b0feccf1080b8559e848b113826ca0733e60b0d28cc5aacf
 AUX lldpd-confd-1 142 BLAKE2B 38b3709d5cfcfdcfdf91ad4bd47902db779d035f825a7c875cbbfa55b35f085c04cc387599526465a0f12a0686d6550e7d3750b077f04993b55893cba2bbe362 SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c
 AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e127a861d259c00410c44223177a3b08cf87465a024120b089f5794957f287479c65542610205303 SHA512 ec0157dff35cb2c370b81bff827c22d2f6c5fb0e139c1a82fabe7c6f259da4f50525a90acb5e26b4e39e0d41495b050ff9c4cf38726d3a8c4c4cea19cdb925d9
 AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893cc7437aa236fac9449d4890989f10618146b1da11795c637f29f2849c89af04b5156f6d9b1d SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0
@@ -11,8 +12,8 @@ AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c04
 DIST lldpd-0.9.3.tar.gz 1601102 BLAKE2B 0ba31d20dad9770c93fa4930a7c439273c36e5cebdb0b4a1674f0a375008f642e33d71b9668c91313ec4bb3311e1b4bd22d0996ed6347d2cacfd7cce24536a58 SHA512 0d40d77bfde78f9ceece56968981f3a36bd7e683b12de05e84e5da0409b8e0d06062e5d665942637a66164af0254a6ac3d1a327aab3bcb48ec91ecfdd2693283
 DIST lldpd-1.0.1.tar.gz 1590903 BLAKE2B 37ff1c042537ac31f394986f1bbd3faf13105d07f340ed045a4bbc196912c0c017a5d60b2c6a89b0da9faa5a7ff8e9c4ef0d4d01a39504a31c23288a89eb92a3 SHA512 61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd
 DIST lldpd-1.0.3.tar.gz 1605563 BLAKE2B 968d1c2e046049fd9ba9e9af7b8cb4f531fbd99f41a9157679f3694f800b0da1a4dd3b21feac583fa5cde3f57b022e2d6ee543ea349e1136037ba10419e3c855 SHA512 bae121a707d06726830dbb6b45210c1ed23aa2a99349a68d088b3ae3109504a6b462c7b0abf8543297083294519be2878779edf1a41bb73fe002bb6c9f966ef1
-EBUILD lldpd-0.9.3-r1.ebuild 2457 BLAKE2B 4db8bd65035df013e9c3d8e70a235f2503c3e313da17f510deb498830966408f6761f42b12c8ee3dd98f296edb815df1de7f4da35f7eeebda7cbcbe9627dda27 SHA512 5426d7c8a2f73286a15b9901134692d77713d3cd4e20e31a4a30be64eb664b348cdd1c27196bc339af49a213e03bbc995bd4b30f8bab7c424b34f6595727b5bd
-EBUILD lldpd-1.0.1-r1.ebuild 2420 BLAKE2B 8847c8718f419481e92fdd857196c71bd73014448855ea8fba5f1b425def8614852fe2891498655acfb5fbc9d0eccf487f520ecc2bf2f475334b06d6c2524b09 SHA512 246b57c0f0e9acf2224e3138d136202d05603e5aa170314d5395679140b4545451a1eaf62d57f9842b967bf1ab2bdcd1ae1892e02bb178d6669a0127591f3335
-EBUILD lldpd-1.0.1.ebuild 2371 BLAKE2B a7926eb76298a0a53c0e2082452904d68f188da49eed3abae777d79ab60e93f68d0dad205effbfabef23c12c2a5ee53fbadad14fac25cb0a11b8df0086ae45fe SHA512 70370f83b91f0f7bd95227e52775386589b641c41f3d7d9ba671f52adab98cfbd78fce3bf02ede734d37b6389383e215bdbb3eefe4853054e4f252a7fa84c440
-EBUILD lldpd-1.0.3.ebuild 2467 BLAKE2B d47946910d25c659032527332596cf73766fb09d314dfe5ea1ee69b87501948bbf7fbc0bd5104ff456f6428589b04940e7a55eebb85f9896eccc6b398cb9e337 SHA512 a2290ec9eec9260b120a6ec3e157d221062ddcdc802a87c127a4979b66d6c85e0ded0462416e3c0c6e362acb382efa05194020a5bbaa6d1324b6594bb39b9035
+EBUILD lldpd-0.9.3-r1.ebuild 2476 BLAKE2B ea99c4a7cf9b328e074c400ae1873340e10c2865b0ec7297f995563f5f0bb7656806d02caa490664b69e72effafa9af964820013a7c3b2a7bb83629680ff3b68 SHA512 aade0484be9dd930dbd7e7225e70796a93f3986b79a6a3a289f30de717e82845c890a6ce93c7986f7542e3f398ac583a95768d60ecf5e34091db7b70bd749fb0
+EBUILD lldpd-1.0.1-r1.ebuild 2439 BLAKE2B fc2b1c220d371f0e2d42efc6e7ed3f7ee5389cd4c2b96f7d5af6449a1bd8f1ccd7b42c01fd5a98587048df6694261ac0b5c157cae80010cb058bdf091227c829 SHA512 3a8fb50e15715e6b7cf53f6723b74b476ffe942adc39ee93612fa7eb7a4dd37c05b763c19afe128c9e17e4251cec9369e2c2c6f78249356f96d9caf0b4e9c788
+EBUILD lldpd-1.0.1.ebuild 2390 BLAKE2B b201067dde29c59460b13866be79e359bd933b24d9dfff80e59f69c0f586e8a6ba1daac4ef4dd4c86a3de398a05e96866f7fd3297771c07cc478830e2d1438fd SHA512 084fb2530ed91f354410515ddaeb790bdf8c6cc94d4db3e34c6ad9d6e094ecb18e7659a92ca46110975a1a6b39693c58eab72b89d0fdcb4b622aa687f1a054af
+EBUILD lldpd-1.0.3.ebuild 2542 BLAKE2B 047b22f95ba2b5b1708b963952d8e0a0f7d1de026fe07247761357006c19be93eabdbef1f666da9ce2ec4a32439834037918aa231fcf7bfda3838be147b98f4e SHA512 ddd5b65a8545d030284043eb782e0faa1a2ab0427891861d0f4323db595693225d0d7bf8f05f88f0bb8a30c846f63fb758775fe37c034ff844348a275064cd66
 MISC metadata.xml 2829 BLAKE2B 83e3f2636828107af74952f951e1e5874ce647f786932a509f79e154ab026a0556bc0341576f4c458e40c88feacee187e7a18fd1ee736953425d2cb252e0175c SHA512 a401329c2f122ba079995ce0c7810d32920a91dc94e8678378f3c0eb9f72e613710933df8508eb25ad1516bda1f406d6e459fe1049112dedd8c524a7d8432c01
diff --git a/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch b/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch
new file mode 100644
index 000000000000..17099a2f819b
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch
@@ -0,0 +1,30 @@
+commit 4e7ec8233cd185941eaa9e41785cfc53f92799b4
+Author: Vincent Bernat <vincent@bernat.ch>
+Date:   Tue Jan 8 17:19:15 2019 -0500
+
+    build: fix compilation with `--enable-fdp --disable-cdp`
+    
+    Fix #315
+
+diff --git a/src/lldpd-structs.h b/src/lldpd-structs.h
+index c3ffa10..f6b03d7 100644
+--- a/src/lldpd-structs.h
++++ b/src/lldpd-structs.h
+@@ -129,7 +129,7 @@ struct lldpd_dot3_power {
+ MARSHAL(lldpd_dot3_power);
+ #endif
+ 
+-#ifdef ENABLE_CDP
++#if defined (ENABLE_CDP) || defined (ENABLE_FDP)
+ struct cdpv2_power {
+ 	u_int16_t request_id;
+ 	u_int16_t management_id;
+@@ -273,7 +273,7 @@ struct lldpd_port {
+ 	struct lldpd_med_power	 p_med_power;
+ #endif
+ 
+-#ifdef ENABLE_CDP
++#if defined (ENABLE_CDP) || defined (ENABLE_FDP)
+ 	struct cdpv2_power p_cdp_power;
+ #endif
+ 
diff --git a/net-misc/lldpd/lldpd-0.9.3-r1.ebuild b/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
index 117ff3bf8973..4f8d9c61c91d 100644
--- a/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
+++ b/net-misc/lldpd/lldpd-0.9.3-r1.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
@@ -17,6 +17,7 @@ IUSE="cdp doc +dot1 +dot3 edp fdp graph jansson +lldpmed old-kernel
 
 RDEPEND="dev-libs/libbsd
 	>=dev-libs/libevent-2.0.5
+	sys-libs/readline:0=
 	snmp? ( net-analyzer/net-snmp[extensible(+)] )
 	xml? ( dev-libs/libxml2 )
 	jansson? ( dev-libs/jansson )
diff --git a/net-misc/lldpd/lldpd-1.0.1-r1.ebuild b/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
index 88ddeebee8dd..4f6e234cb95b 100644
--- a/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.1-r1.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
@@ -17,6 +17,7 @@ IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 
 RDEPEND="dev-libs/libbsd
 	>=dev-libs/libevent-2.0.5:=
+	sys-libs/readline:0=
 	snmp? ( net-analyzer/net-snmp[extensible(+)] )
 	xml? ( dev-libs/libxml2 )
 	seccomp? ( sys-libs/libseccomp )
diff --git a/net-misc/lldpd/lldpd-1.0.1.ebuild b/net-misc/lldpd/lldpd-1.0.1.ebuild
index e555b6b4f7ea..31d70bcb6cd9 100644
--- a/net-misc/lldpd/lldpd-1.0.1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.1.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
@@ -17,6 +17,7 @@ IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 
 RDEPEND="dev-libs/libbsd
 	>=dev-libs/libevent-2.0.5:=
+	sys-libs/readline:0=
 	snmp? ( net-analyzer/net-snmp[extensible(+)] )
 	xml? ( dev-libs/libxml2 )
 	seccomp? ( sys-libs/libseccomp )
diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild
index 09b8552f81f0..822e037de615 100644
--- a/net-misc/lldpd/lldpd-1.0.3.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 
 RDEPEND="dev-libs/libbsd
 	>=dev-libs/libevent-2.0.5:=
+	sys-libs/readline:0=
 	snmp? ( net-analyzer/net-snmp[extensible(+)] )
 	xml? ( dev-libs/libxml2 )
 	seccomp? ( sys-libs/libseccomp )
@@ -35,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
 	"${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
 	"${FILESDIR}/lldpd-1.0.2-seccomp-add-misc.patch"
+	"${FILESDIR}/lldpd-1.0.3-fix-fdp-without-cdp.patch"
 )
 
 pkg_setup() {
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 05b258fb9b4a..b61e85d3f916 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -2,8 +2,8 @@ AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b
 DIST mosh-1.2.6.tar.gz 347185 BLAKE2B 4676ebc9736d83eaf842ac847fb7ce29d0ebbe9546df9755fc03d352ee69edd0d2135bf232c42c77c37e66a69049682611ccd10ceba999c6b4b419c66e288813 SHA512 fe53ba3ba79fb393f9fd5d3c48b2864838a1b51a8e08f0160bcfb98fc8c2363d2bb77456e1bc79b765d6489a2af54237c5423ebb88a13196a82420be0cbc7403
 DIST mosh-1.3.0.tar.gz 356220 BLAKE2B c0a74243f7f54e24b2ccc326f89cff87f2772bf98bf1a0946ede03f8139dcc159c9a6cbbc019ef43c7b324990077df7ac7287866ea2daa813621ff3618ae1d77 SHA512 2b43e3e3fb2ccf6c29a889f10dfc0d5504dbca6fabaf10419f4e355e4b73d64cc1e632324e447b25ac24ee18bb88d8a9a23f9c4824b267343fb86e26e7d5c54b
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
-EBUILD mosh-1.2.6.ebuild 1403 BLAKE2B 5612c55dedf61f42344da91cf649817789394552b0af084f0e64f019d4edbfeeda659facb6f5ad8d20f8e90a891ac4eae2445957cf6f1badfe07e7742d93e740 SHA512 36761d027f665567bdeb6bbbcf97af741da641db5878c8db4dea7f73653f601dcee951f0500c503986226b44a8589f30c11c1d93244ef0b5076829ef80325747
-EBUILD mosh-1.3.0.ebuild 1407 BLAKE2B 58e5cc20a44ab98508c68d805cdc83b06a2181a9261d2a9f63dd86dd6d71f8774875da417f333d609c56c9b87175b387b82a67ac356a019abb41261c87d41bd6 SHA512 b3a06abd4c1c45a4280c43f6628f4c02e438fa0e30b998aafc3db48a81bb8fde973b2617f1995f260ecff3978486aaec508cf1974137e293a82e6c0882f2b238
-EBUILD mosh-1.3.2.ebuild 1411 BLAKE2B 3adc2058e58b4dac33be8929e41488786b3009cf7afe5653d42ea87ca5282ea32b5f5d3eabf5a44d295277fd2872f4587233036184d29826eec54bcb959b512a SHA512 86a4a88d0baa93d50da8c1787fb960a9e74ce3c9b1ea0656f98ca6d7935d152177354cf26fc798bebf23571d112be21d21594883ad8c963cf93b53d8a0ab32ef
-EBUILD mosh-9999.ebuild 1369 BLAKE2B e9aaec4ebb618d05c9ca0a609f821594de3359e6b82d336a5ca261e720cdd83ee7cb29b97ba8ad2fac5f68f89fc73e0ddb20afe5508c0db60458b5dcafc48748 SHA512 778cc0316c4f8f600132477f2a9cb7f0011dbc204d5d2692f1fe61ad40276142f9f105025cef3aeddc1a158eecb5798a7b9e291fe2279348f206ab09e2a2a9c3
+EBUILD mosh-1.2.6.ebuild 1421 BLAKE2B efaae0cc26ad8542351721bd8a82e33241175170b5883b40f2bfb8cf8b6b55209b7e526087ec4104f5eb3a27328844c0f59aa70379ef3d950945259147f8bf86 SHA512 116498494644dfe64dc2764d33e4ee567b7e67ea8fc538ce17eec31243a739d2f5c7ad046952be7b01119fbf1635a44807284694e35ea0ffa56c2520c59646c0
+EBUILD mosh-1.3.0.ebuild 1425 BLAKE2B 8244b7496ab7091af92ff8ddf6d0f702c5d75ae9a647baddaf514fa67fe3532fb3c645cae287dde5da6d226e9d64a005427d656c5121dc7ad53524a552547662 SHA512 aa1d9546fc5a8ac7b58951e54e343a567b1afa63ccccc740e431b716c9ba58bac6ad5e27b4c07b89618ae56ade77d73a7da9d29b99d43b63179683913ce074ab
+EBUILD mosh-1.3.2.ebuild 1495 BLAKE2B 8726361ddd15b620f13c3c011955ec28280c8c2ef03c3d9a7c67568d0736d3e003ca6579f0dc71103d0e19fc7f771d9a73de0d93f3293b3ef50e8ada5564b945 SHA512 3e3cd120664e9817970546b0238bb880d6d0de340b30df782b8232426b01bddf5de9fbdeb564604385f8f023f8133a499b5c3017ee58d1960cb7e7c6f2db3242
+EBUILD mosh-9999.ebuild 1474 BLAKE2B 752b071131e7a0f33587374e8a2150c62570d2c6c70f9c5ed44efe629230202dd2bce07acc40f3cce14eed60ef467df3fc1d78e2fc2be7bc005c8f550b0a7036 SHA512 c7e8cd3814ec54f377472285f7f9c47737bd2dedb596a97551959c3332dfbee5c129cb52c41dd1f1649aa38aa1db38b45793e9d4af42f97d479d2dfb13c1fa0e
 MISC metadata.xml 1054 BLAKE2B 88f7bb070bcd535ba07cd1897dbf27bd2a5081f367354f67943e22148b2ce4d0c9e8b9ba5c1d4906057d4a015f69af2836abb69bd9e656bfd66ad483592cb843 SHA512 48fd6dc4aa24de61a6951b49cad3db41c084a0ec985af53d13d78c7bcae801152afcc7930eae5a0b6393cdcf844f0986f4a943d7d6f6193b950845e9da509ab2
diff --git a/net-misc/mosh/mosh-1.2.6.ebuild b/net-misc/mosh/mosh-1.2.6.ebuild
index 0258c62a187c..f51c7d11081c 100644
--- a/net-misc/mosh/mosh-1.2.6.ebuild
+++ b/net-misc/mosh/mosh-1.2.6.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
@@ -19,6 +19,7 @@ REQUIRED_USE="
 	examples? ( client )"
 
 RDEPEND="
+	dev-libs/openssl:0=
 	dev-libs/protobuf:0=
 	sys-libs/ncurses:0=
 	virtual/ssh
diff --git a/net-misc/mosh/mosh-1.3.0.ebuild b/net-misc/mosh/mosh-1.3.0.ebuild
index 6998cb6bbd20..61fd42fd6e5f 100644
--- a/net-misc/mosh/mosh-1.3.0.ebuild
+++ b/net-misc/mosh/mosh-1.3.0.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
@@ -19,6 +19,7 @@ REQUIRED_USE="
 	examples? ( client )"
 
 RDEPEND="
+	dev-libs/openssl:0=
 	dev-libs/protobuf:0=
 	sys-libs/ncurses:0=
 	virtual/ssh
diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild
index 8e0a4705f404..eb607fe4305d 100644
--- a/net-misc/mosh/mosh-1.3.2.ebuild
+++ b/net-misc/mosh/mosh-1.3.2.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
@@ -12,7 +12,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+client examples +mosh-hardening +server ufw +utempter"
+IUSE="+client examples libressl +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
 	|| ( client server )
@@ -26,6 +26,12 @@ RDEPEND="
 		dev-lang/perl
 		dev-perl/IO-Tty
 	)
+	libressl? (
+		dev-libs/libressl:0=
+	)
+	!libressl? (
+		dev-libs/openssl:0=
+	)
 	utempter? (
 		sys-libs/libutempter
 	)"
diff --git a/net-misc/mosh/mosh-9999.ebuild b/net-misc/mosh/mosh-9999.ebuild
index 96d00779f301..e01550c41834 100644
--- a/net-misc/mosh/mosh-9999.ebuild
+++ b/net-misc/mosh/mosh-9999.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
@@ -12,13 +12,14 @@ EGIT_REPO_URI="https://github.com/keithw/mosh.git"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="+client examples +mosh-hardening +server ufw +utempter"
+IUSE="+client examples libressl +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
 	|| ( client server )
 	examples? ( client )"
 
 RDEPEND="
+	dev-libs/openssl:0=
 	dev-libs/protobuf:0=
 	sys-libs/ncurses:0=
 	virtual/ssh
@@ -26,6 +27,12 @@ RDEPEND="
 		dev-lang/perl
 		dev-perl/IO-Tty
 	)
+	libressl? (
+		dev-libs/libressl:0=
+	)
+	!libressl? (
+		dev-libs/openssl:0=
+	)
 	utempter? (
 		sys-libs/libutempter
 	)"
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 88b42af1bc83..8945f6e86808 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -17,10 +17,7 @@ AUX sntp.confd 149 BLAKE2B 8ef1da02161b1b757dcf3f34934f2455499ad1f28b0691e4b4933
 AUX sntp.rc 484 BLAKE2B b8d829c7f1f2f9fc5e4cfd584483f31843d5b5740cf2fd89a9718fc7db86fc540406dfbf1209fbd5a1a44b3c9a2e0ffc92b28d01310a2125507489f0caf3ec10 SHA512 17b48cf31f5b15f5219d4a7f69a5eb84805bea256f8ae5b4888e56ec4de7e9a2640c7a36e236a467ecc7881a1757a12c24124697694730341f24bdeb751d8d7d
 AUX sntp.service-r2 324 BLAKE2B c94e72170f46453e94d6fb48b3ee353ba2db1bdf1903f6521219975e9a456346f8525f8016dfb10779e474e9495d7dc37ebfbf6e23b4482a6ae2396e6456796f SHA512 8626967f3bf9ef01fa5a2b7268b220ed7c518974db450a6f56316ede7b57947351171fb8ae6d28d32599e50c1d5506b4547dfd03cdbd80c5b873efb7d606cf17
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
-DIST ntp-4.2.8p11-manpages.tar.xz 25700 BLAKE2B 8efff006297925e4dfe57abfb8130d0dcb69e804744a597ad92b9969019b87c7b3e44f032187073d3c19092ca92445ce06b93f89f449430fd21cc540f11f5f3b SHA512 403bc238681abaadc838f5a6619851dcd0cfa5bf780e8aeaa94e8f77e776998d1f5142d65e3fa99c23e22e4cb7207d24b059fbbc6ddcf4414f0076a4b6ab4e81
-DIST ntp-4.2.8p11.tar.gz 7076566 BLAKE2B e81ce2093ea7307a565089bba9cb267be64c71499872272cda221d7356676762a23ac1066ddfed7fb803083dbb9b26ca7376ea75277a63ee8de1c70409e81432 SHA512 05ac60f15a6aac50aaf340d40e4e439a421fa6e3d897bf30a69b2cef0cc97f8a6956012bfc6ceba055f4c3485a24f7fb8ebbd055e1875f1c69cbfdc35e71f236
 DIST ntp-4.2.8p12-manpages.tar.xz 25700 BLAKE2B 0a84908556e997bdd08a78cd04f7f38a32a8441138f31d0adf7fefc380da79e509bea4a8bc67154501e359638f4edcab561d14cbdd1d573473bd2ea5a14f0c48 SHA512 e6df0099b9f62db63d200702267276ee094e8d00b20a67d2181f3f32fe6b871c49ac2eedbc2186b3255c919820c05eac528718b80afe7ed7ed7654b55c361f7c
 DIST ntp-4.2.8p12.tar.gz 7079642 BLAKE2B d7d7817afaf9f94bf230951901b7531aff03c0828eecd40ca6fcc836ffd081387837afee44978742b507a9bee58788022fe9556733e8861dcc37d63f5637b3d1 SHA512 5382dcd1bb7feca8f28fc650f68892cb53f9364ebeb3780754cfbe71b1602057fdfd6eb27956afe79014a435624d77e2648d9e07f4d86ce7a98f5a4438d08310
-EBUILD ntp-4.2.8_p11.ebuild 4517 BLAKE2B 87ccf28c99af3848df8ca2bfc5825358d6c38d2045939b3d8a7c6509a83493ef1de004e4afdc466c453335b637c63895446c351cb2072193620e2af4883c2fbf SHA512 e8d5662377daa1c0ea1e9c1d746b05cf16944d8b3c3d9811307bca1cf6be923899390597019f9a5d203acfdec00d252860110ca0f434bffc43a25c42162696ff
-EBUILD ntp-4.2.8_p12.ebuild 4567 BLAKE2B ac23c755d6befea41196245866147781f3916ddb86b8ff750ef1e2701a1c6b29d026d0f04d791fa55267e36b79b487d37c9d042414ac4a881856e8bb405c8a3b SHA512 37c9f24be3beec669db4b519cec8d8fff19e177f75be859f2017008079e9f6ac07133153c3bac72f3dee5c0352e084d91b5aca2e94ceefe1f7f6ef624179a5b2
+EBUILD ntp-4.2.8_p12.ebuild 4564 BLAKE2B f084db146b958fc8c789b82459135d8fb9de1295bfd39c06c36b580c79bcaf3e8f8cfde8a89001a16fe542dcfe1a08a479413c63356d8480d8aeb2bb860f9465 SHA512 303114ca6511626059920736006fd5e5075787951f9ce61a47ab3b3d7181db904c6b2ab915fa2981e8d89c7a6276bcab129ba4a267fa00a3ef31c1c08038ea11
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/ntp-4.2.8_p11.ebuild b/net-misc/ntp/ntp-4.2.8_p11.ebuild
deleted file mode 100644
index 7d4665cbe8aa..000000000000
--- a/net-misc/ntp/ntp-4.2.8_p11.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs flag-o-matic user systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
-
-CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
-	>=dev-libs/libevent-2.0.9:=[threads?]
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	parse-clocks? ( net-misc/pps-tools )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )
-	!net-misc/ntpsec
-	!openntpd? ( !net-misc/openntpd )
-"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
-	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
-	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
-)
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	default
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
-	find sntp/loc/ -type f '!' -name legacy -delete || die
-	eautoreconf #622754
-	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	# Increase the default memlimit from 32MiB to 128MiB.  #533232
-	local myeconfargs=(
-		--with-lineeditlibs=readline,edit,editline
-		--with-yielding-select
-		--disable-local-libevent
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
-		--with-memlock=256
-		$(use_enable caps linuxcaps)
-		$(use_enable parse-clocks)
-		$(use_enable ipv6)
-		$(use_enable debug debugging)
-		$(use_with readline lineeditlibs readline)
-		$(use_enable samba ntp-signd)
-		$(use_with snmp ntpsnmpd)
-		$(use_with ssl crypto)
-		$(use_enable threads thread-support)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED%/}"/usr/bin/{ntpd,ntpdate} "${ED%/}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	use ipv6 || sed -i '/^restrict .*::1/d' "${ED%/}"/etc/ntp.conf #524726
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED%/}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED%/}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}" || die
-		rm usr/sbin/ntpd || die
-		rm -r var/lib || die
-		rm etc/{conf,init}.d/ntpd || die
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
-		if use caps ; then
-			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
-				"${D%/}$(systemd_get_systemunitdir)"/ntpd.service \
-				|| die
-		fi
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}
diff --git a/net-misc/ntp/ntp-4.2.8_p12.ebuild b/net-misc/ntp/ntp-4.2.8_p12.ebuild
index 2bc93a5a5cec..eb032edec7a0 100644
--- a/net-misc/ntp/ntp-4.2.8_p12.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index 5d392155eeef..c1a182bea8d4 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,8 +1,6 @@
-DIST rclone-1.42.tar.gz 52702474 BLAKE2B 35def37dfb44a9fccabf0f6c3d0106da58bd1468a0c73e8b0a911e9bad48c6da58d303726544c76464230714af68d1727336eb9a4858337b346630f5df147a08 SHA512 69fadc1bc661e6278e461a16b49fb473bf2e35ceb85704c2b92e252422d372fbbbbb9d188cf9cb58d55b6d6c8267c599ea0d8a79fb4edb4a7bc0bac61de3eae1
-DIST rclone-1.43.1.tar.gz 15965941 BLAKE2B 5bf0ac08ca75abfdf6bbcd8f5725b0ab3aa543c7dac043feaf301a6c0a23090c61086e3c16e674bbc2c29d7dff7fc19e7759c70e5990afb2ddd72e5610295cba SHA512 7da3b285a8ed401de95ec0b8bea21ca3db0313eb2012874b10fb65c4441311ba4b24b7dd3ea68a7bce17206ac065f091d2f6ef6a9662fe0111b9f00ff58e6c17
 DIST rclone-1.44.tar.gz 16362501 BLAKE2B 28b4e444b83f361ae641eb7b09e150d46eaac09dd777e247e38f3e708a18e8e58d6a1c40829aba1c44c6c37e733dced2eae069a9b6e725adf0785b7c9959e47b SHA512 1207316ed12646a4ec5f9795d5cca1de9d2fa333f60a8b6dd157462813e2e6ad9ebf85d3d20b9b881d11dcd9ac162b5a674a53ff2af15a452afcfc04f7b34f5b
-EBUILD rclone-1.42.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
-EBUILD rclone-1.43.1.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
-EBUILD rclone-1.44.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
-EBUILD rclone-9999.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
+DIST rclone-1.45.tar.gz 16494131 BLAKE2B 17ca4182af4efe23a367fc38226dc7fe146da55fea47a5f76773f1dcc3d3b629cca7964ffe41aa1e4dbd2fe36bd80545f336d2823a25ebb6b3effc768d4b46d2 SHA512 348dbd6a069f736219b7f925b6aa5234a4d70724ee5bfdb56067241063be36c44a091a37acb3285627803fa013329a6ef804aab4c0070ddaf322c5324b9e2a5a
+EBUILD rclone-1.44.ebuild 855 BLAKE2B 6fa5fed6fa510426c7b0e9fc071628567d2dfd3656d42eec32e4ee53421a0d2e4a0d3a76985b659b07dc92dd781d3ee64d09237bec89f4f6cced00cf4bce213b SHA512 3ebe305dd275b7514361c8e83c66ebcf670cf1e403a5e0bfac65d8ebd97dca2314c8d9a5c89cfac968f0c8db35c68fce49b13e436dc3fe6b81a816d25360dc8a
+EBUILD rclone-1.45.ebuild 857 BLAKE2B 23908780bf153eabb1e45e3a011d5cf3c8a262ac040a24c272e8a9c05dda5e1332accb190b133141d96562ea812459e91595b7f53e0dda63d9a5ce7dd1e49293 SHA512 55a50a88e62179f4a665b45b3da697284b1a1117af190adb0a8eb8c57586f1bb5a23455e625a51d95f0525b274eee20c2d4d05318f88d333145e0f3fcf437356
+EBUILD rclone-9999.ebuild 857 BLAKE2B 23908780bf153eabb1e45e3a011d5cf3c8a262ac040a24c272e8a9c05dda5e1332accb190b133141d96562ea812459e91595b7f53e0dda63d9a5ce7dd1e49293 SHA512 55a50a88e62179f4a665b45b3da697284b1a1117af190adb0a8eb8c57586f1bb5a23455e625a51d95f0525b274eee20c2d4d05318f88d333145e0f3fcf437356
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/net-misc/rclone/rclone-1.43.1.ebuild b/net-misc/rclone/rclone-1.43.1.ebuild
deleted file mode 100644
index 2c530609ee7b..000000000000
--- a/net-misc/rclone/rclone-1.43.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build bash-completion-r1
-EGO_PN="github.com/ncw/${PN}"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A program to sync files to and from various cloud storage providers"
-HOMEPAGE="https://rclone.org/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin ${PN}
-	doman src/${EGO_PN}/${PN}.1
-	dodoc src/${EGO_PN}/README.md
-
-	./rclone genautocomplete bash ${PN}.bash || die
-	newbashcomp ${PN}.bash ${PN}
-
-	./rclone genautocomplete zsh ${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/net-misc/rclone/rclone-1.44.ebuild b/net-misc/rclone/rclone-1.44.ebuild
index 2c530609ee7b..e7c1175ae163 100644
--- a/net-misc/rclone/rclone-1.44.ebuild
+++ b/net-misc/rclone/rclone-1.44.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
@@ -8,7 +8,7 @@ EGO_PN="github.com/ncw/${PN}"
 if [[ ${PV} == *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	EGIT_COMMIT="v${PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
diff --git a/net-misc/rclone/rclone-1.42.ebuild b/net-misc/rclone/rclone-1.45.ebuild
index 2c530609ee7b..e1f64b65bde7 100644
--- a/net-misc/rclone/rclone-1.42.ebuild
+++ b/net-misc/rclone/rclone-1.45.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/rclone/rclone-9999.ebuild b/net-misc/rclone/rclone-9999.ebuild
index 2c530609ee7b..e1f64b65bde7 100644
--- a/net-misc/rclone/rclone-9999.ebuild
+++ b/net-misc/rclone/rclone-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 7bf4a33fc89a..6185152a8113 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -4,8 +4,10 @@ AUX rdesktop-1.8.3-no_strip.patch 428 BLAKE2B 86249bbebd944fc5d3f8e79978f712ab36
 AUX rdesktop-1.8.3-openssl-1.1.patch 3643 BLAKE2B 986f8af19dcd2613d1b45a66060096bed3913ea20aff61a2c0b2f3f2ccee5cad97f054b90128488a2dcf8a997b7b107eca0923714a5f769de040946d880144e5 SHA512 b525aeced7971d77120ad7da166b5fcb491436b8716e140d22df39e2a036ed837f7d2a3623958208d7f1c027ffca9cd7237746ef9e01c10edee24320022a3b41
 AUX rdesktop-1.8.3-xrandr_configure.patch 666 BLAKE2B 1d2b0b57069b4e8a4eeed2d3d81628ebd9f4770bf70c3e88a123d636778240de37cec9c7fa6e5131fc9e019b9d7d6e22b5c8dbd39059ffe1b121c8c800777111 SHA512 f887b2499f71992501485061b047905dbd38445fc45a24e65f5b7e22b83aa14a80b339346ecfc5c185f5fd77e15daeeb5361f009ef02a2858f55cd1a34c56c3d
 DIST rdesktop-1.8.3.tar.gz 320212 BLAKE2B daca0b78a8fcd0461f1c3251135bd980aaafacf8e0cd51ab731b576adb23006ec9f51858586e7e3a1a7f192b7830308e585984b4a31fb013748f8c6b3a8c47bb SHA512 06b94ad3b09430b05e424ef31a3e6f2388190b4920e348603cb66a414244896e0dc8906b9f12920e9406cf153ffa7f6507b23bf6713c3a675c0540a8ef57902d
+DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7ad0feb144746c904146c410c6456391eb3f2b7b9a6a40c2fb34515bb7518888c2c9da8dfcaf17c5309ff21cad3 SHA512 9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae
 EBUILD rdesktop-1.8.3-r1.ebuild 1843 BLAKE2B cc3e9e807656d5cf1d92337f90be8ec6b7e99dfb4d5dc91de931c9f1471d2e080063b1c3b2a2e1cc4418b9d2052e019e06b1573ba0921346d885b82eec37fc3d SHA512 ab93bf6c822cfae151158a427a5d1679beb0fa17f6a9df629283cbeead43b0003a23bc4b3a2ca89a616eca6d46cfc7e2080e03e36600605891a4b4743ba63d71
 EBUILD rdesktop-1.8.3-r2.ebuild 1896 BLAKE2B 5741137acba3af2842dfd5e6bdc95a53d230feadece2a7c5d71ed2042442a6702ff3d94bb1f98554fb2c0134488c8fecf456ca9d8171680c89cc0054ce2acba8 SHA512 2b5e2ed13d3a42dfd70173b7cbafde9d078c08a27ea13aec85951c7dddb302d61b61c08eecc72b7bc8a0ef13fa9fe1854069d6e1c106428adc2182314ca798ec
 EBUILD rdesktop-1.8.3-r3.ebuild 1725 BLAKE2B 0523fb8eb8962017673fe4dc7cfbd05457aa514c2166fbe5ec0beb1fe6902d5109a878f7371ce2157d2a0a85da2e6245d0ca9b80ef2c2de013dce2bca456c296 SHA512 519ff1eafb4ea9420c62a6ce864fdf5005aaa3f7dffa05dc5265d14837133430fc60a204390a7055a2b1277d0f90c2f84bc11ee46baaf0fd76f15c79fd5068ad
 EBUILD rdesktop-1.8.3.ebuild 1803 BLAKE2B 783d1cdb94a66f2c6339cc45fb4c201ed0ba2af0d06b91bf6d615b00b086d7f498fb082efbb34e48b6a110a1232d5c400fd8b984e7729685c7cf1410544ba7cd SHA512 c1bcdac48e93f0e30b57ebfdeb6338b20f980aca3630986e564f20483b38e9f31110a1efda74b94d8fb973b9299399ae7e75351dbda049b82f8e74002363f68a
+EBUILD rdesktop-1.8.4.ebuild 1709 BLAKE2B 09f9ae4b35a35d4a9882034e425c69f66fa30e30166cc26fb6d4ff1fba36512436c40ad4e52f181fae462257e9d575c973efa6b085d29d5e2684fafa55d5ac0d SHA512 c204cc5606d6c38eea53565a09ae57a6783d62aa3436b9049c470ef77053c15e5afbab8027fd8654c465f0878b4c98c5e99112f3f80e14a42475259d34d8c9f1
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/rdesktop-1.8.4.ebuild b/net-misc/rdesktop/rdesktop-1.8.4.ebuild
new file mode 100644
index 000000000000..f5be6057df98
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://www.rdesktop.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.6 )
+	kerberos? ( net-libs/libgssglue )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+BDEPEND=virtual/pkgconfig
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
+	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
+)
+
+DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use ao; then
+		sound_conf=$(use_with ao sound libao)
+	else if use alsa; then
+			sound_conf=$(use_with alsa sound alsa)
+		else
+			sound_conf=$(use_with oss sound oss)
+		fi
+	fi
+
+	econf \
+		--with-openssl="${EPREFIX}"/usr \
+		$(use_with debug) \
+		$(use_with ipv6) \
+		$(use_with libsamplerate) \
+		$(use_with xrandr) \
+		$(use_enable kerberos credssp) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 9248c9fde428..70e6bf762dc4 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -3,5 +3,5 @@ DIST s3cmd-2.0.0.tar.gz 115290 BLAKE2B 1dfc2498c2b89f6f94049b180049a2812c9fcee9e
 DIST s3cmd-2.0.2.tar.gz 124266 BLAKE2B ab5921f22af05007c57df84ab4df559f31a8b7f05427fa06fa7428d41de788e4824b6285b69de592ed84d72733d3ae455a20c017dd9cecf2e4e073bff5016fb0 SHA512 4cd155f4e24e462fcab009b5ae0844718b728134cf436a4c43a9380c178c2172bb5bccc780f0f174cb43793554cb4f9b5ca432c757c9e5a4a8eaa4efe656133d
 EBUILD s3cmd-1.6.1.ebuild 565 BLAKE2B 71458aa49a354e23c1f30edb6df5a14206a28ed933ccd91b35a46c4485a3a3e8e9745df589e59a3223f20e045c46b452e3d56d3012246313f0834b4b0cfa7891 SHA512 f0e4d0bc0d292d40b4733fccf197a046e69621fc30cab7c068a0622f28e3ec27dae99765663f037cd0c6c51780cd33e476f980f172437a2783dafb3d6d468050
 EBUILD s3cmd-2.0.0.ebuild 585 BLAKE2B e5893a2407d2068cc8e7d7e1e1c9490eb485a7104a42ef3c671afc4575221bf58c90fc4a7b0453f04c269695c29ccd1e5c970dc1382733ff8573169c91388e76 SHA512 aa9bda77e77a242e4438f24d020a246d2fc104c3ec40b439cbf8375f45d8f2cd7faeced7f1994fed77b84a90389c07796069e4f04fa23e30f10a574a58e61267
-EBUILD s3cmd-2.0.2.ebuild 585 BLAKE2B f60832cd97239541f9fb0572e26ad33bc7025dd02a13e5d90ac9a75ce9f905c24745b0ee03e5d0bd0a9800b89e235c2c59e358c3c549afb9ea2e47717242cf94 SHA512 fab67e3b49e7a1b057d813bd2fe38da354ee8119842987dc9284a45f92c8c1efbc4d4213938ba4a3541611e4574ccf40ba4c7d9a94f4a820a05a0089a82955a9
+EBUILD s3cmd-2.0.2.ebuild 595 BLAKE2B 47b999ff34c111b119b5ae534a2494e5e31f1051015604ee2af6281daabc32648fa64dd7330d6be2a70fbda821721be98783e57a41431f115b3fa45b133f1b8c SHA512 cbd4561826b36740b82944deb94698da0ce1088491b2bbe9a317d743b30f446b83c977c3091236e77858651e6eba2a51a1971b5bd9ac27eef273c9f85d852f3e
 MISC metadata.xml 653 BLAKE2B 917a644773bed192fb8223b7d4b83685ad70ef09cc0ba3afff7a86b5b238623b01501c7e2c5f7f6515374e4a0cb8a4b09f892638be6e71682536777583f1cb52 SHA512 8f60fecfd5bb15e38d76a37df6ea221b31492a6bc21679e8e327ccdc0f4450d874689948a3acf2b69b4067b8b2201531a844a4e52fddfb1eede3ac10783824ca
diff --git a/net-misc/s3cmd/s3cmd-2.0.2.ebuild b/net-misc/s3cmd/s3cmd-2.0.2.ebuild
index c8ebf64df130..6d8a1feb42a4 100644
--- a/net-misc/s3cmd/s3cmd-2.0.2.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.0.2.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ia64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-misc/sshrc/Manifest b/net-misc/sshrc/Manifest
index b36f977bfa09..86afc95e9567 100644
--- a/net-misc/sshrc/Manifest
+++ b/net-misc/sshrc/Manifest
@@ -1,5 +1,5 @@
 DIST sshrc-0.6.1.tar.gz 3701 BLAKE2B 36cdd0d4dcc80ea1884533f71e6090a6cb393dc1131a6d78fddc43c37e0597aee2da8b92789a59100ad6941d8c17e6ccbf796d73ec704df45aa768cfc6bf36a7 SHA512 69e0919bdef0ec6fb187814f1a0dd360b331dc4c0fc047f7767399944eccb949c172682331e6ebe940c275f0a2b6293a66a6018e12351f566638eed1ac362d64
 DIST sshrc-0.6.2.tar.gz 4410 BLAKE2B 982ae3f0a6d3727699cc3cd7ddc20304ad1330b165f7450047f7d3b236ba7f3b297223d88c6ce8e00d0db97d3193c4547d7a10d51e8feb3bb639b6276865a8e8 SHA512 79dd964c5ed825b38aa775d35df6adc0857817c418fa4ae1971378f062536035bd66e4faa0fb84f66504f09c7e6368355f8c57036bea8d269b4d9084af95ddc4
 EBUILD sshrc-0.6.1.ebuild 508 BLAKE2B 382be296afff6d8c5e4c50d39fc24363afa4d77de0c40e0860d7771b5897a761332f9d6c7e0e1bc0371e3acc5b7c558d3a2212d182d3e80255beac209a82b046 SHA512 76035a2894f49e02366e587ba66e4c0ede86fbffc41a908106eca9b4b2777d1f7786df4e210573d7956d6c7c97b79e14bfb58f4d9b4a3bff571c4d4440c16ce5
-EBUILD sshrc-0.6.2.ebuild 504 BLAKE2B b02e5be6ca53322cde4611e1c749a9bcdf1ee1d5569d56be339206f25f45a706170d1573ab1bfeb253cf1dad9af1335cf4cb0e4aae122235ad2d3f17772f9d62 SHA512 e4f1ce279b024b9b7091721f9e47859b7c96697930960b88ba0837311c84f566ee0e4e0cf94b182f297e476bfee5ae5010c787f59f13f2c6dd3c71d09e4fc2fa
+EBUILD sshrc-0.6.2.ebuild 503 BLAKE2B 678fe7cbac5f64e689bc21c83a79b757d38adf98eccbb8289d8c460012b99156d97eda76f4762d24248b37225b7dfd06c1e1f63fa79197a222d49d2aa87e2eef SHA512 aeed92acfc893a0e3fbd86fc616bb52f427c46d912cb58835bdbaa8b9f2e3ccac3b2ae133ea4fa9759ac6879e3d63e06b878a67c3a1a054df0a2c1e1588fa709
 MISC metadata.xml 686 BLAKE2B 1eb7107316b71bdec72f42a5eaa58aa7fbd9b568c1a887adbe7b031ed9b7b5a42bdfb43374a656118d49dc873d1437d49849faee59646d98593bb0efd87487e2 SHA512 00b1ff2c8d66e8beebb34f409782c43350c9fd6709df2e9300f010632324cba282fdf054d6ba32bd822aac0b2cba7364cb33069ba550a89ad09b9a7ad50f2658
diff --git a/net-misc/sshrc/sshrc-0.6.2.ebuild b/net-misc/sshrc/sshrc-0.6.2.ebuild
index f8fc30766e09..f88910912dc5 100644
--- a/net-misc/sshrc/sshrc-0.6.2.ebuild
+++ b/net-misc/sshrc/sshrc-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Russell91/sshrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="mosh"
 
 RDEPEND="
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 40afc9570562..5dc99873bebd 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,8 +1,3 @@
-AUX wget-1.19.5-fix-dot-prefixed-domain-matching.patch 1077 BLAKE2B 09a341db55d4c0e47007060ba743f11a509526c01cf9815ee4eb9d21c8ae821f122b3ae10047fbfa69e1da407baea799663661e9dbdba0d6a6ddcaf4eda4eef1 SHA512 971b13380dd0a8f60a8ae423ce98798105cbf5670b86445bec67a869ffaf891be7b48a0a6b02e3575459b64f586b2748be8077925f873dc2e1a4bc5467a95392
-DIST wget-1.19.5.tar.gz 4455797 BLAKE2B 988b80090ff1f62cb527afb33c03b7c6a68bbc1649d42f62061e05e416bebf5b2e9546ebafad3c9cdbf1199a8d2b84f4427c921f23338b02631da357da9b3d61 SHA512 0d4964e0f5adb0c023edc831bde9c9f13f3222f6efc1ce93250d234ab937e92b53921624532fb0e6586151ddfdee6df9a7ca91a2a99b3d16e2e68401c625301b
 DIST wget-1.20.1.tar.gz 4392853 BLAKE2B 5740fa70064e24a699ba5fc0b6262b372fc877e86fc74bede07bcfe7dcdf6d4a15db7686fc900d8ec90ad3adce8c4af1c00460601c1845da7907f929d8d48447 SHA512 855c7e3c45f9020a9fdb30e286ee6a0bdcaa780be3d0dda9ffdae73b562ae1012d4550242f66240407a28076a7054328d4f08a469a0da227a9e3410b8d5f46dc
-DIST wget-1.20.tar.gz 4474641 BLAKE2B f9a1fdb1299dcee36467e6a78fc90fb8b17b71d14079b5ce6d60a19a27a2bd4c53fdbd3660cbd2d94a3523d4c5ea517e52f46e4af1be60db885fe79a376b3720 SHA512 2e50b9e83c22cb342d85981f89253d9c72bb1a48152c17c4c0b6315683890075f60ad2783e4fa8c2a6d15c53820d9ecb8d0c4b81cfcef4fcc66126ed1cb7ff54
-EBUILD wget-1.19.5-r1.ebuild 3231 BLAKE2B c3c1c75e7f9d2df4e40959c481c1266f78a216a7600788bbebc0d51b0c9203f773b469df6e2797d98b71c0c5a5cbf5146134312af7bcbaf2945c5ded3604f984 SHA512 694cedb34e2687c1e69212b96808251446618669ef947c410852435063a1daea0000d3a883edf86fa552ef7e0ee104ed250ee0ab125f1ded47f9112002959156
-EBUILD wget-1.20.1.ebuild 3199 BLAKE2B c7c585395a0398339f225f7b93ba0c68a651754191a5517824fe21779434d2ff1af1ae66d1a1a9036c145a3baf8108006bacd103a6f3be0eaeb1805809588186 SHA512 3ba598122d8bab203f362fc73bb53cdb9cb42401f9ee9615bcdc21b94a1bc98c744dd02d33d84e6964a1fd4f756a56b95394c16f2337a274172e92c294569cb7
-EBUILD wget-1.20.ebuild 3199 BLAKE2B c7c585395a0398339f225f7b93ba0c68a651754191a5517824fe21779434d2ff1af1ae66d1a1a9036c145a3baf8108006bacd103a6f3be0eaeb1805809588186 SHA512 3ba598122d8bab203f362fc73bb53cdb9cb42401f9ee9615bcdc21b94a1bc98c744dd02d33d84e6964a1fd4f756a56b95394c16f2337a274172e92c294569cb7
+EBUILD wget-1.20.1.ebuild 3188 BLAKE2B a341244ebf21c99c63082e3fa47fb7c146be73ebafaa8d8a2b5210da7c2dd339873456a9b3e5b4560d7459a6e72259b6e7663486412a365af9c9d81d8e47a704 SHA512 8fa5048e8dd8a42ca12c86aa7f09e3268a35d165c51fd7081a3ca85c3e127674a1f66983b9eb9375a06db74db7e45d73b8e2af5979e75ee7d6846339763b3ad5
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch b/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch
deleted file mode 100644
index 129f0b675414..000000000000
--- a/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fd85ac9cc623847e9d94d9f9241ab34e2c146cbf Mon Sep 17 00:00:00 2001
-From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
-Date: Thu, 25 Oct 2018 17:39:52 -0300
-Subject: [PATCH] * src/host.c (sufmatch): Fix dot-prefixed domain matching
-
-Current sufmatch does not match when domain is dot-prefixed.
-The example of no_proxy in man (.mit.edu) does use a dot-prefixed
-domain.
-
-Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
-Copyright-paperwork-exempt: Yes
----
- src/host.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/host.c b/src/host.c
-index b42cd6e8..2bf848f3 100644
---- a/src/host.c
-+++ b/src/host.c
-@@ -1033,8 +1033,9 @@ sufmatch (const char **list, const char *what)
-       /* Domain or subdomain match
-        * k == -1: exact match
-        * k >= 0 && what[k] == '.': subdomain match
-+       * k >= 0 && list[i][0] == '.': dot-prefixed subdomain match
-        */
--      if (j == -1 && (k == -1 || what[k] == '.'))
-+      if (j == -1 && (k == -1 || what[k] == '.' || list[i][0] == '.'))
-         return true;
-     }
- 
--- 
-2.18.1
-
diff --git a/net-misc/wget/wget-1.19.5-r1.ebuild b/net-misc/wget/wget-1.19.5-r1.ebuild
deleted file mode 100644
index 6db7c1194b03..000000000000
--- a/net-misc/wget/wget-1.19.5-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-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/libpcre[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 )
-
-PATCHES=( "${FILESDIR}"/${P}-fix-dot-prefixed-domain-matching.patch )
-
-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-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)
-		$(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.1.ebuild b/net-misc/wget/wget-1.20.1.ebuild
index 912dcc731412..ae23b38c4306 100644
--- a/net-misc/wget/wget-1.20.1.ebuild
+++ b/net-misc/wget/wget-1.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,13 +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"
+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(+)] )
+	idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] )
 	pcre? ( dev-libs/libpcre2[static-libs(+)] )
 	ssl? (
 		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
diff --git a/net-misc/wget/wget-1.20.ebuild b/net-misc/wget/wget-1.20.ebuild
deleted file mode 100644
index 912dcc731412..000000000000
--- a/net-misc/wget/wget-1.20.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,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/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index aad1127e787e..988f838ed244 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,6 @@
-DIST youtube-dl-2018.12.17.tar.gz 3074432 BLAKE2B b6f4b3a7a2c2159093494230219914ee4a2f87194ebe741cc4687aefa76dfef09c282bcc6534030bb65cd87a641b05cc74bd74eecc0c78b57157970fbea98121 SHA512 88d98391d110d6542503590c4735c765137cde43bc3a1f1b33b197d323a1226ed550d559f67bd4aadab3c82de8a471fa71bf4e1440e5641e1c51ba5cb7059904
-EBUILD youtube-dl-2018.12.17.ebuild 3410 BLAKE2B 8a6e7ca605c8c39c98eba0b01f5c5c1cd3c03b08d963043125f57e1cd87a50cf16a685bbfe26374d5dab07248ca031ce9015fa300d3084896062fc50a8c3f938 SHA512 ca156bc1a202c3a5001f176356c61d8a0ae31c697ff930773adb46c4a04b5fba53766fb6b8584ded1a50c23b6f3d1db662f5af98dd78680f3880f6a6afb7e26c
+DIST youtube-dl-2019.01.02.tar.gz 3079437 BLAKE2B 6eb1610f5638fe64f4d1352ab763014550b99037dde08beb19b94a8d4877cd05f392ce840ec1bba28eee37a7b45b793afb4f68f6d5b234fe7d849501b7fb10f5 SHA512 745a1e9286c225ed0ad3517197304e39655d50ed33df44525579b7fe7038ff2be8fa0872adbc8c35cc738004b0d58c1f30f7af918c7251427da84002cc9ab944
+DIST youtube-dl-2019.01.10.tar.gz 3085961 BLAKE2B 938fe458a22f1c02c5e420ed43bc65247b7992e90d224891e2f5c8fb6410a0fba62dedd035a37b0e8c42a7dadc8082a26c97fb3f192a02df8795c9cfac6c6a42 SHA512 86c86688bf9120b56a0cda54ca4c8fef20f7afeea38a80b44d5aa77958b80ac4605b8de9666668297d0a9244693b17dcdfd85ddacc8990b179bd942c4d7158f2
+EBUILD youtube-dl-2019.01.02.ebuild 3410 BLAKE2B f16485a95281547c0ad2b0f32d1005e7a1500f630d5894dac2f2ab3961de53d92fd535cb7b253ae566a5779e757f5439bdf68d204c9c8a8da8e8c816eda3f72a SHA512 c3745e5375971e638f46dd20389523d648c853aeaa03a36d982814158fd2a0561749e8704998617ef2983905be0f4dbc5b78f06b6faa965e6299487bb55991e0
+EBUILD youtube-dl-2019.01.10.ebuild 3416 BLAKE2B a006e2ef1f88a0867fd931e1bde00c35e211f2c4efde7f5c68348c012ebc22346b46d200a24aa50f86b5e3fdb1e5c9253527c284a949b3c1920f3c8034d3fb94 SHA512 b5f01ad65383548f81ce29a6ed77ba3e450f585a19557c73ea7215df434dcfc8b6f972d057b6b767462a454f6ae7c2162d71fdda8a1d575b0f74952ad655b465
 EBUILD youtube-dl-99999999.ebuild 3304 BLAKE2B 62e4cfa266a5c117633a91e9fe83648f42bbbbd60e8764adca0002a03fb55b06caf224fb7997bcc9073847ca7d0055037749fd45f7521757a8e1bf9d4cc7215b SHA512 70686e618298486fc81621671f687cf11a0b56a05041be6016f4e2eed97ea215c21e869f90b5f071111f229f0d3ee49be3b3d395cd8e28900cc985d1d9d8fd31
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.12.17.ebuild b/net-misc/youtube-dl/youtube-dl-2019.01.02.ebuild
index 7bce052e27ce..c26955b40882 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.12.17.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.01.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/net-misc/youtube-dl/youtube-dl-2019.01.10.ebuild b/net-misc/youtube-dl/youtube-dl-2019.01.10.ebuild
new file mode 100644
index 000000000000..6ef55f59a57e
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2019.01.10.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="+offensive test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+python_prepare_all() {
+	if ! use offensive; then
+		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink camwithher chaturbate eporner
+			eroprofile extremetube foxgay goshgay hellporno hentaistigma
+			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
+			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
+			slutload spankbang spankwire sunporno thisav vporn watchindianporn
+			xbef xnxx xtube xvideos xxxymovies youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	eapply_user
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-01-12 16:58:08 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-01-12 16:58:08 +0000
commit	c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch)
tree	9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /net-misc
parent	2891d29af8907ce881662f4a02844926d7a293c7 (diff)