gentoo resync : 22.12.2021

9 files changed, 198 insertions, 578 deletions

diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 8325b9ae5fe0..2a0d40693da4 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -2,19 +2,14 @@ AUX libtorrent-rasterbar-2.0.4-asio-ssl-error.patch 878 BLAKE2B d9f82601d9600991
 AUX libtorrent-rasterbar-2.0.4-boost-1.76.patch 2557 BLAKE2B db450f88f5eaa17533cb1c0eadf292ef4d4efb5f0ec6093ecd2f3bcd2ddb45460a8bab55e8b440644e97955ae4cd4ee8b1b4977564011cc2c27d90a444df92b7 SHA512 d5f56fb9d2ce8d0807a85b69ab4a0060f96a498159ba76acd7c2f72f9808ac2bb161d263a2ee3bfc07376d2d1c8252ab7646c38fc5935676204c790b7766f653
 AUX libtorrent-rasterbar-2.0.4-boost-1.77.patch 1972 BLAKE2B 31b91cc9ec963fc94fdab61e2fa0f7b0e55f2fea1d2f84bbe2cda409863ec0d0248b4fdb2e85b049165a46ad77cf8e2fffbcd634d01b58549372d9a3045b8890 SHA512 78cca1965d2cabc384051e3c9555d49e5137f025b0211120bd5abdf90897af200f87c95526ff9dc919356f6794ea04ce973dfcb774e7b5d1cd20ebf34e80f89a
 AUX libtorrent-rasterbar-2.0.4-python-symbols.patch 910 BLAKE2B 9467f84b6edb168173ff4745649d8d930ddb6524d2b0aca1aafb7287f4fb0fae05edfa43244526e7f3ef116fe85e8547b9e515140d5754fa4cb19d6c89f02785 SHA512 c72324290bdf675aa211b40ffac3a83bdf77e9cda94e0a9cfea41264be815addc6432464cd7223d962a346a2fc3cd1b2c59968aaa067e98a755ef9c25834bf71
-DIST libtorrent-1.2.10.tar.gz 3586008 BLAKE2B 71971124930462feb5f5083fed38ccadcfd1a2aed0d000a06cd7e0898b40a1451722cd79fdf0b1da3477047b26c7f7e3c1f74086a141770a7d143c916e96b6bb SHA512 e6de939fb6527783695e0b6623ddbe27f85842a36c0899b93ea0284cb3c6f3d14b8c39e29316adb3bf9acac7804f38385cc06854a32df28e7f4f6839af9f382d
-DIST libtorrent-1.2.11.tar.gz 3591610 BLAKE2B fab5d780dc5e1a855b60326cefdca6bcfb7459d4d37429e1c475434ca6ca2f465ffb6188ff519f49f2612941fe4806152511400a1c6fe121ade3ed35c6f40a79 SHA512 d502286f67bf462f14169daafe12b94ca723598530c85360c3a4b3c73535202b63632036248fdecc942cb559e66e6a5cb5afa830dc78bbff72a6c9a330710b62
-DIST libtorrent-1.2.12.tar.gz 3604064 BLAKE2B e0eb00aba90e3d5e3ba1bf3984e2eb606583007137288ccf93961185744ccc2a69922063a9004a2ebe627d7657c582eaee9f7ad2971de0dc41351bd59ed23953 SHA512 78be4c12e12f593154eda0960aaf9583fe27310e0223dbb21220400c5339744c9b2b11afa880fea30f77b4c0d07345937ff8a20d58d2d4ed7dcda84601380e20
+AUX libtorrent-rasterbar-2.0.5-boost-1.78.patch 2885 BLAKE2B 59e3dfae99d493258332b7af5e3eccd4401fc2ed7a7bd98639db5ddc8e27c6332189640046a9eb60adb0c9b3ca35dea13016ad0aa270dcbcec02111e675a3695 SHA512 fadb078a4726ec2ed0cc97787a71b0ec19f4be951d2e2358c5d3807d4f48c7f2eae9742cefc2999c997ff9b5e7b726c07043e19fab7980750658565e047902a8
 DIST libtorrent-1.2.14.tar.gz 3614077 BLAKE2B 423cd0c467510e3b4d33485ea108912a90ef0d66746e6f912eeb07930e7091d1ce8e28953a48dab3bb03c6232a9e958be423d4563bd63c083ec1423c4753b3df SHA512 9ba7d8a271ecc7330ae9c794f3966a6d1677b9d2a02a24df8b6e63daa4d5c0a7ef88607a73b417247b4afc5195e46cd0ca75859358f9e50915af56b3ed19f322
-DIST libtorrent-1.2.9.tar.gz 3584800 BLAKE2B 5160056e227a54992ca4e490ffe0088d080aa9bade7a76f55eac26a644bab720c39a70b90d94f465ec711893249a084d9f77fa496be770585094b9b3ea4a1cdd SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8
-DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
+DIST libtorrent-rasterbar-1.2.15.tar.gz 4163049 BLAKE2B 282d6cf19897706f96d68c75df3c1f5f004df38c07ca2fcaa760f0004512dc8759ea47d4e0c96ff4d8ac2d23569a05507c5dd0667d83c702e14825a0d9ffcd0e SHA512 c409c53ec9c299a05b51ab61d7df1209803cbd6070f0a014dd6fb42c30f6f5230ea90848330f901c61816bc70901e618409acacc95bb0e5acb7f81211d001fa2
 DIST libtorrent-rasterbar-2.0.4-ssl-tests-certs.patch.bz2 26530 BLAKE2B 0958f11be84860cfb0e9224901a6052d9acb80edbd9f9e6eeb2e621e30e75fac4c4db64c71573b7c7f91761e74b9c5781ef8d1a202aef06cd92e3edb15d9f810 SHA512 f3afc4e0857838a44fa3671d657b5f669194c504d07d8f72ca5ddc060786127e3d6ad4ae9efa39e9f02fbe396f4785a1755dd1fd9607c1cef31aa60574b3511e
 DIST libtorrent-rasterbar-2.0.4.tar.gz 4311319 BLAKE2B fee8255d46d5ca019cd487b57fc6003744c208ea5e78873b925f53881667c55c506d302fc7ae6cd5b5d5e776cfe059b714db94d16dd28cfc7939ec6f4fa4e5fa SHA512 66ce3c3369b1d2a83654727c23022d38b070b8bc3ad83b1001e2cfad945acbaa4d61990094bc758886967cd305ca2213b60b1b0523b5106c42d4701d8cff8db1
-EBUILD libtorrent-rasterbar-1.2.10-r1.ebuild 2651 BLAKE2B 93f21eab92ee049b5d89735625e8cb82e6254bf9e1c22037369c6877f92b046746d1c65733132e6ac2c407bdea404dbba22414bc4467359c1c5de821e81dd723 SHA512 d328ecd9d59d26326c841d2638d917c4e67930285478ab337a417fcd9b4a760135b34924986868518398b24d88be99591b8c087b1e12131854f6512332c6fa34
-EBUILD libtorrent-rasterbar-1.2.11-r1.ebuild 2675 BLAKE2B f3eca25e40c12852703a06522b6904d64ae7fcf71b42df5ef3c0d78c06c76898977a29fd51f4cffb60472526c8a99c4b145eca3fb5f02d31e3f7d7be2b647a2f SHA512 2ab394714973bf577cc5ef3d124a2d48dbdad8b9db0178755f53c34a8cc2b4f27d30dcc94f898e3df28c0f37b388836d64fb7beb0cd517c81cdecdcbaa6a9c33
-EBUILD libtorrent-rasterbar-1.2.12-r1.ebuild 2677 BLAKE2B 83ead7b61a014810584e8880f0e6484aa795334f36aa3e46b71faac9036d9a0fa1fdd545bc6732339747f67b2aa7e3f85fba02f6d0662ae42f81df766bc9bc16 SHA512 395be1fc23c0f7eb88a2531ffdfea79b67f4a575ba97dc59f41e0f3cba7bc91defdbc1aeb0532356b5a13c82b540bb76a1ec37d91bbebcdad5694383a30db395
+DIST libtorrent-rasterbar-2.0.5.tar.gz 4407260 BLAKE2B 71c64879be103326fe438ba6b11b672fb0d631ed0de4eb23c2595f3596b522693594ded9f8733c7827dd668e285cb5099cad78bcd437ec184837eafbd39b356f SHA512 be5b812135dada957e565085b5bdda06827c8427f78a4468ef263e1a1e33d3a0bbba7ac27235f0d17ae6087d54311281e3b1975eef81cda514acc8329862dc04
 EBUILD libtorrent-rasterbar-1.2.14-r1.ebuild 2588 BLAKE2B 481eb4d68ffde21e9839f04b1102348923087540e50172d5c612aeced221f76e1b99d44b72fd81a7772ce74989c33928957d77c579f996e5de492769f16b54f1 SHA512 642425ba009fe39ad2c7bd87daf1bdd45020b4b69de99e4ab5031c09dd1f24518c41c74281d6cbda32b24684c60134ee66496dd8674ac221796e8e625b1ae529
-EBUILD libtorrent-rasterbar-1.2.6-r1.ebuild 2440 BLAKE2B 0c36fbc1882e4f115de629bf842ac1f05378866db3a570e75e7bf2c5da99d663594c2893d7e914b5a8079668ba2f5c89b9c64cb91d93e1c1523cd37dd9eadb52 SHA512 87a88041183f8e5bf981ad19a941951c6341907f1396c0f1a1add6ce00337f57ccac51e0260bb1fcc5623386a990d6662af580242e5384ee270e51a5ba22075f
-EBUILD libtorrent-rasterbar-1.2.9-r1.ebuild 2651 BLAKE2B 93f21eab92ee049b5d89735625e8cb82e6254bf9e1c22037369c6877f92b046746d1c65733132e6ac2c407bdea404dbba22414bc4467359c1c5de821e81dd723 SHA512 d328ecd9d59d26326c841d2638d917c4e67930285478ab337a417fcd9b4a760135b34924986868518398b24d88be99591b8c087b1e12131854f6512332c6fa34
+EBUILD libtorrent-rasterbar-1.2.15-r1.ebuild 1725 BLAKE2B 64ba448ee625201de6b2def1f24dcb3f00e57c9d0d3036b609bcaacfee0ae2271c0dd590289a561c7e748864763c7725bf8e0d6f64bc251a1bcf59e0b45b2a68 SHA512 83616c412a0605e3a384c8c1d571eb82454df150c243bd0b754e10f2152c4c7517b7b202a2f2d4651ae24d16fc8668fada518a46fe3cdc3a8474ff4d0fcfec31
 EBUILD libtorrent-rasterbar-2.0.4-r4.ebuild 2267 BLAKE2B 4bdb1808b6ede39a38591d1cf65ba9c4a2311ec3b588cbab6baf2b5db78771eef2bb430829a0d42f27ddecf2e787121fc9ffce3cadf25a75b034515c1ba8bdd4 SHA512 739451f9e602217319e5487c7fd5abc1f846a3bca186d28ebc42cee68a8bf0582d1b6c2497d51dc5ddcdd609df4a158fbd49404cb79b9d3f6ed68ebefb40f158
+EBUILD libtorrent-rasterbar-2.0.5.ebuild 1890 BLAKE2B 4b12abd12057e52e06f20f7f4d2bc04c44945c534f046b77a7579ac91feb0ad3626222d348d25dfa99be7962d420e777e920a2edc126bf2274ce855754b1f9f4 SHA512 21e07043b15d8a9033ccc7da264cb2fb35947b6a4297ba77f7913b305de279fa7b91b01c5aa0315f24d1f5761a5a7dc9b06c15b6865feff7a46984a82d862afb
 MISC metadata.xml 638 BLAKE2B e4ea9381097b54924059f7682aead071561015a3842a6089927840ce24fdac16101cce2c57e01431800c1e471c34117038d10a8b82d70aaed555573a9d4d03d6 SHA512 49f5bd5348f054bec0a2646f96803ab6d2dcf6a0b0f32c9ccfb05a7055012a40703b1e9ddf912827c9197ab1a740fd41b98cd7e993f5f30633686e5b102bdec2
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch
new file mode 100644
index 000000000000..93e14963e366
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch
@@ -0,0 +1,46 @@
+From feb911a19c8a66bf13915973649d3a4f5d729f12 Mon Sep 17 00:00:00 2001
+From: arvidn <arvid@libtorrent.org>
+Date: Sun, 12 Dec 2021 21:52:15 +0100
+Subject: [PATCH] update allocator sizes for boost-1.78
+
+---
+ include/libtorrent/aux_/allocating_handler.hpp | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/include/libtorrent/aux_/allocating_handler.hpp b/include/libtorrent/aux_/allocating_handler.hpp
+index 726032e085c..7096dfd2e67 100644
+--- a/include/libtorrent/aux_/allocating_handler.hpp
++++ b/include/libtorrent/aux_/allocating_handler.hpp
+@@ -77,11 +77,11 @@ namespace libtorrent { namespace aux {
+ 	constexpr std::size_t openssl_write_cost = 0;
+ #endif
+ 
+-	constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 8 * sizeof(void*);
+-	constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 8 * sizeof(void*);
+-	constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 8 * sizeof(void*);
+-	constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 8 * sizeof(void*);
+-	constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 160;
++	constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 9 * sizeof(void*);
++	constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 9 * sizeof(void*);
++	constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 9 * sizeof(void*);
++	constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 9 * sizeof(void*);
++	constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 168;
+ 	constexpr std::size_t abort_handler_max_size = tracking + debug_tick + 104;
+ 	constexpr std::size_t submit_handler_max_size = tracking + debug_tick + 104;
+ 	constexpr std::size_t deferred_handler_max_size = tracking + debug_tick + 112;
+@@ -124,12 +124,12 @@ namespace libtorrent { namespace aux {
+ #endif
+ 	constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 168;
+ 	constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 168;
+-	constexpr std::size_t udp_handler_max_size = tracking + 160;
+-	constexpr std::size_t utp_handler_max_size = tracking + 184;
++	constexpr std::size_t udp_handler_max_size = tracking + 168;
++	constexpr std::size_t utp_handler_max_size = tracking + 192;
+ 	constexpr std::size_t abort_handler_max_size = tracking + 72;
+ 	constexpr std::size_t submit_handler_max_size = tracking + 72;
+ 	constexpr std::size_t deferred_handler_max_size = tracking + 80;
+-	constexpr std::size_t tick_handler_max_size = tracking + 128;
++	constexpr std::size_t tick_handler_max_size = tracking + 136;
+ #endif
+ 
+ 	enum HandlerName
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild
deleted file mode 100644
index 982c7a1fdd1a..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools flag-o-matic distutils-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/libtorrent-libtorrent-${PV}"
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	mkdir -p "${S}"/build-aux || die
-	touch "${S}"/build-aux/config.rpath || die
-	append-cxxflags -std=c++14
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-boost
-		--with-libiconv
-		--enable-logging
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-				# git rid of c++11
-				sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
-				mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild
deleted file mode 100644
index 6f2a72939805..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools flag-o-matic distutils-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/libtorrent-${PV}"
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	mkdir -p "${S}"/build-aux || die
-	touch "${S}"/build-aux/config.rpath || die
-	append-cxxflags -std=c++14
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-boost="${ESYSROOT}/usr"
-		--with-libiconv
-		--enable-logging
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-				# git rid of c++11
-				sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
-				mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild
deleted file mode 100644
index 9a57948f7177..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools flag-o-matic distutils-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/libtorrent-${PV}"
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	mkdir -p "${S}"/build-aux || die
-	touch "${S}"/build-aux/config.rpath || die
-	append-cxxflags -std=c++14
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-boost="${ESYSROOT}/usr"
-		--with-libiconv
-		--enable-logging
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-				# git rid of c++11
-				sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
-				mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild
new file mode 100644
index 000000000000..459ca7926b07
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+dht debug python ssl test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/boost:=[threads(+)]
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost[python,${PYTHON_USEDEP}]
+		')
+	)
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-Dbuild_examples=OFF
+		-Ddht=$(usex dht ON OFF)
+		-Dencryption=$(usex ssl ON OFF)
+		-Dlogging=$(usex debug ON OFF)
+		-Dpython-bindings=$(usex python ON OFF)
+		-Dbuild_tests=$(usex test ON OFF)
+	)
+
+	# We need to drop the . from the Python version to satisfy Boost's
+	# FindBoost.cmake module, bug #793038.
+	use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Needs running UPnP server
+		-E "test_upnp"
+	)
+
+	# Checked out Fedora's test workarounds for inspiration
+	# https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
+	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
+}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild
deleted file mode 100644
index 185c08bbf394..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools distutils-r1
-
-MY_PV=$(ver_rs 1-2 '_')
-MY_P=${PN/-rasterbar}-${MY_PV}
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
-
-src_prepare() {
-	mkdir "${S}"/build-aux/ || die
-	touch "${S}"/build-aux/config.rpath || die
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-boost
-		--with-libiconv
-		--enable-logging
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild
deleted file mode 100644
index 982c7a1fdd1a..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools flag-o-matic distutils-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/libtorrent-libtorrent-${PV}"
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	mkdir -p "${S}"/build-aux || die
-	touch "${S}"/build-aux/config.rpath || die
-	append-cxxflags -std=c++14
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-boost
-		--with-libiconv
-		--enable-logging
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-				# git rid of c++11
-				sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
-				mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild
new file mode 100644
index 000000000000..7df4947a91b8
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2.0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+dht debug gnutls python ssl test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/boost:=[threads(+)]
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost[python,${PYTHON_USEDEP}]
+		')
+	)
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-boost-1.78.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_CXX_STANDARD=17
+		-DBUILD_SHARED_LIBS=ON
+		-Dbuild_examples=OFF
+		-Ddht=$(usex dht ON OFF)
+		-Dencryption=$(usex ssl ON OFF)
+		-Dgnutls=$(usex gnutls ON OFF)
+		-Dlogging=$(usex debug ON OFF)
+		-Dpython-bindings=$(usex python ON OFF)
+		-Dbuild_tests=$(usex test ON OFF)
+	)
+
+	# We need to drop the . from the Python version to satisfy Boost's
+	# FindBoost.cmake module, bug #793038.
+	use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Needs running UPnP server
+		-E "test_upnp"
+	)
+
+	# Checked out Fedora's test workarounds for inspiration
+	# https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
+	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
+}