Gentoo Archives: gentoo-commits

From: Kenton Groombridge <concord@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
Date: Sun, 03 Jul 2022 19:18:13
Message-Id: 1656875868.06a6439e0d67db49c759afcbee6fe3e20d129856.concord@gentoo
1 commit: 06a6439e0d67db49c759afcbee6fe3e20d129856
2 Author: Kenton Groombridge <concord <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 3 18:42:06 2022 +0000
4 Commit: Kenton Groombridge <concord <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 19:17:48 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a6439e
7
8 net-voip/mumble: inherit python-any-r1
9
10 Mumble's build system requires a Python interpreter to be present when
11 building its bundled translations.
12
13 Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org>
14
15 net-voip/mumble/mumble-1.4.230-r2.ebuild | 8 +++++++-
16 net-voip/mumble/mumble-9999.ebuild | 8 +++++++-
17 2 files changed, 14 insertions(+), 2 deletions(-)
18
19 diff --git a/net-voip/mumble/mumble-1.4.230-r2.ebuild b/net-voip/mumble/mumble-1.4.230-r2.ebuild
20 index ee18ba0d74f9..382e030edb65 100644
21 --- a/net-voip/mumble/mumble-1.4.230-r2.ebuild
22 +++ b/net-voip/mumble/mumble-1.4.230-r2.ebuild
23 @@ -3,7 +3,8 @@
24
25 EAPI=7
26
27 -inherit cmake flag-o-matic xdg
28 +PYTHON_COMPAT=( python3_{8..10} )
29 +inherit cmake flag-o-matic python-any-r1 xdg
30
31 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
32 HOMEPAGE="https://wiki.mumble.info"
33 @@ -59,6 +60,7 @@ RDEPEND="
34 zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
35 "
36 DEPEND="${RDEPEND}
37 + ${PYTHON_DEPS}
38 dev-qt/qtconcurrent:5
39 dev-qt/qttest:5
40 >=dev-libs/boost-1.41.0
41 @@ -76,6 +78,10 @@ PATCHES=(
42 "${FILESDIR}/${PN}-1.4.230-poco-link-cmake.patch"
43 )
44
45 +pkg_setup() {
46 + python-any-r1_pkg_setup
47 +}
48 +
49 src_prepare() {
50 # required because of xdg.eclass also providing src_prepare
51 cmake_src_prepare
52
53 diff --git a/net-voip/mumble/mumble-9999.ebuild b/net-voip/mumble/mumble-9999.ebuild
54 index cbe94df0b160..548fe5b1e282 100644
55 --- a/net-voip/mumble/mumble-9999.ebuild
56 +++ b/net-voip/mumble/mumble-9999.ebuild
57 @@ -3,7 +3,8 @@
58
59 EAPI=7
60
61 -inherit cmake flag-o-matic xdg
62 +PYTHON_COMPAT=( python3_{8..10} )
63 +inherit cmake flag-o-matic python-any-r1 xdg
64
65 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
66 HOMEPAGE="https://wiki.mumble.info"
67 @@ -57,6 +58,7 @@ RDEPEND="
68 zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
69 "
70 DEPEND="${RDEPEND}
71 + ${PYTHON_DEPS}
72 dev-cpp/nlohmann_json
73 dev-qt/qtconcurrent:5
74 dev-qt/qttest:5
75 @@ -68,6 +70,10 @@ BDEPEND="
76 virtual/pkgconfig
77 "
78
79 +pkg_setup() {
80 + python-any-r1_pkg_setup
81 +}
82 +
83 src_prepare() {
84 sed '/TRACY_ON_DEMAND/s@ ON @ OFF @' -i src/CMakeLists.txt || die