[gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent-rasterbar/

["Sam James" <sam@gentoo.org>]

commit:     89e83aaf9256ef1621470728003def6127fce08c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  1 00:57:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov  1 01:01:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e83aaf

net-libs/libtorrent-rasterbar: enable and fix tests for 2.0.4

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/libtorrent-rasterbar/Manifest                   |  1 +
 .../libtorrent-rasterbar-2.0.4-r4.ebuild                 | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index c2f342ae7a8..5a73b357628 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -4,4 +4,5 @@ DIST libtorrent-1.2.12.tar.gz 3604064 BLAKE2B e0eb00aba90e3d5e3ba1bf3984e2eb6065
 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-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

diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r4.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r4.ebuild
index 846dee645ee..69145fe1177 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r4.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r4.ebuild
@@ -10,14 +10,16 @@ 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"
+# Should be able to drop on next bump!
+SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-ssl-tests-certs.patch.bz2 )"
 
 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 )"
 
-RESTRICT="!test? ( test ) test" # not yet fixed
 DEPEND="
 	dev-libs/boost:=[threads(+)]
 	python? (
@@ -43,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-boost-1.77.patch
 	"${FILESDIR}"/${P}-python-symbols.patch
 	"${FILESDIR}"/${PN}-2.0.4-asio-ssl-error.patch
+	"${WORKDIR}"/${P}-ssl-tests-certs.patch
 )
 
 pkg_setup() {
@@ -68,3 +71,14 @@ src_configure() {
 
 	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
+}