| 1 |
commit: 3ea4abc692efee0224f22dc8ccfae317b674d258 |
| 2 |
Author: Huang Rui <vowstar <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Feb 8 13:58:46 2022 +0000 |
| 4 |
Commit: Rui Huang <vowstar <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Feb 8 13:59:47 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3ea4abc6 |
| 7 |
|
| 8 |
games-util/chiaki: fix python build dep |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/832879 |
| 11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 12 |
Signed-off-by: Huang Rui <vowstar <AT> gmail.com> |
| 13 |
|
| 14 |
games-util/chiaki/chiaki-2.1.1.ebuild | 11 +++++++++-- |
| 15 |
games-util/chiaki/chiaki-9999.ebuild | 11 +++++++++-- |
| 16 |
2 files changed, 18 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-util/chiaki/chiaki-2.1.1.ebuild b/games-util/chiaki/chiaki-2.1.1.ebuild |
| 19 |
index d786ac5d2..e654bece3 100644 |
| 20 |
--- a/games-util/chiaki/chiaki-2.1.1.ebuild |
| 21 |
+++ b/games-util/chiaki/chiaki-2.1.1.ebuild |
| 22 |
@@ -3,7 +3,8 @@ |
| 23 |
|
| 24 |
EAPI=8 |
| 25 |
|
| 26 |
-inherit cmake xdg |
| 27 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 28 |
+inherit cmake python-single-r1 xdg |
| 29 |
|
| 30 |
DESCRIPTION="Client for PlayStation 4 and PlayStation 5 Remote Play" |
| 31 |
HOMEPAGE="https://git.sr.ht/~thestr4ng3r/chiaki" |
| 32 |
@@ -20,9 +21,11 @@ fi |
| 33 |
LICENSE="GPL-3" |
| 34 |
SLOT="0" |
| 35 |
IUSE="+cli +gui test" |
| 36 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 37 |
RESTRICT="!test? ( test )" |
| 38 |
|
| 39 |
RDEPEND=" |
| 40 |
+ ${PYTHON_DEPS} |
| 41 |
dev-libs/jerasure |
| 42 |
dev-libs/openssl |
| 43 |
dev-qt/qtconcurrent |
| 44 |
@@ -36,8 +39,9 @@ RDEPEND=" |
| 45 |
DEPEND="${RDEPEND}" |
| 46 |
|
| 47 |
BDEPEND=" |
| 48 |
+ ${PYTHON_DEPS} |
| 49 |
+ $(python_gen_cond_dep 'dev-python/protobuf-python[${PYTHON_USEDEP}]') |
| 50 |
dev-libs/protobuf |
| 51 |
- dev-python/protobuf-python |
| 52 |
virtual/pkgconfig |
| 53 |
" |
| 54 |
|
| 55 |
@@ -45,6 +49,9 @@ src_configure() { |
| 56 |
local mycmakeargs=( |
| 57 |
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" |
| 58 |
-DCMAKE_BUILD_TYPE=Release |
| 59 |
+ -DPYTHON_EXECUTABLE="${PYTHON}" |
| 60 |
+ -DPYTHON_LIBRARY="$(python_get_library_path)" |
| 61 |
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
| 62 |
-DCHIAKI_USE_SYSTEM_JERASURE=TRUE |
| 63 |
-DCHIAKI_ENABLE_TESTS=$(usex test) |
| 64 |
-DCHIAKI_ENABLE_CLI=$(usex cli) |
| 65 |
|
| 66 |
diff --git a/games-util/chiaki/chiaki-9999.ebuild b/games-util/chiaki/chiaki-9999.ebuild |
| 67 |
index d786ac5d2..e654bece3 100644 |
| 68 |
--- a/games-util/chiaki/chiaki-9999.ebuild |
| 69 |
+++ b/games-util/chiaki/chiaki-9999.ebuild |
| 70 |
@@ -3,7 +3,8 @@ |
| 71 |
|
| 72 |
EAPI=8 |
| 73 |
|
| 74 |
-inherit cmake xdg |
| 75 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 76 |
+inherit cmake python-single-r1 xdg |
| 77 |
|
| 78 |
DESCRIPTION="Client for PlayStation 4 and PlayStation 5 Remote Play" |
| 79 |
HOMEPAGE="https://git.sr.ht/~thestr4ng3r/chiaki" |
| 80 |
@@ -20,9 +21,11 @@ fi |
| 81 |
LICENSE="GPL-3" |
| 82 |
SLOT="0" |
| 83 |
IUSE="+cli +gui test" |
| 84 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 85 |
RESTRICT="!test? ( test )" |
| 86 |
|
| 87 |
RDEPEND=" |
| 88 |
+ ${PYTHON_DEPS} |
| 89 |
dev-libs/jerasure |
| 90 |
dev-libs/openssl |
| 91 |
dev-qt/qtconcurrent |
| 92 |
@@ -36,8 +39,9 @@ RDEPEND=" |
| 93 |
DEPEND="${RDEPEND}" |
| 94 |
|
| 95 |
BDEPEND=" |
| 96 |
+ ${PYTHON_DEPS} |
| 97 |
+ $(python_gen_cond_dep 'dev-python/protobuf-python[${PYTHON_USEDEP}]') |
| 98 |
dev-libs/protobuf |
| 99 |
- dev-python/protobuf-python |
| 100 |
virtual/pkgconfig |
| 101 |
" |
| 102 |
|
| 103 |
@@ -45,6 +49,9 @@ src_configure() { |
| 104 |
local mycmakeargs=( |
| 105 |
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" |
| 106 |
-DCMAKE_BUILD_TYPE=Release |
| 107 |
+ -DPYTHON_EXECUTABLE="${PYTHON}" |
| 108 |
+ -DPYTHON_LIBRARY="$(python_get_library_path)" |
| 109 |
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
| 110 |
-DCHIAKI_USE_SYSTEM_JERASURE=TRUE |
| 111 |
-DCHIAKI_ENABLE_TESTS=$(usex test) |
| 112 |
-DCHIAKI_ENABLE_CLI=$(usex cli) |
Archives