commit: d77d45673e5909170d6892c8347d5075a5efad58
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 11:07:51 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 18 07:56:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d77d4567
Move dev-python/{dbusmock → python-dbusmock}
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-libs/folks/folks-0.15.2.ebuild | 8 ++++++--
dev-libs/folks/folks-0.15.3.ebuild | 8 ++++++--
dev-python/{dbusmock => python-dbusmock}/Manifest | 0
dev-python/{dbusmock => python-dbusmock}/metadata.xml | 0
.../python-dbusmock-0.23.1.ebuild} | 7 ++-----
dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild | 6 +++---
gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild | 4 ++--
.../gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild | 4 ++--
net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild | 4 ++--
profiles/arch/alpha/package.use.mask | 2 +-
profiles/arch/sparc/package.use.mask | 2 +-
profiles/updates/3Q-2021 | 1 +
sys-auth/fprintd/fprintd-1.90.8.ebuild | 2 +-
sys-auth/fprintd/fprintd-1.90.9.ebuild | 2 +-
14 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/dev-libs/folks/folks-0.15.2.ebuild
b/dev-libs/folks/folks-0.15.2.ebuild
index f8cafe8b1d3..dc0e45aa841 100644
--- a/dev-libs/folks/folks-0.15.2.ebuild
+++ b/dev-libs/folks/folks-0.15.2.ebuild
@@ -46,13 +46,17 @@ BDEPEND="
eds? ( gnome-extra/evolution-data-server[vala] )
test? (
sys-apps/dbus
- bluetooth? ( $(python_gen_any_dep
'dev-python/dbusmock[${PYTHON_USEDEP}]') )
+ bluetooth? (
+ $(python_gen_any_dep '
+ dev-python/python-dbusmock[${PYTHON_USEDEP}]
+ ')
+ )
)
"
python_check_deps() {
if use test && use bluetooth; then
- has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+ has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
fi
}
diff --git a/dev-libs/folks/folks-0.15.3.ebuild
b/dev-libs/folks/folks-0.15.3.ebuild
index 6c8e2077510..ccc18a6ef49 100644
--- a/dev-libs/folks/folks-0.15.3.ebuild
+++ b/dev-libs/folks/folks-0.15.3.ebuild
@@ -46,13 +46,17 @@ BDEPEND="
eds? ( gnome-extra/evolution-data-server[vala] )
test? (
sys-apps/dbus
- bluetooth? ( $(python_gen_any_dep
'dev-python/dbusmock[${PYTHON_USEDEP}]') )
+ bluetooth? (
+ $(python_gen_any_dep '
+ dev-python/python-dbusmock[${PYTHON_USEDEP}]
+ ')
+ )
)
"
python_check_deps() {
if use test && use bluetooth; then
- has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+ has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
fi
}
diff --git a/dev-python/dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
similarity index 100%
rename from dev-python/dbusmock/Manifest
rename to dev-python/python-dbusmock/Manifest
diff --git a/dev-python/dbusmock/metadata.xml
b/dev-python/python-dbusmock/metadata.xml
similarity index 100%
rename from dev-python/dbusmock/metadata.xml
rename to dev-python/python-dbusmock/metadata.xml
diff --git a/dev-python/dbusmock/dbusmock-0.23.1.ebuild
b/dev-python/python-dbusmock/python-dbusmock-0.23.1.ebuild
similarity index 82%
rename from dev-python/dbusmock/dbusmock-0.23.1.ebuild
rename to dev-python/python-dbusmock/python-dbusmock-0.23.1.ebuild
index 68998ccb55f..082b1a20d91 100644
--- a/dev-python/dbusmock/dbusmock-0.23.1.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.23.1.ebuild
@@ -8,13 +8,10 @@ PYTHON_REQ_USE="xml(+)"
inherit distutils-r1
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-
DESCRIPTION="Easily create mock objects on D-Bus for software testing"
HOMEPAGE="https://github.com/martinpitt/python-dbusmock";
-SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz";
-S=${WORKDIR}/${MY_P}
+SRC_URI="
+
https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz";
LICENSE="LGPL-3+"
SLOT="0"
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
index a3899dd29a7..a2054f79964 100644
--- 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
@@ -30,20 +30,20 @@ COMMON_DEPEND="${PYTHON_DEPS}
DEPEND="${COMMON_DEPEND}
test? (
$(python_gen_cond_dep '
- dev-python/dbusmock[${PYTHON_USEDEP}]
+ dev-python/python-dbusmock[${PYTHON_USEDEP}]
')
)
"
RDEPEND="${COMMON_DEPEND}
$(python_gen_cond_dep '
- dev-python/dbusmock[${PYTHON_USEDEP}]
+ dev-python/python-dbusmock[${PYTHON_USEDEP}]
')
"
src_prepare() {
default
- # bind to specific Python version (with dbusmock installed)
+ # bind to specific Python version (with python-dbusmock installed)
sed -i -e "s:python3:${EPYTHON}:" \
libdbustest/dbus-mock.c tests/test-libdbustest-mock.c || die
}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
index 7727243b85a..e0b9654b250 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
@@ -117,7 +117,7 @@ BDEPEND="
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
test? ( $(python_gen_any_dep '
- dev-python/dbusmock[${PYTHON_USEDEP}]
+ dev-python/python-dbusmock[${PYTHON_USEDEP}]
') )
"
@@ -131,7 +131,7 @@ PATCHES=(
python_check_deps() {
use test || return 0
- has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+ has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
}
pkg_setup() {
diff --git
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
index 950cb29a9cf..9734313d2ef 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
@@ -81,7 +81,7 @@ BDEPEND="
test? (
$(python_gen_any_dep '
dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/dbusmock[${PYTHON_USEDEP}]
+ dev-python/python-dbusmock[${PYTHON_USEDEP}]
')
gnome-base/gnome-session
)
@@ -98,7 +98,7 @@ PATCHES=(
python_check_deps() {
if use test; then
has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
- has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+ has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
fi
}
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
index 1158f711755..f30aa94cb95 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
virtual/pkgconfig
test? (
$(python_gen_any_dep '
- dev-python/dbusmock[${PYTHON_USEDEP}]
+ dev-python/python-dbusmock[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
')
)
@@ -43,7 +43,7 @@ BDEPEND="
python_check_deps() {
if use test; then
- has_version -b "dev-python/dbusmock[${PYTHON_USEDEP}]" && \
+ has_version -b "dev-python/python-dbusmock[${PYTHON_USEDEP}]" &&
has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]"
fi
}
diff --git a/profiles/arch/alpha/package.use.mask
b/profiles/arch/alpha/package.use.mask
index 126c09d37cf..28ca080220d 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -242,7 +242,7 @@ x11-themes/qtcurve plasma
dev-db/mariadb numa
# Gilles Dartiguelongue <[email protected]> (2017-08-16)
-# missing keyword on dev-python/dbusmock, bug #620024
+# missing keyword on dev-python/python-dbusmock, bug #620024
>=gnome-base/gnome-settings-daemon-3.24 test
# Michał Górny <[email protected]> (2017-08-08)
diff --git a/profiles/arch/sparc/package.use.mask
b/profiles/arch/sparc/package.use.mask
index 2a3e57849aa..92fbe638651 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -274,7 +274,7 @@ media-plugins/gst-plugins-meta ffmpeg
dev-db/mariadb numa
# Gilles Dartiguelongue <[email protected]> (2017-08-16)
-# missing keyword on dev-python/dbusmock, bug #620024
+# missing keyword on dev-python/python-dbusmock, bug #620024
>=gnome-base/gnome-settings-daemon-3.24 test
# Michał Górny <[email protected]> (2017-08-08)
diff --git a/profiles/updates/3Q-2021 b/profiles/updates/3Q-2021
index a99c693c458..d50215a319d 100644
--- a/profiles/updates/3Q-2021
+++ b/profiles/updates/3Q-2021
@@ -2,3 +2,4 @@ move x11-misc/xrestop x11-apps/xrestop
move media-sound/zam-plugins media-plugins/zam-plugins
slotmove =dev-ruby/elasticsearch-transport-6.8.3 6 6.8.3
move dev-python/cfn-python-lint dev-python/cfn-lint
+move dev-python/dbusmock dev-python/python-dbusmock
diff --git a/sys-auth/fprintd/fprintd-1.90.8.ebuild
b/sys-auth/fprintd/fprintd-1.90.8.ebuild
index 8063672e039..6ff76f43490 100644
--- a/sys-auth/fprintd/fprintd-1.90.8.ebuild
+++ b/sys-auth/fprintd/fprintd-1.90.8.ebuild
@@ -36,7 +36,7 @@ BDEPEND="
dev-util/gtk-doc
)
test? (
- dev-python/dbusmock
+ dev-python/python-dbusmock
dev-python/dbus-python
dev-python/pycairo
pam? ( sys-libs/pam_wrapper )
diff --git a/sys-auth/fprintd/fprintd-1.90.9.ebuild
b/sys-auth/fprintd/fprintd-1.90.9.ebuild
index b0cfcddc5fe..dbf73e8db57 100644
--- a/sys-auth/fprintd/fprintd-1.90.9.ebuild
+++ b/sys-auth/fprintd/fprintd-1.90.9.ebuild
@@ -36,7 +36,7 @@ BDEPEND="
dev-util/gtk-doc
)
test? (
- dev-python/dbusmock
+ dev-python/python-dbusmock
dev-python/dbus-python
dev-python/pycairo
pam? ( sys-libs/pam_wrapper )
