Fix bug #316111. Thanks to Marcin Deranek for the report.

Package-Manager: portage-2.1.10.41/cvs/Linux i686

4 files changed, 295 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 2abca7c8c301..d09b3971a0b9 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.206 2012/01/11 19:21:40 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.207 2012/01/12 19:19:01 billie Exp $
+
+*hplip-3.11.12-r1 (12 Jan 2012)
+
+  12 Jan 2012; Daniel Pielmeier <billie@gentoo.org> +hplip-3.11.12-r1.ebuild,
+  +files/hplip-3.11.12-black-stripes-pcl5c.patch:
+  Fix bug #316111. Thanks to Marcin Deranek for the report.
 
   11 Jan 2012; Daniel Pielmeier <billie@gentoo.org> hplip-3.11.12.ebuild:
   Fix bug #397493. Thanks to Hanno Meyer-Thurow (geki) for the report.
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 4bd78c679c1d..c6dc5d360e27 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -6,6 +6,7 @@ AUX hplip-3.11.1-desktop.patch 506 RMD160 eb55a4cbe136fc2105eb6cad21d5fdd69a8539
 AUX hplip-3.11.1-htmldir.patch 4470 RMD160 ab8369b02b3590a19dec6277e03d3e79768ab803 SHA1 b70b07654d9997d4085e32b5a2419a1913c0f611 SHA256 30185a66b033dfdf0db59e600b19454c7680f3fa09ea8c24adf0fff19c15585e
 AUX hplip-3.11.1-udev-attrs.patch 13946 RMD160 3634385078375936692251464ad9d31f76bc1c63 SHA1 abf1f2cfc709c9a46c18b4bff5f08420e50e2ae9 SHA256 a7ce9b86783c94f3c3c5e111364ef7874bbfda4af89137b1e7d158961d084d33
 AUX hplip-3.11.10-udev-attrs.patch 13895 RMD160 e350d51abbf93f20c1829bdeaf01d300b7030bc5 SHA1 e67a3053f12ac84ca496ddfe75d2864a3a257017 SHA256 83a7b126877f49fbfb28e5d9df26607e1f165a74a865030023c081c60e7256cd
+AUX hplip-3.11.12-black-stripes-pcl5c.patch 552 RMD160 8f6828824244e387418c2d467be63b2c9131e84a SHA1 4d6174bc075560b6ae49bc246a4ff8d55da21217 SHA256 5636e9d32d6bcc71ea358426d1723a0e57080ae5be0e65d597f1d1764eb5728e
 AUX hplip-3.11.12-udev-rules.patch 951 RMD160 29947b36f48b2bce89baf44c215ee044ea916711 SHA1 ef9d4b84520d3ddfdb4f300acc125f86fc47fe0f SHA256 9e461b7f6a264434317fcc83bb53c313f5f9c467bdec8c572b49684f6ddfcfa7
 AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
 AUX hplip-3.9.12-cupsddk.patch 1265 RMD160 4f4cea73c0cfc6e830b27f4945e123e3cd490114 SHA1 01ce069ab67277aab9205ea59537ec55362ef1aa SHA256 3050221f497c14ae3a7a093043018d55f4deb2b2ebd81840a8285cec4eb7759d
@@ -14,14 +15,15 @@ DIST hplip-3.11.10.tar.gz 21419965 RMD160 d5e7bd065f1fea5f536b4bf47c8962374de955
 DIST hplip-3.11.12.tar.gz 21530771 RMD160 e192446613e13d55bedfd331afd9b08d51071da0 SHA1 4990a7e416b5c75a9cf31604d20e5a0ff2f2f2dd SHA256 dcf05d1261f091a1dba1316a1f4e9034147fecbb1fff3e68179a599eb5ee4a9d
 DIST hplip-3.11.5.tar.gz 21227642 RMD160 8a87f201aac95253d0ac1765e21aa094f11389f8 SHA1 e3604752b7a1ab0f492a1b4d470f8fa75e8959e5 SHA256 611f677fc1a0d2d493d44bfe84e5e5aaac4124627e94885f57bc77db9178536c
 EBUILD hplip-3.11.10.ebuild 7517 RMD160 2f9c8086c7176c8ef826dcecb3ebca74266cdb2d SHA1 af9d666b98dd15a1db1e0c867201590b9ced191d SHA256 124b817b401ea6bd3140eefa2afe14b8e2dd0f438ec529e2734de06e7eb4318e
+EBUILD hplip-3.11.12-r1.ebuild 7807 RMD160 dc4c18093e46245b0106496f53c374f5202786c7 SHA1 4fd92331b647c5474e3079bfe168c5419c914538 SHA256 b3ec5873619be3221299c437102ba83718cc74fac701c5e837b5a591b59a5c79
 EBUILD hplip-3.11.12.ebuild 7648 RMD160 cac052ea32591a63bb99f90b01cd05d641919b5a SHA1 b79c896d9984e6e6710fdfc9e50cb5f3d713c778 SHA256 2b7b01354f365594d59ce9e92c2d72fc6910d26a539d5484f0b5301d99485ec4
 EBUILD hplip-3.11.5.ebuild 7517 RMD160 4ae37df100c2990de5b4da29684eee5ef677a5f5 SHA1 dc9f869e81014b7778e4c6aadcbaf82dc6434a5e SHA256 b3eaf951652f14975d7ba12fc16e1bd9198db86aee40e0c78624f25df658ce34
-MISC ChangeLog 35541 RMD160 782a0beff8b14678f818c69b2376c4a3be36cf20 SHA1 ea446613e1e29612e63c8b1c05c3058c043f3215 SHA256 3191d907b5a3851501f7764c63fe4b689494f927e3203db06964aeb7f99147da
+MISC ChangeLog 35763 RMD160 c1d5de346b22a2670a760a4c5d159d80ffff5e98 SHA1 5a336c39c763f396f9045a67adff0de8a5e206df SHA256 5d06b33f48e32bde5045e2c0a175b5cea7666a28f30a0e6a619d671f2afcbcf2
 MISC metadata.xml 1806 RMD160 e707e0dfafb5138991bd381897b2cfdc101592e6 SHA1 7b62985602d07602626bc27078eec3744935cb29 SHA256 351d1d208236544a9a693902bcbcf16e32640f9e049ea0b2326dc1f1a13ad8bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk8N4UoACgkQlcuUeyFa0U1IaQCfT2D3KikrsNBuF5BwxlGr/3o1
-d5kAnjMUNTSeocMjnKFB9ZMZcBDg9/1t
-=1bep
+iEYEAREIAAYFAk8PMjIACgkQlcuUeyFa0U0fMwCgyMOwofeXguHG6G+hlIMA+W2H
+S9IAnR7fTHhUZphnlaXUtfVl46uqFrfI
+=I4wR
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/files/hplip-3.11.12-black-stripes-pcl5c.patch b/net-print/hplip/files/hplip-3.11.12-black-stripes-pcl5c.patch
new file mode 100644
index 000000000000..288a887a7a44
--- /dev/null
+++ b/net-print/hplip/files/hplip-3.11.12-black-stripes-pcl5c.patch
@@ -0,0 +1,11 @@
+diff -up hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines hplip-3.10.2/prnt/hpcups/LJColor.h
+--- hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines	2010-02-24 23:04:09.000000000 +0000
++++ hplip-3.10.2/prnt/hpcups/LJColor.h	2010-04-15 21:46:48.375754707 +0100
+@@ -48,6 +48,7 @@ public:
+     DRIVER_ERROR    Configure(Pipeline **pipeline);
+     DRIVER_ERROR    EndJob();
+     DRIVER_ERROR    FormFeed();
++    bool            CanSkipRasters() {return false;}
+ protected:
+     virtual DRIVER_ERROR addJobSettings();
+     void    configureRasterData();
diff --git a/net-print/hplip/hplip-3.11.12-r1.ebuild b/net-print/hplip/hplip-3.11.12-r1.ebuild
new file mode 100644
index 000000000000..f7844c5e545b
--- /dev/null
+++ b/net-print/hplip/hplip-3.11.12-r1.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.12-r1.ebuild,v 1.1 2012/01/12 19:19:01 billie Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="!minimal? 2"
+PYTHON_USE_WITH="threads xml"
+PYTHON_USE_WITH_OPT="!minimal"
+
+inherit fdo-mime linux-info python autotools
+
+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"
+
+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 minimal parport policykit qt4 scanner snmp static-ppds -acl X"
+
+COMMON_DEPEND="
+	virtual/jpeg
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	acl? ( || ( >=sys-fs/udev-171[acl] >=sys-fs/udev-145[extras] ) )
+	snmp? (
+		net-analyzer/net-snmp
+		dev-libs/openssl
+	)
+	!minimal? (
+		>=net-print/cups-1.4.0
+		virtual/libusb:0
+		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+		fax? ( sys-apps/dbus )
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ghostscript-gpl-8.71-r3
+	!minimal? (
+		dev-python/pygobject:2
+		kernel_linux? ( >=sys-fs/udev-114 )
+		scanner? (
+			dev-python/imaging
+			X? ( || (
+				kde? ( kde-misc/skanlite )
+				media-gfx/xsane
+				media-gfx/sane-frontends
+			) )
+		)
+		fax? (
+			dev-python/reportlab
+			dev-python/dbus-python
+		)
+		qt4? (
+			dev-python/PyQt4[dbus,X]
+			libnotify? (
+				dev-python/notify-python
+			)
+			policykit? (
+				sys-auth/polkit
+			)
+		)
+	)"
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+pkg_setup() {
+	if ! use minimal; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	! 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."
+		ewarn "Recommended USE flags: USE=\"hpcups -hpijs\")."
+	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 and/or hpijs the appropiate"
+		ewarn "drivers are installed."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	use !minimal && python_convert_shebangs -q -r 2 .
+
+	# Fix for Gentoo bug #345725
+	sed -i -e "s|/etc/udev/rules.d|/lib/udev/rules.d|" \
+		$(find ./ -type f -exec grep -l '/etc/udev/rules.d' '{}' '+') \
+		|| die
+
+	# Do not install desktop files if there is no gui
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/452113
+	epatch "${FILESDIR}"/${PN}-3.11.1-desktop.patch
+
+	# Browser detection through xdg-open
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/482674
+	epatch "${FILESDIR}"/${PN}-3.9.10-browser.patch
+
+	# Use cups-config when checking for cupsddk
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483136
+	epatch "${FILESDIR}"/${PN}-3.9.12-cupsddk.patch
+
+	# Htmldocs are not installed under docdir/html so enable htmldir configure
+	# switch
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483217
+	epatch "${FILESDIR}"/${PN}-3.11.1-htmldir.patch
+
+	# Increase systray check timeout for slower machines
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/335662
+	epatch "${FILESDIR}"/${PN}-3.9.12-systray.patch
+
+	# Let 56-hpmud_support.rules call hp-mkuri to make it work with newer udev
+	# Upstream bug: None
+	epatch "${FILESDIR}"/${P}-udev-rules.patch
+
+	# CVE-2010-4267 SNMP Response Processing Buffer Overflow Vulnerability
+	# http://secunia.com/advisories/42956/
+	# https://bugzilla.redhat.com/show_bug.cgi?id=662740
+	epatch "${FILESDIR}"/${PN}-3.10.9-cve-2010-4267.patch
+
+	# Fix black stripes on pcl5c printouts
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/561264
+	epatch "${FILESDIR}"/${P}-black-stripes-pcl5c.patch
+
+	# 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
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || die
+		mv ${i}.temp ${i}
+	done
+
+	eautoreconf
+}
+
+src_configure() {
+	local gui_build myconf drv_build minimal_build
+
+	if use qt4 ; then
+		gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
+		if use policykit ; then
+			myconf="--enable-policykit"
+		else
+			myconf="--disable-policykit"
+		fi
+	else
+		gui_build="--disable-gui-build --disable-qt3 --disable-qt4"
+	fi
+
+	if use fax || use qt4 ; then
+		myconf="${myconf} --enable-dbus-build"
+	else
+		myconf="${myconf} --disable-dbus-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 --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 \
+		--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 \
+		${gui_build} \
+		${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 acl udev-acl-rules)
+}
+
+src_install() {
+	default
+
+	# Installed by sane-backends
+	# Gentoo Bug: #201023
+	rm -f "${D}"/etc/sane.d/dll.conf || die
+
+	rm -f "${D}"/usr/share/doc/${P}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir "${D}"/usr/share/doc/${P}/ >/dev/null
+
+	# Remove hal fdi files
+	rm -rf "${D}"/usr/share/hal  || die
+
+	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die
+}
+
+pkg_postinst() {
+	use !minimal && python_mod_optimize /usr/share/${PN}
+	fdo-mime_desktop_database_update
+
+	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"
+}
+
+pkg_postrm() {
+	use !minimal && python_mod_cleanup /usr/share/${PN}
+	fdo-mime_desktop_database_update
+}