gentoo resync : 17.07.2021

14 files changed, 77 insertions, 231 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index c05c770f7799..f8d5ea0471ef 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/automatic/Manifest b/net-p2p/automatic/Manifest
index db39dcace054..7f24dee94534 100644
--- a/net-p2p/automatic/Manifest
+++ b/net-p2p/automatic/Manifest
@@ -4,5 +4,4 @@ AUX automatic.logrotate 94 BLAKE2B 6f505920dca44514ccec80d4bd917c5254d6955aad195
 AUX automatic.service 303 BLAKE2B 90b2d3ed19c6347b31b90bca68f482d580f56b62212eea17b6d0b8a10bd7ee15ea3937ece839485da7efba4d61597c032f1dccd9fc0802967f7bf0fbf33f6b4d SHA512 4e398133d71b834855d77c6d23f8d4ae87100c48661825797ccfc0e7613933a2a8dd4eddffeac51ffbaa1619847d2e2de0b4ecb20bfa1b13f9596cb57cda392c
 DIST automatic-0.8.3.tar.gz 102181 BLAKE2B cdba7706f16eb552d2da960ae03206acce45149d6e8d8f32654c05b6dc3293368afe3c44a7c0d254fd895c7f5fe30fe541139375793a143c4a3d605d27486824 SHA512 34061065d53ab362c9bfab9b66aebf7090b7079e5988b1984398410ab07ca2bdfdf3c65dd90bb076b6189120877784294484803d4ce5fa813d3bc13207aeebdd
 EBUILD automatic-0.8.3-r1.ebuild 1712 BLAKE2B b0468fb8ab99eec1a00d3b8f5605cc21350d5dfa18a5560bae79668b2fbc5ab6059fc2f408bd4a1c86c7e0b98b88db1445d8167dd99c2054dc13497d47587d60 SHA512 23b3bc1f2d035f8b16593f4ab730ac88a900c00985fa28fc8909c0aaae9d3ea2f6456239ad245abd9588070b9015e5407a16b02d40a0d664338881104e329caf
-EBUILD automatic-0.8.3.ebuild 1625 BLAKE2B 7b6d3dd41a9de064b13f17aca11dfa4c0e611547ab24cbc2aada82faa54cadc6b1df0845c8fb983282d39894f426a496322a7fcc7b87764c330735b1bf0aa44c SHA512 3b5f8123160274ec07c4e12d57ba6a182e4340ab4a2ce2bd39d05d7e93a5acad8aa3dbc5bad6a866a206eeb7724393845a28f9c02ea1635c7bfbaef33f343a94
 MISC metadata.xml 724 BLAKE2B e0857678dafe9aee71474b61bfa686da4819ef7acdfc156387e4b75438b2fadd70039cafb30b395ef201ee2308987bd0762fa2a81c7cf5668c7f66f2510d8664 SHA512 e1a244c20a21e91d017b5c391eb8e065b496529bafd77daee94fdf3d4af3099b2f02186a7204453675dd81f66b0fe711fabdcbd20456d89a011a124fa4757004
diff --git a/net-p2p/automatic/automatic-0.8.3.ebuild b/net-p2p/automatic/automatic-0.8.3.ebuild
deleted file mode 100644
index 3eb191d1c6b1..000000000000
--- a/net-p2p/automatic/automatic-0.8.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools user
-
-DESCRIPTION="RSS downloader for Tranmission"
-HOMEPAGE="https://github.com/1100101/Automatic"
-SRC_URI="https://github.com/1100101/Automatic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/${P^}"
-
-RDEPEND="dev-libs/libxml2:2
-	dev-libs/libpcre:3
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	app-admin/logrotate"
-
-src_prepare() {
-	default
-
-	# https://bugs.gentoo.org/426262
-	mv configure.{in,ac} || die "rename failed"
-
-	# Remove CFLAGS and CXXFLAGS defined by upstream
-	sed -i \
-		-e 's/CFLAGS="-Wdeclaration-after-statement -O3 -funroll-loops"/CFLAGS+=""/' \
-		-e 's/CXXFLAGS="-O3 -funroll-loops"/CXXFLAGS+=""/' \
-		configure.ac || die "sed for CXXFLAGS and CFLAGS failed"
-
-	eautoreconf
-}
-
-src_install() {
-	# Install and copy documentation
-	default
-
-	# Install Gentoo init script and its config
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	# Create automatic related directories
-	keepdir /var/lib/${PN}/
-	keepdir /var/log/${PN}/
-
-	# Install logrotate for automatic
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	# Add automatic group and user to system
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-
-	elog ""
-	elog "To run automatic you should move /etc/automatic.conf-sample to /etc/automatic.conf and config it."
-	elog "If things go wrong, increase verbose level in /etc/conf.d/automatic and check log file in /var/log/automatic/"
-	elog ""
-}
diff --git a/net-p2p/go-ipfs-bin/Manifest b/net-p2p/go-ipfs-bin/Manifest
index d7dd2301c708..1a1d3f2b330b 100644
--- a/net-p2p/go-ipfs-bin/Manifest
+++ b/net-p2p/go-ipfs-bin/Manifest
@@ -2,14 +2,9 @@ AUX ipfs-at.service 354 BLAKE2B 77bf7a265a0b29945e6661d03f9deec5884076f24afffc9e
 AUX ipfs.confd 30 BLAKE2B 7ecaa40f2a4097690f9d8091da5891e0bbfb0f298bed4a59769c8d0ef978a2471865a01177950da5869b61f3b8c124f43eab97daf297c06efecdc25785a5846d SHA512 c55afeb3efe381d18258ddf00f58325b77156375cf223fb2daa049df056efe22e9139cce0f81dc4c73759dad5097af5f3201414beb5950bd894df9ae8c7c4ed1
 AUX ipfs.init 464 BLAKE2B f5927ab792427a87c330772fca4adc177ae84899be5c6b856f763d6e71d1cbdf1d151bf6eea46ff13ba5ce5996a55468a4749d37c1e8306c4d07f897f17430a1 SHA512 6616a0114039a7c178ee9788c748e4abf143a875df2a9d6d823249d7adef2024cd3f537cf45a624e76751792e8c24b1d42b0dd536686b14d6f53f59ca53ca1f4
 AUX ipfs.service 364 BLAKE2B c3d87df9588d6faed1710c592a5f3b2b1baad5442ee9fd63435d8ffff0f4e441afdded35f703c3bc56b505f99b61ac7c1ff3859e0251b87195cf4ed24abc1502 SHA512 dd0943c2b76cf73b686af3d69aac7321036f548b19c662c107ce51a34f8786fd80075e1369f4ed8d2b67280db93bf9772a3ca85e41f126d88e45604473e0d5c9
-DIST go-ipfs-bin-0.4.22.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
 DIST go-ipfs-bin-0.7.0.bash 21018 BLAKE2B 81150944c71fe86b07db8bc2240899cb95637e74e05dd898c2aabd26e47b7222d6e79d4270c4a681450d8d148cf5dcf96d4376de110e6221943e0214ebf1bf61 SHA512 3a5259147652beda38b32e8fa13165775dfd7116ffdc839e350bb8009197c18dc03a69bd3a62233de0ace5fd52e76b6b1d9e88df888ec268e98519b5a35fe89c
-DIST go-ipfs_v0.4.22_linux-386.tar.gz 18865892 BLAKE2B 4ff67301ce6eec8cb38015f6dba16e10ee1fa3efffb47b2c3a9fe76fba875907ccd53ec011abe5b496de4dd2dff0a30f4e526e232f47c174b83004efdcc30764 SHA512 a6d16217412d1be0cdc0a2df604740054758b767994bbcb7ffc745abd90c64c28031b543bcb5589c715fa7115effc9a3b898ada8ad96c604507b428ed2538378
-DIST go-ipfs_v0.4.22_linux-amd64.tar.gz 20900056 BLAKE2B f068c367fb454a62c76f9828927aae0870f54853d0aeddfe6ca774490107c26df88ce41efa016732dffaf269d3dc2d16e1744f9cc35d4f86e355744eb3172a10 SHA512 49b99fec741d67f7bad8fb6fbbd984967f06dfc3de846d10dca34b166f621a182d12f13cf5ccf4e4f33747b67cede6f4205b4cd9b57ce5244128d1385ec82c85
-DIST go-ipfs_v0.4.22_linux-arm.tar.gz 18199193 BLAKE2B 25316649add6256c4f12efb9bb43848e2049cc7bcbe89dbe77309e1cf793e2ebd28559a05d0974af53488c414a26c28499d80f2f13f80454d4217019c58edc65 SHA512 c803964828ccbac40797e58dc82d10bdf899db26ef71ddd2443882bd4f84ff4a5aee4995a04135cb31b8f991381ce8004c51b06501aaef4d58dbcac239519822
 DIST go-ipfs_v0.7.0_linux-386.tar.gz 22038249 BLAKE2B 85c85948d69dcec0c73ac38bad4eb4cd65ef7148199a6afcdf7f419981a12db3d37f4923746feaa608bbcf455065570e264039020c5517f8b0a5ffa163bf4177 SHA512 f2e8db09918aed702f4c952ff014612e06ee59a24f1b796a7d0c56300b82caf388c0201506a174de34aa0e9f0a646e2792a521ceab947d65d82386aefd54799b
 DIST go-ipfs_v0.7.0_linux-amd64.tar.gz 25954590 BLAKE2B 0bd139f77272ac9d5e4e1f3caa8a4967d17ba8fa9caa4eb4859933423c882844eca5403ca90a2cbeae95f080eb21bd64c7f46a391eac3d5717a5e2dcbf2d8aac SHA512 1d5910f27e8d7ea333145f15c6edcbacc1e8db3a99365f0847467bdfa7c73f4d7a05562e46be8e932056c8324ed0769ca1b6758dfb0ac4c2e1b6066b57c4a086
 DIST go-ipfs_v0.7.0_linux-arm.tar.gz 21087228 BLAKE2B ec3122077a487726fe227816f97462bf9caf40d30c44ff6bf67e6266eda7cfff456855cdf8f91c1bc01dcca58b0e76cc931c05179326414e39adb6bf4d7fae18 SHA512 a1a9b6e2833da94d9059f1d03e30e7349ab4f00fc0e8580909f35dbb28f0fdf6cea712a96928f72aa2fadf3efc1328187f4fc863e5ce74e4be699542e262a904
-EBUILD go-ipfs-bin-0.4.22.ebuild 1325 BLAKE2B 347eff8b98a137099b9b4d36ba64ce773da594dda87073099c36c3a337912f61ab67da7c8a179ee229fefb5d600bed892f24dd470b872c5982d94675ab3da4d9 SHA512 bf0eb3b77f96471fb63a13caf1e87dc19dbd2748882a0b3c9c72ac67fd3f6c350f07ffb22d0f80146f88b30bb3b5d152cff442e499c0bff41fb0cca2fbd64c94
 EBUILD go-ipfs-bin-0.7.0.ebuild 1300 BLAKE2B 189949433e69e43b7f8164824b31a4138e2e78fac07d9d82b4618fc0cec1ba3378082ed16af2d6f00169d6def2c3938ae877bf1cade90f6881a2087201fb1938 SHA512 08e4c322aa2fbfe49a2221077d8954029dc6459f5a91d8b723b4c773176fdccce6a83f18fd30311d5be242760c13804344f5d3d0c3f5de1bf1a00bd84bf72e21
 MISC metadata.xml 521 BLAKE2B 7d136cffdae521412f8934493a623e3ac749f70b06c90cf76937dd12ba26ad3b3565d8350626f906195f85961e6bccab3032680012ab58cc344b191823ebe4e8 SHA512 ac4f1bdff15ad8dd25faa2ad2ebef168e372b45ee3cb4268e1c2484a8dc5eba554f42919e569cb39682855732397b639152025012d6fa177d691a7d1155e09b8
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.22.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.22.ebuild
deleted file mode 100644
index c4af0136eb9e..000000000000
--- a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.22.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 systemd
-
-DESCRIPTION="Main implementation of IPFS"
-HOMEPAGE="https://ipfs.io/"
-SRC_URI="amd64? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-amd64.tar.gz )
-	x86? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-386.tar.gz )
-	arm? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-arm.tar.gz )
-
-	https://raw.githubusercontent.com/ipfs/go-ipfs/v${PV}/misc/completion/ipfs-completion.bash -> ${P}.bash"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
-
-RDEPEND="
-	acct-group/ipfs
-	acct-user/ipfs
-	sys-fs/fuse:0
-"
-
-S="${WORKDIR}/go-ipfs"
-
-QA_PREBUILT="/usr/bin/ipfs"
-
-src_install() {
-	dobin ipfs
-
-	systemd_dounit "${FILESDIR}/ipfs.service"
-	systemd_newunit "${FILESDIR}/ipfs-at.service" "ipfs@.service"
-
-	newinitd "${FILESDIR}/ipfs.init" ipfs
-	newconfd "${FILESDIR}/ipfs.confd" ipfs
-
-	newbashcomp "${DISTDIR}/${P}.bash" "ipfs"
-	keepdir /var/log/ipfs
-}
-
-pkg_preinst() {
-	fowners -R ipfs:ipfs /var/log/ipfs
-}
-
-pkg_postinst() {
-	elog 'To be able to use the ipfs service you will need to create the ipfs repository'
-	elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)'
-	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
-}
diff --git a/net-p2p/go-ipfs/Manifest b/net-p2p/go-ipfs/Manifest
index 8feb2e3b70cb..d818d1598035 100644
--- a/net-p2p/go-ipfs/Manifest
+++ b/net-p2p/go-ipfs/Manifest
@@ -1745,4 +1745,4 @@ DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f36
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
 EBUILD go-ipfs-0.7.0.ebuild 82738 BLAKE2B eefa46f1053c9716dd43a8ae120736781adfed53be40f9f9602aae273aa9f1d28f28c05c50721e4be446b9ba6bc36a046aa1f103d6031ff643aeac597fc22bc2 SHA512 38a823e3878a19fbef7be5fe8356606b34a1156642a5940de9b38b28ef7da656dad9f34b1ca3a40e92e6250219ffe8a575e2bb0178a2c6bb63c69503e8a09dcf
 EBUILD go-ipfs-0.8.0.ebuild 75130 BLAKE2B 4831e021e5501bf17e2e6b0629dbcd02c4b8d66cb05b9d988c1886bc2ebcf22170c7337feb5ebe150bb7dfccbb12bbd8fe0fc7ac223e172cc1c2b3845d7e45ed SHA512 3dd920602303f27eb6bdfabd6535aad97d7cbb4417aebbb4be5d2c8ab82163037b43ae3d699113b432d7aa200e446f069048945a40329fc9c65e9e3d57940928
-MISC metadata.xml 396 BLAKE2B 264f50317693f9929b7995e1188ffe4ab7616fbdb9be8a5a445cf03dfb9fed58742a11ab6df154c20395441195c64fb3ee68278612478527579f3beec202c0e0 SHA512 0632b981dc48dbd6432ef940c5a8e8c3836773e14a67bb81bde469410b6bdace1c4eeb7d27ff6ac72291213d201435f9f884535378bedfe7957d72240cf707c2
+MISC metadata.xml 521 BLAKE2B 7d136cffdae521412f8934493a623e3ac749f70b06c90cf76937dd12ba26ad3b3565d8350626f906195f85961e6bccab3032680012ab58cc344b191823ebe4e8 SHA512 ac4f1bdff15ad8dd25faa2ad2ebef168e372b45ee3cb4268e1c2484a8dc5eba554f42919e569cb39682855732397b639152025012d6fa177d691a7d1155e09b8
diff --git a/net-p2p/go-ipfs/metadata.xml b/net-p2p/go-ipfs/metadata.xml
index 72bff73de1e0..744411f3075f 100644
--- a/net-p2p/go-ipfs/metadata.xml
+++ b/net-p2p/go-ipfs/metadata.xml
@@ -5,6 +5,10 @@
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>hurikhan77+bgo@gmail.com</email>
+		<name>Kai Krakow</name>
+	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index bef4402c52d1..4e6ed0f6de68 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,3 +1,3 @@
-DIST gtk-gnutella-1.2.0.tar.xz 20467452 BLAKE2B 8884c74e5c7ba52ce870289579cb26608fd8eb0fff14986fba40e200181e28908aa42c7a345f1c69dd5b1099135b4a0458d266abdf94361cc0a37b8949867322 SHA512 8d4da23acce22af42b39ca4af2ee4d250cadea9f8c549d712ffdfb797b53311ce8db9fcb38bc1f5547b7df32e95ebc53676bff1127805e867b23d0598b1fa4cd
-EBUILD gtk-gnutella-1.2.0-r1.ebuild 1879 BLAKE2B 3a834f074c28a97d0577900d77d8b7e123487b60a55257b7a5f0b97c38b93ad66304eb272d552e6e3df3721f7967736391d0371a8804a35a1502d6ef01ea623d SHA512 7d0dcc558027da78e334e0a9caaea188393602f478987c67d7f5522dc6e7c223f2886ffecbdcac67b7576f213d3a19f4772190f7e00db23c5af5d92aeb07a9db
+DIST gtk-gnutella-1.2.1.tar.gz 25055800 BLAKE2B 09f68979bc4df130e2b7b4a78017c2834feab1173d6242fe07856be038b9c671609fee7a7ec270fd6f9592a2fb2bfa0bf8a08472da0f41f6e3dc2dfaafd5ed58 SHA512 e53c8e0f7d11f699e9eb77546f3d6ca240ee9fa92e8817af4631250d86714b97eb36fbcd83e46d8429cbd12532c9c9a343a2ba69eba6deda4bc9c5610e98efc8
+EBUILD gtk-gnutella-1.2.1.ebuild 1955 BLAKE2B 8909b8ddab6c94525ea72f5d7dd0514dfd6a8f2be7305594dc001c1a65fc56be119ba4351fa71331ff1d1de04ade63e0e6fe66304146aa6518a3a0069db99752 SHA512 772f019794f4abdfcb1721f7a97b6e2ac3272cd182790752218ee3bfb6ead7395b6ca57f67d542f09af0cee18b5788a7308ff7f31e2687710cf1b4ba74da1d1d
 MISC metadata.xml 299 BLAKE2B 8e823e2ff9ff16738e4f1d5a5e04264557ee9529ce035978e59a8d1371a8dba5485bde5095e05346ddca410d197e7fbb62f8b651bbe8cd0815396fdeda7935ed SHA512 ab18fa3318fdd64a0e4bff392a88d9f58b1c611c71ee090a767a4a25f75f273dc60a7cfeb7e386e5fbed548d982788c16654584938aec8ef5f6b11cd6d5b3c61
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.2.0-r1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.2.1.ebuild
index 2d4f8c1d8292..0c8fc17fa879 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.2.0-r1.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.2.1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit strip-linguas toolchain-funcs
+inherit flag-o-matic strip-linguas toolchain-funcs
 
 IUSE="nls dbus ssl +gtk"
 
 DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+SRC_URI="https://github.com/gtk-gnutella/gtk-gnutella/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
 
 SLOT="0"
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	filter-flags -flto
 	strip-linguas -i po
 
 	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index e9c0e7b926ce..6bbd813ed092 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,7 +1,5 @@
 DIST ktorrent-20.12.3.tar.xz 2141556 BLAKE2B 8c1bfd675597a724ae6143bddb88005da0ec852a93ef3cc843605b4a3a47d80acba23df2a2cc13ff49efa9e4576269f3157e8456c80388b7e309527befbf0297 SHA512 fb54341368b3260ceefdb9be8bbc62c74397ada1a824a96f9de316caa365be438adc96ed15ee0bc44b7cc0db8eb1082c9ffb49eacb9448c31e8fbfe6e6314e93
-DIST ktorrent-21.04.2.tar.xz 2091444 BLAKE2B f68c89b60dcd92e9986c034974b40ba97aa6f0738a7ed24416b9eff73d3d8d06db0f4314cb851e6762544f3eecdad93a04dce7f75fa10001640019d9fc9af5c3 SHA512 0ce49277ade0b358746c76107d96346b36a20a9d73428696f6daf04734f909953fb2926eebc3a9015855c7f962adbd566434e056022259bb940d472fb23b1687
 DIST ktorrent-21.04.3.tar.xz 2091116 BLAKE2B bd03c3730a5082c17c58d6453d035fa785b5ee6e0f253d5cd37adb5e43508315deedbdd423a2e453a116a8ab9dedfe78cef063fd11262579d910b1a0f5a36e05 SHA512 70e8baf2d04fe86be09fd4583ba20375ccbec67e5e8b7a8aac252bbe04469ccfb36c55fc5088497f8575f3bef59cff40f48f648d73071e06f676b45504aa935e
 EBUILD ktorrent-20.12.3.ebuild 3088 BLAKE2B f7285f9e6d0071698ec7af6c329a4537e4766aa073265af0c08c50921cd853c4e7db6c8f256102c2292c982c4aadee50b7872a49e6cfbbf621b33bcd4715835f SHA512 736a156c76972306a0e08d376fee53dde944a9434890eca28f8e70535d6a041f7518b20ebc2439e7d612726dc25ad45f506a1c2ba88eee4972947415295d865e
-EBUILD ktorrent-21.04.2.ebuild 3080 BLAKE2B 34e6edcc5b843aff51bd44c57ff24b9714b403c76810543fad88339bbbf8cdc3accc64af42cfe11a17e6c7edca51adc152da42ad7bd5c0d3b22a5bd0aa164577 SHA512 756fc3a8b501bb779aeb28ab21958dd9f7754e694e4dde186ef81948f7bb99a7e7df84d142d2ca08b0fa775810ac15438a75006cdfd12ad0594319b28fe7f58f
 EBUILD ktorrent-21.04.3.ebuild 3080 BLAKE2B 34e6edcc5b843aff51bd44c57ff24b9714b403c76810543fad88339bbbf8cdc3accc64af42cfe11a17e6c7edca51adc152da42ad7bd5c0d3b22a5bd0aa164577 SHA512 756fc3a8b501bb779aeb28ab21958dd9f7754e694e4dde186ef81948f7bb99a7e7df84d142d2ca08b0fa775810ac15438a75006cdfd12ad0594319b28fe7f58f
 MISC metadata.xml 1389 BLAKE2B b928cdf2526433fcf48c5600049b27c9f7c12aa043a332931b5a567d1baff9fa0bb0ac6e4e8de056947637d1253ee338a8b6620e52b294b20cdd7127a3b1c81d SHA512 4cf5204afc5a9f451752efcf1bae64a947c3bbb0d259641a85771071a7c390ee50818518a15c38f47f7778cdb3ff10732428dfff3c99a09049ca8c2486736991
diff --git a/net-p2p/ktorrent/ktorrent-21.04.2.ebuild b/net-p2p/ktorrent/ktorrent-21.04.2.ebuild
deleted file mode 100644
index 2728b9034f1a..000000000000
--- a/net-p2p/ktorrent/ktorrent-21.04.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KDE_GEAR="true"
-KFMIN=5.80.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/ktorrent/"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
-+mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
-
-BDEPEND="sys-devel/gettext"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=net-libs/libktorrent-${PVCUT}:5
-	infowidget? ( dev-libs/geoip )
-	kross? (
-		>=kde-frameworks/karchive-${KFMIN}:5
-		>=kde-frameworks/kitemviews-${KFMIN}:5
-		>=kde-frameworks/kross-${KFMIN}:5
-	)
-	mediaplayer? (
-		>=media-libs/phonon-4.11.0
-		>=media-libs/taglib-1.5
-	)
-	rss? (
-		>=dev-qt/qtwebengine-${QTMIN}:5
-		>=kde-frameworks/syndication-${KFMIN}:5
-	)
-	shutdown? ( kde-plasma/libkworkspace:5 )
-	stats? ( >=kde-frameworks/kplotting-${KFMIN}:5 )
-	upnp? ( >=kde-frameworks/kcompletion-${KFMIN}:5 )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-	zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	ipfilter? (
-		app-arch/bzip2
-		app-arch/unzip
-		kde-apps/kio-extras:5
-		>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler)
-		-DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder)
-		-DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget)
-		-DWITH_SYSTEM_GEOIP=$(usex infowidget)
-		-DENABLE_IPFILTER_PLUGIN=$(usex ipfilter)
-		-DENABLE_SCRIPTING_PLUGIN=$(usex kross)
-		-DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
-		-DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
-		-DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
-		$(cmake_use_find_package rss KF5Syndication)
-		-DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
-		-DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
-		-DENABLE_STATS_PLUGIN=$(usex stats)
-		-DENABLE_UPNP_PLUGIN=$(usex upnp)
-		-DENABLE_SEARCH_PLUGIN=$(usex webengine)
-		-DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf)
-	)
-# add back when ported
-# 		-DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
-	ecm_src_configure
-}
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index dab730f4a27f..d458549a89ff 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,5 +1,6 @@
+AUX cpp17-byte-namespace.patch 2224 BLAKE2B 8d69353ae9a5d3297f304d2b130ed06f5f2f8aef5ae1116a69e36019c70e3c991354b0d8ad27951910b67b8a87641b563c7065c4e50f11452c0f9be79971cbae SHA512 8f7e1893846568e41e651f63ed9a003090adbe3ec7a6ccb18a1e2638ccbc9b249e99b27babfca030129d8b4c1f72b752a5c6eb18cc21a066cd08ff414c92a8d8
 AUX mldonkey.confd 949 BLAKE2B 05e1ceaa111249a979931c14eb599201e525f50af2370318c4bd0b6025694b55167e400c784774719dc084e326de378365e6a53badaf48cc1681003ef5b55ceb SHA512 d45f8ca35aacbd4f05a936c591866b7cb4b19e6c69139f728160c8dc09b3d4c1f689d28fa7287692f8382c291b50ff91b3ea594fe781f861efa991f2927e882c
 AUX mldonkey.initd 3509 BLAKE2B d3098a027f044f3bfc7559fa1869f7080844de1cec93fe26424322aafd482c7f010fef96854115e42e4b2a37f31b1d0f6caf94abf0c97c52d794db4767f5c0c1 SHA512 0c423feb9abbe7b08d77a3221a3638a0a93526bbf68c5e60e944413f4fd13ac44813609179b981c31d19e1e8fe11333f16dc8388a144208694cb84c008dbbed3
 DIST mldonkey-3.1.7-2.tar.bz2 2801815 BLAKE2B f914648b4e2a358e51518f3b58dc0df803cdb28d7706783504644266690514c17c2cae0688011073391db221eb8f38c7cbaf1e913220d824e41ca2e23d4c8587 SHA512 11cb0fa0db95e918c291009f4121a1b34cf485e5ac6826a72a4dc520dd78d21ced40d205fa26eb451c7d3eb31f2193cbb64e46c99c85dc932762c1bcc4da4934
-EBUILD mldonkey-3.1.7-r2.ebuild 4605 BLAKE2B 3842e7aa6cd7aace9be040d80ac2f905b5e3cac9db08ec2bf71cb6d854c3ba25e82dc638a4f4b4d8984e04a2a9b9a95e3a4571f48dbd43f728ae9674afb40d62 SHA512 c565722c0523bd174fb42703ebd44d43d2422e07334c4bd5493254e3d15b5faba71e4d9daf8585e38e61f52cd7110d428ee199beefdc64a8348057d14ffd82c5
+EBUILD mldonkey-3.1.7-r2.ebuild 4659 BLAKE2B 60a14309d772b80cd916b1b187795e69592c7604eae0034b7bb64040d5848d2f17945ef0606000f208e79ffe737dfacf796187899c1c16ab1402a66796d05e34 SHA512 5346ed2cf24081cafbd05ac373a02ae9f8f9e21b720992d0d476d3cb366fbf488a4acba0c7e112dd2a15e6b61f2ae53058352432b43803ec366abccf21840e59
 MISC metadata.xml 809 BLAKE2B 1e1d3eb87ffee2ab5b4fe9860de53679b7b29095d14811687d53cc9f4dc150bfe728375ab8acb48348d8f1a85d8f93e0d008f14cfd8e15129377fb26fe719dab SHA512 1d58b72d25faafecbe527956dd19820a78566e27dd10c996fc36a81807a48245efbb6d5a037304770b823e0c9930dc333db22749a8ebc3d056a4118f8d970286
diff --git a/net-p2p/mldonkey/files/cpp17-byte-namespace.patch b/net-p2p/mldonkey/files/cpp17-byte-namespace.patch
new file mode 100644
index 000000000000..0b1ca44e8eed
--- /dev/null
+++ b/net-p2p/mldonkey/files/cpp17-byte-namespace.patch
@@ -0,0 +1,63 @@
+diff -ur a/src/utils/lib/CryptoPP.cc b/src/utils/lib/CryptoPP.cc
+--- a/src/utils/lib/CryptoPP.cc	2021-07-06 22:20:46.675183781 +0200
++++ b/src/utils/lib/CryptoPP.cc	2021-07-06 22:20:51.025182789 +0200
+@@ -9482,7 +9482,7 @@
+ #define PRIVKEYSIZE 384
+ 
+ static Signer* s_signer = NULL;   
+-static byte m_publicKey[MAXPUBKEYSIZE+1];
++static CryptoPP::byte m_publicKey[MAXPUBKEYSIZE+1];
+ static unsigned long m_publicKeyLen = 0;
+ 
+ void cc_lprintf_nl(const char * msg, bool verb);
+@@ -9555,7 +9555,7 @@
+ 
+ 
+ // return signatureSize (buf)
+-int createSignature(byte *buf, int maxLen, byte *key, int keyLen, uint32_t cInt, uint8_t ipType, uint32_t ip) {
++int createSignature(CryptoPP::byte *buf, int maxLen, CryptoPP::byte *key, int keyLen, uint32_t cInt, uint8_t ipType, uint32_t ip) {
+ 
+ 	int result = 0;
+ 
+@@ -9570,7 +9570,7 @@
+ 		CryptoPP::SecByteBlock sBB(s_signer->SignatureLength());
+ 		CryptoPP::AutoSeededRandomPool rng;
+ 	
+-		byte bArray[MAXPUBKEYSIZE+9];
++		CryptoPP::byte bArray[MAXPUBKEYSIZE+9];
+ 
+ 		memcpy(bArray,key,keyLen);
+ 		PokeUInt32(bArray+keyLen,cInt);   
+@@ -9597,7 +9597,7 @@
+ 
+ }
+ 
+-int verifySignature(byte *key, int keyLen, byte *sig, int sigLen, uint32_t cInt, uint8_t ipType, uint32_t ip) {
++int verifySignature(CryptoPP::byte *key, int keyLen, CryptoPP::byte *sig, int sigLen, uint32_t cInt, uint8_t ipType, uint32_t ip) {
+   using namespace CryptoPP;
+ 
+ 	bool result = false;
+@@ -9607,7 +9607,7 @@
+ 		StringSource ss_Pubkey(key, keyLen,true,0);
+ 		Verifier pubKey(ss_Pubkey);
+ 
+-		byte bArray[MAXPUBKEYSIZE+9];
++		CryptoPP::byte bArray[MAXPUBKEYSIZE+9];
+ 	
+ 		memcpy(bArray,m_publicKey,m_publicKeyLen);
+ 		PokeUInt32(bArray+m_publicKeyLen,cInt); 
+diff -ur a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
+--- a/src/utils/lib/CryptoPP.h	2021-07-06 22:20:46.675183781 +0200
++++ b/src/utils/lib/CryptoPP.h	2021-07-06 22:20:56.271848200 +0200
+@@ -181,10 +181,9 @@
+ #	define __USE_W32_SOCKETS
+ #endif
+ 
+-typedef unsigned char byte;		// put in global namespace to avoid ambiguity with other byte typedefs
+-
+ NAMESPACE_BEGIN(CryptoPP)
+ 
++typedef unsigned char byte;		// put in global namespace to avoid ambiguity with other byte typedefs
+ typedef unsigned short word16;
+ typedef unsigned int word32;
+ 
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild b/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild
index 8557ea1a285e..c1bb19df5b69 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild
@@ -51,6 +51,8 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT="!ocamlopt? ( strip )"
 
+PATCHES=( "${FILESDIR}/cpp17-byte-namespace.patch" )
+
 S="${WORKDIR}/${P}-2"
 
 pkg_setup() {