[gentoo-commits] repo/gentoo:master commit in: net-print/hplip/

[Daniel Pielmeier]

commit:     79d614e2e8409b65113d92a54bef848871119392
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  2 17:56:20 2016 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 17:56:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d614e2

net-print/hplip: Version bump.

Fixes bump request bug #582146. Thanks to Lars Wendler for the report.
Add python 3 support. Fixes bug #554766. Thanks to Virgil Dupras for the
report.
Enable 'snmp' USE by default. Fixes bug #544636. Thanks to Pacho Ramos
for the report.
Drop ppc and ppc64 keywords due to dev-python/PyQt5.

Package-Manager: portage-2.2.28

 net-print/hplip/Manifest                           |  2 +
 net-print/hplip/hplip-3.14.10.ebuild               |  4 +-
 .../{hplip-3.14.10.ebuild => hplip-3.16.5.ebuild}  | 96 +++++++++++-----------
 net-print/hplip/metadata.xml                       |  3 -
 4 files changed, 50 insertions(+), 55 deletions(-)

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index a0036fd..1804893 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -2,3 +2,5 @@ DIST hplip-3.14.10-patches-1.tar.xz 8140 SHA256 33116a5e2c104495d60f0b15e923b2ae
 DIST hplip-3.14.10.tar.gz 21773429 SHA256 11b3cd8311dea6b22a4c80be1e5d021e84d15a5f3e7e22cbd43798e5c1a89598 SHA512 ed184c8d0d3d8d5aad454831013d7c5e0b1685b088ee8099b6efc1b152f8b159a2349f23f0c5c77a7a5f1a48165b0e22f2ff83ced1beb14633bd278d4ef4d6dc WHIRLPOOL 8e1985cfd370849db96765f792655da36e22b6cecb660dd4707b0ff33dd53c8b66b2ec73a9596c7e60036edc1843c195bbbde64f37c5a1c319752bf0ebc08eb6
 DIST hplip-3.16.2-patches-1.tar.xz 8188 SHA256 8a9a78e0caac1731eae79f047a6054b411c237c579fdfd07bc59d435db708705 SHA512 7eb03c093cfb9ef6b9a980ef5520575310d080c45ed13191933a5facaf9bbb04b38c8381762a3ecd33884ad582830e61e17b6c17f2ed7cdf910670e05eed2510 WHIRLPOOL 6721eac17977485eae0cb22b1702d0479003e3639e806ecd3c5888f1b5015a0bf904512104ebefee4b3d5f64abebd0608090e00310ec8d5b48f210c7e4a95e4e
 DIST hplip-3.16.3.tar.gz 22408596 SHA256 42d2302ee38bda41caa0f2f9524a91f531e3aa432814ffd45b3e5c396dc30194 SHA512 32d2f88c0983208e77592f73bf65cf2900cd6aa234d09220a18b45b5fc4bd0d10e9cfc8c7a10639e5a51ad5f5d0f8ed7bd477d08c86b89c633a1bbcd42682915 WHIRLPOOL b287ecf80c2e7b0da0de0afefcf60c507f9d42c74dbba1e745b4b43f253a5b0dedb6398a1f073e14d196296da47764e983138c0151e05bfc7a5dd416458662a0
+DIST hplip-3.16.5-patches-1.tar.xz 8200 SHA256 98866e57a247e7a30d9cd584ed9411aa79a6185294a73b4cc5961efe9a5e5fa6 SHA512 36d33da5fc4105183cbc5137845ddccd8ab2b6abbff053a3a51f3da61c26c2d9d48dcb735345fb453abd67b6a0797aa337102c366cce037bc7006599b20b1646 WHIRLPOOL 8ac91bdefeb177c092b1d6de16474e8e1da57ad046dbc579f14fd40a27d1837d9bf142573137ef8d91c37dc7b03ca908fd5bfad23a9815af2015b521091c2700
+DIST hplip-3.16.5.tar.gz 22662561 SHA256 c609516003c9613c51e2ef24503e535f8d93693dd618cb6397a2d71f70315ed9 SHA512 5fdf7dc710158af2aff651f23df9da88dd8443668f738cc143be66bd53952189dd3c87f73741a5af7369d48d465d6dd3936e45eff59bfc4146243c4897a8434b WHIRLPOOL 003a663048210d9c4ce53ac8de009df48454c7d2a73cf8685d90c2cc6a8b8952363009fa565f68f517858c5e36ac3ffa74fa282a7f37cd0b229741fd4824d457

diff --git a/net-print/hplip/hplip-3.14.10.ebuild b/net-print/hplip/hplip-3.14.10.ebuild
index d822854..c14e24c 100644
--- a/net-print/hplip/hplip-3.14.10.ebuild
+++ b/net-print/hplip/hplip-3.14.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads,xml"
 
 inherit eutils fdo-mime linux-info python-single-r1 udev autotools toolchain-funcs
 
-DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools"
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
 HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
 SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 		https://dev.gentoo.org/~billie/distfiles/${PN}-3.14.10-patches-1.tar.xz"

diff --git a/net-print/hplip/hplip-3.14.10.ebuild b/net-print/hplip/hplip-3.16.5.ebuild
similarity index 74%
copy from net-print/hplip/hplip-3.14.10.ebuild
copy to net-print/hplip/hplip-3.16.5.ebuild
index d822854..eb8f220 100644
--- a/net-print/hplip/hplip-3.14.10.ebuild
+++ b/net-print/hplip/hplip-3.16.5.ebuild
@@ -1,29 +1,27 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 PYTHON_REQ_USE="threads,xml"
 
-inherit eutils fdo-mime linux-info python-single-r1 udev autotools toolchain-funcs
+inherit eutils linux-info python-single-r1 readme.gentoo-r1 udev autotools
 
-DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools"
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
 HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
 SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		https://dev.gentoo.org/~billie/distfiles/${PN}-3.14.10-patches-1.tar.xz"
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.16.5-patches-1.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
-# zeroconf does not work properly with >=cups-1.4.
-# Thus support for it is also disabled in hplip.
-IUSE="doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X"
+IUSE="doc fax +hpcups hpijs kde -libusb0 minimal parport policykit +qt4 qt5 scanner +snmp static-ppds X"
 
-# TODO: check if net-print/cups, net-analyzer/net-snmp
-# are migrated to python-r1
+# dependency on dev-python/notify-python dropped due to python 3 incompatibility
+# possible replacement notify2 (https://pypi.python.org/pypi/notify2/0.3) not in tree
 
 COMMON_DEPEND="
 	virtual/jpeg:0
@@ -48,43 +46,44 @@ DEPEND="${COMMON_DEPEND}
 
 RDEPEND="${COMMON_DEPEND}
 	>=app-text/ghostscript-gpl-8.71-r3
-	policykit? (
-		sys-auth/polkit
-	)
+	policykit? ( sys-auth/polkit )
 	!minimal? (
-		>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-2.28.6-r53:2[${PYTHON_USEDEP}]
-		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
+		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		kernel_linux? ( virtual/udev )
 		scanner? (
-			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
-			>=dev-python/pillow-1[${PYTHON_USEDEP}]
+			>=dev-python/reportlab-3.1.44-r2[${PYTHON_USEDEP}]
+			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
 			X? ( || (
 				kde? ( kde-misc/skanlite )
 				media-gfx/xsane
 				media-gfx/sane-frontends
 			) )
 		)
-		fax? (
-			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
-			>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
-		)
-		qt4? (
-			>=dev-python/PyQt4-4.9.6-r2[dbus,X,${PYTHON_USEDEP}]
-			libnotify? (
-				>=dev-python/notify-python-0.1.1-r3[${PYTHON_USEDEP}]
-			)
-		)
+		fax? ( >=dev-python/reportlab-3.1.44-r2[${PYTHON_USEDEP}] )
+		qt4? ( >=dev-python/PyQt4-4.11.1[dbus,X,${PYTHON_USEDEP}] )
+		qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,${PYTHON_USEDEP}] )
 	)"
 
-REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )
+	^^ ( qt4 qt5 )"
 
 CONFIG_CHECK="~PARPORT ~PPDEV"
 ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
 
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+
+Any user who wants to print must be in the lp group.
+"
+
 pkg_setup() {
 	use !minimal && python-single-r1_pkg_setup
 
-	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
+	! use qt4 && ! use qt5 && ewarn "You need USE=qt4 or USE=qt5 for the hplip GUI."
 
 	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
 
@@ -104,15 +103,15 @@ pkg_setup() {
 }
 
 src_prepare() {
+	eapply "${WORKDIR}/patches"
+
+	default
+
 	if use !minimal ; then
 		python_export EPYTHON PYTHON
 		python_fix_shebang .
 	fi
 
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
 	# Make desktop files follow the specification
 	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
@@ -150,7 +149,13 @@ src_prepare() {
 src_configure() {
 	local myconf drv_build minimal_build
 
-	if use fax || use qt4 ; then
+	if use qt4 || use qt5 ; then
+		myconf="${myconf} --enable-gui-build"
+	else
+		myconf="${myconf} --disable-gui-build"
+	fi
+
+	if use fax ||  use qt4 || use qt5 ; then
 		myconf="${myconf} --enable-dbus-build"
 	else
 		myconf="${myconf} --disable-dbus-build"
@@ -224,8 +229,8 @@ src_configure() {
 		$(use_enable parport pp-build) \
 		$(use_enable scanner scan-build) \
 		$(use_enable snmp network-build) \
-		$(use_enable qt4 gui-build) \
 		$(use_enable qt4) \
+		$(use_enable qt5) \
 		$(use_enable policykit)
 }
 
@@ -248,19 +253,10 @@ src_install() {
 		python_export EPYTHON PYTHON
 		python_optimize "${D}"/usr/share/hplip
 	fi
+
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "For more information on setting up your printer please take"
-		elog "a look at the hplip section of the gentoo printing guide:"
-		elog "https://wiki.gentoo.org/wiki/Printing"
-		elog
-		elog "Any user who wants to print must be in the lp group."
-		elog
-		elog "Please note: Printers requiring a binary plugin are currently"
-		elog "not supported. All bugs regarding the plugin are most likely"
-		elog "closed. A bug about including the plugin package to gentoo is"
-		elog "available here: https://bugs.gentoo.org/352439"
-	fi
+	readme.gentoo_print_elog
 }

diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index e0cf7c2..243ad8e 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -10,16 +10,13 @@
 		<name>Gentoo Printing Project</name>
 	</maintainer>
 	<use>
-		<flag name="doc">Build documentation</flag>
 		<flag name="fax">Enable fax on multifunction devices which support it</flag>
 		<flag name="hpcups">Build the hpcups driver for cups (by HP)</flag>
 		<flag name="hpijs">Build the IJS driver for cups (Foomatic)</flag>
 		<flag name="kde">Enables <pkg>kde-misc/skanlite</pkg> as scanner GUI with USE="scanner X"</flag>
-		<flag name="libnotify">Enables desktop notifications</flag>
 		<flag name="libusb0">Depend on <pkg>virtual/libusb</pkg> SLOT 0. Some old printers do not work with <pkg>virtual/libusb</pkg> SLOT 1.</flag>
 		<flag name="minimal">Only build internal hpijs/hpcups driver (not recommended at all, make sure you know what you are doing)</flag>
 		<flag name="parport">Enable parallel port for devices which require it</flag>
-		<flag name="qt4">Enable graphical interface using Qt 4</flag>
 		<flag name="scanner">Enable scanner on multifunction devices which support it</flag>
 		<flag name="snmp">Add support for <pkg>net-analyzer/net-snmp</pkg> which enables this driver to work over networks (both for server and client)</flag>
 		<flag name="static-ppds">Use statically-generated PPDs instead of Dynamic PPDs. Although this is deprecated some printers may still need it to work properly. Use this flag if hp-setup fails to find/create a valid PPD file</flag>