commit:     2d89beb5bdad410cba3e18a92d4e9db38589cbc0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 22:53:48 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 23:05:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d89beb5

net-libs/telepathy-qt: EAPI-8, Add PYTHON_REQ_USE="xml(+)", python3_10

Closes: https://bugs.gentoo.org/812917
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...qt-9999.ebuild => telepathy-qt-0.9.8-r1.ebuild} | 32 ++++++++++------------
 net-libs/telepathy-qt/telepathy-qt-9999.ebuild     |  6 ++--
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild 
b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
similarity index 83%
copy from net-libs/telepathy-qt/telepathy-qt-9999.ebuild
copy to net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
index 6e73cf75cae..9f392ed86ab 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
@@ -3,37 +3,23 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-if [[ ${PV} = *9999* ]]; then
-       EGIT_REPO_URI=( "https://gitlab.freedesktop.org/telepathy/${PN}"; )
-       inherit git-r3
-else
-       SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
-       KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="xml(+)"
 inherit python-any-r1 cmake virtualx
 
 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="https://telepathy.freedesktop.org/";
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE="debug farstream test"
 
 REQUIRED_USE="test? ( farstream )"
 
 RESTRICT="!test? ( test )"
 
-BDEPEND="${PYTHON_DEPS}
-       virtual/pkgconfig
-       test? (
-               dev-libs/glib:2
-               $(python_gen_any_dep '
-                       dev-python/dbus-python[${PYTHON_USEDEP}]
-               ')
-       )
-"
 RDEPEND="
        dev-qt/qtcore:5
        dev-qt/qtdbus:5
@@ -51,6 +37,15 @@ DEPEND="${RDEPEND}
                dev-qt/qttest:5
        )
 "
+BDEPEND="${PYTHON_DEPS}
+       virtual/pkgconfig
+       test? (
+               dev-libs/glib:2
+               $(python_gen_any_dep '
+                       dev-python/dbus-python[${PYTHON_USEDEP}]
+               ')
+       )
+"
 
 python_check_deps() {
        use test || return 0
@@ -63,6 +58,7 @@ pkg_setup() {
 
 src_configure() {
        local mycmakeargs=(
+               -DPython3_EXECUTABLE="${PYTHON}"
                -DENABLE_DEBUG_OUTPUT=$(usex debug)
                -DENABLE_FARSTREAM=$(usex farstream)
                -DENABLE_TESTS=$(usex test)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild 
b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 6e73cf75cae..4ae1fc73d37 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="xml(+)"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI=( "https://gitlab.freedesktop.org/telepathy/${PN}"; )
        inherit git-r3
 else
@@ -63,6 +64,7 @@ pkg_setup() {
 
 src_configure() {
        local mycmakeargs=(
+               -DPython3_EXECUTABLE="${PYTHON}"
                -DENABLE_DEBUG_OUTPUT=$(usex debug)
                -DENABLE_FARSTREAM=$(usex farstream)
                -DENABLE_TESTS=$(usex test)

Reply via email to