Version bump.

Package-Manager: portage-2.1.11.60/cvs/Linux i686
Manifest-Sign-Key: 0x215AD14D

3 files changed, 281 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index dfaaa23dff51..8674e2d9bf54 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.268 2013/04/06 08:38:40 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.269 2013/04/12 15:39:45 billie Exp $
+
+*hplip-3.13.4 (12 Apr 2013)
+
+  12 Apr 2013; Daniel Pielmeier <billie@gentoo.org> +hplip-3.13.4.ebuild:
+  Version bump.
 
   06 Apr 2013; Daniel Pielmeier <billie@gentoo.org> hplip-3.13.3.ebuild:
   Raise dbus dependency for new python-r1 eclass.
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 1906d28e8699..fafae2cbe0ad 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -5,15 +5,17 @@ DIST hplip-3.12.10-patches-1.tar.xz 10496 SHA256 7b8f10c1e58ca60778c5c240e51d684
 DIST hplip-3.12.10a.tar.gz 21827613 SHA256 616a30f260407f959874d35d351eaf73c74f7f8f016a7826286c88d923a4b1fc SHA512 870a794fdd729aa69b392c3d5cba764ee77141be16313adaf43089c82de397b64517e88d986ecc6f1766cdd5381fa103528ee214358e7b9398f7d4bd70d5f33c WHIRLPOOL 45d2831f593b609b4e4e774c0bf446dd98cb8ad4eba797baafbc43d8af4897764973066348dde08f97ae90635becbe3e91419fbc080d4fdb0a3771b8e63d3c89
 DIST hplip-3.13.2.tar.gz 21681714 SHA256 7dee21c30a15729b2107713a1b779ea07982064a38e2d4935e58e6f56d6d3592 SHA512 be8ed690cd0ff7171de76c3ab67d67ea5065f7ad9f587c56194c05d1ce5f8b9274452d7d428efd5c4d04b94e44456b050302ae865d78e99f31d843dc31a76c39 WHIRLPOOL f6088657ad729e6dd404d39be1e3d59431dcedfd6ffd7e043e7332d3f051cd52c9c9a7049b025cf4f38b3a8dd5415573064e73a530fe55988d8a922a3c0b9da7
 DIST hplip-3.13.3.tar.gz 21685109 SHA256 36e590b06f3810c13cfba7721f0a75b3d3f0133a7d62312d5d25864fa6d94366 SHA512 cd81d7771ba48510984dce2884f8a47c8f748e2378888b93614adf17183644be66fb8bc2aac87f5f9edc1ddd11b44da00510877acb8e53071f6dba192982cdd6 WHIRLPOOL 2ec3474c3d770b3f71e78018c9a4c89e9272bacc74750c0fab95afc14fd590602b675acc75cf635a1a22c930439a4092c886f299b7ea2b0ff277c66a8dc2a5f7
+DIST hplip-3.13.4.tar.gz 20680774 SHA256 1adad3b15578bf81eae93d554f877fea78c734f4b4f2e34606230b2fe62d6956 SHA512 4b1b02f4cf3b0f7d7e030b8981d72f4dae03cf9b2b0515c05d1ab83cefb8d69c446cd9825aadf2625d53a0e51ae45287e0c546ea998737a030bb93a1703900d8 WHIRLPOOL 6ff3949fa7cf8f3b4acc0e722686197a868bd6fd248bc55f8b86f20cbd0a255915ed90ff5c3f596692a2918620bc8fa3614a54981e99e9f1c4e25bea3065383a
 EBUILD hplip-3.12.10a.ebuild 6774 SHA256 0bbe59d0b90af08c9b9ba92c75a80b7864755e222514cf3ec5f02697b4857701 SHA512 7088959016734bf194fbae687f96881ebcbf712a89054fd0e883f51e7fd70a28989cb84d07eabb3613a1c77887b335be241acd3e789395bb078873ac27533987 WHIRLPOOL f8eb2628b67872e55c72b1923c522716a23524b4e8592707a713653e435a3051cd999e033eaae39ecea9dc68c167d349edccc0910797b8693e08db042ef47002
 EBUILD hplip-3.13.2-r2.ebuild 8280 SHA256 188ee1368c0f287f28f9ec3bcf745db2cd30292a0b1cb9c3511046199ce799cb SHA512 19b3758713180316c2f2a29cae85a2e99439037ec400a01efe71e330f3dd46303abf4ade4bffa6921d12bbe6b37c793239e276aa4113981c803cea8ce76b5ec5 WHIRLPOOL 7b26cd9e64316a3e57cc682d061b498acf94e1a7ef48c880db14fac2e2b0d9d66f1ddafb6e587818ded05bb8b010720d6db4d5cae3093902505aab5da8dc5efe
 EBUILD hplip-3.13.3.ebuild 8273 SHA256 560a0c15dbf49fd18b446d99056a6edae871b5809105b70975ba7ff501e633d0 SHA512 0529227c44647057812edb734fe282ab59d2800075b1ddaf02a5a2ac6358786854d1dfb2d8afc3c9b8d45ab48514cc906285547065b8a10ba6bb2bdef43d28c5 WHIRLPOOL 7c9efbe88ee5bd4c5c88adf2da232e7b597ef82af391bfab7d87655794fbdd2316bd504d49fd93e472fa6a21f87357e3477daa29976f53f7b794d23509636013
-MISC ChangeLog 46366 SHA256 80765a894487ec790a3eb9cd08c07ad1d00f85c438235255037b62aaa69158c1 SHA512 c5892e3dbac53b44c1e92e3dfa37a1261f9b50a27599017003de52e70c6ff9d9d451707ff5878d86e1eba84e5d3a001d53998ecfb15a0f89acc8d99cf469f09f WHIRLPOOL a7cbcfa14f75ddc2916206cd84349612100a2b614175c49c671be48bd7d477c6ddb0c03d6039d20cda27523879a08136a756c5edec39acdd58739799a59dd06d
+EBUILD hplip-3.13.4.ebuild 8016 SHA256 720cfe04c6d413db714a2722512a181d56bbb956beb247dd0a6170974201a865 SHA512 a7f53f9ee98a6b90345c586a33e64fce809683ea00af3abde41eca1bbab3bbfb59f1e23622f29394f3878ea1e686369784ec4ad15c319fb9cda0d5dc707b91ab WHIRLPOOL 5f1647f4182c0b553d51ee81bed092fcbda2ef9cc9bae97b77c92e28fdf4b88810d769d0233dacab3b81c42249666bc30b680145641c803a6f4570e02a3bb170
+MISC ChangeLog 46486 SHA256 4ad3e64c6fdbc5eaaa018f1b816e2f92eefb824febf408b7b652d33b89948b49 SHA512 cba2daccfe1339a5640f73513fee678972d1652a3fa6ccd8323faf40b446bb0f20dab654ee73d1f94e32cffbdfed51d75fbdc7cb040d80377d97f7db8bef51fc WHIRLPOOL ebbf56337278c66c5e40e19d9b7890554e3f05cb6fbeb9c6d602f41a11fc431ba6b5c240411a8c1c22bb7283dc3bb3c9d8d73796136a1c4352dcab2645ce2752
 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFf3xwACgkQlcuUeyFa0U06gQCgh4V8tWoHPbAadG1oALCljX9F
-J+gAn13kuANwAS5yOUm0caz5Sx2u5kUK
-=vVjs
+iEYEAREIAAYFAlFoKsIACgkQlcuUeyFa0U2ETQCg7U+mAN9YZbUUT/LK6sOQnknH
+LOoAoJB0DYx8PSe11/hVgEIBdaK9mWck
+=4fWR
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.13.4.ebuild b/net-print/hplip/hplip-3.13.4.ebuild
new file mode 100644
index 000000000000..58c1e247be97
--- /dev/null
+++ b/net-print/hplip/hplip-3.13.4.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.13.4.ebuild,v 1.1 2013/04/12 15:39:45 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.12.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
+	hpijs? ( >=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}]
+			>=dev-python/imaging-1.1.7-r2[${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}]
+			)
+		)
+	)"
+
+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_preinst() {
+	# remove temporary directory so it is recreated with correct permissions
+	# this ensures correct permissions when upgrading from vulnerable versions
+	# remove this after some time
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=452586
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1016507
+	if [[ $(stat -c '%A' /var/lib/hp/) =~ w.$ ]] ; then
+		rm -rf "${ROOT%/}/var/log/hp"
+	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
+}