gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /net-misc
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
80 files changed, 679 insertions, 502 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5cb72d8dcd0e..3646868acba2 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 4900cfb5791a..26b61058f326 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -10,8 +10,8 @@ DIST apt-cacher-ng_3.3.1-1.debian.tar.xz 50912 BLAKE2B a873c4e718765a7161d9f87b6
 DIST apt-cacher-ng_3.3.1-2.debian.tar.xz 49772 BLAKE2B b864859e7f0ad5eba24b2f1ced74dbdb7a1878fbc2190863929f45534163c18ed2a67c4c75b5fe8011d93312ab9a67d899b09669e7aacb1ad3ae15a2bc1fba12 SHA512 653ca59c1d9c89a9586ccf963da480524ff8195222435e4a89f0c08ca64586e1993a92d00a05dbf738b0814869a5e6b539a05d1d59cb956e66b2dbe5ad95eeb8
 DIST apt-cacher-ng_3.3.1.orig.tar.xz 321996 BLAKE2B b630a31414ee86256f2e2ebe950b56d182d61dffd1603ce8387b5cd677d18fcda3ed17864bb99c253b11e2d29163b172c2d0bc91a3f5b14fb9f0ef321d656b40 SHA512 0d412e4a488fa4c55f1292c1fc7346bdf88228528455ce1d2ad20137ddb84df211a3bc5911c12662428335d8f624979d166b0ed31f74e466228df3ab108e67f3
 DIST apt-cacher-ng_3.3.orig.tar.xz 320884 BLAKE2B c4bda8de90f76e7cb8335fdb758571db030c1298881afceb865f84e506aeb82e4db69c5c091debfdcf6c85bc8d4e703b75725ae6b06f2e412ba4b4362d568a05 SHA512 01a09bc13d2a9d24ee3012a21ae954362715bc0b69ef021a3446ad7d78157209aaaf941fbb02b0e5323bfb0337a1e3d6450c07b680d42f7bf93855d7ac65c60f
-EBUILD apt-cacher-ng-3.3.1_p1.ebuild 2907 BLAKE2B 47adba5835b919179c63558378b1c06918a64af4255890c5c48a4c91713ebfe26807c5924df6048eb0b2268a1dbf7dd0528ba7473b4c43964618a163002c3559 SHA512 8a1cb4173e52229794d5e4b87cf9f11842d5529b87abf9ec34d56d9e3a83fb51f99b402e832dd0445d537d8dc66c4ee3da0c70c3f4751ef71aee6972f9808ee7
-EBUILD apt-cacher-ng-3.3.1_p2.ebuild 3014 BLAKE2B 866540ecee2c74fc186688d24772574e61540559eab6e3edd1d4193d08b0eea0206b1c95fd87bf7051777aafea5c31c3f9fde13916d11ab9d8a18efbccda300e SHA512 70a3c680c7460b5c897a5202db7ae88c8480fe6d383a48e0b968461eab1566c3f1369bcd6dcb81e7596082fa8ec471e084d72aff30b1ead1f635222fcfa154c5
-EBUILD apt-cacher-ng-3.3_p2.ebuild 2863 BLAKE2B 20318be65af24050ec49f9b429e5119d0a0a2a7b426b66bbed13e861459e601e873d6abd6aceb540f11d75b316341a70d650160cf194b9dd60967fe7dff00c70 SHA512 bd2bd0728bc5049dc54eedcd38a09c5c33615cf09054e0e9bbd141dce845e0dae57d5d793c99406060871e7f375b962bd335fe9363f3e627095bc85acbd76682
-EBUILD apt-cacher-ng-9999999.ebuild 2791 BLAKE2B bdb7e182590dbe4cb0220216ea31ce4cd08238c47fa0e0f3cbb210e63c7ada4562c2b91a9aa45460b1b280465273849e8e517c3fab1129dfd2136c93257457a3 SHA512 01bd9b8a96655f882b53e602371a7cdb805056cee58b63b009c87308749bc7cbdfd1031c251f04746dafe4902d248a3234ecc0db81960b0044570d8dd45a8052
+EBUILD apt-cacher-ng-3.3.1_p1.ebuild 2879 BLAKE2B 4c9c3afcb14de20f728f9e30a6a1e589f93f030688c455eb8b3aebe4c2ba4d6216dcd4b201e20e4750947d03d7d96dca81482e6585a21f232b1a2aafa79151ce SHA512 707727031eacee8eed6ef40ff7a6bc096080ad63f4c6e9c50207154a39878211198be02eb1570b9f93318d8d47b21a96e0a4161409d23dca9987117e6e6166bc
+EBUILD apt-cacher-ng-3.3.1_p2.ebuild 2986 BLAKE2B 67abb15845e25e8fd8369f457f095f1051015d230b550ec20446334053fe15caceac1e0da0ed7be97f2643f6f3b460d48803919d50e08c3e74a7f855c19932fd SHA512 86990db8ef1d294d222a3f7988d18384fd80f58fec1dbe6a05917baaed1e0e0bfe6609208d0edf4e6c3e6af589ebd7bbb9ae560a3ed2ae73506f377dd946b1c2
+EBUILD apt-cacher-ng-3.3_p2.ebuild 2835 BLAKE2B b465405ffc612eb7aa930e0597a7d9639351da40754ffefe6e4655708a1e49f17d31c5a53544541de7be1dad566b5d9994601fd3d3cf18145026ae03e022d125 SHA512 5771eab3a8a56fb692ebb54c495633f644b98f89069e83bc70f732b060da81b6c1621743afdf08c6373642ef336967cc97f481a1ce5ce48c6d5ffe271d244ec5
+EBUILD apt-cacher-ng-9999999.ebuild 2765 BLAKE2B 8df3e332732ccad11a6040820351e787bfa7f46eb6745d8bf6ec34fe7151a996248bea17bc91c2477fe50970b47f0427bd982ec59dcb88b36f49bfbd5bd114d7 SHA512 9843a2f6c6d91b1517b52a06085eb801589dcf46a019069400c7b2cde458d455b11e260a7fec621514d63b6c9a16f703c8427559f660a59384a60e54f3c5a63b
 MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild
index 6fcc74573fc8..2af7ed01cfc5 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild
@@ -61,9 +61,7 @@ pkg_setup() {
 }
 
 src_configure(){
-	mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=/usr"
-	)
+	local mycmakeargs=()
 	if use fuse; then
 		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
 	else
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
index 21f1ce96df06..f0991d2bc87a 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
@@ -61,9 +61,7 @@ pkg_setup() {
 }
 
 src_configure(){
-	mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=/usr"
-	)
+	local mycmakeargs=()
 	if use fuse; then
 		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
 	else
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild
index fe76de4838c2..ce8b2df72f46 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild
@@ -60,9 +60,7 @@ pkg_setup() {
 }
 
 src_configure(){
-	mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=/usr"
-	)
+	local mycmakeargs=()
 	if use fuse; then
 		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
 	else
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
index 8bde423cde01..75d78c14ed9f 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
@@ -58,8 +58,7 @@ pkg_setup() {
 }
 
 src_configure(){
-	mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=/usr"
+	local mycmakeargs=(
 		"-DCMAKE_SKIP_BUILD_RPATH=on"
 	)
 	if use fuse; then
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 8345942e8657..e2cad1ef5c75 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -8,6 +8,9 @@ DIST bird-1.6.6.tar.gz 1029505 BLAKE2B 45cd621175962ea22848948e61aaf8b5c4eebbae5
 DIST bird-2.0.2.tar.gz 1015224 BLAKE2B 3931c0431dc6511596e7214f6e2099548aafa69c951a44cd628443701eac061e8d95c387d74d81ad889988750c5bdb32a69ed77bfe655b161932017f1a1266a1 SHA512 aef96f246484a52269b44963df033ccc584e62d50d1ae31a97a97b9c7375e576d70d00f61a0f6da336e60cefc4c921945df0cc821d5fd1c737b19f508e65d30b
 DIST bird-2.0.3.tar.gz 1141917 BLAKE2B 14b51a4195003ddcf848be45755057ebf835edf54f35208f8d80121c22eeb83c9afa0c0c1ab269c376da59f5d07843054b08e1679db873a0b8121aa611b9202b SHA512 c88d0119dbebf4b2224ff7c6555e1ebf516748611e3544e7cfba47adb60c45a996efed7d2dc2b8fd849f15689e5d3c2624c4019c4a9a5a356d551a35db8fa0e2
 DIST bird-2.0.4.tar.gz 1051911 BLAKE2B 12100685e4aad969dbb51eaa567e1038f50e7c030a25a8697bc35d4f33d0f64f9ccbc045e1210acb78f3d8d4a7cc7ef2be7ae50a36679f2322d292e8e6993ed4 SHA512 65092ca6be115b4d0c31c3c4a79d3ee2e196dc2f85454448eab568cc9cc1fe37b7bdfe1ddb74d4f6f147dc479a8570cf7bf702d762cd69414f976678c14c8e2f
+DIST bird-2.0.5.tar.gz 1099509 BLAKE2B cc865db0a845c045b441b27d1cfba6865f711ee3a68f0000056b701ba5d0652478325d3797069785af912b5f955a24647837d818c269b299106acba4acabce4f SHA512 2da6f99c5e55915f8669a0dc3778357aedbb75cf06e0f672a5ddcc01a5b850aa4a1932957d2044f89f075cd437a74ba6c5da5a607225b391525aa48f43c47140
+DIST bird-2.0.6.tar.gz 1899912 BLAKE2B 068f740a01a327b5fecf10a8aaafecac218fd14536ea98c93980d7ef9426766be80c68202410aaa20012f7f3b1837173e51d83d0ce2fb1828029d54174065206 SHA512 22aa676e171cf5ddf6dedbf0dfe9bb36a959efdf9cb278b7e969d5b08b06fe483e3b30ef40c1f9980387ed6ac6ee6626f3d85704925256c22dae91fa7d23267d
+DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
 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
@@ -15,4 +18,7 @@ EBUILD bird-1.6.6.ebuild 1268 BLAKE2B 23639d0d57b4927dcdf805a9c8f31a4197649a2168
 EBUILD bird-2.0.2.ebuild 774 BLAKE2B cdb92e8ef96464851c1b4d37b916ea705fb5b880cb89df18a093c411052e8363f15321da2bc400fd99cb8d33af5f6ab33668939a759e27028bca043961dc46bf SHA512 a14f8b83bf5d68a1c89c1ac8ab64f6f597893ea9ff004c904c7a3d009bb5ba4007a9607a30f987f423cf95aa7b8dda5040b94929d7a8e9f63f14e7775fb3f53e
 EBUILD bird-2.0.3.ebuild 771 BLAKE2B 9adf75165ef2ff7721d62a1ff062338e8119b32bdb8e8390b9e9b294ae2900f58d872252070b0ea1983526db6693e5fd8438cfb086e901fdf6c6a44a26cdb3e3 SHA512 8bd4530fa36b6e9476539bea7e37fa4a16d07aa1e1e60b1c63f757d545174a7bff163860b81f261a1b7f06dccc4f756e96d5fe134aff91f9c7dc3c33619f045a
 EBUILD bird-2.0.4.ebuild 764 BLAKE2B 8478281f359226d4fcd8373829ef27f1c119b8380a90e95c08cfa6cead3adf43ae5e519ad9b80f4c438f95163c8380da02210e5faf0d6fc02809b582690969ad SHA512 575d8d2bca595e5e215c3bc3bdd957827cd8888c885ad7dd489ef823f455a740ef1d6769af8dc435d9f1f6fb074372f1c241360ad4098fdfb4ceccc58211d85c
+EBUILD bird-2.0.5.ebuild 764 BLAKE2B 275d827d7462d6b8e8ab027beb275aed312f4eaeb78795ef40364772d4b050dd58f6f9bc35e943c2baf8a87e3b9e955ec90dccb1bb9ffb2c183f193db31a669c SHA512 22528e9a12ca25d83c6231d15b4b16cefa84a3833a7d66726f3cae4208fa99134cab438bec6317e695a21fcbf20f968bcc74c0c6600f27e33ee701b57c0764e7
+EBUILD bird-2.0.6.ebuild 764 BLAKE2B 275d827d7462d6b8e8ab027beb275aed312f4eaeb78795ef40364772d4b050dd58f6f9bc35e943c2baf8a87e3b9e955ec90dccb1bb9ffb2c183f193db31a669c SHA512 22528e9a12ca25d83c6231d15b4b16cefa84a3833a7d66726f3cae4208fa99134cab438bec6317e695a21fcbf20f968bcc74c0c6600f27e33ee701b57c0764e7
+EBUILD bird-2.0.7.ebuild 764 BLAKE2B 275d827d7462d6b8e8ab027beb275aed312f4eaeb78795ef40364772d4b050dd58f6f9bc35e943c2baf8a87e3b9e955ec90dccb1bb9ffb2c183f193db31a669c SHA512 22528e9a12ca25d83c6231d15b4b16cefa84a3833a7d66726f3cae4208fa99134cab438bec6317e695a21fcbf20f968bcc74c0c6600f27e33ee701b57c0764e7
 MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-2.0.5.ebuild b/net-misc/bird/bird-2.0.5.ebuild
new file mode 100644
index 000000000000..edc17f5b33c7
--- /dev/null
+++ b/net-misc/bird/bird-2.0.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 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-${PN}-2" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/bird-2.0.6.ebuild b/net-misc/bird/bird-2.0.6.ebuild
new file mode 100644
index 000000000000..edc17f5b33c7
--- /dev/null
+++ b/net-misc/bird/bird-2.0.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 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-${PN}-2" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/bird-2.0.7.ebuild b/net-misc/bird/bird-2.0.7.ebuild
new file mode 100644
index 000000000000..edc17f5b33c7
--- /dev/null
+++ b/net-misc/bird/bird-2.0.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 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-${PN}-2" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/charm/Manifest b/net-misc/charm/Manifest
index c5299b0dbee9..ff1d5cd2f9d7 100644
--- a/net-misc/charm/Manifest
+++ b/net-misc/charm/Manifest
@@ -1,3 +1,3 @@
 DIST charm-1.9.2.tar.gz 84927 BLAKE2B 6c1daea30a8b038a23d82567ba4e00f50a65d8faadd384d25524a29b0c5b1902f18d2d14fb2ef28b78cb1e43cb168704883719c493267a0cdacb348729a8c334 SHA512 9ea4c7411764dd1d1c87a1a19de2de3061e08e030e793ff259e80477aa5880a01f05f8a8d1ecc9b1e696111c3f3f9504f5387f535d9d52d1496d20b04c68835b
-EBUILD charm-1.9.2-r1.ebuild 831 BLAKE2B a16ee14f0008046c3ad37ed3843a26baf2b1f5c9a5dab6b8455a49d9a21100931c9b8edff72433f0a388f1059148f087baeae69978c9c1035101719879f029f8 SHA512 4657bee6fc6681eff86e6ca84037a2c86b50457eb337319bf7137f7a159d7e271fd38733d982cf0d87db6f741b8e627f0dd36f371ff3d5050308216bd8ef5746
+EBUILD charm-1.9.2-r2.ebuild 868 BLAKE2B 5a2a209c913388f4fd2dce2c1a9a2e425adadefa67aaeaa4afa5f2fe8ddaae4c0ceba0f8b3d562946660f33e1c579518bf96075bfa66cd8f0488cf361a721b98 SHA512 12dcac21c72dbf39981ce7ee5febcbbdd759ede3a619f816a80f0607a8a4a3c6cee8281f3b13fe0246481217b692744769493b15aaf5c676431db815a30492e3
 MISC metadata.xml 244 BLAKE2B 06f30181d05c2a8bb01c34cf29bc0b3950a577aa678cf84697633a525f762d229fd0ce32fd1281c8204f89ea47f09d46a3106eb045bc3b3dccdabc588fa07534 SHA512 e563e61a42c0710c2c87775e29ce2804ad1ebe2cf9619f0babf342b72a0a38ff44aa79c6a940b4486b9982cb962d56d12698c3cdc5aa6eecdf515d4a3057bbd0
diff --git a/net-misc/charm/charm-1.9.2-r1.ebuild b/net-misc/charm/charm-1.9.2-r2.ebuild
index 3b5fe2799c91..52c66fb0448f 100644
--- a/net-misc/charm/charm-1.9.2-r1.ebuild
+++ b/net-misc/charm/charm-1.9.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,10 @@ SLOT="0"
 KEYWORDS="amd64 sparc x86"
 IUSE=""
 
-DEPEND="dev-python/feedparser[$PYTHON_USEDEP]"
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/feedparser[${PYTHON_MULTI_USEDEP}]
+	')"
 
 DOCS=( CHANGES.charm sample.charmrc README.charm )
 HTML_DOCS=( charm.html )
diff --git a/net-misc/connman-notify/Manifest b/net-misc/connman-notify/Manifest
index 299db987c5b5..774005939a05 100644
--- a/net-misc/connman-notify/Manifest
+++ b/net-misc/connman-notify/Manifest
@@ -1,3 +1,3 @@
 DIST connman-notify-0_pre20191003.tar.bz2 9102 BLAKE2B 7c31de51b21f7cae475b543cf74bba1d969c779f00d1dab7ebce2da6758e1dec6c3c06ae1f0ab133292fc03c1dc61cd1c18c4719311f7a7b65f1771afb097b64 SHA512 6ca8dce104fc5c94af8ef4fab94e44f6a921017d58bbe12660f6bb6a6a0ab6b0808bb7584b75d2acaa486d4cbe718f436fcf7924d6baac97b59a2b77a13215f4
-EBUILD connman-notify-0_pre20191003.ebuild 905 BLAKE2B 1470c993bc2edaf3c20fc2bd57ca546d69119679455bd44bcdc288fd448afc6648b091239f92fa0aa6bf87585e13af10ed3218b596e72a6f9d4767033114af9b SHA512 d0c771eab2ade6db0bc41c554591591e51293978518e609c4be7f4c8f27bffef86ba07c53221c3444403e9b9442bf44de6963c63043644c764d1848eb32e65ba
+EBUILD connman-notify-0_pre20191003-r1.ebuild 948 BLAKE2B 8b608d6576417ad978e1a1be91340cb8d449c91a591439e8450873907942725297fad523a287d21ad90af1afea08ad6f81d54a1ab6cc3c62bfbc091d20e90561 SHA512 976104fe1ea5e0131717146bcf1890fc935992e6c2823739b62b0bf908b5dc2df34d7e4a8dac5a2676280be09e926895c63cca5957c42faa5b83aa796c44e382
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r1.ebuild
index 3f875e44e212..d093e295fa63 100644
--- a/net-misc/connman-notify/connman-notify-0_pre20191003.ebuild
+++ b/net-misc/connman-notify/connman-notify-0_pre20191003-r1.ebuild
@@ -22,8 +22,10 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	net-misc/connman
 	virtual/notification-daemon"
 
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index cedb825a48a9..a8349ef1a604 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -6,5 +6,5 @@ DIST dropbox-cli-19.py.xz 13960 BLAKE2B 16d33155cbe5449434ff9fc5a9fddca9a7cd20bd
 EBUILD dropbox-cli-1-r1.ebuild 558 BLAKE2B cc8d5071ae4c78a71532c2d614ba557ac1f3356a6bc3290f089dfdc2c3485641621045f06e7b6a626e69d423ab25af7f237f78d5ddb639bc299d325085d5d7d1 SHA512 f5e55ab6913334f11f28b41ad9387bb56d47d6a8636b85850630f2da40de83cbd9092ab5de265556491df73fd28ce700aab417c996a079c074d003ecb4613ef8
 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
-EBUILD dropbox-cli-19.ebuild 712 BLAKE2B ebc48492372029873de68176c054032a33e64947b53169328296b11165780fb8c9161daece6db2f3b8ffb6f72ed582e9812b33c5e2efc7c66c9a72b31f03b3e4 SHA512 4ddb869d74e06cb096ea55adbe055ded47a03d5a89e836a7a2e25e79441b19b42fc79a1958ef7492a2bac1a03ba1efd3d46a37eac51cc08f298c4ca2e6457afd
+EBUILD dropbox-cli-19.ebuild 710 BLAKE2B 9ff353fffc498a9a9697fafb9ea962c1f8cb83787ff62cbba815e83037dea32b4d8bc19f93c586c07f6abe3707176f8e9c2328b3b37d47d3b3c71c5de28a690f SHA512 c996a797a31da15c1354a17ba1eac71335e862f4033a34936861363988638727b701ebe47615974689696d834cb93ebcde90777822172340dd129820c4416e54
 MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/net-misc/dropbox-cli/dropbox-cli-19.ebuild b/net-misc/dropbox-cli/dropbox-cli-19.ebuild
index f7fd170117b9..3e90bad7e128 100644
--- a/net-misc/dropbox-cli/dropbox-cli-19.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${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/dropbox/Manifest b/net-misc/dropbox/Manifest
index e95c8a7ad76d..382dfda950b3 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -3,8 +3,11 @@ AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af00
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST dropbox-lnx.x86-89.3.268.tar.gz 92308961 BLAKE2B 4b1a229eca8e96b49360404fc3a03277343f1dcea9b2065b637d8531b266233215e3f3c21163d20ed104db90b4d37dcd873bc1353036a14f89ac50b78180a518 SHA512 25195ef1f44641ca3aee00c4b5cb52006d9610b9d067ea1ade4717dd47729db98e5b0556b5c61ea881ee84e8f8aafec868555591d8d3f4c1ecc81974159e3321
 DIST dropbox-lnx.x86-89.4.278.tar.gz 92309633 BLAKE2B 47f886ab9f81335b8cb0a9133ad0b47e55d53aab6d6d99b89f2b266bd0345e4a788b950dd3fce7b24ff91ffc45c2ba5e8e5154d28a1c3690ed1d200d4d06e9ee SHA512 7f3731f32ef7869c31b18ca7b167ed5695deb8c8130aff3bb7783799dddd1ae3472bd49ef4069dd5ccda76a02b518f7eaba0209fbaf94b974e7caed4c0f8b9ee
+DIST dropbox-lnx.x86-90.4.307.tar.gz 92672302 BLAKE2B 4323a379cbfe4428db63bb36c78b9eb83dc6026242eeb6f6f68687f0868c2d03edcf40ff2c9312e5a432458814c96a4df749640f0a256ecc675f3a5e860a8772 SHA512 b3248397d8b83436ccaf671528a2dd333c8bcb3073b3248f1826a63c5b1f542a7bebfd8ee184e3eb5feb74070116c681a3c71816c4a8ae817ed992cc9b07aa00
 DIST dropbox-lnx.x86_64-89.3.268.tar.gz 96723713 BLAKE2B 5bfb7721303b466f9015709f1a235045263fa0db46ff4f0ad7e772c4dc1261b8c7549d63c0ac4a9d98e35581c630ad5ed851d0c63334267b196bec7dc93c0ddf SHA512 627bf49df5a6da76bf04484912c7be686f4e9adc51be619fd613b56fdd514088c173c39cab5fb5a6757074130efc54edf192c7df43090965ba9066de5d0f1755
 DIST dropbox-lnx.x86_64-89.4.278.tar.gz 96726025 BLAKE2B 152be18f9b15e9e2a4c188ea6f4649da09b6d50571bacf42068db1abe16a375612e5db9c86369cc4d3e582b660d79df1f35af03504abfed64e728a8515630eed SHA512 5bfc29ff40a3b423eb03ad44e0212ebf015b877bd128432f76ff3103aa43ea6f87575247a5b0b815951c203dfd4b54345e6ab880ab47deb21e29d659e5819755
+DIST dropbox-lnx.x86_64-90.4.307.tar.gz 97077393 BLAKE2B 2271b740d381ad5748ec0b5986991b1b3e5ef9d9553e101eca787ff0db5eb03dd91934b7024cdb2eb545dff7ecb5dd64bb95d3b0b8b5f709fb27f90081a1a0e4 SHA512 464ba52e6fe3376c1bd8cb0806a65918e2fd3ff0e5b8379c6c19f9b302cc64b64cdc80f9b8ee2a072fa6564d8c9de0502a9474c72ef5560d7a0b62faf9c5633a
 EBUILD dropbox-89.3.268-r1.ebuild 2749 BLAKE2B 3c7d18fefef5596d9dd6c7e140a4fce617f897090a64ed36fc07695a9bc4006b0d0137353e83dd7aba32d6aa4d7464eaf88b411671e7aefa92b9345fb3d0215c SHA512 6955781d8b1fdbf8d5e9e04f262f8f50bf6e4fc69f9061e9ff1a09e47c79ba32dcff0d2feb80da4edc4aba9c7b0d1b2b4bf0f4d66f0d69de27cd3ad193abc513
 EBUILD dropbox-89.4.278.ebuild 2751 BLAKE2B a9fb44c7a6588eac19a8d25c6be0f53868ed0fa7ba75bcc1ea8948b4c237563de05c6a0fe8e0dfb42f2e0250f042bd8f5f72d0d474341a17212d9167097fb0a3 SHA512 adadd488e7749135212fcc6c4c4f8b68b62d22b95e0242a33407a54cde4dfd448b08ae380c92414b44f3147a3f41642abb1d5e2b7f061748dab961071c510d64
+EBUILD dropbox-90.4.307.ebuild 2751 BLAKE2B a9fb44c7a6588eac19a8d25c6be0f53868ed0fa7ba75bcc1ea8948b4c237563de05c6a0fe8e0dfb42f2e0250f042bd8f5f72d0d474341a17212d9167097fb0a3 SHA512 adadd488e7749135212fcc6c4c4f8b68b62d22b95e0242a33407a54cde4dfd448b08ae380c92414b44f3147a3f41642abb1d5e2b7f061748dab961071c510d64
 MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839
diff --git a/net-misc/dropbox/dropbox-90.4.307.ebuild b/net-misc/dropbox/dropbox-90.4.307.ebuild
new file mode 100644
index 000000000000..21752c395069
--- /dev/null
+++ b/net-misc/dropbox/dropbox-90.4.307.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+DEPEND="librsync-bundled? ( dev-util/patchelf )"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		dev-libs/glib:2
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		|| (
+			dev-qt/qtgui:5[-gles2,X(-)]
+			dev-qt/qtgui:5[-gles2,xcb(-)]
+		)
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5[-gles2]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5[-gles2]
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/libffi-compat:6
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+
+	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
+	# tray icon doesnt load when removing libQt5* (bug 641416)
+	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf PyQt5* *pyqt5* images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
index 58752e6914ed..3f681e615880 100644
--- a/net-misc/econnman/Manifest
+++ b/net-misc/econnman/Manifest
@@ -1,3 +1,3 @@
 DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b
-EBUILD econnman-1.1.ebuild 669 BLAKE2B 56a599676b5f6ed7fc371ab0b4adbedb7ce87ce0c563f90642dc3cbbec3f2d84762993879f9db21a673c3630281f600b265b1095040b24e2894f475d53aa36ca SHA512 6ea1b01ff4b21bdac0a4fbd35675a061e72570e42afad841261e3994c6637119906225ef229fa6eb896d529100b13cbc5b4b8a7a27c7ccbdbb4090b7a322cf83
+EBUILD econnman-1.1-r1.ebuild 705 BLAKE2B d6867f731cde532852a9c423058bd08feff493d8d9521903b3bbc728296396c563bda9265ef2535673b6f5c0d0045617d94ebe91a23a38be3b16aa9ae8df10f6 SHA512 1c0230063216607707e43e9e7f41e3a7ca5ac2f6dc9423143da5174a9f9b479b8abb418a376aa044083c6888fed3985a6d1f7afa5076bdf2d6dba28f7c495ea7
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-misc/econnman/econnman-1.1.ebuild b/net-misc/econnman/econnman-1.1-r1.ebuild
index 6469ce52bbc6..bf5b23bdf38b 100644
--- a/net-misc/econnman/econnman-1.1.ebuild
+++ b/net-misc/econnman/econnman-1.1-r1.ebuild
@@ -21,7 +21,9 @@ DEPEND="${PYTHON_DEPS}"
 RDEPEND="
 	${DEPEND}
 	dev-libs/efl[X,connman]
-	dev-python/python-efl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/python-efl[${PYTHON_MULTI_USEDEP}]
+	')
 "
 
 src_prepare() {
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 0843992cf055..60e7e5aae6ec 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -7,6 +7,6 @@ DIST geoipupdate-vendor-4.0.3.tar 532480 BLAKE2B c619098fa40d6a92743a2847900e7ce
 EBUILD geoipupdate-2.3.1.ebuild 564 BLAKE2B f0f6e6492581266e50dad9557fd62e363529e57fa5e7461a9cc12c4d35fca243703455d34a4f452427a60bc9789a93db73f033c9f0e8c1f88f823d82e1e63c8d SHA512 1c052646927f9b8352062c069b020f1799b787eaf781ecc2b74bf41b127a19d7e47c89b8c8f4e771c7262149fc455f33c462d236e4a259d27e969f9644a10ee2
 EBUILD geoipupdate-3.1.0.ebuild 572 BLAKE2B d23a2f47e4daf03fa025461cbc4b045759cc70f5f386cd6e66eaab67d428de2d51c4b1eb315af506c4604b1c8445d0a4626031a1cd327bd379bae9b6691b7581 SHA512 e456e1a8711123172ec60b634732f0ac372659c23bb05be4a445ea153508b115b47086b8c49dd99b5f420a313210b7d504d25a166b0f2aa102ea912687d196f9
 EBUILD geoipupdate-3.1.1.ebuild 572 BLAKE2B d23a2f47e4daf03fa025461cbc4b045759cc70f5f386cd6e66eaab67d428de2d51c4b1eb315af506c4604b1c8445d0a4626031a1cd327bd379bae9b6691b7581 SHA512 e456e1a8711123172ec60b634732f0ac372659c23bb05be4a445ea153508b115b47086b8c49dd99b5f420a313210b7d504d25a166b0f2aa102ea912687d196f9
-EBUILD geoipupdate-4.0.3-r1.ebuild 1268 BLAKE2B 39d26909a70acfdddbeb9f823e4babac6af48077af154f15f1228d7d50a40fe73b2c4de5842ce8d6b87ea6d39a25d998e553ec0cbf42904a9efa45302d9f7eee SHA512 194465588a84cd045cb0694c5dfbfd1e9e14cd07d49d3a77d68ec6e0df4a872766d8a5bcb2a9094f72853cfe3e28a350969cbd4bec99bce35edaa2786cb4d52d
+EBUILD geoipupdate-4.0.3-r1.ebuild 1289 BLAKE2B ee680fcdb3c7f9f27fd362e92dcd9b3b5a2c6f1003cd5d52b44a8f711261cf796b4597429d014c352b193894abab135af8ef2b716ab89d21824a43f67b7c7dae SHA512 2960dad2406366ceac8bf104e79daf9d2dac8a37b89b515a1bf9349a12a357c81f2f1215431e37f8548e1df5e4adfe5540521e824a9bb10a842d82eae2819e2b
 EBUILD geoipupdate-4.0.4.ebuild 1146 BLAKE2B 7b690131bd0f63803a2709e718bf6d33ffb6109d2e62c5eb99ca5bb793a9ea185bc5ca6962abffcdc0068a54187e70cdcee5d12128443f673637d92903f37015 SHA512 a3242fffa1b3511f861664134362ecd3dd06525b86be3791137ccade9bfb382ec3261ff24dd2c4bde2c5f75a79ddbbb1e9bb94102a9a3a35017bbc589840c336
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild b/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild
index f8f05abf74d5..12bbd5889a0c 100644
--- a/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild
+++ b/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild
@@ -8,7 +8,7 @@ EGO_PN="github.com/maxmind/${PN}"
 inherit golang-vcs-snapshot
 
 DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
-HOMEPAGE="https://${EGO_PN}"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://files.adjust.com/${PN}-vendor-${PV}.tar"
 
diff --git a/net-misc/ipsorcery/Manifest b/net-misc/ipsorcery/Manifest
index 98defd8b8031..52d1f727452d 100644
--- a/net-misc/ipsorcery/Manifest
+++ b/net-misc/ipsorcery/Manifest
@@ -1,5 +1,5 @@
 AUX ipsorcery-2.0.9-_BSD_SOURCE.patch 203 BLAKE2B d04a19c782186b5c966116eeb3681f9695b71190928aa6e81e152ee7c68d6f6cec66d1d46f9b6e85ed562cfdde046b05877460f98e6d0408e461ae85ec3beb0c SHA512 e3497b6d5f77288fd8627ecf610045177bd7a5db22b94ee87f91965ddfc13539736b23dc0245001f5d2726617c120d7133dc288b7fb2355d7648f83c08a06dcc
 AUX ipsorcery-2.0.9-gentoo.patch 756 BLAKE2B a37fc6896955a1b4e86847f027cc71320960c71e7e2eee077cc29d632c7fbfd0a60fa7456bdde1d354824e564a45ede7a18801b8ca270d1f83e465587e153e11 SHA512 9619924c02996032584c4a0975dcce9d5d9ad5945f3320b0d4cca0f0bb2d938ce07644992db794c928aa84a1e0a3d46968516b6bdb6180e547a8a13b50de6f39
 DIST ipsorc-2.0.9.tar.gz 38600 BLAKE2B b773a60105e03963edeead61d93d7a28cb16683cf00fbc9d874f4de7e854127c44c9c64dc045f4228520114593cf98587e594e7946015f2f3f8ec7e9e2fdd36c SHA512 a45454d70ecd928df36aa466dc886ab470ea3200e1b252288ea96f96e3fa8742af57bfe98f42d65c7e7abb07986092c2191aadee78ac785fffda40acc5ff8d66
-EBUILD ipsorcery-2.0.9-r2.ebuild 801 BLAKE2B 6eb60851bfbfc01681bc998338c7eccb04b4694c74e41c392c5da530a9f1a3d51cb26e70d46d33d95a29fc074215b15243de4ec5e936646f9e83034c2d087305 SHA512 58b7bec0900e81bf967a157ff904e7e0e496f58430bad00a4ce6d26b1ce1f45fcc6bccba393a0e3c25d23c9b08c98381bd744e7f1c3a9409ad56867e5d85d65e
+EBUILD ipsorcery-2.0.9-r2.ebuild 818 BLAKE2B 1218ab4f13a718a8e316bc24d8e25f61a5f404913688c8845bca6c822d9548f951b8ec9631f0e8a05c5929f3588a00527a248b849ce7d2371845e216abe6ce18 SHA512 bdaea2cf9a372f36a866da36e29ec30e2154152cd0e4be842f9454ca7ecc901af31bde1fa83cfc94c79739899744281821ba9e3cc323a08b6d2cbcc058aa9e1b
 MISC metadata.xml 212 BLAKE2B fb59bcfbeb093c851e3e4a935d1614a10f509fd386894f9d9ade50348d9a1963e9eb482c89980f54986c79e073769212b0f9f0b4ec49d817fd252f578f292bfe SHA512 934c3c3ff6efab14f989c4b030de2bad2ce242d4402a68f90cb6e6fa9d5c3aa85cf0d6f5b92936acead641ebd9d05c870f4d5d59d1e94901c21cb9ebfa4ae685
diff --git a/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild b/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
index 3598a8d8e95e..515c5f784c83 100644
--- a/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
+++ b/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Ipsorcery allows you to generate IP, TCP, UDP, ICMP, and IGMP packets"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/ipsorc-${PV}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index e8fcf4c36639..c66be774c8d5 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -12,6 +12,6 @@ DIST iputils-manpages-20190515.tar.xz 27556 BLAKE2B adf3eb5c7f3fd71fa24ff48daffd
 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066
 EBUILD iputils-20180629.ebuild 3969 BLAKE2B 20308a601874c7b4082f8c466734341c827a9bd241ca64961c2d83a4f8b7ec38119e2ed284b18ab2c98928c3e8f06690f2c726047ef6a8f75f442a85719a61fa SHA512 56aa930b4078d61e9b6cc05ee7d09dd2076da97560177ad49aa134c94e1b1aac39543a0217bebf4a4fc59ead143a7e81eac52f5bfd658e9f11ba38b5dd1de91d
 EBUILD iputils-20190515.ebuild 4923 BLAKE2B e7c4bb2ac6393f93e3294559091b4a339a76a2e21e0b787b92cf631b9799486a701ca5e5e5f1b77910a9edecc00b68661f5e789f336fce9c9321ec3656e4faa9 SHA512 48037b05394e88e60ee399d9560f59529e3b195e10b8a5137b11377a6e4240a11aa2409f0e5d74ac753a72fd42c414edff975fff78d77c20de6e46a9c7c116a5
-EBUILD iputils-20190709.ebuild 4846 BLAKE2B ccd0487139bcc3dc40c2922191e10053fd5248f0bb3419ab7c40b21f3599467754ade3d844803087b7a9b477c5d1c1823d13ae14f7285c3a2814cfed21b6d8a0 SHA512 6e11a646108a6fb73a124ad00d569db2fbb3c6193264a9677ced0a8405bb815fbf442bb13d08a53580ec258857c494d39a50144faa967f4d923fc0b55a7fd3ff
-EBUILD iputils-99999999.ebuild 4853 BLAKE2B acda2cfa73d94e1f5c2e34f716ce27911a26df3acef3138f462af53e2ad230f02ec39b6186b64f5bada03bdb40efa494f6a33eb09350b2dc638375263406ce72 SHA512 a218a45c72883e6fe3165f9b7ac2438b06582d6470ef116c67d9e4e6a2cafe276ca4f05f58938a22e5f5267373fd6670c5456b28a9d6c4f4ff5fd83e2b346cea
+EBUILD iputils-20190709.ebuild 4836 BLAKE2B 9275ac93aca04c5e51a8595945f9e431f5acb25767952ac1b41cec684d30f594f3d69838b1b412c82f6e055e10340de905c25f3fe0e9631afddce5cb89a5c4eb SHA512 a5db81e22fd5a98a4aa38c4e85e69205bb8685c31e172ef171004716b3f3730fccfbd2be7edfc13674013fc1c9ece4ce5126d0a19a40d1dd72fcee75b250346b
+EBUILD iputils-99999999.ebuild 4843 BLAKE2B e22a34d1ef274e826ea81b56ea96a3d5115d489c5693196dff526637dfb26eb650af874b05df77b0d4350bca1b0e8f1395020ef4e513a9da46da51245b08dc1f SHA512 26d8ec2206ee720aa02a9feaf9e1c8318704ea2f85b3b7d8eb90ce9608ad55ad066f87959f121a8f7f771d006eec70152c7dd7af9e69e538d81a3b558aa180cb
 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e
diff --git a/net-misc/iputils/iputils-20190709.ebuild b/net-misc/iputils/iputils-20190709.ebuild
index 3d4c44ef2ce2..1c478e19659d 100644
--- a/net-misc/iputils/iputils-20190709.ebuild
+++ b/net-misc/iputils/iputils-20190709.ebuild
@@ -142,7 +142,7 @@ src_install() {
 	dodir /bin
 	local my_bin
 	for my_bin in $(usex arping arping '') ping ; do
-		mv "${ED%/}"/usr/bin/${my_bin} "${ED%/}"/bin/ || die
+		mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
 	done
 	dosym ping /bin/ping4
 
@@ -175,7 +175,7 @@ src_install() {
 			if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
 				html_man_pages+=( ${my_bin}.html )
 			fi
-		done 3< <(find "${ED%/}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
+		done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
 
 		pushd doc &>/dev/null || die
 		doman "${man_pages[@]}"
@@ -186,7 +186,7 @@ src_install() {
 		popd &>/dev/null || die
 	else
 		if use doc ; then
-			mv "${ED%/}"/usr/share/${PN} "${ED%/}"/usr/share/doc/${PF}/html || die
+			mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
 		fi
 	fi
 }
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index b017e1a7fb9a..228cbf543703 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -142,7 +142,7 @@ src_install() {
 	dodir /bin
 	local my_bin
 	for my_bin in $(usex arping arping '') ping ; do
-		mv "${ED%/}"/usr/bin/${my_bin} "${ED%/}"/bin/ || die
+		mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
 	done
 	dosym ping /bin/ping4
 
@@ -175,7 +175,7 @@ src_install() {
 			if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
 				html_man_pages+=( ${my_bin}.html )
 			fi
-		done 3< <(find "${ED%/}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
+		done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
 
 		pushd doc &>/dev/null || die
 		doman "${man_pages[@]}"
@@ -186,7 +186,7 @@ src_install() {
 		popd &>/dev/null || die
 	else
 		if use doc ; then
-			mv "${ED%/}"/usr/share/${PN} "${ED%/}"/usr/share/doc/${PF}/html || die
+			mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
 		fi
 	fi
 }
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index b71c94c3e02e..06b86dca1f9f 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -3,5 +3,5 @@ AUX lksctp-tools-1.0.8-prefix.patch 332 BLAKE2B a83cc8172bb96f7cade25b049608ef46
 DIST lksctp-tools-1.0.17.tar.gz 795762 BLAKE2B a37b653b1f9effd039c5241669c767d8b0918bf4790d9f017c70eefd4ce1efdbe5d76f6e88e15ddf214308267ee62a6004d2af781ad720ef847e8d99ae5a55f6 SHA512 055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4
 DIST lksctp-tools-1.0.18.tar.gz 560302 BLAKE2B 6151109a0f43044048ff64a6ca021710f28e695017b79513412a44999ec67bdbe7cb0bbba7d5e0deb28b8fdd097379100046ef77508678f726f18944b9799f22 SHA512 1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055
 EBUILD lksctp-tools-1.0.17.ebuild 1259 BLAKE2B 6b9cb9c10f012c0d6b2d8e29c4dd5f312278a4b0e6d56844c895f6c611bfed461e2a91a7c8adf488786c4f835dad98acaece83aea0acc9c34443359dd8802ae9 SHA512 ec01fab740601afc9fcd2d55a32748ea0b088c3a11f580d72a9c1b2222a23847c25a83029eaab8cbc9a3cddcd2c28a96f9c8a9206981c7d68f72b76f8c98634a
-EBUILD lksctp-tools-1.0.18-r1.ebuild 1392 BLAKE2B afc5110a412b3c24b889aa4f8d3042140bca69281e16093498af8cccbddb9e55bd3ef9c1066a4cfbb09a38fbfd5e15dd3c0767786a1af47e403099b6f32d1b14 SHA512 d641c66df6dc26ce5f79271904f1300f46951361147df3ca73c58618560c6ef68ff3e65d12590f9d8362d6151d0e15fc9db0fa269bec3efa8b15e2476fad6b71
+EBUILD lksctp-tools-1.0.18-r1.ebuild 1390 BLAKE2B ccf9ae161867e71ef3842ae0d5cc89dc26bfca0fac6c0f2c455f86aebf0187dfa8d09d278bda71aeab9e129297fe199995a792f5cf847e08283bac164152043b SHA512 ab17a01562363f2fd37d53ccb993bfdd8d39cb8682b330a3a375a97ea667093bbfaa57ae28ffa8db4df06185ee2d3a1762a9632a7a9516f16c0b2dae869fca28
 MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
index 7f1c3466c1ab..8ee3b73e8976 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
@@ -39,7 +39,7 @@ multilib_src_configure() {
 	append-flags -fno-strict-aliasing
 
 	local myeconfargs=(
-		--docdir="${EPREFIX%/}"/usr/share/doc/${PF}
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		--enable-shared
 		$(use_enable static-libs static)
 	)
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 03a2d46d655c..3865e30e6cb6 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,6 +5,6 @@ AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117
 AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
 AUX networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch 1350 BLAKE2B 4cffb7d29c1ffdff7106485e2fe1a74ec403c8b9cb5235a066021fd91d0231aef7b9f621cd82706e58adbe27085d13600a651f5957e6a20f3ca241af483cf88c SHA512 f541c873f097b8424e04fdc0fb2ca6256a3e17cb60021f1c931908ff39bbf95de3e40975ea62b19c18aa35476a5f7e07fc96135a0fb0bc1128acc5b62724bd3e
 DIST NetworkManager-1.18.4.tar.xz 4875196 BLAKE2B 9c58d6d7317562332dfa9639f8e236a0a7f6b58e7dad5af83916b1c6178899a6bcf12bc289fb401d84fd6420306364b4c4c0a25eda2a08eef812acde1862a18a SHA512 9fd22775a400ee8d20c75ebddfee842bfbd8780966444dd537e371a65918f41640e921d2c441853afe8f72d693e9b4c1415435136a07004666a6af4799fd3350
-EBUILD networkmanager-1.18.4-r1.ebuild 11317 BLAKE2B d1708bae2519251123071b311d68703cc4df21912023506d277bf7c134e8cf28fc3dc325014fb8c0497ec85dbe53676b60e4dc230c68a9e3a9616fd2598d0c5f SHA512 091027b715f06d8f347f504c35e70de20f3a1042bb263dde8b2a7366e651f4c3a59bd64ae90ebd6498d5b442696e18bbe525ad130049d6076af773a0fefc7ddc
-EBUILD networkmanager-1.18.4-r3.ebuild 11457 BLAKE2B 92fcac81d87d37f3f371ee313dd0a0c25d22e08133f14eb81d49088d8a7df2d2c733a06d17ca29876dedc82a6d7b9e552e32e331f1dc5024fb8aafcf69803e07 SHA512 71455a2e56341b31e69940a8dbb2ef8f6a52a5ca0ecdb4c976441467011dedc1f658aeff8bb19bdca65196e0de99e51b128c3755af23f345aa2674b85252525f
+EBUILD networkmanager-1.18.4-r1.ebuild 11313 BLAKE2B 64307633192d02edf3d4d623588cfe7ab009e2a668daee04c0261d2c9a5b40abe8e8fc840a546a626b2fd32d2ec6aca0bc92aff7480e34e0d79d3f750d817347 SHA512 1b8db6b06a3974cdc746312797a4adb736c389596cc54ef6ed27f23a0aaf2fce401f92e5a1fc4d6ec57bb056bb1c0fa4e3dd8f2460409ad21529c3412d901d7a
+EBUILD networkmanager-1.18.4-r3.ebuild 11453 BLAKE2B 60492af74aa341b60c290d89dfa52c7f7bf2a38cb353cfedc469ac9b3fd18d16fe6034b722ce4fa587482c9e10ad059d31854bc1688bc302f603da8f326661f0 SHA512 cbeacaa37268f40912e46c6cc676aa7b854ebe7d880f88db87e828cb51aca5268ac682e90416d65f94651ff57848519e3b0b802e99fdc5e97aa9a6667484ac6a
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
index ed2ea6102e3b..38eebd608ee1 100644
--- a/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME_ORG_MODULE="NetworkManager"
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
 
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
index ae3ec3ec7874..7f6098399a87 100644
--- a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME_ORG_MODULE="NetworkManager"
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
 
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 4f48bf90dc8d..edf31fe9c60f 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -23,6 +23,6 @@ AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be6
 DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2
 DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075
 EBUILD ntp-4.2.8_p13-r1.ebuild 4562 BLAKE2B 0c2ea0e5db7ed0beafd8f16c68148fcbcfffac71d842ced27ef4b605bc59411b3a4327aa449635e4cbc91a63b021018c8d1ccc98d39fab705b91c6e4996d2c5f SHA512 ffa1e54d5cb412cbd484cf911e44c50be9a3f649a4c78995344bf40095ad8fecab35c8efac2df6377d4522399f96f38f4d5a566d7eceacbb34e97f04d4b3995c
-EBUILD ntp-4.2.8_p13-r2.ebuild 4615 BLAKE2B 063af81b68f5ab371c2de2463f85f1258395d31e287eb149a892978be6f8e0b35f2146fa968e29d233c84d08a486ad27ac41c2f62d7c7b3d701bec04dcd29a52 SHA512 7bbdd96070f95b58dc24afcb6d734890d0b58b02d3dafa1e2a6690040c83576e12b02771ba69c44baf7dc106d3727007239af99b5a0e18fec335933853617d60
+EBUILD ntp-4.2.8_p13-r2.ebuild 4613 BLAKE2B d4ba16cbde46c383b9cc441b46b1187708615689508e9d11d2c1bfb42bf56617946d269e7591ae86b7b62855dd89b3084bd6aac37ed941553e7b8e4bb4f3455e SHA512 450e5178f50520310934eb59418c15eb1377957f521c5f9721a9b8d579f2933e8349b0dac1d1368b4b8b7b9b23edc996d6b4a1a959c5f806eda764f77f123dc5
 EBUILD ntp-4.2.8_p13.ebuild 4550 BLAKE2B be2ab12851068dd20baa6e134fecc34c4e5fd651b4235041672bfb5064bd15a20560b3fd17eab2add20f8f4685e4b55682dce4fb36ba833e91a9856daab301bb SHA512 8821c4c21a76c108de86b746057225618a7fd595cc90a3db77e3ce247f20705d618ca1f50ffa5e6e3fe087f6652f9e4befb559976beb32e2746ac873a30ba253
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
index 7683b71bf4fd..508eb7ff7b9f 100644
--- a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
@@ -124,7 +124,7 @@ src_install() {
 		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 \
+				"${D}$(systemd_get_systemunitdir)"/ntpd.service \
 				|| die
 		fi
 		systemd_enable_ntpunit 60-ntpd ntpd.service
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index d2924d77238a..4a24ad791c6d 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -73,8 +73,8 @@ DIST openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff 42696 BLAKE2B d8ac7fa1a4e4d1
 DIST openssh-8_1_P1-hpn-PeakTput-14.20.diff 2012 BLAKE2B e42c43128f1d82b4de1517e6a9219947da03cecb607f1bc45f0728547f17601a6ce2ec819b6434890efd19ceaf4d20cb98183596ab5ee79e104a52cda7db9cdc SHA512 238f9419efd3be80bd700f6ae7e210e522d747c363c4e670364f5191f144ae3aa8d1b1539c0bf87b3de36743aa73e8101c53c0ef1c6472d209569be389e7814d
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
 EBUILD openssh-7.5_p1-r4.ebuild 11165 BLAKE2B a2ec84eee8d85fcde9f1f31dd1093aacbe24fe121ee234067aa196a9e1a9399cf397396cadbc6cbd2e5b004e505ac76a67dfacf8820b4c61fc74af7932b961b3 SHA512 1023740690ecab734bc7671b65a68defccff626b9da0ef0580c45fb6d30de681d05b555bb0d74cb342aa3873f11d2ac5c6a444041f13c80b508412a7b4fcac4c
-EBUILD openssh-7.7_p1-r9.ebuild 15920 BLAKE2B 421e98245cc89bb1c482a0ec3c5d35448e222430c0b1b258cfd0a7902543d1307b328e541c5418d533936c948fc67b1ece4ad9f4b48bced7f3c6061abe032f25 SHA512 4ab2bcd5bdf5ae7f5a5561c4964d3173b6f52ad95426c8db7cfbbcf4150bfb6b05e3dd72dcdf62533de0d0ed0506fc040e87fbd4212357d213bc9158d37a9130
-EBUILD openssh-7.9_p1-r4.ebuild 16294 BLAKE2B 3b5d7d2cfd03d6d22996b45cfaa467b71fa779b612e1a304cc10493587e05426d9936ed86898c11de3f1ce8068bdf429a728b63947283293f3d0a2a5ab44d019 SHA512 7a8100d59db2382be08b90e031b0e5691e22f7f66033e7ffc46d4956f1465f3ff76fc08b643799a453817e8fd75d67b550e7c741d2bdad1d7b43f9733667863b
-EBUILD openssh-8.0_p1-r4.ebuild 16667 BLAKE2B ba64a43648d8cef989c078019d8a0fb06386b646136adcd08f030771014bf05de142c95eade811b7e493f6e91d520894848174c4cf1508813a8cc32fdd109d22 SHA512 b6daa06fc03f190d82fbf3b762c1a698fa9a803fbcb375c460a38cc2cb42b2a5da5d4f76529db3390554c9af861c637d918095981b8b7cf10dacf886b1051db3
-EBUILD openssh-8.1_p1-r2.ebuild 16367 BLAKE2B 6fc69bfe00c80e45f20f096bc6931d6acc020d2b0ab3b7372cab48aab7576d376adfb8c7c0b79e7ec366a1d7cd89808026d4be6091084e896d53934911631f30 SHA512 022e9673db8e18c786afa06c08ef1f29eb0be1e4f5de0e24ff088142b3be71fcc00f5c6fd5a985065da35a829f168099bbd2dabb04ce54a1132ac36765802e93
+EBUILD openssh-7.7_p1-r9.ebuild 15908 BLAKE2B 82c5c2e5ff3f9ee0f1a99b1b3c455b41180da4d8cfde805cd0f8b12f833d6eb0ca60344362e8861e4b70a59951c78f345e5480b19cb8886eb50aae2a686b06d0 SHA512 80115988d12fed4b4b58affc264fd4fb0bd493893369779b54dd30a7790820be3fee51816d6bbd761c69c6258de3ea2e60aa2307c3245c42aef76737116d6fd2
+EBUILD openssh-7.9_p1-r4.ebuild 16280 BLAKE2B f92dcd2d77e2f9545a06adcc2760eed840b0309df447a656e4b83482c34b4c380f60b8950a5dff305a1ffdb1dd2625afe856a0a9da3b728102eef81bf0aced85 SHA512 ca07f21accaf519b290e5d2208110c95d04153f64ceeda2988cab9cb8ffe3c4493c1eb347a00df69820c222f64e5dbed137aadb8cca8a2f60fb47442ccc2c771
+EBUILD openssh-8.0_p1-r4.ebuild 16663 BLAKE2B 0c2b6048a4c936c473f68b63cf0d7a5b6fa9d65f48ea5bea42ebbed06980236399e674111da0dfeb122449da5b5bc08ba9e6355fac5701ff34a31ee574ba3ace SHA512 1f32100d6a67cec24096f4445b16912ea3dbcbcc2010590e3ef62af12670bc8743d271b6b0d0332eab680654c4271ce2e866649dbb879853745a517250e820fd
+EBUILD openssh-8.1_p1-r2.ebuild 16413 BLAKE2B a74b650af4d74c6256c5f47c2cce9bdcc69cbdf5fc0068444bff72f6147152e1fc17ef9e552a1795f9bae95919db824af4551d33d0797c8e3c438c9e92fd9d52 SHA512 2c3a625733d290fa1c874334ea1930111105e7ecb878671a2d79fe91a4cb84d7192c2a742c2ec27d38f5c488eef12d04cc133dba9ba588d19bacb34ea95961e2
 MISC metadata.xml 2291 BLAKE2B 9e12fbae3c37a48c3b04876a7247bf38c33d6cc5be210b382e35e45c9318b3c3e7c91a0ef32a9fda96ac7a68a00f9d703aacfc1c1f23e59511ea97d159527488 SHA512 8605c7aa2e4594a04006b3abfac3fad359e3e44182be53116e25159b7419d4429176617c10b50354d0d10c2be26af550e9a2b6e4c7085906558a569dddf5c8f3
diff --git a/net-misc/openssh/openssh-7.7_p1-r9.ebuild b/net-misc/openssh/openssh-7.7_p1-r9.ebuild
index 7851cc3b95e1..98bf001c684e 100644
--- a/net-misc/openssh/openssh-7.7_p1-r9.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r9.ebuild
@@ -98,7 +98,7 @@ pkg_pretend() {
 
 src_prepare() {
 	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
 		pathnames.h || die
 
 	# don't break .ssh/authorized_keys2 for fun
@@ -255,13 +255,13 @@ src_configure() {
 		--with-ldflags="${LDFLAGS}"
 		--disable-strip
 		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX%/}"/etc/ssh
-		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX%/}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX%/}"/var/empty
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
 		--with-privsep-user=sshd
 		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
 		# We apply the sctp patch conditionally, so can't pass --without-sctp
 		# unconditionally else we get unknown flag warnings.
 		$(use sctp && use_with sctp)
diff --git a/net-misc/openssh/openssh-7.9_p1-r4.ebuild b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
index 9064d66d9fbd..828c4a17b8ef 100644
--- a/net-misc/openssh/openssh-7.9_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
@@ -110,7 +110,7 @@ pkg_pretend() {
 
 src_prepare() {
 	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
 		pathnames.h || die
 
 	# don't break .ssh/authorized_keys2 for fun
@@ -279,17 +279,17 @@ src_configure() {
 		--with-ldflags="${LDFLAGS}"
 		--disable-strip
 		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX%/}"/etc/ssh
-		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX%/}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX%/}"/var/empty
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
 		--with-privsep-user=sshd
 		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
 		# We apply the sctp patch conditionally, so can't pass --without-sctp
 		# unconditionally else we get unknown flag warnings.
 		$(use sctp && use_with sctp)
-		$(use_with ldns ldns "${EPREFIX%/}"/usr)
+		$(use_with ldns ldns "${EPREFIX}"/usr)
 		$(use_with libedit)
 		$(use_with pam)
 		$(use_with pie)
diff --git a/net-misc/openssh/openssh-8.0_p1-r4.ebuild b/net-misc/openssh/openssh-8.0_p1-r4.ebuild
index 2acc872e9ccc..1b1d9363437b 100644
--- a/net-misc/openssh/openssh-8.0_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-8.0_p1-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eapi7-ver flag-o-matic multilib autotools pam systemd
+inherit user-info eapi7-ver flag-o-matic multilib autotools pam systemd
 
 # Make it more portable between straight releases
 # and _p? releases.
@@ -111,7 +111,7 @@ pkg_pretend() {
 
 src_prepare() {
 	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
 		pathnames.h || die
 
 	# don't break .ssh/authorized_keys2 for fun
@@ -281,17 +281,17 @@ src_configure() {
 		--with-ldflags="${LDFLAGS}"
 		--disable-strip
 		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX%/}"/etc/ssh
-		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX%/}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX%/}"/var/empty
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
 		--with-privsep-user=sshd
 		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
 		# We apply the sctp patch conditionally, so can't pass --without-sctp
 		# unconditionally else we get unknown flag warnings.
 		$(use sctp && use_with sctp)
-		$(use_with ldns ldns "${EPREFIX%/}"/usr)
+		$(use_with ldns ldns "${EPREFIX}"/usr)
 		$(use_with libedit)
 		$(use_with pam)
 		$(use_with pie)
diff --git a/net-misc/openssh/openssh-8.1_p1-r2.ebuild b/net-misc/openssh/openssh-8.1_p1-r2.ebuild
index fe7b7fb1bb49..057f482b572b 100644
--- a/net-misc/openssh/openssh-8.1_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.1_p1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib autotools pam systemd
+inherit user-info flag-o-matic multilib autotools pam systemd
 
 # Make it more portable between straight releases
 # and _p? releases.
@@ -71,6 +71,7 @@ LIB_DEPEND="
 		)
 		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
 	)
+	virtual/libcrypt:=[static-libs(+)]
 	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
 "
 RDEPEND="
diff --git a/net-misc/pimpd/Manifest b/net-misc/pimpd/Manifest
index cf2c1778e0a0..82fad9124755 100644
--- a/net-misc/pimpd/Manifest
+++ b/net-misc/pimpd/Manifest
@@ -1,3 +1,3 @@
 DIST pimpd_0.8.tar.gz 6763 BLAKE2B 4a9119a0f96b208551a61cc9c3e0ff2e278d7483e57baa0968f9e0949f23d824f75270c3fbc463f9af3e4760ae99e8f8b52fcedf5a2c3d86040486396acb819e SHA512 cb9a60386d5071e21feacf991bb1b2d3d0cb681561a04dc3b9e830336b9d63b4c7026e0a1e43d5276895c733cc0c7d9e072ce1e13ae4b26e83543c53c8147dbe
-EBUILD pimpd-0.8.ebuild 483 BLAKE2B 6f89f2abcb46d4a2357321d9e4aead0234da83640b294c3ffaaa47d06b3cba740f21f4020af3d87ebcf0f5bd17660a73e84c722974088acffd07ce6cbcf19ff7 SHA512 c12ced7a675c80230a9ea9e571c8674f28bce8c7b654cdf4cc1a73dc904de12546fb7372f47a1096b63e56518efe2f2a384feb4574620f785eec1b5e7f8cfcfc
+EBUILD pimpd-0.8.ebuild 505 BLAKE2B 0c17f0039381e14fc41fc36dd541175d8f99c39e770786782a10ac4e22d4952ef7c7cbf108eb38881ec02bfe002d83a08a162af950d940c0edcb43a846d5d2bc SHA512 2fdf23584c74ead7b41a72d570985a4651104a28d08a5d109434ea86a46820d39750407bb32eec19d2ea83eac08c0fb96d08673dff2c6b9eac528e3d049fde52
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/pimpd/pimpd-0.8.ebuild b/net-misc/pimpd/pimpd-0.8.ebuild
index c2734c71ef6d..86940f2db44f 100644
--- a/net-misc/pimpd/pimpd-0.8.ebuild
+++ b/net-misc/pimpd/pimpd-0.8.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 inherit toolchain-funcs
 
 DESCRIPTION="RFC1413-compliant identd server supporting masqueraded connections"
-HOMEPAGE="https://gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="http://cats.meow.at/~peter/pimpd_${PV}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-misc/pssh/Manifest b/net-misc/pssh/Manifest
index 5de81b5cc8b8..cf86f6aec58c 100644
--- a/net-misc/pssh/Manifest
+++ b/net-misc/pssh/Manifest
@@ -1,3 +1,3 @@
 DIST pssh-2.3.1.tar.gz 23427 BLAKE2B 7297ec83d31272506a34ca771a4476deb0e22f6d85f770cd380d6122e2e39c40f6767b84286efd9980c53729f5f7e0ed19af566cc1eea358ffd9fb0820eca167 SHA512 c39e1c2b0a3bc2bd736f1e7d2f402db6a128e81d6a80ce7e97f39e7fae93f7a20037b43b5725bed5ba911f54e36a9b65c509d858a53c696989b76b1322e7680f
-EBUILD pssh-2.3.1-r1.ebuild 770 BLAKE2B b0443bd0b4909b25528c0274aa50598138f1f5c6621c8c6c03f342737180aa090987599ea4e54a775f147fa0ab21f19e85892f65a56b35b060e886fee1bd28a3 SHA512 bf34b050e61e4d3d8019e2432f5f8dda6e1aa567fb5f5f654de696ddfdd819513c742bbb1d57b92c9f1ec4c5c569b7c7394a4dc74fee7b9c58d11462e2d676e9
+EBUILD pssh-2.3.1-r2.ebuild 726 BLAKE2B 9a7ae47d5674f7f29f2a4a362e0b69f443d9239338022b78a4f91c06157df61304cf755bf61092f6d7b69abf2af8324dde966ac3360cf0898a0ccd17a5c537b2 SHA512 7335dcb8885b4dc12e147ca114d1ee45ac2049f4083a11fdfee54f6df59651bab761131ec82b119e984ae158898c57e5231963c206f34895753198ef291a6731
 MISC metadata.xml 339 BLAKE2B fd5344fdf419b900b25c757d4f4bee0084c9493f73f77dd4d760ca8c438bb71e00fecf2aab2acbb62c2d824e149e4db8a1b6fa32814b945ed56969612f36e21f SHA512 bcea2011bb23b0796bbfa66c6cadedbd03d06ab15f9254c444d6cfe6c1985a41ad37dbafc214cbcdba73f3cb789ac3ec4a42fdb5a20cf9d38a88ef0d23c588ff
diff --git a/net-misc/pssh/pssh-2.3.1-r1.ebuild b/net-misc/pssh/pssh-2.3.1-r2.ebuild
index a79e2bcdd73c..eb333cc8d3a5 100644
--- a/net-misc/pssh/pssh-2.3.1-r1.ebuild
+++ b/net-misc/pssh/pssh-2.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,8 +19,7 @@ IUSE=""
 
 RDEPEND="net-misc/openssh
 	!net-misc/putty"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
 
 # Requires ssh access to run.
 RESTRICT="test"
diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest
index 4010ab5f6b9a..8402ff1da9e8 100644
--- a/net-misc/pulseaudio-dlna/Manifest
+++ b/net-misc/pulseaudio-dlna/Manifest
@@ -1,8 +1,5 @@
 AUX pulseaudio-dlna.desktop 300 BLAKE2B 47eba4d57809eed44acd5df2ce2b9333bede1713f9d291009888427c8ad507cec4a39472cee7422c4f689916b55935935d4b790c3a7ea9778e200d51cdc37fbe SHA512 f8c396e08d387c72fc60a278e40525da1922ca85ed87133538ceb2f0452c34db6da12412c65abd803702fb4a049588e7e3d47b43610e0f52ee0499323c4341b3
-DIST pulseaudio-dlna-0.5.2.tar.gz 701412 BLAKE2B f31d2e5f9adb79fc2882b14582f2787f152675c6f2c97857edf93d6b28fe2d3cbc85badf427665dac44e7d37802365b287e42fd2f8c11bde7cec5267a2fddeb6 SHA512 298f61d643c35449fbb0001efa69a1792e41518953f58506703f3568902da4457d0f4f9e52b9641df26fc6f978670dd29a7f5d786b99339bd2a71f5fa59dd7db
 DIST pulseaudio-dlna-0.6.0_pre20200114.tar.gz 709196 BLAKE2B 3113d34eaadf735646f7e421e8271fcac02ea4faed76676d5a70e05c8a26745ffd1ae135d2c5186d9db7ad146d166535a1c901927d24ae2a1a4d08720a4f78d2 SHA512 9c97d160116acf07325b18f35000b58a042243345f98cb1c9e42848e39ef3ef32a9199e31044a758a0a5ec81176be651fa3ef2917a227347017fe375e27385c7
-EBUILD pulseaudio-dlna-0.5.2-r1.ebuild 1692 BLAKE2B 8690a3a2c4025c435e1b4f2d91b369d37f1a31b5b06db9e5d06d7559f5a802b2aaaf796150ab3480cb1a2381c217049a4d55748451adcca83689a7a5cb5c897a SHA512 0add5a8d68bf0cbb8c1f6dae3b3b089f55014d52fe404b4c3204ed09c4c0c8c4487cb6540c948a4a4838b08c4e67ff161d47c6db6d0ec01a47def7351abdde89
-EBUILD pulseaudio-dlna-0.5.2.ebuild 1635 BLAKE2B 7275dc34e0110f07791d17daea24b8c3bfe1214a081d87d3ac3cfefefd2838056415aca63868fbdf6e11fd6dc9b23ec76da13437168a710b1498b4331329cecd SHA512 15ff8e21bdeae53480132106fa1bba7954eac5dee19e31a611fb02764e9c23b702419360c7ad46ec62321e5c580b5fdc095a9e519280592896d0f542fe8b7ba8
 EBUILD pulseaudio-dlna-0.6.0_pre20200114.ebuild 1988 BLAKE2B 07014a92a0feefd1902bb7c023dfb01081109b9b243482071cb9b327f176590616fb78f9bb41f577ce54fa6e8c63a89ac78b442a72f99ea7af2232f1e84d2c92 SHA512 477e5dfac0a8a2130e58811180c70ee681ef69350d8372f891c5235ba2c441d1bdf00a540c9a3eaaae733bad7f3c6937ace411bce5e1107b7e1cba2f18ca4c38
 EBUILD pulseaudio-dlna-9999.ebuild 2116 BLAKE2B f912ad135fd58c1584304d2b3fb352ea997bc89784d3f91c839db051674dd6da3fe55ef194a610013479b099727adb073c7e3b27aa90f4728bab7ed4c314ea60 SHA512 dea99662045c76c7428f8a53d0c4aaeef6aa768b2f47a9ea244de3bd9607ac20345df274377591e4307259ce4841561326271598391cc09308953d70cbe42807
 MISC metadata.xml 340 BLAKE2B b7b3ce106203873c919144347d33bb3fea82da6d163d15bb6adba027a8230353976862fb3dc16592d15db37954356e240278d1677bfddd4037d7f42b6834b241 SHA512 43640a91e95c2ec3969e19341e64dd653e8e00136c03e98119e4d5f357a3f79754a49d17837326dcb8f10023ec0fc6ad3bde80f0912d532db77f3fb7727d4493
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2-r1.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2-r1.ebuild
deleted file mode 100644
index 6714dd0bdc2d..000000000000
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
-HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
-SRC_URI="https://github.com/masmu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	dev-python/librsvg-python[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
-	>=dev-python/notify2-0.3[${PYTHON_USEDEP}]
-	>=dev-python/psutil-1.2.1[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/setproctitle-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/zeroconf-0.17[${PYTHON_USEDEP}]
-	|| (
-		|| ( media-video/ffmpeg[encode,faac,mp3,opus,vorbis]
-		     media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] )
-		( media-video/libav[encode,faac,mp3,opus,vorbis] )
-		( media-libs/faac
-			media-libs/flac
-			media-sound/lame
-			media-sound/opus-tools
-			media-sound/sox
-			media-sound/vorbis-tools )
-	)
-	virtual/python-futures[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-sound/pulseaudio"
-
-src_install() {
-	distutils-r1_src_install
-
-	insinto /usr/share/applications
-	doins "${FILESDIR}/${PN}.desktop"
-}
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2.ebuild
deleted file mode 100644
index eca97fcf2c71..000000000000
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
-HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
-SRC_URI="https://github.com/masmu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	dev-python/librsvg-python[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
-	>=dev-python/notify2-0.3[${PYTHON_USEDEP}]
-	>=dev-python/psutil-1.2.1[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/setproctitle-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/zeroconf-0.17[${PYTHON_USEDEP}]
-	|| (
-		( media-video/ffmpeg[encode,faac,mp3,opus,vorbis] )
-		( media-video/libav[encode,faac,mp3,opus,vorbis] )
-		( media-libs/faac
-			media-libs/flac
-			media-sound/lame
-			media-sound/opus-tools
-			media-sound/sox
-			media-sound/vorbis-tools )
-	)
-	virtual/python-futures[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-sound/pulseaudio"
-
-src_install() {
-	distutils-r1_src_install
-
-	insinto /usr/share/applications
-	doins "${FILESDIR}/${PN}.desktop"
-}
diff --git a/net-misc/pytvshows/Manifest b/net-misc/pytvshows/Manifest
index ea8cf5ec6ca0..a4a9f165409f 100644
--- a/net-misc/pytvshows/Manifest
+++ b/net-misc/pytvshows/Manifest
@@ -3,5 +3,5 @@ AUX pytvshows-0.2-feedurl.patch 13082 BLAKE2B dccfd2c5d6637411faf91020a93dc9d84f
 AUX pytvshows-0.2-improved-re.patch 680 BLAKE2B c2d7f08c256d78ae0d793df5e889bc5b99b7018053dfb701b52e0b2fdd364c6e23748db9defeb63be39ddb5cb0414e02175f9c1f0eff42e30866aad93f3fcaff SHA512 15cf4beb2b7da4efed4cf4ae744c0dcefffb4ef61b6a920c41e7926a2666bc07b9cb4ec9b058cfe84566415e7659e00adad423ae90aab0e91ba43646ecc0f6a9
 AUX pytvshows-0.2-rename-var.patch 484 BLAKE2B 9d03cff276bc1960a4813f0605be411c1044ed4647a372683bf46fca45f1df24866784be25ef1f2426fd0355c44aecf89062d2ff5e47ceeb16a4febb509106b0 SHA512 15de0a4fdef7f70df5b5e7612bc3c40741bd2efe4ef0e714b067635b400a4b5676e1f1bbbaa53818380c915714cdfc141cea3aafed75871edfb4f0bec89a9c0f
 DIST pytvshows-0.2.tar.gz 14156 BLAKE2B 61449e01096ef81b131c03b0cadd89433a7dcafd3a8828f251ca9ecceb49dd4d92e382ce50b06f4b5498523fd8b4625fb5442e7f5ef71949a4605ab10910be45 SHA512 c4acd9b968dba7af1c787f9a3f5db4986ffbc52bfc43a4b7101070f8e91e80e78be0e59c4a4fbd873e64a6c4862e64abed2396c7140e9165d72e7d3cea267d5f
-EBUILD pytvshows-0.2-r3.ebuild 700 BLAKE2B 5f152e711b10c2b153644df4d480b2faf0fac6d7f98e86d3ad862bac6718e5dd08237d096e5cf66bb0d87b5d30879cc56213cbedd2f6b06f556ba23080360eb6 SHA512 16542d842d135dc535482a5366e2803dad33b3d444f61e48c6d5747b5a42ab58f41179678447e9c617d38d94b5493b0ef4c814f95e78c0d880eada702cfd250b
+EBUILD pytvshows-0.2-r4.ebuild 735 BLAKE2B e3e58b21109797c6421bb8196fcf8b9a6d6a5e187da210286746ff5f1f90867e386af053448b7ca61dce6dede2f4991855438e01290a72a847ba0aec0d3045ca SHA512 274226cb80932ac76e7ca518dea07ceeb67ecc6df57f603ca80911f16f75d51cfbe2c991cd2123299e3efed01f35797415b215be0d9bcca940b6c2c4381a340e
 MISC metadata.xml 246 BLAKE2B 9716f6dddff0f0604acad323b9c91c077bcf46a52f165f566193eb6cd5cb338180ff87f67f0d4df33eda5dc0136e5dd263f4f327d274803be59ff9d9acb17ccd SHA512 6f6e043d6a63993611316553ea1c70736c02151d19f1ee63ad855226dd79862c7ae7bdeccc572f23ed4dc9dfe3b0e77dd80d48bcbc33c02091c40111ac5e1aa1
diff --git a/net-misc/pytvshows/pytvshows-0.2-r3.ebuild b/net-misc/pytvshows/pytvshows-0.2-r4.ebuild
index 48e83a238426..dd398bde85ea 100644
--- a/net-misc/pytvshows/pytvshows-0.2-r3.ebuild
+++ b/net-misc/pytvshows/pytvshows-0.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,10 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/feedparser[${PYTHON_MULTI_USEDEP}]
+	')"
 
 PATCHES=(
 	"${FILESDIR}/${P}-ezrss.it.patch"
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index 28cbf1201a15..2f8145fe4b46 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -4,6 +4,6 @@ DIST r8168-8.045.08.tar.bz2 104427 BLAKE2B 56e332b518aa3c244750310a77d53ca2fc9a3
 DIST r8168-8.047.05.tar.bz2 108933 BLAKE2B 03e0bd90c970fc5f98f3e2e2a5d724891a6ffdfe53dc9de1e30b6c855658d53944ed1d8f996edf63ac448194d917685ef8902d6960fafebfe695453e8ea34e51 SHA512 a58cbbdfd836373ad65607908bd84e48a93222966c65d190ae5dff20621b55976c044c31a18e1c00ea5c4c6d66ac300acdc7537d4dec5dd1e281f0ad33bb24e6
 DIST r8168-8.048.00.tar.bz2 109018 BLAKE2B e3587fda9cdad8a8433933daef7f05b123b661e6079703c840fb20562ff8511424bf183781970957fa3b0371ebcb4c7a5b7ef84101c3ac5bed7d3eee1236194c SHA512 425d3e0fc56006e9371c31078d32f6fd135a038b13ec1c4f1b809f68e73e8fd15e4a4c2d027c0b4a2cee9ef0dda348b478cc855fb123eb05e4157564ab9de12a
 EBUILD r8168-8.045.08.ebuild 764 BLAKE2B b337a217df697f7ed8ff91b812cea9e59864d2b7b6f5d45f35d97805137bd0d333505ec275abf1f1f5b69914bc95b6df183c9af914d69091f07d0e74d66e3698 SHA512 9eb1659e0aff4ad03cd9fc0a63b473427c2ce6aed67b800533aa11bda7666c58a544309cd5e65f799894a1e609a2bebea2ea7bec3e6828110372053370c8e629
-EBUILD r8168-8.047.05.ebuild 976 BLAKE2B a754f02e6ed4aee01ad1804ba28dc7d31673bbde968176726a562f3cf54b170593a65eb1bd42bb945442412474fdd20272012af999987635c62af3e887c62d89 SHA512 71881b738190bfaec377232b469aaa8bf4cf701eaed4650a7983e643f90caa042c09a6cbaf0b3b269f39ff20f1ec3e6d630184a0f3f087a0277d352bf2355b43
+EBUILD r8168-8.047.05.ebuild 975 BLAKE2B e912aebc2db2f2e7e7da79d75936a9a471df2bbdb3e374074ef61aae409a0f4934de845a4a68bd149164b23e1b23cc9ed8b3f346ae7b05ddc6f6997ace963b42 SHA512 e997798c5fcb40b5434c2ff2c55f5215cdcea479f6b18dab48510ea5cdfd4ae897367849d701ff2ac4503c75c27eecc9b8e971303d15e363fa03d1e879aec158
 EBUILD r8168-8.048.00.ebuild 925 BLAKE2B 987ba8d46e4e68a176fe782df425e6be2c085d842853187cdb4aae9af0431e8a362af4329bdc99d5f892583138b0c78f84eed229738c26da216e2ecc8eb93876 SHA512 d49c5452662c5a59ebd0af45b87005e5f2931b65611dedd85984b69ab9c15e44dcf1848157ce4a5b6e8a705571dde34f3fcff4086aac30b8427cebe0ba09c818
 MISC metadata.xml 480 BLAKE2B 1b0bd59517b3efdf470580f755382155f324126d5cd10b56bd907632612bd8d911a99da551a405f29d0d487d7401212d70644861200aaae07fb28d9a50f7aad2 SHA512 d854597c150f44307f7c15a73b6beb214864398c7479a7e3ae2a62e014776cd0e9b3f9a74df5a44715c64f4350174d9af9472f95847d6d134ad3c4536e77704f
diff --git a/net-misc/r8168/r8168-8.047.05.ebuild b/net-misc/r8168/r8168-8.047.05.ebuild
index 99f290f5063f..beff876a09c2 100644
--- a/net-misc/r8168/r8168-8.047.05.ebuild
+++ b/net-misc/r8168/r8168-8.047.05.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 MODULE_NAMES="r8168(net:${S}/src)"
 BUILD_TARGETS="modules"
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 09d7d07fe6ad..f7319c8bebad 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,8 +1,9 @@
+AUX remmina-gcc10.patch 911 BLAKE2B 4499abeb5b85d1460c4f00596222ad6dafa1bcf4434c2b6cfa3bbd7f0935cfa2a83e17fd42352437c9f82bf6598c36cd435992253101343599d37911557bb6f0 SHA512 4a54f0c98de0c9f24a11ac6cf935fadc7e832bb6a6bf4ff5b95ab0eaf065dd8d54b39f83f7ba6da31f49ee597a33fa1e8ec3efbf019b806b446d99106efd562c
 DIST Remmina-v1.3.10.tar.gz 1651065 BLAKE2B 8d2f3068ad0938c4641deb2c20ccef10e30949273a2db92a9ff8bf4e84e49aa0bc662128f8fc576f98baa3cb0f4b19273399118a3ce5d7b5aa92ff03cc602cdb SHA512 e6770fee4d9c694c7c85a9937a293db437456840eee107de4adaad0bdfb1d649bd66b1f28ee0f196386eb968a2f23e139429db22f32febdc62ce02c0a4d66f7f
 DIST Remmina-v1.3.4.tar.gz 1365473 BLAKE2B f71a9c0a0fa9eafa547abf192972da39f0cfe1ca3745a87783d6a9ec5bab0674d93df8815b589b25659990bb345748f8f464f401c7efb934e8e71b207b0dab67 SHA512 212ebc6e08c694861522a05feb51e4efa012ef3361debf079384c07e4354370f6cf7d2880ff442bbe03782421bac7f33343d8049207073d90925d1c894d30e7a
 DIST Remmina-v1.3.6.tar.gz 1538166 BLAKE2B f3fc60df2a1a31bd5aae7d8de2d85cd579fa4cc35a0351fbce80433e21583b67cfc81665307d02fbd4863f6a55695be81f9c4d07423d6c8122d84dd625b69c3b SHA512 ce16379aa163467d05018c900d0dc7c2a7d73c1c22dd06a9a3092efa7675fda505bfa31b20131b9a3a10c74788377db17961c0bc9e59c47b1c7a15bf347f3bab
 DIST Remmina-v1.3.9.tar.gz 1627404 BLAKE2B 4077b38e987a93f71f96597784949522659def04ad0d2ab05c72bebb94a3bbf2c2a222828965aaf76b0273a378950b5dd0e7acdb7543f0d6c7f3220d16eb281c SHA512 f87d30d30d6d9692f60cd27336ac0059a4374125b231cdf1e3710785b08fc77722112ea48e5717958b03fc5784abb9fcd86aa5a427c4d634cb3f2be1aac41945
-EBUILD remmina-1.3.10.ebuild 2546 BLAKE2B 3b869a8f591e2836c1a526bf2a0ec76ffaffaa1d5137ca7080d7f5c576a3aa051d429a3b72aa9309dab9ff282842944a02c5bec9f717f1a0e400d08393ff078d SHA512 d8e5b18a021c82d1c1d0dbaf7ffa82e13bac987cc9766d018ff50d2854a827648754fb00a7eb3d53d8479611a46ccde19c58e0d41b83e167af28087572ff9090
+EBUILD remmina-1.3.10.ebuild 2590 BLAKE2B b4c9157c4aa4b4ef2526ee143aa175ea22d25fd827e822eb70f32e35cda3b1f344866faaf6841a47b653c26ffbb879d6d8f9d51faeb48d993b936b114a3fdeac SHA512 8126449263d5d17019fb63b010cdb6d561f1662f09df77b6fef08e8ce5ead2c30b821c69e1c70148bc7224cf8c7135ce79db04e0f7cf0278842846571b9638a4
 EBUILD remmina-1.3.4.ebuild 2245 BLAKE2B 256d9073a83f692a70c9db223a0d201f30100a5ff80d411f1990a53afd4954e6b96b8be0e9ef47600c4d3f2039b9250daf33fb9dc5ff6d6d74d451d860e52d49 SHA512 d2181e7130c47df3b0849936bea4cef88444ecbd2873a45b5f2f46e3269d310dc27d958138ecf7f0ed3d6929a82a8a9b0a3999838eb9dfb1646b137a481772d1
 EBUILD remmina-1.3.6-r1.ebuild 2477 BLAKE2B f0912aab7e270c36283a9a82a04f3f171ab5fc56e084aab967b701faaa3cdfde7d556c13fc2c3f232a19923e32856dc7e8e80aa0a01b3aadd6d6b9af1a8ef633 SHA512 ec36b830cfeb182d5977913982b829a7fad1fe8c7230781b8df59eb80ef16ee5218f13860cea8a99513fc3aee0cfc442ee90de248ec65729ed0034f9a4e6336e
 EBUILD remmina-1.3.9-r1.ebuild 2546 BLAKE2B 3b869a8f591e2836c1a526bf2a0ec76ffaffaa1d5137ca7080d7f5c576a3aa051d429a3b72aa9309dab9ff282842944a02c5bec9f717f1a0e400d08393ff078d SHA512 d8e5b18a021c82d1c1d0dbaf7ffa82e13bac987cc9766d018ff50d2854a827648754fb00a7eb3d53d8479611a46ccde19c58e0d41b83e167af28087572ff9090
diff --git a/net-misc/remmina/files/remmina-gcc10.patch b/net-misc/remmina/files/remmina-gcc10.patch
new file mode 100644
index 000000000000..214a8c887879
--- /dev/null
+++ b/net-misc/remmina/files/remmina-gcc10.patch
@@ -0,0 +1,36 @@
+From 27f84d1c0a2e4c2432281f25ef3026bb00bbdc15 Mon Sep 17 00:00:00 2001
+From: Antenore Gatta <antenore@simbiosi.org>
+Date: Sun, 9 Feb 2020 02:34:50 +0100
+Subject: [PATCH] Removing struct declaration utsname as not used - Closes
+ #2080
+
+---
+ src/remmina_stats.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/src/remmina_stats.c b/src/remmina_stats.c
+index a6eb6f609..3b7cbf0bf 100644
+--- a/src/remmina_stats.c
++++ b/src/remmina_stats.c
+@@ -159,8 +159,6 @@
+ #endif
+ #include "remmina_stats.h"
+ 
+-struct utsname u;
+-
+ struct ProfilesData {
+ 	GHashTable *proto_count;
+ 	GHashTable *proto_date;
+@@ -864,9 +862,6 @@ JsonNode *remmina_stats_get_all()
+ 	json_builder_set_member_name(b, "REMMINAVERSION");
+ 	json_builder_add_value(b, n);
+ 
+-	if (uname(&u) == -1)
+-		g_print("uname:");
+-
+ 	n = remmina_stats_get_os_info();
+ 	json_builder_set_member_name(b, "SYSTEM");
+ 	json_builder_add_value(b, n);
+-- 
+2.24.1
+
diff --git a/net-misc/remmina/remmina-1.3.10.ebuild b/net-misc/remmina/remmina-1.3.10.ebuild
index 42a9e58cb1c6..37a05502cf5a 100644
--- a/net-misc/remmina/remmina-1.3.10.ebuild
+++ b/net-misc/remmina/remmina-1.3.10.ebuild
@@ -51,6 +51,7 @@ RDEPEND="${CDEPEND}
 "
 
 DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+PATCHES=( "${FILESDIR}"/${PN}-gcc10.patch )
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-misc/samplicator/Manifest b/net-misc/samplicator/Manifest
index 8cb2f04efebc..391e858b310d 100644
--- a/net-misc/samplicator/Manifest
+++ b/net-misc/samplicator/Manifest
@@ -3,6 +3,6 @@ AUX samplicator.confd 199 BLAKE2B b360c0c8a092e54aedbc08807b114f18d189f79f8756cd
 AUX samplicator.initd 988 BLAKE2B 2a1266ab11dc15c11507e5be5f8d1b364bff9d48633b84a9ba28e88f2085eb742d4ddf8d1c14471cc7489963f736ac03570df8416617ed79326d3bebc7f4830c SHA512 7bb9ebdb7d4b50d0df4827926b2ee6f9aaba0b63f841f6cb62d1dc2dcdf517e5a8e155813dab33e846270b9cb589c82e47ac293b4ab6482e504955856c68bc99
 DIST samplicator-1.3.6.tar.gz 87901 BLAKE2B 0ee1a7900c941e5c92c722cbc1c7308be8025cded04d4ddce5a496f3c3cc44d3973f3e1562147f5077d0cab6caa1cba12c0e5225b70d60bb07c32e7f8f2f6b8a SHA512 a4023344ec911d3dc6992ddce139e6f1c86a67bd9948a3f92a995dc26aeda1753becea4b0f5d9ad45a06d628029bffc0a77c28fbd277da9faf42100c01d55f31
 DIST samplicator-1.3.8rc1.tar.gz 109870 BLAKE2B 2ff442733216d6489028117936460ba8436af2f92982ac819a1d824ec5e07cf7f43c01e6de9abd9d50005e3bb8d5d91a64570bb805eefafee4bda14fac11d6d0 SHA512 9f688baff07f885a0ad58974374cdf6b66a5aeaeb01fbf38f431ebaaf160b38e37fae7c511f0fe388b10fa91d0bf4505c765556f55a2c6753a57d3df3b8b3306
-EBUILD samplicator-1.3.6.ebuild 1536 BLAKE2B 096f853ef76e9cb1e22fcef9d735c2c87f486eb733d02727ef43718efffe642ef9edcb05a2b7b0fc690f503d083f55b1190ee0db3a6bbb453f0212c7692d8b29 SHA512 56b2e1796150961f6e9b30894de3ad5310a0a40e7e185f98a90c46b1706412b8610fa9b3fd819609e6996a2fd54dd254ff1c4c116432d69d36735741209ef3da
-EBUILD samplicator-1.3.8_rc1.ebuild 1601 BLAKE2B 88f6f5475d8f9c601054843a6aac0168ef2a7ed2b569bc1458b3fa6855ee8f64274c8991e53eacac17de928fddbb2314785d6ae6f50c4cd8cede96708af02ad2 SHA512 9985e45f3e47dfdcd7998b2980b3be0d3cc86d0870c8f2581e87c6140cd88ab0b78f91af672abf002cd14ca4a937a1f36d9a6a0f9335e70e354b8a5a599706cc
+EBUILD samplicator-1.3.6.ebuild 1542 BLAKE2B 73705d12b17a86d4f7746d86994e92fc95824f3edad2dc9c02d8065c8a2f8c3085ffeced6a899c6ac58a247f9270913e0d473580c2699788d78ebae493387f5b SHA512 e78865fd2d5f9ff6e5bd29c9cef05e4238aad9515f624a6fa1dc255bf7c08ccf2acf2c664846e1e6a7db3f1e86a7d6ee2303431a68634feb43c2131f32a19375
+EBUILD samplicator-1.3.8_rc1.ebuild 1607 BLAKE2B 0bb16fd5be0b3d90a66e0c3ce3f7fe99a52e31cd315505402f871176b9a50702abcf0972865ac7fd83e2778d209cecaeb8deeb974518d98dc6e1b521be027407 SHA512 b58bf58dc2a82fde8da31125535ab135bc74b1fff4338ad03f45a47300b5cbb6b2a9bbcfbbbe6c8b8582aa376e293f533ed8c26d179d0bd752adf5c7d7d85539
 MISC metadata.xml 816 BLAKE2B a9153d3127cd86761dd1163f2ca8df8bc7ef2191bbba211a37999004d74f2e7ff32460b9eff3bda68dd6e1b5e96b638ac5a32ae5ffd4f4ecf2cf61342a6c8e88 SHA512 95e2021fe0539b320556156c01810e133a2abf75858cd5f57261704c1b98765cbea51635b6e9cd9b485d60c9d7360456ec03ae9429ed1ae1b91c46e010c50e02
diff --git a/net-misc/samplicator/samplicator-1.3.6.ebuild b/net-misc/samplicator/samplicator-1.3.6.ebuild
index 52905b78ec33..9a0dc3dba6c6 100644
--- a/net-misc/samplicator/samplicator-1.3.6.ebuild
+++ b/net-misc/samplicator/samplicator-1.3.6.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit user
 
 DESCRIPTION="UDP packets forwarder and duplicator"
-HOMEPAGE="https://github.com/sleinen/${PN}"
+HOMEPAGE="https://github.com/sleinen/samplicator"
 SRC_URI="https://github.com/sleinen/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
diff --git a/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild b/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild
index 91ac19d6e813..a3aec7839f99 100644
--- a/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild
+++ b/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild
@@ -9,7 +9,7 @@ MY_P=${PN}-${MY_PV}
 inherit user
 
 DESCRIPTION="UDP packets forwarder and duplicator"
-HOMEPAGE="https://github.com/sleinen/${PN}"
+HOMEPAGE="https://github.com/sleinen/samplicator"
 SRC_URI="https://github.com/sleinen/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 5acbf75c1b51..e7622bf35250 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -2,7 +2,9 @@ AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2a
 DIST seafile-client-6.2.11.tar.gz 2346059 BLAKE2B 107ed7af53a8e0244a9d9805d3c84f66e273f00d306663cfaa07983f94ed98f0dc23cce7d1ff7592bdb64915d1e7dd32cb5a2e9bb10f4b36b87bd28f8f3a9082 SHA512 4ba39c33c41cb95e2ff5bb9704cdac1f95561bb4ff0b59d0993364070c5ee10284c51d640591195b7361b595221fd899a4aeafcac1c917625b175e98b9a894a2
 DIST seafile-client-7.0.2.tar.gz 2365981 BLAKE2B 9e11d3e2b770f2b85bb55f0108344c1c69e1fb28ea69ea8a5022efc7811f6336a2fee0de4f38981343d7a29270051e292c14f656d7a7b99e0d646d0f3fee9a9b SHA512 3edafb9728eb39e1b2adbcb0526758279599d25020c5303aa6b610aac1296eef0ebe66447f6555c21dbe125aa5ac1d605736359b52f2bd8933187efd04c2e8df
 DIST seafile-client-7.0.4.tar.gz 2357414 BLAKE2B 9c3368d745d30f57b313e9b5351714097403e67519a4582dd5658cb97152f4ad37c32cb9e6f47c13f199c75e9bd42c529ef0d352f363da815f486c90c305779c SHA512 9073df49639045319e971a76eb3769c184617e179694981ad88ddd02382b4ca50ff92c26239757022270e0a0a4115c8b70ca7efeab6ff2dee78e90a7de1bf5a7
+DIST seafile-client-7.0.5.tar.gz 2359779 BLAKE2B 58fa532668859c4413bb931146a58eb51ede7c1faa3ea2a9cafb94be44a8819261570ef16cc9f62f584f9ff483aa0832a63a99bb53380dd9efa4f82d25dea553 SHA512 b79cde3f98ebb1a0cb1035131cf95735f01c63bcb4bb658d5c40c36cdf85705d2c6fd2f7787fbdb3d965a25d60ee98e020e33c4f9423295c7ef1ab36ee5c7c27
 EBUILD seafile-client-6.2.11.ebuild 1088 BLAKE2B 361dd8fba4526094d41d08d91cda65da848a1b8677b94e3de056ec227db0e98bc8a0b41dfb86d652eac7993646ee93b3b3c3c2743bf5bd659b8bc8aaf3d6f544 SHA512 9e01233d8f5d8cbb100f226c844cbe21eb1381d56a99de246c723ad7fb8abfe978ac8efd74714a963b55e9ab41c91ba1d072352cbc95be3c21991fef9e93faf9
 EBUILD seafile-client-7.0.2.ebuild 1098 BLAKE2B 56c918a1e7d6d4aea28d4113ac1db40579a3c453b31ce20b261917aebdf18fd61d1820876061195b29b10bb2ef4833dc63f6c4f6ed2d93941643f8fd6b09137a SHA512 f82b1c8065e6d7ac795510d3489fe405873f9be5ff231cc208f70c221a4841fc8efad10c714c3a6df5fcef23a6e7f76145813fc137aefd1996cc96a10572f93a
 EBUILD seafile-client-7.0.4.ebuild 1098 BLAKE2B 56c918a1e7d6d4aea28d4113ac1db40579a3c453b31ce20b261917aebdf18fd61d1820876061195b29b10bb2ef4833dc63f6c4f6ed2d93941643f8fd6b09137a SHA512 f82b1c8065e6d7ac795510d3489fe405873f9be5ff231cc208f70c221a4841fc8efad10c714c3a6df5fcef23a6e7f76145813fc137aefd1996cc96a10572f93a
+EBUILD seafile-client-7.0.5.ebuild 1061 BLAKE2B 801d2f5f073c2ee390efaed34c27cd3143862835eae30086ada519638e8c27c0cc1c04de717eb43a67105f3e9c60ac168390f1c62b9101a687fd6b9e8b5a5d80 SHA512 02ef9623d42f3d87541645241d502759d840fc3d78ebf2c9a899146856deeb6c3606f344d72b89ce6dc415471b505384683c6c6efb11044ce3285077cb975661
 MISC metadata.xml 541 BLAKE2B 994b8936e2a25627989635426eb7f2e3a23f1943b2c5908f50a789bc1f5f84753efe6e305effb1046bb4948224c068233079fac0003e3f5b2beb507aafdac9f8 SHA512 4ce109a926de9d456bf209ff539f57e15f11c8bd486ea1984658383f5435fbec3ae7b8a77cef45409f5fc6a7e4c6c91b7890bccb6e8ccf3eaa721b92d916a33f
diff --git a/net-misc/seafile-client/seafile-client-7.0.5.ebuild b/net-misc/seafile-client/seafile-client-7.0.5.ebuild
new file mode 100644
index 000000000000..ca54c9edd03f
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-7.0.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="http://www.seafile.com/ https://github.com/haiwen/seafile-client/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="shibboleth test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="net-libs/libsearpc
+	~net-misc/seafile-${PV}
+	dev-libs/libevent
+	dev-libs/jansson
+	dev-libs/openssl
+	dev-db/sqlite:3
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtdbus:5
+	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=("${FILESDIR}/${PN}-select-qt5.patch")
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index cee6ba99f2e5..1948959da979 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,7 +1,9 @@
 DIST seafile-6.2.11.tar.gz 703739 BLAKE2B a072b103875e3a90a9c457079d3101262abc826659c604130f7c3e9d1b129e7d806b687a5673109b37cf040bba02a0a862374997a819cf384ecf2bd3bb6af058 SHA512 90ff1ca4c2a75da9a44d7833209800629c7bec3e8d5b651a820d158261bee77a3b7e599748e6ed350fe919fb67685882a215c18720b0a9702d56e384b8561985
 DIST seafile-7.0.2.tar.gz 698373 BLAKE2B 171ef14253c260d0e1ed9e984219a545bc5c86895fd554223148515feeb8fd2c6f9ab802f0f505ada0ed504def01999cdd254683de6e0d00f77272eb9d491f4b SHA512 f348139662edb061bbb2da534cd099619f23e09b1383cc97a53116c7e1eb5b41e95d61f719a83f3a69d3914e64836baf15900a9597a7b6ddfb8d23f3e362b8cd
 DIST seafile-7.0.4.tar.gz 706114 BLAKE2B 8abcf24b752eac20e2abeb355c79d420c0cadb374e70739be76531e9ecb6cb3428f6d8c0aeaa6cf5638a9dd5e964f9ae72b4933fd379655149790396dfe9ffb8 SHA512 2eefbb928f3082ba8373509c149e4e1fcfe960f10baba227759ed43411d5adeca844f1538609fd1046f22661322c57bbf93ede1fa849a39e50a4af8a3a7febc1
-EBUILD seafile-6.2.11.ebuild 1048 BLAKE2B 8427d6e2fbaf0c0cd07539c75b2710773f802bbf64b47cc19c5278faa767f8ec8ebd6b48d81410f1ec9960bac6baaf1eaa6d432f36629572db510cb055d2f2b2 SHA512 8bb17b48494317a758d414c56db5751a229859072aa6634cc826208eae48c4cd21c1659b86064100032f1d685140fc3c55e2df623ac5aa5f3bb29344075e29ea
-EBUILD seafile-7.0.2.ebuild 1049 BLAKE2B 535fe6fb71c373a01ef4749c4d4e5dc94082069c05c933a08c6512d14f4874eb626cf74ced0830626d5817167bfd5ce1e068e1dde8ff382de2296a520f7ff99d SHA512 f98355eb1e314085de614899e6ebf8b9e23f15957d0f77e95b8fa5a90eff7ef4aa459c7f87f40438659490326e06524e5be0b64d3fb64f24b5aaf0735ba1e3de
-EBUILD seafile-7.0.4.ebuild 1091 BLAKE2B 308d133ab906e450236d76a5c39dda016c629331aba1479d92137cb6c6c447dba87632f931531e61efaecb0501c8eedf88f45d7556d8348a817b8fb905c272cf SHA512 b2365ffcac7a5c69e6a4194500313d78ba8810b236e32b0b75a08538d307489a0e9353bce91a564856ba0e128a11f07c2fce7c3b926fffd64e522656547f7381
+DIST seafile-7.0.5.tar.gz 706430 BLAKE2B 49402de13660bcda9a6fad35879bd0e9ba4e491e921525a9cb16498f833d0d8e4177e615afa95780da040c9617d2795a3aa97ce389edae54621d8079033fd24e SHA512 c51c5f3f4a4b316fdf21d8eec12d42e7e1c76cf1271393658dd447c4b0ba77e6149eb7770a99af6aa23f6ebcb1572f4b847f8de44320d8bae8960bde7f429920
+EBUILD seafile-6.2.11.ebuild 1055 BLAKE2B 37f40dd27f04b6e422fc55200c1c60ec4e944127b7a24b4923617d7ceda36afacd89cac7aa5fe9ed31cbd35620fd2a5c49acf79c9eaaaadee00cd7b7dee17596 SHA512 e7e1f55163512d3c34c999b7b8c2fea18982306c90ccd4fd130757a6f37077cff30327eb73ea6a7187c30de5e2edad48cdc2a5169198e0ee9217facdd1a8cb70
+EBUILD seafile-7.0.2.ebuild 1056 BLAKE2B bb4f9535adca4ef40ac250e61cc1490bca4aa093c270c5d3a581c4a9347afa3781922cabd0ff41ed5ed9c292aaa83df971fc579e3d894cc9602132d510b29b43 SHA512 0b7c1369f2598bd648f9181c7c9f90ab3718ebc4a960990a8afdc0a1c52c26ca8901dc29abe5ff520ff7ad3b4996e837e02d84860b5b4b5865fab8905e7703f5
+EBUILD seafile-7.0.4.ebuild 1098 BLAKE2B 38c27930d6c7a8a3788b5386e989c0414a1cd3e9080f07b45de8dfe9919057b003bdef865b6702c04f7bac21d0f5f19dddbc26ce52cbf5ccaedfcd38480e3a36 SHA512 928fc119789b152beae6ff1c54d1736f40cbcdd69cb39174d905352ba37182e440283ace623ac7bc1948c4ac8fa12bb7b176ccd0a1f8a0f905723194b45fdac5
+EBUILD seafile-7.0.5-r1.ebuild 1075 BLAKE2B 4e877c79fe06723fd093d2975825b9bacc93541daac59fadd60ded97b7b720e84d50303c9c3e91bfd5389a903f67ffc7274227ed98af19ed4ff4ec74f95dc533 SHA512 f82df8ba2ef0a971f89650c8f3a63e3ccd2e7fca21f5cf7fb37ef4424f126d97a53729caa649d881ce8cd003da8a129a0cb68ad8d1feb11dffca98aac9dbe54c
 MISC metadata.xml 442 BLAKE2B 46c5da41a70765d782fa536789caa196545f800145ad109df96cc0cc819e41411aae7e0beec1161e09a37479ec9e6c79ff08395fe73eba8a092c07ed40a37f41 SHA512 b134c065c3c389e0db935094b7efbed1eb82e09be3ab83b31b2b84c3c6860c7fe002554e1ee817f69c8f873a67a352127b8d8e663a5088f5a38255ef15f2e20b
diff --git a/net-misc/seafile/seafile-6.2.11.ebuild b/net-misc/seafile/seafile-6.2.11.ebuild
index a667cc035f78..7b750024c87b 100644
--- a/net-misc/seafile/seafile-6.2.11.ebuild
+++ b/net-misc/seafile/seafile-6.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
+	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/glib:2
 	dev-libs/libevent:0
 	dev-libs/jansson
diff --git a/net-misc/seafile/seafile-7.0.2.ebuild b/net-misc/seafile/seafile-7.0.2.ebuild
index 4c5040c1196d..e41376502fec 100644
--- a/net-misc/seafile/seafile-7.0.2.ebuild
+++ b/net-misc/seafile/seafile-7.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
+	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/glib:2
 	dev-libs/libevent:0
 	dev-libs/jansson
diff --git a/net-misc/seafile/seafile-7.0.4.ebuild b/net-misc/seafile/seafile-7.0.4.ebuild
index bbe3738676be..1779236fefd9 100644
--- a/net-misc/seafile/seafile-7.0.4.ebuild
+++ b/net-misc/seafile/seafile-7.0.4.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
+	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/glib:2
 	dev-libs/libevent:0
 	dev-libs/jansson
diff --git a/net-misc/seafile/seafile-7.0.5-r1.ebuild b/net-misc/seafile/seafile-7.0.5-r1.ebuild
new file mode 100644
index 000000000000..0ba1676a8c00
--- /dev/null
+++ b/net-misc/seafile/seafile-7.0.5-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python{2_7,3_6})
+
+WANT_AUTOMAKE=1.16
+
+inherit autotools python-single-r1 vala
+
+DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
+HOMEPAGE="http://www.seafile.com/ https://github.com/haiwen/seafile/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/glib:2
+	dev-libs/libevent
+	dev-libs/jansson
+	sys-libs/zlib
+	net-misc/curl
+	dev-libs/openssl
+	dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)"
+
+src_prepare() {
+	default
+	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
+	eautoreconf
+	vala_src_prepare
+}
+
+src_install() {
+	default
+	# Remove unnecessary .la files, as recommended by ltprune.eclass
+	find "${ED}" -name '*.la' -delete || die
+	python_fix_shebang "${ED}"/usr/bin
+}
diff --git a/net-misc/stargazer/Manifest b/net-misc/stargazer/Manifest
index a57146e32206..66fc14934983 100644
--- a/net-misc/stargazer/Manifest
+++ b/net-misc/stargazer/Manifest
@@ -22,5 +22,5 @@ AUX patches/stg-2.408-static-libs.patch 198 BLAKE2B 2ad854cd7ac7f9bf8a01aa8cfbb8
 AUX rscriptd 453 BLAKE2B fb7d771ad0c29223d8a24196da05c05faf852291530fef644b60bf83893e3d038628a1ca7db92d3f3b8144cf44ccc7aa694686c77e6514867048841f1f57d61f SHA512 21cb21a5a14901f3b370f2cedb6ede9414c1080d3d4e073ed048f005f40622179cd91e8cf80f609f0a7b5cacecff5f15913a5cf954dfff56ad036649f4a0a48f
 AUX sgauth 462 BLAKE2B 9aeb1dfe4ce08f7626d6275813e8a3b2f3023ebc11b10841c7a6b01ff9110ed1193e3b2b367c7c1056c473d41f481c93ad25f4252f774fd7df5392af710255bd SHA512 a2d6ba8c2200095072a73342fab4cb5706470d52d9dc6a57f023b16dc895957d4377bc089a4a3cd57126bc9628020c2c1bb60347758e53576eccbc0c854c2364
 DIST stg-2.408.tar.gz 5100291 BLAKE2B c5e50d5607f7c5253dcbb9d48fffdd55bf44829bfc3dba1e45227fa819d2592212366baff6b19dce70ef7a565f8b03e8f580204225441b12653de6271a030554 SHA512 200e08cfd629dbacda31ffd3134c2908a1ad58604421cc288ad0ec1bdcd60fe021d51fed50fdc2517bb7c2b61ef23b0b9c71a606babd09bc7804cb899e0b7f75
-EBUILD stargazer-2.408-r1.ebuild 17363 BLAKE2B 46d7f71b58eb45e764684fd4e4653b4827024090543a91225d4bb88d7739d2f4238c0d4ba13ab76cdbf23c25787c79203672e67a41fac73c5ab55917d2ffc0a9 SHA512 095507ed18283cc13121c11910dd13fc9a344e540d9cb9ca7eaa10a5a8e67c67ff98aabbbe816f2ca7d9fe6881da0f2a151b7d28abeab81e0773069a926918de
+EBUILD stargazer-2.408-r1.ebuild 17361 BLAKE2B 28865db200c061ce0e1bfe9b3fddeb527bed986608d8e2eace0d69f87fed514d93b8034aa0e8f986db1cf9590575f54f1928f9a2a6db254f1b76a349d63ec6ad SHA512 14565cd03606981febc297263fdd22ae6ef5718b85b225cac8d5dc7f64f929c1b2e047118a43c1c98c704fe75b1b3c2396885311cda51cc8a8779b6ae80e98f0
 MISC metadata.xml 4163 BLAKE2B 8b56f499cd2f996cef1d15ff7f01dffaa6f76577ac437b7e040a5b8c49272b2eed8f680d6f2ed8c9e2512326971aa5e5a66b06f408341af7add6caa076c74e9f SHA512 60e4a6fc5304feb38c6ccc5fa3dc69df9c600289a65779d6d957b0252262a371c1cca02ae51f4538c7d4d006d0b03040a18a478011a31656562d2e36fce668fa
diff --git a/net-misc/stargazer/stargazer-2.408-r1.ebuild b/net-misc/stargazer/stargazer-2.408-r1.ebuild
index 18d197b3ccb1..d8372e8418af 100644
--- a/net-misc/stargazer/stargazer-2.408-r1.ebuild
+++ b/net-misc/stargazer/stargazer-2.408-r1.ebuild
@@ -339,7 +339,7 @@ src_install() {
 		if use module_other_remote_script ; then
 			# Create subnets file based on example from mod_remote_script.conf
 			grep 192 "${S}"/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf \
-				| sed 's/# //' > "${ED%/}"/etc/stargazer/subnets
+				| sed 's/# //' > "${ED}"/etc/stargazer/subnets
 
 			# Correct permissions for file
 			fperms 0640 /etc/stargazer/subnets
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index a02bd0c44a8f..d1f78a6ba8b9 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,4 +1,4 @@
 DIST streamlink-1.3.0.tar.gz 694190 BLAKE2B cd262290cd81f1954567e217eaf9568c00180ee7f6955c8227b7067488d685385fe8b4b3bcd6004e7e8f7f66236696a48e744cb24c4d00f2111f00633ffeb1bf SHA512 5a114e0b1e617b2a41f8fe00f9bd6846843dd7643b4283d2fe30ea869cc9d6f495458b0ddb97955a87b7ad64e5628343262af5068b8a7a19d0d84a32020b3365
-EBUILD streamlink-1.3.0.ebuild 1992 BLAKE2B e39f67d0517b4d7203ab2fcd1c1739eac895b30fe94fd7c3052842253eda5a3cafc39296f8c34fa058a4984f844174e3407648de97bc9f1e035e38178d7e7eb3 SHA512 085b351ba808fe26230468ad3e3c0a3b577fd22e4186f8b9e4d4fd7866fc66d863d0b427a0744c787c1588c0802662d29abf4698e445ab7cbc9c50c071e24250
-EBUILD streamlink-9999.ebuild 1992 BLAKE2B e39f67d0517b4d7203ab2fcd1c1739eac895b30fe94fd7c3052842253eda5a3cafc39296f8c34fa058a4984f844174e3407648de97bc9f1e035e38178d7e7eb3 SHA512 085b351ba808fe26230468ad3e3c0a3b577fd22e4186f8b9e4d4fd7866fc66d863d0b427a0744c787c1588c0802662d29abf4698e445ab7cbc9c50c071e24250
+EBUILD streamlink-1.3.0-r1.ebuild 2159 BLAKE2B 06e4eedee820ca62d69137842c2ef3146c900a6cae3147579603894b29a031893af853132a37ccf31489cb03b110a2f2200f1cbcb1961bc8f428e101976dd699 SHA512 2396dbe90aa88d795fc818ab6e8e31abad0bd527ee848e3ce63f8335cbcad147458911d3284468acf2638701ed9fa8ba365b3547067d8f95684c6baebc215e3e
+EBUILD streamlink-9999.ebuild 2159 BLAKE2B 06e4eedee820ca62d69137842c2ef3146c900a6cae3147579603894b29a031893af853132a37ccf31489cb03b110a2f2200f1cbcb1961bc8f428e101976dd699 SHA512 2396dbe90aa88d795fc818ab6e8e31abad0bd527ee848e3ce63f8335cbcad147458911d3284468acf2638701ed9fa8ba365b3547067d8f95684c6baebc215e3e
 MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672
diff --git a/net-misc/streamlink/streamlink-1.3.0.ebuild b/net-misc/streamlink/streamlink-1.3.0-r1.ebuild
index 04417d2b4e75..28994a6a0f82 100644
--- a/net-misc/streamlink/streamlink-1.3.0.ebuild
+++ b/net-misc/streamlink/streamlink-1.3.0-r1.ebuild
@@ -30,31 +30,35 @@ RESTRICT="!test? ( test )"
 
 # >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too
 DEPEND="
-	virtual/python-futures[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		virtual/python-futures[${PYTHON_MULTI_USEDEP}]
+		virtual/python-singledispatch[${PYTHON_MULTI_USEDEP}]
+		>dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}]
+		dev-python/isodate[${PYTHON_MULTI_USEDEP}]
+		dev-python/websocket-client[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycountry[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_MULTI_USEDEP}]
+	')
 "
 RDEPEND="${DEPEND}
 	media-video/rtmpdump
 	virtual/ffmpeg
 "
 BDEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
+	$(python_gen_cond_dep '
+		doc? (
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+			dev-python/recommonmark[${PYTHON_MULTI_USEDEP}]
+		)
+		test? (
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests-mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+			dev-python/freezegun[${PYTHON_MULTI_USEDEP}]
+		)
+	')"
 
 python_configure_all() {
 	# Avoid iso-639, iso3166 dependencies since we use pycountry.
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 04417d2b4e75..28994a6a0f82 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -30,31 +30,35 @@ RESTRICT="!test? ( test )"
 
 # >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too
 DEPEND="
-	virtual/python-futures[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		virtual/python-futures[${PYTHON_MULTI_USEDEP}]
+		virtual/python-singledispatch[${PYTHON_MULTI_USEDEP}]
+		>dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}]
+		dev-python/isodate[${PYTHON_MULTI_USEDEP}]
+		dev-python/websocket-client[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycountry[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_MULTI_USEDEP}]
+	')
 "
 RDEPEND="${DEPEND}
 	media-video/rtmpdump
 	virtual/ffmpeg
 "
 BDEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
+	$(python_gen_cond_dep '
+		doc? (
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+			dev-python/recommonmark[${PYTHON_MULTI_USEDEP}]
+		)
+		test? (
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests-mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+			dev-python/freezegun[${PYTHON_MULTI_USEDEP}]
+		)
+	')"
 
 python_configure_all() {
 	# Avoid iso-639, iso3166 dependencies since we use pycountry.
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 9956ddda388a..6b00ae62b50e 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -3,6 +3,9 @@ DIST teamviewer_15.0.8397_amd64.tar.xz 12532076 BLAKE2B a66cc74961edb1eb28b38a77
 DIST teamviewer_15.0.8397_i386.tar.xz 13019240 BLAKE2B b14dc20b31d888297602baae65c9ec802e5104f8169090ca3f88b87814f58b81585b9d5b89bfe8478d767b30612ad05ccf2d6a659046c0c5e75bfa287436e06c SHA512 4e1d6101ae8a91e03c6580407857df76505dd216baf172de6a7d00ea308318b8b326f0d15e1d8819ede4d7d758c65608c4446abcfc52ba224e56ab11a623aa65
 DIST teamviewer_15.1.3937_amd64.tar.xz 12898448 BLAKE2B fea1d64c04c5c4f04237ab639b1faf1c6fb027fa5f4824f8a9c0ed31b52894c7a22130d0871dba98388ccf073a5393973350a3e3ea88f94bc5958196a6bb8934 SHA512 23fc65a676570c291184a5c89ce05998cb70ec822d764264de7afaffa47a862e3eb0a4ae9364064fa831165be901dc0b85cb5b79181b8b833638d720504dee5c
 DIST teamviewer_15.1.3937_i386.tar.xz 13443796 BLAKE2B aa9c5f3cd42a123c38a567a117c919c829e089e4c81cf4b6fca0559351895c3824b7a117ac7dc64c9f1129e0cd44dd2347e57644080559a86640a9d8bffbe62a SHA512 8054e5e3901d60bbf210b03209da8afaab03ba95529d1a107a23401a7561c5ee0c33a43837f84490667f0fa282fe8a74087473b7f51f604b675e87d87522302d
+DIST teamviewer_15.2.2756_amd64.tar.xz 12925536 BLAKE2B 94029edb0c333bbab3dc8ed0ad881fc5e5de820a4a92f578781456315d746d1fbf94e7b4d1b651c250c23a32247d2ccf9ba9f9fe839ba188e572ffacebd71630 SHA512 9227388efd819689bd852de62b1dbe122e7081cbec19ba4c96546dd8f889c8b87884fe53231f00f39030882bc150aefaaeedab7d9b3ff28315273d95303eaf78
+DIST teamviewer_15.2.2756_i386.tar.xz 13456056 BLAKE2B cd41db000d5d7fe67f888026146affcfd08495c4e275b1e66ffcc71224b75643713a6f59598eb94aae473d1ec3e9dd500c40e28017bec1f2d50f27f182a01ed7 SHA512 17c0da4599ae1c111ff1ac3069bbb7b613175253a13086c1d564e0ab268317e6249daa3453d686379b3c29cc5cd76a74c2e6654bed8326ee1c8f46e40cbb4888
 EBUILD teamviewer-15.0.8397.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14987d3c082a50e3ea35a142a5e93bbd90faba7620cff33969703cca89647606eff249f9082167fca314ca93839bd8ae39 SHA512 0d1281c28821cfc0db145931e661090af846fe62df96b6390c7c5cf18b5b5ed3d9533748c9611219ac01a330b79b6221001837ba65f064289fc05cc7355ca8d9
 EBUILD teamviewer-15.1.3937.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14987d3c082a50e3ea35a142a5e93bbd90faba7620cff33969703cca89647606eff249f9082167fca314ca93839bd8ae39 SHA512 0d1281c28821cfc0db145931e661090af846fe62df96b6390c7c5cf18b5b5ed3d9533748c9611219ac01a330b79b6221001837ba65f064289fc05cc7355ca8d9
+EBUILD teamviewer-15.2.2756.ebuild 4095 BLAKE2B e8a01b0e7e749396705fafd6c178d8e85159a9e4a282ea8ea74c0279e39dc7c5933f8f07883cb57d788cbddf7efb33aebf299c2ee23555fac30fbb6a17b47864 SHA512 177d58dc814db1a593af2f1f64871d8964d4bbdf67f56017dfe0ba60b12fe5f9225e9ff72320f0e0b5e18cb767db814b4ab30f9945729cc3b9bac1d83c20a3de
 MISC metadata.xml 353 BLAKE2B 6b23f0ea5f9e3bc076641d6991535e7069dab3abd3f30e1d1052580223ec1f2ad94a8b0f6dfc6ee0019cdb3f1b3ea31edc5bbd04579da77f866291922f4c675a SHA512 bb21752978f1cf4c9cabf6b5fad33e0dbb820d27a5dd3ef40fd54f4a86893b77cd994dfe77395ff8fdd69f4e0f805bca622486538a4781b0f30b55ffdcf1540d
diff --git a/net-misc/teamviewer/teamviewer-15.2.2756.ebuild b/net-misc/teamviewer/teamviewer-15.2.2756.ebuild
new file mode 100644
index 000000000000..96d0e2cc15fc
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-15.2.2756.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=${PN}${PV/\.*}
+inherit desktop gnome2-utils systemd
+
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
+		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
+
+LICENSE="TeamViewer MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/dbus
+	!sys-auth/consolekit
+"
+
+# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
+
+RESTRICT="bindist mirror"
+
+# Silence QA messages
+QA_PREBUILT="opt/${MY_PN}/*"
+
+S="${WORKDIR}"/teamviewer
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
+		-i tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_PN}" # install destination
+
+	# Quirk:
+	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
+	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
+	# when changing the ABI of one of its dependencies. According to the
+	# TeamViewer devs, this binary is an unused remnant of previous Wine-
+	# based builds and will be removed in future releases anyway
+	rm tv_bin/script/libdepend
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
+		fperms 755 ${dst}/${exe}
+	done
+
+	# No slotting here, binary expects this service path
+	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
+	done
+
+	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
+	# have the undesired result of installing subdirectory 'doc' in /usr/
+	# share/doc/teamviewer-<version>)
+	for doc in $(find doc -type f); do
+		dodoc ${doc}
+	done
+
+	keepdir /etc/${MY_PN}
+	dosym ../../etc/${MY_PN} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_PN}
+	dosym ../../var/log/${MY_PN} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "Please note that parallel installation of multiple versions of"
+	elog "TeamViewer is currently not supported at runtime. Bug #621818"
+	elog ""
+	elog "Before using TeamViewer, you need to start its daemon:"
+	elog "OpenRC:"
+	elog "# /etc/init.d/teamviewerd start"
+	elog "# rc-update add teamviewerd default"
+	elog
+	elog "Systemd:"
+	elog "# systemctl start teamviewerd.service"
+	elog "# systemctl enable teamviewerd.service"
+	elog
+	elog "To display additional command line options simply run:"
+	elog "$ teamviewer help"
+	elog
+	elog "Most likely TeamViewer will work normally only on systems with systemd"
+	elog "or elogind. See this thread for additional info:"
+	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/throttle/Manifest b/net-misc/throttle/Manifest
index 49a75419f7f1..028d6ea32c78 100644
--- a/net-misc/throttle/Manifest
+++ b/net-misc/throttle/Manifest
@@ -1,3 +1,3 @@
 DIST throttle-1.2.tar.gz 72501 BLAKE2B 8374d09f12f37f60a2dd52c5e3e08ef53af0862fdb51d530883f291b1d0ab2a1127dcc70a08d4179e3052788a84e9a8183db3dbb53ae8181e62fc3728005c7a3 SHA512 ec0a639e6fed5e4a5fbb32498a77e08e0b53f3d6ffdb1788a6b52480387c87c43a5d17507941c9660406721bdbd5d4eedd4d6f1c0153dc41dc44a2aae0f9492f
-EBUILD throttle-1.2-r1.ebuild 479 BLAKE2B 64fa1e6e898302aeb049c822184c1a69b10cae74c0e3317db8c99bb961271befa1bd29e9de87526f1f615422c031f604868802cbc0b8ce59aea6008187af3528 SHA512 7d72eb64002d2c808608e04f221c3eff80a91560e688776a0e9f7dbe55a4ff26ebcdaa698016def00be339a5fe16e8ed3003b10c167dff95a186b15edaa18794
+EBUILD throttle-1.2-r1.ebuild 496 BLAKE2B 9e392fb19dcacb23a04e27132d3e3e531c8ae6949cec238c2583522cd06cb1c4df03e80f173ba7112677824ae3821ec3976487d695bb44fedf0781ec03ad6d14 SHA512 c16d0db7a23dd04c811863b1bb2ba62bef673f029e9196842967ed60f0b9d8c35c007afbe2bc5067ad9ca350026dc21b337f4ae47f6082b9ce2513b17c5efb6f
 MISC metadata.xml 370 BLAKE2B a472fb5ba4c9dd2f9d29f932befe96a997d27ed559ca0173388d6c8ca842032a34f2b4df8f962f6a275bddc83cc7498d5c971b79e91c5f4ef1314d52c7b4f954 SHA512 39d066692873cf85dc75f2d6f5c566ac799aa1e2fdc6743915d19167913f92800ade4be1d101780fc011362757531d8f59615e3d150a160f7196a43314d64c69
diff --git a/net-misc/throttle/throttle-1.2-r1.ebuild b/net-misc/throttle/throttle-1.2-r1.ebuild
index a5112cba9fcb..15222cd4de12 100644
--- a/net-misc/throttle/throttle-1.2-r1.ebuild
+++ b/net-misc/throttle/throttle-1.2-r1.ebuild
@@ -9,7 +9,7 @@ inherit autotools
 # disappeared
 
 DESCRIPTION="Bandwidth limiting pipe"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~grobian/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest
index bcad5c421d61..e4d40d60aec2 100644
--- a/net-misc/uftp/Manifest
+++ b/net-misc/uftp/Manifest
@@ -1,16 +1,10 @@
 AUX logrotate 166 BLAKE2B a3da56439bae88709b8cea7d1631d6848ea9e63870a9e9ad2853889d3b9b16d11d09bbfa99a41e24b2ecb5e1134875190b99aa7056192fd16d7696560bbfb83f SHA512 77c7b0e17123432f39d43048d7c51b88b20cb5ef297d36e2be50f8816f956dda6ca300fa3053756ac9f9480699cec9c28fb5ad77e81eeac667ace55dbc61e88f
-AUX uftp-3.7_makefile.patch 2037 BLAKE2B a1bd4751b74c6d1b3edfa914575235a8ad135dd18e70ee31bd83bc8aa475d7f447ba0254ae7a094c7326f09e580fb4693d33ce16afeb839a3a5e27d26bd30fa8 SHA512 1fc5109626a8a46bd9bd05348cbfc957a524827c5f165f1f991f7887319f735ae90dab6bad91a96d7c6bae7e2c07e26ebcbd91b9a595b97d8b1b6d79e496e899
-AUX uftp-4.9.4_makefile.patch 1502 BLAKE2B fc5b2b07f250b16bed1386c31850dcab1fd854c8db2232190559855fb45c0608b35e4e5accd3c93cce198c792b36f31f5705b068371a94780cb841772c61846f SHA512 41a2c9f6f572eacb2c503f578ab3c4baf6c9e1ffb92b7831da2e122e1b99c2fed2e82811ec0fb2f98cee684b395981cd83ae2f50dacfc7234210c91c6d3ce87e
+AUX uftp-4.10.1_gcc10.patch 624 BLAKE2B db832be23f45ed2aac0ecab15ce9c2cdbdefa9502e8bd3f9a90ae0bdf5b5371ac48cacb793a95c871148963ebd637156e9384223fe2c3eda6579350cefd128ab SHA512 82f0ec11196ee4f2aa2c32fd6a66e7effd03f7d3b3ac609640c850c33d85090c952ebea530076a4f18575c3c8a02ce34bc6b4975d3970c8333f3159a53143980
+AUX uftp-4.10.1_makefile.patch 1502 BLAKE2B fc5b2b07f250b16bed1386c31850dcab1fd854c8db2232190559855fb45c0608b35e4e5accd3c93cce198c792b36f31f5705b068371a94780cb841772c61846f SHA512 41a2c9f6f572eacb2c503f578ab3c4baf6c9e1ffb92b7831da2e122e1b99c2fed2e82811ec0fb2f98cee684b395981cd83ae2f50dacfc7234210c91c6d3ce87e
 AUX uftpd.conf 169 BLAKE2B 13e8d47f9a2b79f7e6c81d3a4aed80bbffa2c3195981b67eafce3801faf50b5ea2570de36634dd3e36b526f721e14259ba7b79a95f35c8e98d85fe6b95b9525f SHA512 732a3e7f5eb1eec609f05d6c075ea11b16bdd9abcdc9528dacf7fbc148e2249306226fd5975b39956758d0b237b0d59b97e7c602451639fe7db19c43ae4f39f9
 AUX uftpd.init 518 BLAKE2B b4a98852340d03a5bb8673faff02f7f18a5a27b87d22aebaf19753d836250c7d4519598049d41b9cf81832c18cc7a1726664bf647cceb92b2457a811df54ea8a SHA512 4008611d6a8f7e4c960269526761b9c5b2b7446bf1795983a62fb5fc12b4525ecd2e0e42ff2fb7d937e427d9d77834a2b6836db1242269fad7b09f92952c53b8
 AUX uftpproxyd.conf 121 BLAKE2B 82664d638b8a4041a5c18676e46509c3ed20525b7178ada1fa902f41f57a78c5e465b22701bd369e26ea65ebf4fe5834f7b23f4fcebd6d87850ed8fd93e58f40 SHA512 c61441d048ce99a50b5224cea7c4f9f1a2532fff8083a9a71e6099a98cba1fe79b43825188034efd402b47ac28bbe341827cb21872c17550419db36a8da7bb35
 AUX uftpproxyd.init 522 BLAKE2B a7a4df565d5dfa2761068adfa3dc440030269cc0d809c892807a2582df36882b2cc489de608ed0baa85f6714d15e7a3ec3f00895324fe1f6a521c3ca8ffd9ccb SHA512 2d69f0b84750cb62fb96b7fc7a042fe54b6f658074f9c4c49a2bf4957507fce333862ae95fd0498e60240490ce44cd299b8fba851d4d7c9a67dcdf1e7f29d7f5
-DIST uftp-3.7.1.tar 849920 BLAKE2B 32a2ccca01f4b8ee205301a2bb4ac30da4f17bf0d8a24f885ec40a430b2cc478efcd504ba118ef7f55c43ef53a6fb3e6caa2e2cebda93c254ab289a8683488a6 SHA512 93fefe1d4c5310bfa6470a78011e63aea8cc9cf59a73ea24920d3ad8c835476bbc410b3669ee79c847eba7d21d61f600e09529d5e6f2ed24076f663a34d99c15
-DIST uftp-4.9.4.tar.gz 243819 BLAKE2B b7aa75f8db82480912dd4cf8199dce7e8170db837853f16a2d8e5a4b7cf190416b7a2a23e170a4837f59a7bba030b0434383bceae9b253eb1d2fc13f6fcd26e7 SHA512 f3c799265a55e0cb536f17be3a0ebfad5f81284255083ebe9a12fda4b5ce8407f05a710cb32a41f3dccbc0ac90367c44d4b67058bdbeaa4f2f8efe732463ebf0
-DIST uftp-4.9.5.tar.gz 243999 BLAKE2B 32f6e6fef062e3b0696db775f2e925fdd53f03d8e04181f65140372abc85674b90579ea4b0c48cf21378c97552d06374005e70b6f1e9af7c03b7478d0b86e26c SHA512 3a4809cc61555ee26de6c1e1ac8525c0345a3b9555cf0a2094ff06eb6f409d1b3ca16b94d7b953dba6d1ae1d8c69a646d575a6357cd178c374bef68888744086
-DIST uftp-4.9.8.tar.gz 244855 BLAKE2B bdb5b5caffbfbfaf8d7aa71e675a98240e64b27b6386088c9a096202f32e825a1cd9bed933b5242601c9ff7c5c2afb4c43190b2335a2a73c0dd0b51caf74a1cf SHA512 04875ddc59cdd9cfa88d642aeb9ea4418a99eca12057f54c949ec5aecee85a8a78803ebdeefe11a29a298a151bb5eb19d6c6c5656f26e17639a86308a2946ef5
-EBUILD uftp-3.7.1.ebuild 1062 BLAKE2B eab032956e3170de02ad65e543011be42260335cbe51e30acde9509a6b15a10f98ade2bd284293a27906484c4281bd7549569543df68ae1af6b4c2fcd5160b13 SHA512 59352a391e6b7aceff3939ea588a6be4859b1b62333451b26978ad0b08eb3d1cd7b90c0e3e4a5d84c1fac86741ce43ffc9ec5bfb64c697ccb02079cd1b5f6006
-EBUILD uftp-4.9.4.ebuild 1268 BLAKE2B f0f5346bc945ded6924a601256d95e997c9a626a3b770f849e35b73a380ab319ca30e3ef8b211f7aed256fb0e1d214291943b730b6b9b52b23bdd8b0cf48fb82 SHA512 1ae279fcaa4e627fd212465e73de1d1b1bb18491de290fd0cce5c945c07c43eca7f35421ff589fe1fc33b35bf057d938519cb32d327fd5bf88de1e7a27fe5612
-EBUILD uftp-4.9.5.ebuild 1366 BLAKE2B 155a929dc9a2eba399f0842ca73a4187a91bf4c6c5399f70a26e27026e3d25fd7c404278cf09ea73f4c3e215a31928b2a189905a7ba924d3894e2c22fab58013 SHA512 9812a24f7988ccbbe8a905ec0c0c0423b1f2aa178ab53b2270bbdd5a0dbbee376e0400128bea6a9c3416071952f22125f2a6e4bb038c7ffa10bff81b807198e2
-EBUILD uftp-4.9.8.ebuild 1363 BLAKE2B dd637e4fe96458b3b7db4053be4d15e71914e215daf3cf89f530ece8bdbfb509de3608d6250e7a0a06bfb41d83e3ab3a340096bd613c7380e650cf4a9ecd36cb SHA512 78f403d2293de619115214fba140cc4e28e76cd5995cb0e97f0886d4da2418d3fe31ba511f8f206427d28c47709ed5d440e4dca778aa664108bed23490fc7005
+DIST uftp-4.10.1.tar.gz 245625 BLAKE2B 23b01758fa5a0387471f8d95b24738d8157801822b8a07a59072eeab81277ceb5283463465ed522af6971d65141712ead3e2206caa286bedece9e0c34a149873 SHA512 9ef4594e0cde2f64970523661fcee07f34600bd4f2ab235c34bde9d20ef1b0312d5e430e1f52ab605c188c42aee4a0384ed02ae9f5e93b3edc062f848a8130bf
+EBUILD uftp-4.10.1.ebuild 1434 BLAKE2B 9f722def7df49faac8b15fd3cca37ff19764fc6c53bb66dfb913cb1711c0a8c5553d0b4436606fcc7d38a0f499fa247f37cd5bc56de604969915b7e276b4e81e SHA512 3e4d228f59647135a0c56654f5d54af7da10a48d69e356c6bb805397434b2bdd51ec62a68596003f6672cfb62aa75ea981cea2c642bb6b9f6aa7f7b862962e81
 MISC metadata.xml 433 BLAKE2B 0c732cc29ed317b29aa5c7313ebf825e62835325c1c44f1e39bbf2893d40335b3458ddf9263132fc858d28ac8c66876f39bdccbfdc376c87c955e8f09eba7171 SHA512 7e63ff9bed7a90bc94ac2f0441b6f089e5f38d08afb47c5513b09bb6ee2b5fca756a20401d622548c129b540a0b93dba882c38e5ac69dcca9ec72e4c4c9e7686
diff --git a/net-misc/uftp/files/uftp-3.7_makefile.patch b/net-misc/uftp/files/uftp-3.7_makefile.patch
deleted file mode 100644
index 81afe8b9baae..000000000000
--- a/net-misc/uftp/files/uftp-3.7_makefile.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Nuar uftp-3.7.orig//makefile uftp-3.7/makefile
---- uftp-3.7.orig//makefile	2012-08-10 17:00:22.566403478 +0600
-+++ uftp-3.7/makefile	2012-08-10 17:04:47.523386683 +0600
-@@ -39,25 +39,26 @@
- endif
- 
- # defaults
--CC = gcc
--OPTIONS=-g -Wall $(ENC_OPTS)
-+CC ?= gcc
-+OPTIONS=$(ENC_OPTS)
- LDLIBS=-lc -lm $(CRYPT_LIB)
--CFLAGS=
-+CFLAGS?=
-+LDFLAGS?=
- 
- # FreeBSD
- ifeq ("FreeBSD", "$(UNAME_S)")
--OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
-+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
- endif
- 
- # OSX, aka Darwin
- ifeq ("Darwin", "$(UNAME_S)")
--OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
-+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
- endif
- 
- # Sun
- ifeq ("SunOS", "$(UNAME_S)")
--CC = cc
--OPTIONS=-g -DBSD_COMP $(ENC_OPTS)
-+CC ?= cc
-+OPTIONS=-DBSD_COMP $(ENC_OPTS)
- LDLIBS=-lnsl -lsocket -lm $(CRYPT_LIB)
- CFLAGS=`getconf LFS_CFLAGS`
- OPENSSL=/usr/sfw
-@@ -65,9 +66,9 @@
- 
- # Linux
- ifeq ("Linux", "$(UNAME_S)")
--OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
-+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
- LDLIBS=-lm $(CRYPT_LIB)
--CFLAGS=`getconf LFS_CFLAGS`
-+CFLAGS?=`getconf LFS_CFLAGS`
- endif
- 
- ifdef OPENSSL
-@@ -82,7 +83,7 @@
- testclient_multi.o: testclient_multi.c uftp.h uftp_common.h encryption.h
- 
- testclient_multi: testclient_multi.o encrypt_openssl.o uftp_common.o
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- clean:
- 	rm -f testclient_multi uftp uftpd uftpproxyd uftp_keymgt *.o
-@@ -176,16 +177,16 @@
- endif
- 
- uftp: $(UFTP_OBJS)
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- uftpd: $(UFTPD_OBJS)
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- uftpproxyd: $(UFTPPROXYD_OBJS)
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- uftp_keymgt: $(UFTP_KEYMGT_OBJS)
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- %.o: %.c
- 	$(CC) $(OPTIONS) $(INCLUDE) $(CFLAGS) -c $<
diff --git a/net-misc/uftp/files/uftp-4.10.1_gcc10.patch b/net-misc/uftp/files/uftp-4.10.1_gcc10.patch
new file mode 100644
index 000000000000..d25de61465dc
--- /dev/null
+++ b/net-misc/uftp/files/uftp-4.10.1_gcc10.patch
@@ -0,0 +1,14 @@
+diff -Nuar uftp-4.10.1.orig/proxy.h uftp-4.10.1/proxy.h
+--- uftp-4.10.1.orig/proxy.h	2020-02-06 17:30:34.904020513 +0300
++++ uftp-4.10.1/proxy.h	2020-02-06 17:30:49.214021144 +0300
+@@ -167,8 +167,8 @@
+ extern int proxy_type, debug, rcvbuf, dscp, keyfile_count, keyinfo_count;
+ extern int hb_interval, priority;
+ extern unsigned int ttl;
+-char portname[PORTNAME_LEN], out_portname[PORTNAME_LEN];
+-int port, out_port;
++extern char portname[PORTNAME_LEN], out_portname[PORTNAME_LEN];
++extern int port, out_port;
+ extern union sockaddr_u down_addr;
+ extern int have_down_fingerprint;
+ extern uint8_t down_fingerprint[HMAC_LEN];
diff --git a/net-misc/uftp/files/uftp-4.9.4_makefile.patch b/net-misc/uftp/files/uftp-4.10.1_makefile.patch
index 5a131c350a56..5a131c350a56 100644
--- a/net-misc/uftp/files/uftp-4.9.4_makefile.patch
+++ b/net-misc/uftp/files/uftp-4.10.1_makefile.patch
diff --git a/net-misc/uftp/uftp-3.7.1.ebuild b/net-misc/uftp/uftp-3.7.1.ebuild
deleted file mode 100644
index 41aed30ba67b..000000000000
--- a/net-misc/uftp/uftp-3.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Encrypted UDP based FTP with multicast"
-HOMEPAGE="http://www.tcnj.edu/~bush/uftp.html"
-SRC_URI="http://www.tcnj.edu/~bush/downloads/${P}.tar"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+server ssl"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7_makefile.patch"
-)
-
-src_compile() {
-	use ssl || local opt="NO_ENCRYPTION=1"
-	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
-	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
-}
-
-src_install() {
-	dobin uftp uftp_keymgt
-	dodoc ReadMe.txt
-	doman uftp.1 uftp_keymgt.1
-
-	if use server ; then
-		dosbin uftpd uftpproxyd
-		newinitd "${FILESDIR}/uftpd.init" uftpd
-		newconfd "${FILESDIR}/uftpd.conf" uftpd
-		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
-		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-		doman uftpd.1 uftpproxyd.1
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/logrotate" uftpd
-	fi
-}
diff --git a/net-misc/uftp/uftp-4.9.8.ebuild b/net-misc/uftp/uftp-4.10.1.ebuild
index 08943133b714..9fb44efca5f8 100644
--- a/net-misc/uftp/uftp-4.9.8.ebuild
+++ b/net-misc/uftp/uftp-4.10.1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
 DESCRIPTION="Encrypted UDP based FTP with multicast"
 HOMEPAGE="http://uftp-multicast.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
+SRC_URI="https://download.sourceforge.net/${PN}-multicast/source-tar/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+server ssl"
@@ -22,7 +22,8 @@ RDEPEND="${DEPEND}"
 RESTRICT=test
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.9.4_makefile.patch"
+	"${FILESDIR}/${P}_makefile.patch"
+	"${FILESDIR}/${P}_gcc10.patch"
 )
 
 src_compile() {
@@ -34,7 +35,7 @@ src_compile() {
 src_install() {
 	dobin uftp uftp_keymgt
 	dodoc {Changes,protocol,ReadMe}.txt
-	doman uftp.1 uftp_keymgt.1
+	doman {uftp,uftp_keymgt}.1
 
 	if use server ; then
 		dosbin uftpd uftpproxyd
@@ -42,7 +43,7 @@ src_install() {
 		newconfd "${FILESDIR}/uftpd.conf" uftpd
 		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
 		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-		doman uftpd.1 uftpproxyd.1
+		doman {uftpd,uftpproxyd}.1
 		insinto /etc/logrotate.d
 		newins "${FILESDIR}/logrotate" uftpd
 	fi
diff --git a/net-misc/uftp/uftp-4.9.4.ebuild b/net-misc/uftp/uftp-4.9.4.ebuild
deleted file mode 100644
index 74358db417d4..000000000000
--- a/net-misc/uftp/uftp-4.9.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Encrypted UDP based FTP with multicast"
-HOMEPAGE="http://uftp-multicast.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+server ssl"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}_makefile.patch"
-)
-
-src_compile() {
-	use ssl || local opt="NO_ENCRYPTION=1"
-	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
-	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
-}
-
-src_install() {
-	dobin uftp uftp_keymgt
-	dodoc {Changes,protocol,ReadMe}.txt
-	doman uftp.1 uftp_keymgt.1
-
-	if use server ; then
-		dosbin uftpd uftpproxyd
-		newinitd "${FILESDIR}/uftpd.init" uftpd
-		newconfd "${FILESDIR}/uftpd.conf" uftpd
-		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
-		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-		doman uftpd.1 uftpproxyd.1
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/logrotate" uftpd
-	fi
-}
-
-pkg_postinst() {
-	if use server ; then
-		ewarn "Please note, uftpd 4.x server is not backward compatible with"
-		ewarn "uftp 3.x clients! Please upgrade clients before servers."
-	fi
-}
diff --git a/net-misc/uftp/uftp-4.9.5.ebuild b/net-misc/uftp/uftp-4.9.5.ebuild
deleted file mode 100644
index a596a8380bbd..000000000000
--- a/net-misc/uftp/uftp-4.9.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Encrypted UDP based FTP with multicast"
-HOMEPAGE="http://uftp-multicast.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+server ssl"
-
-# openssl with EC required, see #644674
-DEPEND="ssl? ( dev-libs/openssl:0=[-bindist] )"
-RDEPEND="${DEPEND}"
-
-# Workaround, see #644670
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.9.4_makefile.patch"
-)
-
-src_compile() {
-	use ssl || local opt="NO_ENCRYPTION=1"
-	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
-	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
-}
-
-src_install() {
-	dobin uftp uftp_keymgt
-	dodoc {Changes,protocol,ReadMe}.txt
-	doman uftp.1 uftp_keymgt.1
-
-	if use server ; then
-		dosbin uftpd uftpproxyd
-		newinitd "${FILESDIR}/uftpd.init" uftpd
-		newconfd "${FILESDIR}/uftpd.conf" uftpd
-		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
-		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-		doman uftpd.1 uftpproxyd.1
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/logrotate" uftpd
-	fi
-}
-
-pkg_postinst() {
-	if use server ; then
-		ewarn "Please note, uftpd 4.x server is not backward compatible with"
-		ewarn "uftp 3.x clients! Please upgrade clients before servers."
-	fi
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /net-misc
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)