Version bump.

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

3 files changed, 274 insertions, 17 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 41f501a86f9b..97ab9f487170 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.290 2014/01/05 23:08:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.291 2014/01/10 19:47:21 billie Exp $
+
+*hplip-3.14.1 (10 Jan 2014)
+
+  10 Jan 2014; Daniel Pielmeier <billie@gentoo.org> +hplip-3.14.1.ebuild:
+  Version bump.
 
   05 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> hplip-3.12.10a.ebuild,
   hplip-3.13.9.ebuild, hplip-3.13.11-r1.ebuild:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 22e98e809033..4688e375d4d9 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -7,27 +7,17 @@ DIST hplip-3.13.11-patches-1.tar.xz 6280 SHA256 e1e301b01a94c6565d9acd4b868e1b69
 DIST hplip-3.13.11.tar.gz 21104424 SHA256 1ea0ed020ab54e08620fe6ea7c30e93dbb8be505f2e6994e7222a7be63ca3b34 SHA512 31cfb57baa870f5086a6c02ebf2893290a489afef4a450d7b2627eb240669e70e7dadca5a418d628d547ec9d07202f28e065b97ad64d42095e15798370fbdd7f WHIRLPOOL fde504d5e4c77d49da60032b7302bb739f8112593b1c6f189b892f087eba446e2d022dc477aee6797eadede0aa759f2ce00a5cf0eba354b4f25898163de7d5c0
 DIST hplip-3.13.9-patches-1.tar.xz 8096 SHA256 cabdc3ad00ed745728810f4af667356baa3b0b757ee889486d424102ce4cdce4 SHA512 88f6c542c5b9d1125eaa0748b17d99ea177f455023a7678a1fa7ff74fdace2b6b16ba3e08a61b1ff2006af511212c434cab60cac2c50e8584d1c4a9f8510cc9e WHIRLPOOL ca44d44b6e4d33a8c9300e2388982983e44305b389c32998c342fbf3cbc0a2217e032a49377231518c813540f6267d0f7c6664a21bec0e6072d2caebc24d4aa7
 DIST hplip-3.13.9.tar.gz 20878480 SHA256 d95c729a79b0d28be3ecb6cba6df5a931b0788484c4d323963abc36d514bb120 SHA512 7895b55336a61db9479f1457ef7d46084e22bb92a59c5f705be47f435e8854a51ba0409f7bbc332215edcb372fb5f21423ab1222fda5286113f105a20d928960 WHIRLPOOL 86c7ceac0bf33a4a2799233b7ee7718e23bab7f6720fa1c571967c98e5c7ba77667efcd8320a98a0f4eea773ae2c7325320a475029d9b1d0f5741c9d478e368b
+DIST hplip-3.14.1.tar.gz 21116532 SHA256 5c1e79d4426c00c3eb7ec9b689c430ea3d132e23849c08ae3dc58cd8d3d0eb14 SHA512 caeeda3e641dd2a15d272a20272c220a2ea7ecabde0fad3b579e9cf351a0f44de2b32e0dc5b2880c231e61eaacb9d8d19e8ecd3ff1945027412089a43fee2ca7 WHIRLPOOL 75caf28546f42f3f436c7eeb108f1cb8ce26f57ab9fb8b2ae64d9de4c1f03a71b28f281353ca6240ecaa2ff6918b926d749aad50f4ea50a5312a07292d30c216
 EBUILD hplip-3.12.10a.ebuild 6832 SHA256 49e791534f1bddc7f725f867621dc39bcd35ffd82c16caea60bf6012aabdeeac SHA512 82d9cf1e59797d05808a077c0d4991dfd7881c9202a9610bd7fd96456409dfc0d425e3fd43087e3ec71ab1434755fa3f6e51c52d4b68672007bd962b536c6d0a WHIRLPOOL 0f8b72c7cefaf97d1331eb7b74e1d345dee6eefe3e3dc6017bb9054b47e0f9ff0262ab53d78b7c143677a6f24b0728a41256e9f987cc2ac3f11dcd938da3d1a5
 EBUILD hplip-3.13.11-r1.ebuild 7714 SHA256 9d2f9e9e9bb329f7bff0db5ad54f94e1da38b9297f22e539f2988e32cd42966f SHA512 b971787bfebf3f668d6967984d1ae55907bf6039f0b46729f29d2f392b7a9af8374f1f7d73656218b1a6c40b32961ea5463fa4aa8a08e12303b183a6610a48d8 WHIRLPOOL e6baec735f73c9c1bb8629f5b93ee275b9a8fa48f10a187865aa2a6bf8a54122b4a37cf3a0d9d0c244aad5ec9001bac52b0537b36cb01e7695e14012ce542cb0
 EBUILD hplip-3.13.9.ebuild 8121 SHA256 7464f3ebc66dbeecbef2459421f24436868eba774587074a33f8ba63bd459737 SHA512 df122d8ba13a27cdb07b76607ae616669478f64740aa81efd0ae0157925efa566f8703ebfaeb916fe958f841372071ab990a467b05e02090112959caae8c26a9 WHIRLPOOL e0b0eb5bdc6783a881fcbe54c780f1ce97e4560911a3bb22eb8b7f57b2708236dba0000bd0895e6d0b708a6df3934c252318dcff356aa5567f1bab14236a5c76
-MISC ChangeLog 49360 SHA256 897cb5ccc458356dd9fd27efddf6445dd548f0f41b4000935e0ad467984bc608 SHA512 045ee6f97fb5a2e43df31e2f7550e6ad0183f30abed781902e8527db347a9198f508e16b03f3f9f900bd4599bc6333c460d52f49d0fbf7f7caf0434d40bbb9d1 WHIRLPOOL 1f9a251ba85c66cdcbada446503168f8b0d102765804c9d60a4c0c03d3eac7e888479269299f5cf35b1ef502b2aeb1723ace709474c4d0568619755f3066f634
+EBUILD hplip-3.14.1.ebuild 7707 SHA256 ad6e9e7cd4332941a0402ea498a5590d7df849b3a377a2bb9cc892c0695baa0a SHA512 022c8bbacb0e21fc19bd0073bf63c0e4a0339ad7bbc7ce21952a4d285ca0c7b9aec23d20263442a48dcdc942bc226cd6543bd3d3f37fa5d2a47229fe7fcd1877 WHIRLPOOL 7594324864015b720afebf8bd72c058c5332251bc7a16644d2a64684428b738ea10e1c89bd928f1828a2033cec163e49438d5976b7f2989050e0e11a5b0f7082
+MISC ChangeLog 49477 SHA256 1bdd7afee4d109ed479a7b38956a64cb927e0e63bcc61c5a8a0aac4341668bd1 SHA512 4bd006d17aeddabf27ea5e1a14437c9b1c7b0a62db12758fbd3e0d1cc2c5df9e84502f53e95062760dc1bc554cafe25c3f505d22fc46496c134bdd0a32fd8a77 WHIRLPOOL daf284878905811af203917b8096cdf9c5695852bb1bff3f5d5f24f53b2870a3377150f7885030106eb9561446d6a750220c09076d4c6754fd9e39e2bcf687e1
 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSyeYlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcJdEQAIIqisIP6uC8qroRiyqMtjjZ
-i0B9ktcQrDN7Dp3SezdjeGnCLVGvspfJHtuMMqAJggb3jNEQZrSD54VYo0a99lm/
-9EW0MP5akh4jOenrMPreqc6O3j4zGegDEc/E4U+yMAm/xSSX/tco7wf4M8MuLbNm
-6xka0sbmfgDbHbd99GEl/TwkAkpo5i4fJ0UDPepBVbqWMBgWr71hkktiTqmFnH3u
-yg2pZcDyZAng3Jg+6vX1m07rEoQVTPIX45DWjiUGYPX0wH5LnulGc58gkS8UxGNy
-XK1W4Fh0vLuUphYc1vWB4jAw2Bu5UvVMz/G7d0jzHAXrKGfaH+9kcr/B50FtNMa4
-SmCZkwAsqfXxW6EZ/Le8iHkhTqaedoRY8dn89hMGn1VLASp9hjJOsLyJTA3IIaWO
-kj9XjeEq47FEthdQKf1s+qjxIp6mkBG1kbN7SHWnEX+nYGLKKFCWWFvlxTKsDTgi
-QEYPutjikpICKyrvaYsSG4V1Z/4Hh2V4DpVYdBkMlMUGaNl3xsG5z/zOUAUj1N+C
-V52rPtdbTY1fp3BkQM07Fqs7OnTsmMLGGV1+VlJhbGgDOYyCcAzLWhVjTnW3Qo72
-YumeJ4uvvtB8Qt0+3K/OH96wIQR+t7uMKSlRjXQb5hb6yjRFaV1yiJwEie0HjtYx
-GjgDtCkl+yVo5WYd+FTn
-=4gvQ
+iEYEAREIAAYFAlLQTk0ACgkQlcuUeyFa0U3WuwCfWwde0oPu//3lo4pDJgaoz/Ic
+FLQAoLkVGJGl9Yz9SwlGpg3k0xDq3w8q
+=hsX8
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.14.1.ebuild b/net-print/hplip/hplip-3.14.1.ebuild
new file mode 100644
index 000000000000..2728d6075407
--- /dev/null
+++ b/net-print/hplip/hplip-3.14.1.ebuild
@@ -0,0 +1,262 @@
+# 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.1.ebuild,v 1.1 2014/01/10 19:47:21 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.13.11-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
+	>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
+	policykit? (
+		sys-auth/polkit
+	)
+	!minimal? (
+		>=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 \
+		--disable-udev-acl-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
+}