From e11ae60541a0297fe0df89dac1e4a07709684a5a Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 7 Feb 2020 09:50:46 +0100 Subject: app-admin/system-config-printer: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../system-config-printer-1.5.11-r2.ebuild | 14 ++-- .../system-config-printer-1.5.12-r1.ebuild | 86 ++++++++++++++++++++++ .../system-config-printer-1.5.12.ebuild | 84 --------------------- profiles/base/package.use.mask | 2 +- 4 files changed, 95 insertions(+), 91 deletions(-) create mode 100644 app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild delete mode 100644 app-admin/system-config-printer/system-config-printer-1.5.12.ebuild 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 c3ccfa108f05..d2f73378485c 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-r1.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild new file mode 100644 index 000000000000..a62572dca403 --- /dev/null +++ b/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_REQ_USE="xml" +inherit gnome2 python-single-r1 systemd + +DESCRIPTION="Graphical user interface for CUPS administration" +HOMEPAGE="https://github.com/OpenPrinting/system-config-printer" +SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/${PV}/${P}.tar.xz" + +LICENSE="GPL-2+" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86" +SLOT="0" +IUSE="doc gnome-keyring policykit" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Needs cups running, bug 284005 +RESTRICT="test" + +# Additional unhandled dependencies +# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ? +# python samba client: smbc +# selinux: needed for troubleshooting +COMMON_DEPEND="${PYTHON_DEPS} + dev-libs/glib:2 + net-print/cups[dbus] + virtual/libusb:1 + >=virtual/udev-172 + x11-libs/gtk+:3[introspection] + x11-libs/libnotify[introspection] + x11-libs/pango[introspection] +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + >=app-text/xmlto-0.0.22 + dev-perl/XML-Parser + dev-util/desktop-file-utils + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig + doc? ( dev-python/epydoc ) +" +RDEPEND="${COMMON_DEPEND} + $(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 ) +" + +PATCHES=( + "${FILESDIR}"/${P}-check-for-null.patch + "${FILESDIR}"/${P}-fix-abrt-in-udev-configure-printer.patch +) + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_configure() { + gnome2_src_configure \ + --enable-nls \ + --with-desktop-vendor=Gentoo \ + --with-udev-rules \ + --with-systemdsystemunitdir=$(systemd_get_systemunitdir) +} + +src_compile() { + gnome2_src_compile + use doc && emake html +} + +src_install() { + use doc && local HTML_DOCS=( html/. ) + gnome2_src_install + python_fix_shebang "${ED}" + python_optimize +} 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.ebuild deleted file mode 100644 index ddfedb5f26de..000000000000 --- a/app-admin/system-config-printer/system-config-printer-1.5.12.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7} ) -PYTHON_REQ_USE="xml" -inherit gnome2 python-single-r1 systemd - -DESCRIPTION="Graphical user interface for CUPS administration" -HOMEPAGE="https://github.com/OpenPrinting/system-config-printer" -SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86" -SLOT="0" -IUSE="doc gnome-keyring policykit" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Needs cups running, bug 284005 -RESTRICT="test" - -# Additional unhandled dependencies -# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ? -# python samba client: smbc -# selinux: needed for troubleshooting -COMMON_DEPEND="${PYTHON_DEPS} - dev-libs/glib:2 - net-print/cups[dbus] - virtual/libusb:1 - >=virtual/udev-172 - x11-libs/gtk+:3[introspection] - x11-libs/libnotify[introspection] - x11-libs/pango[introspection] -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - >=app-text/xmlto-0.0.22 - dev-perl/XML-Parser - dev-util/desktop-file-utils - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - 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}] - gnome-keyring? ( app-crypt/libsecret[introspection] ) - policykit? ( net-print/cups-pk-helper ) -" - -PATCHES=( - "${FILESDIR}"/${P}-check-for-null.patch - "${FILESDIR}"/${P}-fix-abrt-in-udev-configure-printer.patch -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_configure() { - gnome2_src_configure \ - --enable-nls \ - --with-desktop-vendor=Gentoo \ - --with-udev-rules \ - --with-systemdsystemunitdir=$(systemd_get_systemunitdir) -} - -src_compile() { - gnome2_src_compile - use doc && emake html -} - -src_install() { - use doc && local HTML_DOCS=( html/. ) - gnome2_src_install - python_fix_shebang "${ED}" - python_optimize -} diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 95f1686fcc2e..b28fb1ff286b 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -28,7 +28,7 @@ dev-python/zeep tornado # Michał Górny (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 -- cgit v1.2.3-18-g5258