6 files changed, 63 insertions, 38 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 473a43ce6a14..f9b2c9b6d077 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libbloom/Manifest b/net-libs/libbloom/Manifest
index 410fd2bae887..7332c04d4d1c 100644
--- a/net-libs/libbloom/Manifest
+++ b/net-libs/libbloom/Manifest
@@ -1,6 +1,4 @@
 AUX libbloom-1.5-AR.patch 492 BLAKE2B 1149e58d6c333b0ae442633e1c4824fc37cd07eb29d75c18cd0509f36114c8e458773fb4aee38b9b01193a92ace06aa193dee133da49c007d42399c8977d9e48 SHA512 da775a1e99a161c8f3433930b224aafaff681ffd96f89441bbce9b39a789d75de055eea95e799cac3769c9f9c5d14308968ee65a7daf5121d5ef024f3350c2ed
-DIST libbloom-1.5.tar.gz 1210081 BLAKE2B 8af463c487c2898c5a4cf3f7541490e2b069d4667ccda4b536f347535be5c7f5664c8ee17e0789ac5325feb8f325ae30a89e2de34323962e89378724cf130a84 SHA512 0dd69e3ee102e5808ba4350c71d212876db56235e263f8d5a66d6c3616d2e51cc18b5ca3a5a946d79c12751d9cc5667f7c633d77645c4b88a4d16ea344b51929
 DIST libbloom-1.6.tar.gz 1872005 BLAKE2B de3368724e9c05489efae74ce36e880e2db29f78792b84b13325a24a3c302154fdbb621d672e9ef7f612ef00df1ec8fe010c59461822f5d04b4c5b27996ef773 SHA512 3dd4343d68def05800dd6ffc5a05b05d0702a8c0c9f0a397f105d4389c88a7bffa419734aeb4fa4e1a2c418b12a8192fa27ddcbaeee72906450d64cbfd64db15
-EBUILD libbloom-1.5-r2.ebuild 594 BLAKE2B ed1a294523463079b1199bd73c2d8bd7da125cce47fa52808ccf9d46ca4b7f5a39415f3fcd656c48f210439e205fbf3583e308af8fb4974735d437d22b3e998c SHA512 c9d7681619def50b64aa577210973ca8e9ce1e1511b9e68d6ecd4f40ad22caac5a7b0a1536bee0cdf7ac039050a33c80916aaf9c97acb3df2400340bcf2b8a3e
-EBUILD libbloom-1.6.ebuild 601 BLAKE2B 283f36b78a30ab73787c343a122205af7be6c3ba8cf524c305556a3697ad25882d6e7512ac0ffb880984ef19ccbb295a69cba0ea85593371f6e0a0681ee4c733 SHA512 8228296056c3805666f0864745475b6bb9f4e4dba8e0e8b6759a9355fc451d45a5db9d53c4dfcb7afb058061dbf8ff1c9cb974bb3b870f053a706b93cee1d327
+EBUILD libbloom-1.6.ebuild 571 BLAKE2B 2f686de951b76123db2f37c503ba9c5ca3ba1c05de901508d8e906344135374d79c21bb7027de1a392f9e2212745bbafaba8d52eacbb818cd6612fc62a9ea0f9 SHA512 146ddc3dc1caf93835c194d2c3962b7a40d4bcbf31719ba62e62a6c1b245772bb40fcf7f07daf5cea62532fecbd1adbb8f6dd39b53ab2afce0281fd9cffc41a1
 MISC metadata.xml 322 BLAKE2B ccf8ee2efd91b7e6ada82afcb00f67de420d5d2c1680e0fe1c3c4d5f2d1556494f5a9ed50c994d0e23d3fca239c2d8b24ae00bc25babe950d042c99a514820ab SHA512 5cfd32799c2bad0dd515be059453d54b23bb4c7e19718e9477549bd33baafff1a11debc9f25e9eba5979cc83d748b8cdddedad09d7d469fefa08a7dba8bdc1d4
diff --git a/net-libs/libbloom/libbloom-1.5-r2.ebuild b/net-libs/libbloom/libbloom-1.5-r2.ebuild
deleted file mode 100644
index 17be8bdca711..000000000000
--- a/net-libs/libbloom/libbloom-1.5-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A simple and small bloom filter implementation in plain C"
-HOMEPAGE="https://github.com/jvirkki/libbloom"
-SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PATCHES=("${FILESDIR}"/${PN}-1.5-AR.patch)
-
-src_compile() {
-	tc-export AR CC
-	emake BITS=default OPT=
-}
-
-src_install() {
-	doheader bloom.h
-	dolib.so build/${PN}.so*
-}
diff --git a/net-libs/libbloom/libbloom-1.6.ebuild b/net-libs/libbloom/libbloom-1.6.ebuild
index a792f191fa46..9a4c0b1e0169 100644
--- a/net-libs/libbloom/libbloom-1.6.ebuild
+++ b/net-libs/libbloom/libbloom-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,10 +12,6 @@ SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
 PATCHES=("${FILESDIR}"/${PN}-1.5-AR.patch)
 
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index d6fe9ceac5f8..8bc548b21b35 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,5 +1,7 @@
 DIST libktorrent-23.08.5.tar.xz 604184 BLAKE2B e4fc72be9fe20b06220b25fa558a1f86dd029e4eec15da2c8f26ed4acc69e1c06db3fea6ed8dfdb643a01beaf2146c7c0939e8a0da05920712e7f5614e4b4a47 SHA512 c38f944167436a7190e46093cbc928d3db375f7414fa5acdf5b3fd9e77007435259740027941daed422c784d691532f3c9a6c824ce9ac23c091edbedc563aa11
 DIST libktorrent-24.05.2.tar.xz 605972 BLAKE2B 136951dd13029c4b05ce7f5785b913c14c2dcd47c575e10ca223ef9cd0fd187dd0654c49d1e65032ff9d9a4713c772c9bb48512b040d004736d67fce34b47016 SHA512 fb2fca63079988e8f623e77adeff21dfb49c15c604d6ae35da172be3b012c529e73139245061ead46a895bb5af8f4a3be35668295c0a2f5c5fbe1d0a7bc92711
+DIST libktorrent-24.08.0.tar.xz 605840 BLAKE2B 575899a932e2b3633cda64566aa60d34b9b110a53939a66aa624c2fbcd700d8958c3938014fcec47300417c7aae9f3368601379c1fc355ed8333f5c164aff1c6 SHA512 272bb03e7acf1b86443ab2cab93eb79703df98b3e49a27cd89b37bb5256bdd2056715f6249b0615ed9e8a03ec11305d8b2a4f05cd03987bc83c2adbabe04c802
 EBUILD libktorrent-23.08.5.ebuild 1424 BLAKE2B c75dcab9838324cb487b6af948687ba3044e452494b1068eb1cf8499fd5ae9fad84a137e4043f76093e14aabb6347277e13e9aacffbff7d6927ac66e32ce4152 SHA512 a1b47ee5380a6d5d505d19f55958c0c122a8c7c9ee75e63db84affe38865753e46c0adbc590dea381cf2ff7a72333cb9e653a0f888af0f2212c6b86e93bf0d22
 EBUILD libktorrent-24.05.2.ebuild 1429 BLAKE2B 9385c2f22b0bd2b0116c3d5fca5177bacbec119a81ec29b60e59f18e739fcd01866c67dcbe527873e507f9a3fddce876ec9d2c2fe4570c853327316500d1392c SHA512 8b67dd05a78c90a65597e0cf12ed15a1a57a6e0cd1f0e83b0814cc3120b08b3099ace47b6e2c6df3e6f62f38fead40022b65ca4fe03c0480e9c4b70a01e56ee7
+EBUILD libktorrent-24.08.0.ebuild 1429 BLAKE2B fc1d5664e8ac6a20cb666c3b245842f38d7f07158a78eaf44d47b8c2aba25293dd7f62463a8d37308f47712c0fa88e896e6fe820ae974e176a64db7aee2c488b SHA512 a7f0bd60df89e5ea198872b209f0f7473914b3955c56f77288d2b2fe09a3ac61a99d769297c37486b6ed398d9014c3a63193534697e942dd56b02f4476e7bc95
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-libs/libktorrent/libktorrent-24.08.0.ebuild b/net-libs/libktorrent/libktorrent-24.08.0.ebuild
new file mode 100644
index 000000000000..b4e75e71fc67
--- /dev/null
+++ b/net-libs/libktorrent/libktorrent-24.08.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KDE_ORG_CATEGORY="network"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="BitTorrent library based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=app-crypt/qca-2.3.7:2[qt6]
+	>=dev-libs/gmp-6.0.0a:0=
+	dev-libs/libgcrypt:0=
+	>=dev-qt/qtbase-${QTMIN}:6[network,xml]
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.71
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-libs/botan[gmp(-)]
+"
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	ecm_src_prepare
+
+	# Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is breaking this
+	sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \
+		CMakeLists.txt || die
+	sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \
+		KTorrent6Config.cmake.in || die
+}
+
+src_test() {
+	# failing network tests
+	local myctestargs=(
+		-E "(fin|packetloss|send|superseedtest|transmit|utppolltest)"
+	)
+
+	ecm_src_test
+}