commit: 3a7fe6fe1c4f9593013363647c187266ff50a993 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Aug 27 01:08:00 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Aug 27 01:10:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a7fe6fe
net-libs/libtorrent-rasterbar: fix 2.0.x build with Boost (and fix Python eclass) - Fix Boost by using a different Python version name (drop the ., just like we did in previous versions) - Don't use python-any-r1, but python-single-r1 instead. python-any-r1 is for where we have a build-time *only* dependency, but we build libraries linked against libpython, so we need it at runtime too. - Fix other dependencies (everything is an RDEPEND too) Closes: https://bugs.gentoo.org/793038 Signed-off-by: Sam James <sam <AT> gentoo.org> ...-r1.ebuild => libtorrent-rasterbar-2.0.4-r2.ebuild} | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild similarity index 75% rename from net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r1.ebuild rename to net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild index 127f26feb7f..3538983c205 100644 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r1.ebuild +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python{3_8,3_9} ) -inherit cmake python-any-r1 +inherit cmake python-single-r1 DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"; @@ -15,28 +15,30 @@ 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 ) test" # not yet fixed -RDEPEND="dev-libs/boost:=[threads(+)]" DEPEND=" - ${RDEPEND} + dev-libs/boost:=[threads(+)] python? ( ${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-libs/boost[python,${PYTHON_USEDEP}]') + $(python_gen_cond_dep ' + dev-libs/boost[python,${PYTHON_USEDEP}] + ') ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) " +RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-boost-1.77.patch ) pkg_setup() { - use python && python-any-r1_pkg_setup + use python && python-single-r1_pkg_setup } src_configure() { @@ -52,7 +54,9 @@ src_configure() { -Dbuild_tests=$(usex test ON OFF) ) - use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON}" ) + # 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 }
