Version bump.

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

3 files changed, 261 insertions, 2 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 5c76f16e548e..096555d4a214 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.164 2010/07/12 20:50:19 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.165 2010/07/24 21:06:18 billie Exp $
+
+*hplip-3.10.6 (24 Jul 2010)
+
+  24 Jul 2010; Daniel Pielmeier <billie@gentoo.org> +hplip-3.10.6.ebuild:
+  Version bump.
 
   12 Jul 2010; Daniel Pielmeier <billie@gentoo.org> -hplip-3.10.2-r4.ebuild,
   -files/hplip-3.10.2-systray-segfault.patch,
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 371f7ed24373..3313815e3e3b 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -6,8 +6,10 @@ AUX hplip-3.9.10-htmldir.patch 4444 RMD160 7c960a3049f0b27b761c0f05c4fa9b1484dcd
 AUX hplip-3.9.12-cupsddk.patch 1265 RMD160 4f4cea73c0cfc6e830b27f4945e123e3cd490114 SHA1 01ce069ab67277aab9205ea59537ec55362ef1aa SHA256 3050221f497c14ae3a7a093043018d55f4deb2b2ebd81840a8285cec4eb7759d
 AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95dc SHA1 11d85332f0200f14bb4492c1528cebb2af72d6f0 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b083bb0cf1305d5d7a8cc5bd719
 DIST hplip-3.10.5.tar.gz 21495175 RMD160 080d2b1d763857f88093334d581e44c6376f05de SHA1 4e6e534983311af6991245e99814a44d857cda8d SHA256 1701e32b01eb90ab5e90f301fb115ee4a8e3e48e4739c331230646d5b24dd4d3
+DIST hplip-3.10.6.tar.gz 21577342 RMD160 a5194123a584bad62b1a04fbd05aca7f22ddc03c SHA1 1dc507340f8087bdeefb804c7771410bf958d564 SHA256 3ee0e68a613d2b966dcb6df9fd8e074c4c3e590249e61c0d792de3373b84fdeb
 DIST hplip-3.9.12.tar.gz 21371447 RMD160 f1717e8bad043b54497489fa1a2764b3ac548094 SHA1 d4d659ae52f01055bfc7060e0d4e3c7354c1dee3 SHA256 1c53febe3101b3718d43c9176c08826a1a46c49a79c9f6445cd16981fbf2a12a
 EBUILD hplip-3.10.5.ebuild 7630 RMD160 7ae5ef2e655209e10d62892875ae619a49b32b9c SHA1 f2f7326ef6b27cb607ec44bdafdb063dcc3e33fd SHA256 129938feb6851ae631d2fb34298862b507f40edf3900dac683bdc1aca36b10eb
+EBUILD hplip-3.10.6.ebuild 7480 RMD160 f32afa8261658825c691bcce1c59e58c2a14d421 SHA1 2906adfb55906c9ab6d3f0f2e6fde840bb98d08c SHA256 1dcc108ff3c057383b7dd03e3d0df56f3d065b09f386cab7b58a524fd5556ef1
 EBUILD hplip-3.9.12-r1.ebuild 8208 RMD160 f79073fe4ab4bf42230e36845cbd8c661b312316 SHA1 d89236a53a19d44d360d00627c9ba5ef92ae3856 SHA256 7f058d034d324ea2cd318f453ccbbe29a0d5224a2813bc7d9dc2b925aa0cc3b3
-MISC ChangeLog 28771 RMD160 fbf34c807b5c05f39273501661cd91aa9f11cda6 SHA1 ed7ec82d71bb172afecdb705251921f5a36430e6 SHA256 949967bcb6fc2bd16d760a1ee2c300be0e32ccd4b78b856f00d8798ec26d76d4
+MISC ChangeLog 28891 RMD160 f306b0d4ece56d8beb6e55f6da3659ece2769191 SHA1 b2b6a5fea12ab1a1b9d19d423968376146cd2777 SHA256 ed9cdcef24ebdae7472180c2e91b92706b4817910ab30a833b58caa20e5d00ba
 MISC metadata.xml 1958 RMD160 f7cd369924faba500e66b63fef225a0c114d8ec1 SHA1 b123d54310fa7c8fbb0ef3af1e335942938d84ae SHA256 7aa06125ddd13a5533b3d2b4f9349abb4f0b5bc7eda5b73711d9b6bca764903e
diff --git a/net-print/hplip/hplip-3.10.6.ebuild b/net-print/hplip/hplip-3.10.6.ebuild
new file mode 100644
index 000000000000..dbc182c92c1f
--- /dev/null
+++ b/net-print/hplip/hplip-3.10.6.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.10.6.ebuild,v 1.1 2010/07/24 21:06:18 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 System. 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 libnotify minimal parport policykit qt4 scanner snmp static-ppds -udev-acl X"
+
+COMMON_DEPEND="
+	media-libs/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? ( || ( 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/policykit
+			)
+		)
+	)"
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (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 .
+
+	# Do not install desktop files if there is no gui
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/452113
+	epatch "${FILESDIR}"/${PN}-3.9.10-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.9.10-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.10.5-udev-attrs.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 "You should run hp-setup as root if you are installing hplip for the first time,"
+	elog "and may also need to run it if you are upgrading from an earlier version."
+	elog
+	elog "If your device is connected using USB, users will need to be in the lp group to"
+	elog "access it."
+	elog
+	elog "Starting with versions of hplip >=3.9.8 mDNS is the default network search"
+	elog "mechanism. To make use of it you need to activate the zeroconf flag on cups."
+	elog "If you prefer the SLP method you have to choose this when configuring the"
+	elog "device."
+}
+
+pkg_postrm() {
+	use !minimal && python_mod_cleanup /usr/share/${PN}
+	fdo-mime_desktop_database_update
+}