Version bump. Add patch to fix hp-systray for kde5. This fixes bug #525028. Thanks to Manual Rueger for the report.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D

3 files changed, 275 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 6ccdebd8fc45..8c8873571172 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.308 2014/10/11 10:20:43 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.309 2014/10/11 10:23:12 billie Exp $
+
+*hplip-3.14.10 (11 Oct 2014)
+
+  11 Oct 2014; Daniel Pielmeier <billie@gentoo.org> +hplip-3.14.10.ebuild:
+  Version bump. Add patch to fix hp-systray for kde5. This fixes bug #525028.
+  Thanks to Manual Rüger for the report.
 
   11 Oct 2014; Daniel Pielmeier <billie@gentoo.org> -hplip-3.14.4.ebuild:
   Remove old.
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index be9e9fa860de..4f8c345eb8c4 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -3,16 +3,19 @@ Hash: SHA256
 
 DIST hplip-3.13.11-patches-1.tar.xz 6280 SHA256 e1e301b01a94c6565d9acd4b868e1b69e7420a586addd9439529713a30d68100 SHA512 054b62bfde6f2b41894c0da2644aae8d8f592d14021fbf5e7eede9f0b3f6f1bea9b6a219c2807102bfa7c6c738565d9910e6fdefabd45eccd3c62c6313714595 WHIRLPOOL ec7102dfbced0886ca64c83743b90bd3fa8308510c71f56246ab47acd3cf4770e2e3538b84265a8d096869881c85c98f477207a8e802c763db57255236479ed9
 DIST hplip-3.14.1.tar.gz 21116532 SHA256 5c1e79d4426c00c3eb7ec9b689c430ea3d132e23849c08ae3dc58cd8d3d0eb14 SHA512 caeeda3e641dd2a15d272a20272c220a2ea7ecabde0fad3b579e9cf351a0f44de2b32e0dc5b2880c231e61eaacb9d8d19e8ecd3ff1945027412089a43fee2ca7 WHIRLPOOL 75caf28546f42f3f436c7eeb108f1cb8ce26f57ab9fb8b2ae64d9de4c1f03a71b28f281353ca6240ecaa2ff6918b926d749aad50f4ea50a5312a07292d30c216
+DIST hplip-3.14.10-patches-1.tar.xz 8140 SHA256 33116a5e2c104495d60f0b15e923b2ae5eaaf269cd5ee8e988b035eb20aa23ab SHA512 a8deb03979c55b660ef299505afc328fc930786ea9d473109a9fafd83d72528a9c3700faf4742f2e05829824fc97c3656538e1a607e2191e617f3944f0482e9a WHIRLPOOL bbf5d62f29c0fb0162f34b7815fc190459c619fdaf4f96e33d085f9b7228fa5431b6d668322256995a0a1d16aa1cccb75171000bbb2334ad3b51fec47f2653c0
+DIST hplip-3.14.10.tar.gz 21773429 SHA256 11b3cd8311dea6b22a4c80be1e5d021e84d15a5f3e7e22cbd43798e5c1a89598 SHA512 ed184c8d0d3d8d5aad454831013d7c5e0b1685b088ee8099b6efc1b152f8b159a2349f23f0c5c77a7a5f1a48165b0e22f2ff83ced1beb14633bd278d4ef4d6dc WHIRLPOOL 8e1985cfd370849db96765f792655da36e22b6cecb660dd4707b0ff33dd53c8b66b2ec73a9596c7e60036edc1843c195bbbde64f37c5a1c319752bf0ebc08eb6
 DIST hplip-3.14.3-patches-1.tar.xz 7116 SHA256 af5a084ca52a5f95fc71a015bdba96d8d0e81152ec06f0e56c6a368ffdd6ef08 SHA512 7fe976e43ff7ee65601792e364b4ace04cc792e04a0f2e9449e4baa6aee1ebcdc2089ab3afded9e1431c46c3068a08b1233212011b4cceb961c7c1b7fd609b05 WHIRLPOOL b937ed09e5e2127aa7a7a59eb3816a394502c9d77806be50ae0c4ad590e77437ef18c486d3f391baad4406e13934d195b8b33f9d3a5758d9bdcd0fc94b30ae39
 DIST hplip-3.14.6.tar.gz 21603895 SHA256 a57233cd0e2db1dcf1d34d8b90c6a9d3e027e522695aada6c3c411a839868b8e SHA512 aca2bdbfc043bdae86215e7cb4efbca298d7f506bbddd4e46ca9542b12de0bba6c8098747b0a293e7af471b3f2297ef287a052e4791a469d407d5c769259bdc3 WHIRLPOOL 8f68e2db64fe5b7a2fff463b053e7ea4ce1ec17988af67644218ebe69c4750bae5b5bbeff831224c489ea1850d7fba2e5b48a4f69de3d9594bce1e390c859908
 EBUILD hplip-3.14.1.ebuild 7693 SHA256 8dd4da60ace677f86c77e6faf9b0f15e00fe860586b01d4c26be1aa672887e8b SHA512 bfe8e35910fd7ee22ec3626958394e9cbaded5bee615efa7e6e962b7756842df2c8cc950d45f14645eb245466dc6e59486fb47acd98716893cab2c7b5b033e81 WHIRLPOOL c39d2b7c632d27a382925329e1d539a7acee30f317af1fe16ee21f6b3ba868cdad9af29af02aada9095640822d22a84d1c39908057daadb2d1ca9d44f6275edd
+EBUILD hplip-3.14.10.ebuild 7646 SHA256 74577d5472f8d034d62b0ea3f444444ad826d6ca005596db2bc5a217efb0e328 SHA512 81336b6fe31d376f56e63531d1da7bf33c95ef4e24a11429cf58515f460c2045159d16d97223c6088ddecafb5a23f2b3520f34d9a8d2864eb566eb7dd07cde9e WHIRLPOOL a57aad4ee3d8a5b45275a888de1cea4875ec814df90583545c0c4b16058bf63d7f835a2d911334951699dd28869d3bea08dd5856e6e28f65725fc22281a1860b
 EBUILD hplip-3.14.6.ebuild 7644 SHA256 81b4bc75d154a0026688b7f2828d790610f7df105900ec2c91a2990b5b7bae0a SHA512 9d6baa8ed69c733b8dba3daf99af95d7ed78e041b83044da4b650f763b18de15e0aae8ebc4a795213e05ec086b74f8f4f58b0fe078d450d921c0ef203b0bb83f WHIRLPOOL f4bc1550514c91fcebd5b077107a1ec750b9bb388cbd5f4410672f406dbea1788f32dec2669d7e7638cd91608928df9ae4cb9386ca24791de75143c577c93556
-MISC ChangeLog 52024 SHA256 38f3149e111daf805da0dc51a46cfa5120a5251a37f857dac810ab65cfdd55b8 SHA512 d73aa7fa965647611d8f4dc8b6eb39d324479a395f2ac58b89b2fc3471b81e9d279c84dbc809da0947e538c99eed9f2d9e423955d1a6b1f4722b0041e9bdd115 WHIRLPOOL 88d40ce241b2a6250ff45b89d1273ccb20d3c669970dd3bb498fba078203ef4eaf89000f9ef27c4606fc48f1f1ff41d29f6c33a07763740cdfd6810f7ef316bc
+MISC ChangeLog 52250 SHA256 9732c11d590f20673bdc19e02b191b8c06a9b5b150d5215ce9e4601b26b60d0c SHA512 a03363f2d2455907b3fcde67289e93f645f2bc7d69fdc276f41f8a5a1528b45297938a61f19c4b4333eb57ac5bc452c1dd0f0ea015c22fae559d5b1ab4e419d6 WHIRLPOOL fd6b4b188e13e5f54533451cf7bcf2562054ac0e55a7ea52a274e10c53ecabd8d721aff8d4c4a8373f730f3209a61fda3a78ea1cf3c82a5aca4daf6c24412677
 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ5BIUACgkQlcuUeyFa0U1bzgCghf2qd/P0+0R/dxQh1pfsTY9Q
-9XcAoLBjVA7TcvSxGhlFqtj1JJsP+P9/
-=QBaY
+iEYEAREIAAYFAlQ5BREACgkQlcuUeyFa0U0cVACfSjclmJ0l8c6wZqaYeDLg7lRB
+z2MAoJtrz+oQfwmYd67BX6Z2CUEuq24h
+=dn9Y
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.14.10.ebuild b/net-print/hplip/hplip-3.14.10.ebuild
new file mode 100644
index 000000000000..18fbe404310c
--- /dev/null
+++ b/net-print/hplip/hplip-3.14.10.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.14.10.ebuild,v 1.1 2014/10/11 10:23:12 billie Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_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"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		http://dev.gentoo.org/~billie/distfiles/${PN}-3.14.10-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~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"
+
+# TODO: check if net-print/cups, net-analyzer/net-snmp
+# are migrated to python-r1
+
+COMMON_DEPEND="
+	virtual/jpeg:0
+	hpijs? (
+		|| ( >=net-print/cups-filters-1.0.43-r1[foomatic] >=net-print/foomatic-filters-3.0.20080507[cups] )
+	)
+	!minimal? (
+		${PYTHON_DEPS}
+		>=net-print/cups-1.4.0
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+		fax? ( >=sys-apps/dbus-1.6.8-r1 )
+		snmp? (
+			net-analyzer/net-snmp
+			dev-libs/openssl:0
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ghostscript-gpl-8.71-r3
+	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 )
+		scanner? (
+			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+			>=virtual/python-imaging-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}]
+			)
+		)
+	)"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	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
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	local i
+	for i in ppd/hpijs/*.ppd.gz ; do
+		rm -f ${i}.temp || die
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || die
+		mv ${i}.temp ${i} || die
+	done
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use fax || use qt4 ; then
+		myconf="${myconf} --enable-dbus-build"
+	else
+		myconf="${myconf} --disable-dbus-build"
+	fi
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(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 policykit)
+}
+
+src_install() {
+	default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${D}"/etc/sane.d/dll.conf || die
+
+	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${D}"/usr/share/hal || die
+
+	prune_libtool_files --all
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${D}"/usr/share/hplip
+	fi
+}
+
+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 "http://www.gentoo.org/doc/en/printing-howto.xml"
+		elog
+		elog "Any user who wants to print must be in the lp group."
+	fi
+}