From 7d6a26f8b2304d62d379647ee963d3ffa3635f6b Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 7 Feb 2020 14:00:10 +0100
Subject: dev-util/dbus-test-runner: Switch to PYTHON_MULTI_USEDEP API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 .../dbus-test-runner-19.04.0-r1.ebuild             | 58 ++++++++++++++++++++++
 .../dbus-test-runner-19.04.0.ebuild                | 52 -------------------
 2 files changed, 58 insertions(+), 52 deletions(-)
 create mode 100644 dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
 delete mode 100644 dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild

diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
new file mode 100644
index 000000000000..c4f1875532ba
--- /dev/null
+++ b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit flag-o-matic python-single-r1
+
+DESCRIPTION="Run executables under a new DBus session for testing"
+HOMEPAGE="https://launchpad.net/dbus-test-runner"
+SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# now optional:
+#	test? ( dev-util/bustle )
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/intltool
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/dbusmock[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/dbusmock[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+src_prepare() {
+	default
+
+	# bind to specific Python version (with dbusmock installed)
+	sed -i -e "s:python3:${EPYTHON}:" \
+		libdbustest/dbus-mock.c tests/test-libdbustest-mock.c || die
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
deleted file mode 100644
index 829f86ec19c3..000000000000
--- a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit flag-o-matic python-single-r1
-
-DESCRIPTION="Run executables under a new DBus session for testing"
-HOMEPAGE="https://launchpad.net/dbus-test-runner"
-SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# now optional:
-#	test? ( dev-util/bustle )
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/intltool
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-python/dbusmock[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbusmock[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	default
-
-	# bind to specific Python version (with dbusmock installed)
-	sed -i -e "s:python3:${EPYTHON}:" \
-		libdbustest/dbus-mock.c tests/test-libdbustest-mock.c || die
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
-- 
cgit v1.2.3-65-gdbad