| 1 |
commit: 3a7fe6fe1c4f9593013363647c187266ff50a993 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 27 01:08:00 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 27 01:10:27 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a7fe6fe |
| 7 |
|
| 8 |
net-libs/libtorrent-rasterbar: fix 2.0.x build with Boost (and fix Python eclass) |
| 9 |
|
| 10 |
- Fix Boost by using a different Python version name (drop the ., just |
| 11 |
like we did in previous versions) |
| 12 |
- Don't use python-any-r1, but python-single-r1 instead. python-any-r1 |
| 13 |
is for where we have a build-time *only* dependency, but we build |
| 14 |
libraries linked against libpython, so we need it at runtime too. |
| 15 |
- Fix other dependencies (everything is an RDEPEND too) |
| 16 |
|
| 17 |
Closes: https://bugs.gentoo.org/793038 |
| 18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 19 |
|
| 20 |
...-r1.ebuild => libtorrent-rasterbar-2.0.4-r2.ebuild} | 18 +++++++++++------- |
| 21 |
1 file changed, 11 insertions(+), 7 deletions(-) |
| 22 |
|
| 23 |
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 |
| 24 |
similarity index 75% |
| 25 |
rename from net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r1.ebuild |
| 26 |
rename to net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild |
| 27 |
index 127f26feb7f..3538983c205 100644 |
| 28 |
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r1.ebuild |
| 29 |
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild |
| 30 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 31 |
|
| 32 |
PYTHON_COMPAT=( python{3_8,3_9} ) |
| 33 |
|
| 34 |
-inherit cmake python-any-r1 |
| 35 |
+inherit cmake python-single-r1 |
| 36 |
|
| 37 |
DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" |
| 38 |
HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent" |
| 39 |
@@ -15,28 +15,30 @@ LICENSE="BSD" |
| 40 |
SLOT="0/2.0" |
| 41 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" |
| 42 |
IUSE="+dht debug gnutls python ssl test" |
| 43 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 44 |
|
| 45 |
RESTRICT="!test? ( test ) test" # not yet fixed |
| 46 |
-RDEPEND="dev-libs/boost:=[threads(+)]" |
| 47 |
DEPEND=" |
| 48 |
- ${RDEPEND} |
| 49 |
+ dev-libs/boost:=[threads(+)] |
| 50 |
python? ( |
| 51 |
${PYTHON_DEPS} |
| 52 |
- $(python_gen_any_dep ' |
| 53 |
- dev-libs/boost[python,${PYTHON_USEDEP}]') |
| 54 |
+ $(python_gen_cond_dep ' |
| 55 |
+ dev-libs/boost[python,${PYTHON_USEDEP}] |
| 56 |
+ ') |
| 57 |
) |
| 58 |
ssl? ( |
| 59 |
gnutls? ( net-libs/gnutls:= ) |
| 60 |
!gnutls? ( dev-libs/openssl:= ) |
| 61 |
) |
| 62 |
" |
| 63 |
+RDEPEND="${DEPEND}" |
| 64 |
|
| 65 |
PATCHES=( |
| 66 |
"${FILESDIR}"/${P}-boost-1.77.patch |
| 67 |
) |
| 68 |
|
| 69 |
pkg_setup() { |
| 70 |
- use python && python-any-r1_pkg_setup |
| 71 |
+ use python && python-single-r1_pkg_setup |
| 72 |
} |
| 73 |
|
| 74 |
src_configure() { |
| 75 |
@@ -52,7 +54,9 @@ src_configure() { |
| 76 |
-Dbuild_tests=$(usex test ON OFF) |
| 77 |
) |
| 78 |
|
| 79 |
- use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON}" ) |
| 80 |
+ # We need to drop the . from the Python version to satisfy Boost's |
| 81 |
+ # FindBoost.cmake module, bug #793038. |
| 82 |
+ use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" ) |
| 83 |
|
| 84 |
cmake_src_configure |
| 85 |
} |
Archives