app-admin/system-config-printer: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny@gentoo.org>

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 c3ccfa108f0565cb66244163c72bb36bdf816895..d2f73378485c1c4b20df16d4c3928d63d18f9844 100644 (file)
--- 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
similarity index 85%
rename from app-admin/system-config-printer/system-config-printer-1.5.12.ebuild
rename to app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild
index ddfedb5f26de4f20c5036bc554b050d95e96d7d2..a62572dca403d2fa2b0eab637efdbbb08b341e14 100644 (file)
--- 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 95f1686fcc2e9bcdbbb46cc5705105c5ce647d94..b28fb1ff286bbc124f2eb34875425cc6a34d1428 100644 (file)
--- 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