Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/telepathy-qt/
Date: Wed, 22 Sep 2021 23:05:59
Message-Id: 1632351905.2d89beb5bdad410cba3e18a92d4e9db38589cbc0.asturm@gentoo
1 commit: 2d89beb5bdad410cba3e18a92d4e9db38589cbc0
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 22 22:53:48 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 22 23:05:05 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d89beb5
7
8 net-libs/telepathy-qt: EAPI-8, Add PYTHON_REQ_USE="xml(+)", python3_10
9
10 Closes: https://bugs.gentoo.org/812917
11 Package-Manager: Portage-3.0.23, Repoman-3.0.3
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 ...qt-9999.ebuild => telepathy-qt-0.9.8-r1.ebuild} | 32 ++++++++++------------
15 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 6 ++--
16 2 files changed, 18 insertions(+), 20 deletions(-)
17
18 diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
19 similarity index 83%
20 copy from net-libs/telepathy-qt/telepathy-qt-9999.ebuild
21 copy to net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
22 index 6e73cf75cae..9f392ed86ab 100644
23 --- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
24 +++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
25 @@ -3,37 +3,23 @@
26
27 EAPI=7
28
29 -PYTHON_COMPAT=( python3_{7,8,9} )
30 -
31 -if [[ ${PV} = *9999* ]]; then
32 - EGIT_REPO_URI=( "https://gitlab.freedesktop.org/telepathy/${PN}" )
33 - inherit git-r3
34 -else
35 - SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
36 - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
37 -fi
38 +PYTHON_COMPAT=( python3_{8,9,10} )
39 +PYTHON_REQ_USE="xml(+)"
40 inherit python-any-r1 cmake virtualx
41
42 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
43 HOMEPAGE="https://telepathy.freedesktop.org/"
44 +SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
45
46 LICENSE="LGPL-2.1"
47 SLOT="0"
48 +KEYWORDS="amd64 ~arm arm64 ~riscv x86"
49 IUSE="debug farstream test"
50
51 REQUIRED_USE="test? ( farstream )"
52
53 RESTRICT="!test? ( test )"
54
55 -BDEPEND="${PYTHON_DEPS}
56 - virtual/pkgconfig
57 - test? (
58 - dev-libs/glib:2
59 - $(python_gen_any_dep '
60 - dev-python/dbus-python[${PYTHON_USEDEP}]
61 - ')
62 - )
63 -"
64 RDEPEND="
65 dev-qt/qtcore:5
66 dev-qt/qtdbus:5
67 @@ -51,6 +37,15 @@ DEPEND="${RDEPEND}
68 dev-qt/qttest:5
69 )
70 "
71 +BDEPEND="${PYTHON_DEPS}
72 + virtual/pkgconfig
73 + test? (
74 + dev-libs/glib:2
75 + $(python_gen_any_dep '
76 + dev-python/dbus-python[${PYTHON_USEDEP}]
77 + ')
78 + )
79 +"
80
81 python_check_deps() {
82 use test || return 0
83 @@ -63,6 +58,7 @@ pkg_setup() {
84
85 src_configure() {
86 local mycmakeargs=(
87 + -DPython3_EXECUTABLE="${PYTHON}"
88 -DENABLE_DEBUG_OUTPUT=$(usex debug)
89 -DENABLE_FARSTREAM=$(usex farstream)
90 -DENABLE_TESTS=$(usex test)
91
92 diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
93 index 6e73cf75cae..4ae1fc73d37 100644
94 --- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
95 +++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
96 @@ -3,9 +3,10 @@
97
98 EAPI=7
99
100 -PYTHON_COMPAT=( python3_{7,8,9} )
101 +PYTHON_COMPAT=( python3_{8,9,10} )
102 +PYTHON_REQ_USE="xml(+)"
103
104 -if [[ ${PV} = *9999* ]]; then
105 +if [[ ${PV} == *9999* ]]; then
106 EGIT_REPO_URI=( "https://gitlab.freedesktop.org/telepathy/${PN}" )
107 inherit git-r3
108 else
109 @@ -63,6 +64,7 @@ pkg_setup() {
110
111 src_configure() {
112 local mycmakeargs=(
113 + -DPython3_EXECUTABLE="${PYTHON}"
114 -DENABLE_DEBUG_OUTPUT=$(usex debug)
115 -DENABLE_FARSTREAM=$(usex farstream)
116 -DENABLE_TESTS=$(usex test)