5 files changed, 3 insertions, 142 deletions
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 8b75017ac273..c1a6f3ab3cb2 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,8 +1,4 @@
-AUX 0.16.9-disable-style-tests.patch 502 BLAKE2B bc082ee45ac39a3457457d2d7d92809765ef27eb5d160e44546036223a511ce799e6be8abcfa5b7444619dc62188ab0b30f4b23a23b608e93c9054cd93253223 SHA512 1d9f957a74b767db9355380437233167e1c2e6957dd993843ad7eaac3f0cfb9fad739b9238207d60db203bf6daed6f1b5ce9373ef1a4085431845e8f8f9b6147
-AUX 0.16.9-replace-dbus-launch.patch 2851 BLAKE2B ddbfe3ffb7a5b55af448e5312340a83587ec7aa7613111caad4c9c54df4d2c05f6b0efb755262044e749d1d0c6ed2a289b02103f81518bd6ea24da7181bc71e0 SHA512 43fc52f453b086b59f854677eafda955ddd1e6a448579ac60de7288f6f1c8e8e029f5af12486ef6c14ba01f41fd10785c7bb076dcf4968349811be47c0b56073
 AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea5360cf6a128a2f569782a51525c1ac9e6972bd03188f9777b1685f04900d48f2e554507db7c8b755de02c0a07de8defa26f05 SHA512 a105bb67702ef10d578e4df723452f060248287e9fc394754257c036ba0c6b186f90f5849a37e32e57cd70f16bbb73d0b8f84d9d153e1649d3ec5ab147dd6183
-DIST dbusmock-0.16.9.tar.gz 71014 BLAKE2B d1c0853cfd06848f1d10afdd8de764814054a44080b44e1ac2ef3a1658a538f1e4c7f5936d65658c16da33ccbc2e94f35d2746f200fc6791f645e1eccc55f6fd SHA512 3aa91f6ede054ed3d3a69f68f3886094e881d266a8f09c7d08a34d10b080a77facde8aae01e75232472c2e643574fe897dae2c3588f5ad9ecf4ec4e67f404f54
 DIST dbusmock-0.18.2.tar.gz 72031 BLAKE2B 44b46f05e48f1178fe95e44c83899bbef5bc64dcee856be1b332890893a5b901a03c236ad9a8cc6cf2ece83efbf5ec798551320a098736ff95c13951333ffaa3 SHA512 2421cea872e1d84db639cae0d6cc10c4b80ccf64903b7b3f437cb58ad8e3d957c30c871f9666a7a7774808b4b56d6116959ea03fdc8b575ed98023b77b61c8a0
-EBUILD dbusmock-0.16.9.ebuild 1066 BLAKE2B 9df8f24c4231843c9738982b1836135f8852774bbe5de4b102987594973d5b9d8d23694aa36447cd0246d415e2aa9d4c17db0c423ad2255f2dda55445baad209 SHA512 63c6f73a03800b347c54dd6fb1f060d942e260a9230fec805344ad486d2443d39fb8983427dd8e41cf59048599d95e5ec7d0c65f6766f8bdeace873e2bfc328b
-EBUILD dbusmock-0.18.2.ebuild 1046 BLAKE2B 6b637377e8e97d293ccebc62982ac33b176b92dfc3020967774eace49f9d48c3b90b2a27f260e7bcb8f47293a889b98b91260b7cbf839acd6f0d97d4de3e2f3e SHA512 23de8fc1732f6578746cf6e332c6ea292402dba295041620b061f6f79deb362c1ece16cf79e5fe5bb30094df5412654fde87d4fc3714012c07d7473499eee8c3
+EBUILD dbusmock-0.18.2.ebuild 1075 BLAKE2B e821ac7d0be21633e3b9f0cc53b193741145eb43ff99456c9b3a077fd32bdc069c6c51215d270e8b60599f87ec0be9ff8bfb54db32abc4574fd4e029a8a64d90 SHA512 deac3fdc5d2b8f523ae04ec9899d969369704ca1fc17c0ce0468ea79a932efbb7d04ec67353ab34d35c11a2e03096ef522afe8f20a8eaeb47ae45500be7fd3a5
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.16.9.ebuild b/dev-python/dbusmock/dbusmock-0.16.9.ebuild
deleted file mode 100644
index 47cb5113fdfe..000000000000
--- a/dev-python/dbusmock/dbusmock-0.16.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/0.16.9-disable-style-tests.patch
-	"${FILESDIR}"/0.16.9-replace-dbus-launch.patch
-)
-
-python_test() {
-	nosetests --verbose || die "tests fail under ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( NEWS README.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dbusmock/dbusmock-0.18.2.ebuild b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
index e6abe64d7261..5189486b8f30 100644
--- a/dev-python/dbusmock/dbusmock-0.18.2.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -20,6 +20,7 @@ LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/dbusmock/files/0.16.9-disable-style-tests.patch b/dev-python/dbusmock/files/0.16.9-disable-style-tests.patch
deleted file mode 100644
index cb7febdb4e53..000000000000
--- a/dev-python/dbusmock/files/0.16.9-disable-style-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-These tests are bound to fail dependending on QA tools updates
-
-https://github.com/martinpitt/python-dbusmock/issues/28
-
---- a/tests/test_code.py	2017-08-16 09:20:43.848503995 +0200
-+++ b/tests/test_code.py	2017-08-16 09:20:54.410177037 +0200
-@@ -21,6 +21,7 @@
-     pycodestyle = None
- 
- 
-+@unittest.skip('style tests')
- class StaticCodeTests(unittest.TestCase):
-     @unittest.skipIf(subprocess.call(['which', 'pyflakes'], stdout=subprocess.PIPE) != 0,
-                      'pyflakes not installed')
diff --git a/dev-python/dbusmock/files/0.16.9-replace-dbus-launch.patch b/dev-python/dbusmock/files/0.16.9-replace-dbus-launch.patch
deleted file mode 100644
index 54149ed033aa..000000000000
--- a/dev-python/dbusmock/files/0.16.9-replace-dbus-launch.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 9470c54a2836795974e83e55ea859e4653b20b37 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin@piware.de>
-Date: Mon, 19 Jun 2017 16:31:28 +0200
-Subject: [PATCH] Call dbus-daemon directly instead of dbus-launch
-
-dbus-launch is X11 specific and being deprecated.
-
-Adjust documentation to use dbus-run-session instead.
-
-https://bugs.debian.org/836053
----
- NEWS                 |  4 ++++
- README.rst           |  6 +++---
- dbusmock/testcase.py | 18 ++++++++++--------
- 3 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index c1250ea..181a4df 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,7 @@
-+0.17 (UNRELEASED)
-+-----------------
-+ - Call dbus-daemon directly instead of dbus-launch. (Debian #836053)
-+
- 0.16.9 (2017-06-19)
- -------------------
-  - NetworkManager template: Fix type of 'State' property in AddActiveConnection()
-diff --git a/README.rst b/README.rst
-index 3dc4552..310e1ac 100644
---- a/README.rst
-+++ b/README.rst
-@@ -118,9 +118,9 @@ Let's walk through:
- Simple example from shell
- -------------------------
- 
--We use the actual session bus for this example. You can use ``dbus-launch`` to
--start a private one as well if you want, but that is not part of the actual
--mocking.
-+We use the actual session bus for this example. You can use
-+``dbus-run-session`` to start a private one as well if you want, but that is
-+not part of the actual mocking.
- 
- So let's start a mock at the D-Bus name ``com.example.Foo`` with an initial
- "main" object on path /, with the main D-Bus interface
-diff --git a/dbusmock/testcase.py b/dbusmock/testcase.py
-index 825c61f..49787e2 100644
---- a/dbusmock/testcase.py
-+++ b/dbusmock/testcase.py
-@@ -97,16 +97,18 @@ def start_dbus(klass, conf=None):
-         Normally you do not need to call this directly. Use start_system_bus()
-         and start_session_bus() instead.
-         '''
--        argv = ['dbus-launch']
-+        argv = ['dbus-daemon', '--fork', '--print-address=1', '--print-pid=1']
-         if conf:
-             argv.append('--config-file=' + conf)
--        out = subprocess.check_output(argv, universal_newlines=True)
--        variables = {}
--        for line in out.splitlines():
--            (k, v) = line.split('=', 1)
--            variables[k] = v
--        return (int(variables['DBUS_SESSION_BUS_PID']),
--                variables['DBUS_SESSION_BUS_ADDRESS'])
-+        else:
-+            argv.append('--session')
-+        lines = subprocess.check_output(argv, universal_newlines=True).strip().splitlines()
-+        assert len(lines) == 2, 'expected exactly 2 lines of output from dbus-daemon'
-+        # usually the first line is the address, but be lenient and accept any order
-+        try:
-+            return (int(lines[1]), lines[0])
-+        except ValueError:
-+            return (int(lines[0]), lines[1])
- 
-     @classmethod
-     def stop_dbus(klass, pid):