Version bump.

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

3 files changed, 273 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 857318200a6e..8c5680aaad88 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # 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.299 2014/03/07 16:28:09 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.300 2014/04/17 07:30:42 billie Exp $
+
+*hplip-3.14.4 (17 Apr 2014)
+
+  17 Apr 2014; Daniel Pielmeier <billie@gentoo.org> +hplip-3.14.4.ebuild:
+  Version bump.
 
   07 Mar 2014; Daniel Pielmeier <billie@gentoo.org> -hplip-3.14.1-r1.ebuild:
   Remove old.
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 714f5fb4747c..200d71ec9929 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -5,14 +5,16 @@ DIST hplip-3.13.11-patches-1.tar.xz 6280 SHA256 e1e301b01a94c6565d9acd4b868e1b69
 DIST hplip-3.14.1.tar.gz 21116532 SHA256 5c1e79d4426c00c3eb7ec9b689c430ea3d132e23849c08ae3dc58cd8d3d0eb14 SHA512 caeeda3e641dd2a15d272a20272c220a2ea7ecabde0fad3b579e9cf351a0f44de2b32e0dc5b2880c231e61eaacb9d8d19e8ecd3ff1945027412089a43fee2ca7 WHIRLPOOL 75caf28546f42f3f436c7eeb108f1cb8ce26f57ab9fb8b2ae64d9de4c1f03a71b28f281353ca6240ecaa2ff6918b926d749aad50f4ea50a5312a07292d30c216
 DIST hplip-3.14.3-patches-1.tar.xz 7116 SHA256 af5a084ca52a5f95fc71a015bdba96d8d0e81152ec06f0e56c6a368ffdd6ef08 SHA512 7fe976e43ff7ee65601792e364b4ace04cc792e04a0f2e9449e4baa6aee1ebcdc2089ab3afded9e1431c46c3068a08b1233212011b4cceb961c7c1b7fd609b05 WHIRLPOOL b937ed09e5e2127aa7a7a59eb3816a394502c9d77806be50ae0c4ad590e77437ef18c486d3f391baad4406e13934d195b8b33f9d3a5758d9bdcd0fc94b30ae39
 DIST hplip-3.14.3.tar.gz 21178745 SHA256 1805b103639b51b9d908921e1e77db66c6e78b792aa51e405a5415e8e1c55e6e SHA512 c51ee7ff1255d56b271a2d2072fb7cdf62ccece323fe4814cdfb2a93fa97144dd83343f09bc5fdcc7e757c3ba16d3158c239689e0324fb2d9295917f94153dea WHIRLPOOL f489902c046250a98865f9631ca18addc8820cf2bdb1b7ac00f601b93d95734d0298c1be45f4c40008d361cbe450e6a32714d4ed72769cd9aa40ee79840b0bfb
+DIST hplip-3.14.4.tar.gz 21414140 SHA256 ce50c2e0ebc0f469599500257d291ca170c6559a99c8eb312f89be881c2110c9 SHA512 1df41a2813dccd1bed5b549a3de71791bcd7cabcfef3957f441a1c144119f2cd3641607ed14f55def19b5130f339c2e4169869cbcb94fced159eaa89296ce14f WHIRLPOOL 1e49464ffc57406701b768d8b660ec3bfead1fb709b984969f77e2f8aa25304d3669ffbd22cf99737df0817ca11f0d6941df24a868cb2c273e5a48246460234f
 EBUILD hplip-3.14.1.ebuild 7700 SHA256 75b86b0dcc9e3472cad114efef2bcd50dc7a0ed12c90b84bd690545afdf9fb32 SHA512 ee320d0767969ed14cb3ed80a9084d4f79398300921297caf50eaa94070c94fe9df094bc6477bde1ccfaa1d32d38165b3edc8d79b2bd98285b9ab3d542c44588 WHIRLPOOL 76654dd0e207de71239e99c3a26fd7a6194abb43845139969eaf9cd6b6dc22959dd462238ba75d35263db9de80949a649e593988087a220f0a7cc3ea7b0b6b6d
 EBUILD hplip-3.14.3.ebuild 7678 SHA256 0bc1834adbb48795a878049219ec95764159e3006fa5fddfe779e8e07bf1cc0e SHA512 d71898e4f2d368472261300bca7d6f310aa8beffa82d781027d424a55e5bb0aad4be330be84a3eead28d1ea86ad5b2e0a518b813c09d99df2da73c44668c005a WHIRLPOOL a0c2809dc9d0bff8bc58a72481320c2307489798caaa51775a675868557ff193aac59f9cb137d939a98ea685d6e7b07a7b3904b7e04d4d9eddd76968d8b50141
-MISC ChangeLog 50795 SHA256 f1e8553396085bca487fd8e965a88c0d0e2ea0f39a5c71d46f5ba9e62d508033 SHA512 271c9c6582a22c994de901cc4b6f276b0278c4fd29dc0cb6ba983403daff0ace68163a6a0fd1019afcc78943fffea497ea93293949dd93525b8a15220df180a6 WHIRLPOOL 5b5156e499b7013132eb83cfa5bc8dc144597fd4d630db8cc3edc37be8febc1343046d0861784efb051bf08ada062c17c78e452ab7c7a342a9adf14a16562993
+EBUILD hplip-3.14.4.ebuild 7678 SHA256 7b6ed6764ee8744055f38b80203b20f5399320d1b5fd9bb6bd55a9837fc269ab SHA512 77809c6247a91f598fdcecb932446874f9cb2528dd60c8792f6b382e12dca9c06c45a930b19e609938ee175bd775abb8f47ae31dad1959c9de32c920e0237512 WHIRLPOOL 11553ab34b7533c6089a3f227813bf5d0b13956271ba7788190434907efac98ef49cb2684a8ed1bd0bda9c47b1451ed7aef6210bfb18611fe05f4a9f6c40eb44
+MISC ChangeLog 50915 SHA256 3610f19abe1f0c78bf55589a099bd331d22d9ecea12319cdbd263a8e8b747903 SHA512 295b2491952e023dbd93c2894355e1b60f3e7636236ae368f0f82f4815256c854dd80dc4e4cc07ad10ef9d13c15e9590d715afd23c02a83fd9cac93a439d9acf WHIRLPOOL 56195a34698628b5b4a87d3d3695b22b2dbeff05aa9e2ca7d323dedd362d4f3fea078f3d0193ddc78595309f442598de15997d497b7ba7333fd51a6beb413b8d
 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMZ85oACgkQlcuUeyFa0U337QCfdL/OuUAOqcWKMKa2+RlLIVEH
-DSMAoO6RtoRtadBtTEjF+T0tPrdqnYtC
-=9z/S
+iEYEAREIAAYFAlNPgyMACgkQlcuUeyFa0U3UhQCg3wcx/c+1pOQSQQ6mH8+pBD0t
+KmkAoIuNlz6HEWwC6CtuSRI/c5z5uP/O
+=4l/F
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.14.4.ebuild b/net-print/hplip/hplip-3.14.4.ebuild
new file mode 100644
index 000000000000..1be0d0427055
--- /dev/null
+++ b/net-print/hplip/hplip-3.14.4.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.4.ebuild,v 1.1 2014/04/17 07:30:42 billie Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_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.3-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
+	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=$(udev_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
+
+	find "${D}" -name '*.la' -exec rm -rf {} + || die
+
+	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
+}