summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-02-07 09:50:46 +0100
committerMichał Górny <mgorny@gentoo.org>2020-02-09 17:10:31 +0100
commite11ae60541a0297fe0df89dac1e4a07709684a5a (patch)
tree759d316046e417328cf11dbbbac9725944b1f30c
parentapp-admin/packagekit-base: Switch to PYTHON_SINGLE/MULTI_USEDEP API (diff)
downloadgentoo-e11ae60541a0297fe0df89dac1e4a07709684a5a.tar.gz
gentoo-e11ae60541a0297fe0df89dac1e4a07709684a5a.tar.bz2
gentoo-e11ae60541a0297fe0df89dac1e4a07709684a5a.zip
app-admin/system-config-printer: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild14
-rw-r--r--app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild (renamed from app-admin/system-config-printer/system-config-printer-1.5.12.ebuild)14
-rw-r--r--profiles/base/package.use.mask2
3 files changed, 17 insertions, 13 deletions
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
index c3ccfa108f0..d2f73378485 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
@@ -45,12 +45,14 @@ DEPEND="${COMMON_DEPEND}
doc? ( dev-python/epydoc )
"
RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pycups[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/urllib3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycups[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ dev-python/urllib3[${PYTHON_MULTI_USEDEP}]
+ ')
gnome-keyring? ( app-crypt/libsecret[introspection] )
policykit? ( net-print/cups-pk-helper )
"
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.12.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild
index ddfedb5f26d..a62572dca40 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.12.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild
@@ -44,12 +44,14 @@ DEPEND="${COMMON_DEPEND}
doc? ( dev-python/epydoc )
"
RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pycups[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/urllib3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycups[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ dev-python/urllib3[${PYTHON_MULTI_USEDEP}]
+ ')
gnome-keyring? ( app-crypt/libsecret[introspection] )
policykit? ( net-print/cups-pk-helper )
"
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 95f1686fcc2..b28fb1ff286 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -28,7 +28,7 @@ dev-python/zeep tornado
# Michał Górny <mgorny@gentoo.org> (2020-01-29)
# Require dev-python/epydoc which is being removed.
-<=app-admin/system-config-printer-1.5.12 doc
+<=app-admin/system-config-printer-1.5.12-r1 doc
<=dev-python/cosmolopy-0.1.104-r2 doc
<=dev-python/dbus-python-1.2.4 doc
<=dev-python/pycrypto-2.6.1-r2 doc