From 3fd146ede028edfb103f117e53e6ef2dfc73a792 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 18:32:56 +0100 Subject: [PATCH] net-print/hplip: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- ...3.18.12.ebuild => hplip-3.18.12-r1.ebuild} | 36 ++++++++++--------- net-print/hplip/hplip-3.19.11.ebuild | 36 ++++++++++--------- ...3.19.12.ebuild => hplip-3.19.12-r1.ebuild} | 36 ++++++++++--------- 3 files changed, 57 insertions(+), 51 deletions(-) rename net-print/hplip/{hplip-3.18.12.ebuild => hplip-3.18.12-r1.ebuild} (91%) rename net-print/hplip/{hplip-3.19.12.ebuild => hplip-3.19.12-r1.ebuild} (91%) diff --git a/net-print/hplip/hplip-3.18.12.ebuild b/net-print/hplip/hplip-3.18.12-r1.ebuild similarity index 91% rename from net-print/hplip/hplip-3.18.12.ebuild rename to net-print/hplip/hplip-3.18.12-r1.ebuild index b28c7ba4201f..6c7b5ccefb0f 100644 --- a/net-print/hplip/hplip-3.18.12.ebuild +++ b/net-print/hplip/hplip-3.18.12-r1.ebuild @@ -49,26 +49,28 @@ RDEPEND=" ${COMMON_DEPEND} app-text/ghostscript-gpl !minimal? ( - >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*') - fax? ( dev-python/reportlab[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*') + $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*') kernel_linux? ( virtual/udev ) - qt5? ( - >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}] - libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] ) - ) - scanner? ( - >=dev-python/reportlab-3.2[${PYTHON_USEDEP}] - >=dev-python/pillow-3.1.1[${PYTHON_USEDEP}] - X? ( - || ( - kde? ( kde-misc/skanlite ) - media-gfx/xsane - media-gfx/sane-frontends + $(python_gen_cond_dep ' + >=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}] + fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] ) + qt5? ( + >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}] + libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] ) + ) + scanner? ( + >=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}] + >=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}] + X? ( + || ( + kde? ( kde-misc/skanlite ) + media-gfx/xsane + media-gfx/sane-frontends + ) ) ) - ) + ') ) policykit? ( sys-auth/polkit ) " diff --git a/net-print/hplip/hplip-3.19.11.ebuild b/net-print/hplip/hplip-3.19.11.ebuild index 83e3e5a46112..0d2eb10db37c 100644 --- a/net-print/hplip/hplip-3.19.11.ebuild +++ b/net-print/hplip/hplip-3.19.11.ebuild @@ -49,26 +49,28 @@ RDEPEND=" ${COMMON_DEPEND} app-text/ghostscript-gpl !minimal? ( - >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*') - fax? ( dev-python/reportlab[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*') + $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*') kernel_linux? ( virtual/udev ) - qt5? ( - >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}] - libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] ) - ) - scanner? ( - >=dev-python/reportlab-3.2[${PYTHON_USEDEP}] - >=dev-python/pillow-3.1.1[${PYTHON_USEDEP}] - X? ( - || ( - kde? ( kde-misc/skanlite ) - media-gfx/xsane - media-gfx/sane-frontends + $(python_gen_cond_dep ' + >=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}] + fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] ) + qt5? ( + >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}] + libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] ) + ) + scanner? ( + >=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}] + >=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}] + X? ( + || ( + kde? ( kde-misc/skanlite ) + media-gfx/xsane + media-gfx/sane-frontends + ) ) ) - ) + ') ) policykit? ( sys-auth/polkit ) " diff --git a/net-print/hplip/hplip-3.19.12.ebuild b/net-print/hplip/hplip-3.19.12-r1.ebuild similarity index 91% rename from net-print/hplip/hplip-3.19.12.ebuild rename to net-print/hplip/hplip-3.19.12-r1.ebuild index 83e3e5a46112..0d2eb10db37c 100644 --- a/net-print/hplip/hplip-3.19.12.ebuild +++ b/net-print/hplip/hplip-3.19.12-r1.ebuild @@ -49,26 +49,28 @@ RDEPEND=" ${COMMON_DEPEND} app-text/ghostscript-gpl !minimal? ( - >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*') - fax? ( dev-python/reportlab[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*') + $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*') kernel_linux? ( virtual/udev ) - qt5? ( - >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}] - libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] ) - ) - scanner? ( - >=dev-python/reportlab-3.2[${PYTHON_USEDEP}] - >=dev-python/pillow-3.1.1[${PYTHON_USEDEP}] - X? ( - || ( - kde? ( kde-misc/skanlite ) - media-gfx/xsane - media-gfx/sane-frontends + $(python_gen_cond_dep ' + >=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}] + fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] ) + qt5? ( + >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}] + libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] ) + ) + scanner? ( + >=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}] + >=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}] + X? ( + || ( + kde? ( kde-misc/skanlite ) + media-gfx/xsane + media-gfx/sane-frontends + ) ) ) - ) + ') ) policykit? ( sys-auth/polkit ) " -- 2.26.2