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 f633a95b4042..cf55b9f19f1e 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.302 2014/06/04 17:07:48 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.303 2014/06/10 19:13:25 billie Exp $
+
+*hplip-3.14.6 (10 Jun 2014)
+
+  10 Jun 2014; Daniel Pielmeier <billie@gentoo.org> +hplip-3.14.6.ebuild:
+  Version bump.
 
   04 Jun 2014; Daniel Pielmeier <billie@gentoo.org> -hplip-3.14.3.ebuild:
   Remove old.
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 2f3355ca24c9..582cf00895c5 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.4.tar.gz 21414140 SHA256 ce50c2e0ebc0f469599500257d291ca170c6559a99c8eb312f89be881c2110c9 SHA512 1df41a2813dccd1bed5b549a3de71791bcd7cabcfef3957f441a1c144119f2cd3641607ed14f55def19b5130f339c2e4169869cbcb94fced159eaa89296ce14f WHIRLPOOL 1e49464ffc57406701b768d8b660ec3bfead1fb709b984969f77e2f8aa25304d3669ffbd22cf99737df0817ca11f0d6941df24a868cb2c273e5a48246460234f
+DIST hplip-3.14.6.tar.gz 21603895 SHA256 a57233cd0e2db1dcf1d34d8b90c6a9d3e027e522695aada6c3c411a839868b8e SHA512 aca2bdbfc043bdae86215e7cb4efbca298d7f506bbddd4e46ca9542b12de0bba6c8098747b0a293e7af471b3f2297ef287a052e4791a469d407d5c769259bdc3 WHIRLPOOL 8f68e2db64fe5b7a2fff463b053e7ea4ce1ec17988af67644218ebe69c4750bae5b5bbeff831224c489ea1850d7fba2e5b48a4f69de3d9594bce1e390c859908
 EBUILD hplip-3.14.1.ebuild 7696 SHA256 71a9a563fdd425dff147930682ffc0844a2803e9fd1c3938b76628cf22fe14b1 SHA512 ff6cd6e6f4d74d3dcdda25540716a23f805e8e38901ac99bd1a6227983fe214e999fdc4c8b90bed6ed0fe16643d66bf0f26a5898ab0ee2391e3a019c3017e4e8 WHIRLPOOL 3f14c8ee43c0a465e2e89bea7efb23fab8a7d9d03b91706295557a2f808a5f0bb465a988b2c1aeea8d633def02b7dee4333589359bc327b143ab5df031dc9152
 EBUILD hplip-3.14.4.ebuild 7671 SHA256 165ec5d519d83cab04def00df5aee72f1f7d26351db6563edf0a83922b65f636 SHA512 28f817729f3f46269d2e83e45a765ba6f362384db6febc562a918fd204396a3043f766c4dbad3b6b9377cc359b2c3f95a6c48d36fdf46a7f69af92f5751ea995 WHIRLPOOL 5ae44e2bcfea79a901ebcee47e4c0de9ccf1908c68e676977229113e796f2af3a661fbc4d315d76b3ab08ba6c155728fed4b368bf57f04be850593913519ee0d
-MISC ChangeLog 51178 SHA256 0e185be394bf16c35fa25b23a710b0e8734d1ae9ace3b721b221cd6c3a37df19 SHA512 cfcdf5355296063c9c8b820954ee7cf9e08caf719dd43a42d2fa94031518feda0b25c973f6f7dc9c21d0075280bb353a445eab5cb06475e67ecf0210012651c6 WHIRLPOOL a286020cbd12e31ebc29e6e5cc4a3b1e426a328b0f21c0f30709367d9f162d72041fc5b570a263951277678b1ffe19c25704443f3e63195623ebd40f75f1e59a
+EBUILD hplip-3.14.6.ebuild 7672 SHA256 3b20a5b6dcd21aa03984128c3f30e97a9259bffb9c0ddd32bf76616f6a3faca1 SHA512 15e4c9b8ace94660af5078aa042e4fd4e664ec9df7bb8392ea7ffe477c86f877c49dc9856a6fb2d11f2796b097068460f0a678cc4ac3bdf71477fd0ae42bf547 WHIRLPOOL b7cdfb339be474ee651828c815ec99e8147476d686f0c8dc60362c92c4c1dda299119ffc18445e785e01f1328630ea2e144eef1aa73317eb5c8b988f8d451046
+MISC ChangeLog 51298 SHA256 9e9f190cd208aec6bc1a15a77003057d95f13b5d9699057d5cbbcba272e5b1d9 SHA512 09b22f6e0ad901cb6935273e25936f2133daa1fe480ede54b2592eb49bf06bb05c106dd830083929af7f2324ad9eb636d80a7196d6b806fe5730e73878663b99 WHIRLPOOL 9adc6b1157513922ee6b93e16f652ba714397ed4f4418dea0c1d66b47f68fcbf128a6e3a5f51a32182da0303cf5756fbf7067e85705a03b981df7b86de619729
 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOPUp0ACgkQlcuUeyFa0U0bsQCg7dgV+/in2IbqRwNw6QV5DS3X
-IWkAoPrlXqzJ6LUxgf2V1o2/PDUg4pL7
-=PMqn
+iEYEAREIAAYFAlOXWNYACgkQlcuUeyFa0U32qACfSrFh4tfuWaA6KztOarFgij/g
+TBwAoKlKLhDbCgTIrkci+spWY9FHp1hU
+=mclU
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.14.6.ebuild b/net-print/hplip/hplip-3.14.6.ebuild
new file mode 100644
index 000000000000..a89b8a805bae
--- /dev/null
+++ b/net-print/hplip/hplip-3.14.6.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.6.ebuild,v 1.1 2014/06/10 19:13:25 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.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
+}