Version bump.

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

3 files changed, 270 insertions, 2 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index aea0d042427d..e9ef51229654 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.181 2011/02/14 19:53:22 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.182 2011/03/22 20:44:58 billie Exp $
+
+*hplip-3.11.3 (22 Mar 2011)
+
+  22 Mar 2011; Daniel Pielmeier <billie@gentoo.org> +hplip-3.11.3.ebuild:
+  Version bump.
 
   14 Feb 2011; Daniel Pielmeier <billie@gentoo.org> hplip-3.10.9-r1.ebuild,
   hplip-3.11.1-r2.ebuild, metadata.xml:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 60617e4ef8a4..a591ab9fc564 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -10,7 +10,9 @@ AUX hplip-3.9.12-cupsddk.patch 1265 RMD160 4f4cea73c0cfc6e830b27f4945e123e3cd490
 AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95dc SHA1 11d85332f0200f14bb4492c1528cebb2af72d6f0 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b083bb0cf1305d5d7a8cc5bd719
 DIST hplip-3.10.9.tar.gz 21818298 RMD160 37f512c73768e7a02bdf2814bb7528804cfada32 SHA1 5e145eafefbc5122bbe98345f2984fc0a55e5787 SHA256 1d34630084eccfcc80c08065becdf9313fd8f5a09a4cf523dbd9d3ec724206b9
 DIST hplip-3.11.1.tar.gz 22167916 RMD160 0ac41ed3935a050f1bcd431418fa280b853e8caf SHA1 6b06567373cadc7dff48134c6b58f90a4d72582a SHA256 2f5d988ce53c084556425ae6c5e56a9b5cfa3ac0381059eed913b4523bd1c878
+DIST hplip-3.11.3.tar.gz 22332327 RMD160 7a8a9a3a548ec03bab498a2e9db372fd69eb3e42 SHA1 0343038e7dd71623c48ea046137894231f0442e8 SHA256 5ded966c97430b78a8bd53ddd183d71bf12bd9fcf96590f51d50a07352e468bc
 EBUILD hplip-3.10.9-r1.ebuild 7555 RMD160 6826be4038a3df41fd4e13b8c69310f904e67c31 SHA1 b5a49874fc16a601ebe4e1f367907f465a3fc7ca SHA256 55e00fcef73203f11faec74c15ce1dd7a42361833a98692e53e0d13633484449
 EBUILD hplip-3.11.1-r2.ebuild 7539 RMD160 29cbb5f041924557c0289d8f7ab8f54cc49d324d SHA1 ca7ecf9e3d5184d06fee4a6db9c042c84eb483ca SHA256 bb0d22614daccba5b89fdddc6dbc71faaac05bdb162b6a2b57ce9e98074548f0
-MISC ChangeLog 31578 RMD160 d29fef3a4daeea3fd8fab776acaecc2fcedaa4fe SHA1 3930aef3a30eed8111d0156ac21648d18a218160 SHA256 a37956f9902d7c523de56052d898276b20aa42de3315f9a87eb8daf7e8772b49
+EBUILD hplip-3.11.3.ebuild 7560 RMD160 d2e6290a7dd16c8d180c52880c5de1c169c984e6 SHA1 920aceb216b03773a573c41391baee1e46808fbf SHA256 2062ff4c41fb8632cb42e96c6746443270ce3067b3a06bbefa74fe4602fed157
+MISC ChangeLog 31698 RMD160 ce3c6e6348a2829c91c7883903cab6555730c33d SHA1 07acd6c4c3b8c3a959382f2befb04699f094f64d SHA256 07ee5c55e32f33079d4b40d15c0699a8649c854daf32021fc097d4e577185aef
 MISC metadata.xml 1913 RMD160 1c4fd3bb30048481c0cb42c07fcc5c5c4bb0d0e7 SHA1 8579b881d5997f443891eef70bb677d8fe2e7815 SHA256 5fe1b44e4ddfdca2d3c5842aaecff76430255153d3d397629cca188f4a5a93a1
diff --git a/net-print/hplip/hplip-3.11.3.ebuild b/net-print/hplip/hplip-3.11.3.ebuild
new file mode 100644
index 000000000000..41cfbc050e14
--- /dev/null
+++ b/net-print/hplip/hplip-3.11.3.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.3.ebuild,v 1.1 2011/03/22 20:44:59 billie Exp $
+
+EAPI=2
+
+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 -udev-acl X"
+
+COMMON_DEPEND="
+	virtual/jpeg
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	udev-acl? ( >=sys-fs/udev-145[extras] )
+	snmp? (
+		net-analyzer/net-snmp
+		dev-libs/openssl
+	)
+	!minimal? (
+		net-print/cups
+		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
+	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
+	!minimal? (
+		dev-python/pygobject
+		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() {
+	python_convert_shebangs -q -r 2 .
+
+	# Fix for Gentoo bug #345725
+	sed -i -e "s|/etc/udev/rules.d|/$(get_libdir)/udev/rules.d|" \
+		$(find ./ -type f -exec grep -l '/etc/udev/rules.d' '{}' '+') \
+		|| die "sed udev rules"
+
+	# 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
+
+	# SYSFS deprecated but kept upstream for compatibility reasons
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/346390
+	epatch "${FILESDIR}"/${PN}-3.11.1-udev-attrs.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
+
+	# 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-dependency-tracking \
+		--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 udev-acl udev-acl-rules)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# Installed by sane-backends
+	# Gentoo Bug: #201023
+	rm -f "${D}"/etc/sane.d/dll.conf || 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
+}