Revision bump. Fix bug #406135. Thanks to Martin Mokrejš for the report. Remove old.

(Portage version: 2.1.10.44/cvs/Linux i686)

4 files changed, 48 insertions, 308 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index c5463ecc10da..9a10b38bf262 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,14 @@
 # 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.213 2012/02/21 18:15:23 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.214 2012/02/28 17:56:09 billie Exp $
+
+*hplip-3.12.2-r2 (28 Feb 2012)
+
+  28 Feb 2012; Daniel Pielmeier <billie@gentoo.org> -hplip-3.11.12-r2.ebuild,
+  -hplip-3.12.2.ebuild, +hplip-3.12.2-r2.ebuild,
+  +files/hplip-3.12.2-sane.patch:
+  Revision bump. Fix bug #406135. Thanks to Martin Mokrejš for the report.
+  Remove old.
 
   21 Feb 2012; Daniel Pielmeier <billie@gentoo.org>
   files/hplip-3.11.12-fast-pp.patch:
diff --git a/net-print/hplip/files/hplip-3.12.2-sane.patch b/net-print/hplip/files/hplip-3.12.2-sane.patch
new file mode 100644
index 000000000000..14d15b4a348e
--- /dev/null
+++ b/net-print/hplip/files/hplip-3.12.2-sane.patch
@@ -0,0 +1,11 @@
+diff -Naur hplip-3.12.2-old/scan/sane.py hplip-3.12.2/scan/sane.py
+--- hplip-3.12.2-old/scan/sane.py	2012-02-28 18:32:25.237883282 +0100
++++ hplip-3.12.2/scan/sane.py	2012-02-28 18:34:00.899673377 +0100
+@@ -272,6 +272,7 @@
+             self.last_opt = self.dev.setOption(opt.index, value)
+         except scanext.error:
+             log.error("Unable to set option %s to value %s" % (key, value))
++            return
+ 
+         # do binary AND to find if we have to reload options:
+         if self.last_opt & scanext.INFO_RELOAD_OPTIONS:
diff --git a/net-print/hplip/hplip-3.11.12-r2.ebuild b/net-print/hplip/hplip-3.11.12-r2.ebuild
deleted file mode 100644
index 9c04c4b3be70..000000000000
--- a/net-print/hplip/hplip-3.11.12-r2.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# 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-r2.ebuild,v 1.1 2012/01/25 18:50:03 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
-
-	# Fix parallel port cpu usage
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/750796
-	epatch "${FILESDIR}"/${P}-fast-pp.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
-}
diff --git a/net-print/hplip/hplip-3.12.2.ebuild b/net-print/hplip/hplip-3.12.2-r2.ebuild
index 5b421e097282..25f87b63863e 100644
--- a/net-print/hplip/hplip-3.12.2.ebuild
+++ b/net-print/hplip/hplip-3.12.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.12.2.ebuild,v 1.1 2012/02/07 20:04:31 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.2-r2.ebuild,v 1.1 2012/02/28 17:56:09 billie Exp $
 
 EAPI=4
 
@@ -22,19 +22,21 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 # 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"
 
+REQUIRED_USE="|| ( hpijs hpcups )"
+
 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 )
+		snmp? (
+			net-analyzer/net-snmp
+			dev-libs/openssl
+		)
 	)"
 
 DEPEND="${COMMON_DEPEND}
@@ -42,6 +44,9 @@ DEPEND="${COMMON_DEPEND}
 
 RDEPEND="${COMMON_DEPEND}
 	>=app-text/ghostscript-gpl-8.71-r3
+	policykit? (
+		sys-auth/polkit
+	)
 	!minimal? (
 		dev-python/pygobject:2
 		kernel_linux? ( >=sys-fs/udev-114 )
@@ -62,9 +67,6 @@ RDEPEND="${COMMON_DEPEND}
 			libnotify? (
 				dev-python/notify-python
 			)
-			policykit? (
-				sys-auth/polkit
-			)
 		)
 	)"
 
@@ -81,17 +83,10 @@ pkg_setup() {
 
 	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."
+		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
@@ -139,6 +134,14 @@ src_prepare() {
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/750796
 	epatch "${FILESDIR}"/${PN}-3.11.12-fast-pp.patch
 
+	# Fix minmal/hpijs_only/hpcups_only install
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/932918
+	epatch "${FILESDIR}"/${P}-minimal.patch
+
+	# Fix Option parsing in sane/scan.py
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/927708
+	epatch "${FILESDIR}"/${P}-sane.patch
+
 	# Force recognition of Gentoo distro by hp-check
 	sed -i \
 		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
@@ -158,18 +161,7 @@ src_prepare() {
 }
 
 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
+	local myconf drv_build minimal_build
 
 	if use fax || use qt4 ; then
 		myconf="${myconf} --enable-dbus-build"
@@ -187,7 +179,8 @@ src_configure() {
 			drv_build="${drv_build} --disable-cups-ppd-install"
 		fi
 	else
-		drv_build="--disable-hpcups-install --disable-cups-drv-install"
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
 		drv_build="${drv_build} --disable-cups-ppd-install"
 	fi
 
@@ -224,11 +217,11 @@ src_configure() {
 		--disable-lite-build \
 		--disable-foomatic-rip-hplip-install \
 		--disable-shadow-build \
+		--disable-qt3 \
 		--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} \
@@ -237,7 +230,10 @@ src_configure() {
 		$(use_enable parport pp-build) \
 		$(use_enable scanner scan-build) \
 		$(use_enable snmp network-build) \
-		$(use_enable acl udev-acl-rules)
+		$(use_enable acl udev-acl-rules) \
+		$(use_enable qt4 gui-build) \
+		$(use_enable qt4) \
+		$(use_enable policykit)
 }
 
 src_install() {