Revision bump. Replacing udev rules shouldn't be necessary anymore. New udev-acl use flag which installs 40-hplip.rules only if udev with acl support is available else 55-hpmud.rules is installed. Use minmal does not install files below libdir anymore.

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

4 files changed, 268 insertions, 3 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 6a15cdb55153..ea8a0c09f149 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.127 2009/10/14 18:03:04 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.128 2009/10/14 22:05:24 billie Exp $
+
+*hplip-3.9.8-r2 (14 Oct 2009)
+
+  14 Oct 2009; Pielmeier Daniel <billie@gentoo.org> +hplip-3.9.8-r2.ebuild,
+  metadata.xml:
+  Revision bump. Replacing udev rules shouldn't be necessary anymore. New
+  udev-acl use flag which installs 40-hplip.rules only if udev with acl
+  support is available else 55-hpmud.rules is installed. Use minmal does not
+  install files below libdir anymore.
 
   14 Oct 2009; Pielmeier Daniel <billie@gentoo.org> hplip-3.9.8.ebuild,
   hplip-3.9.8-r1.ebuild, metadata.xml:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 15435632f562..bd011b6dc9fe 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -7,6 +7,7 @@ DIST hplip-3.9.8.tar.gz 15715640 RMD160 8b06537176bfb32d32ae20eec1cfa6765609ecc0
 EBUILD hplip-2.8.6b.ebuild 5223 RMD160 b22ab30c66893db8aa5b66844a38fefbdbcf80fa SHA1 3e402dbc955fe3c7ea98be5980d2e747600e4845 SHA256 0d1e993376b31bd5f2ddaa2d051fc927d6ebf38ae0d7e336061d1d3d24320719
 EBUILD hplip-3.9.4b-r1.ebuild 6450 RMD160 ee06e2af71f51ef1d6d67be04a25d5bfb01ec6af SHA1 2869085220ce59defb512e96c06016560ab7afac SHA256 fb80576ee4cba069386cfa34ce87caacc2529d780af181faea5c58bfd3a8ca4c
 EBUILD hplip-3.9.8-r1.ebuild 7586 RMD160 326d29fe0f045fa50e451aac3c76f741eac77a37 SHA1 494c96ba3e5c424a533e6b2065821a7aa2e80af2 SHA256 dd1bcc273e2dfb5ff29e43ef0b070bf9f4e8cb50983f474fb25abb64dda4fc85
+EBUILD hplip-3.9.8-r2.ebuild 7428 RMD160 96904cbddeaa7b984fdfaf77096e7cfc580fa1a7 SHA1 c1d21787d984f1bcca3ecb2ad1de3c03deea0438 SHA256 6c40ae52517e09827a674e9f9919dc2cc0548dd59be07bb898c287f860f6d9f7
 EBUILD hplip-3.9.8.ebuild 6794 RMD160 774dd5a3573a42254f752af87c2be41faf885989 SHA1 0fc90045a8086a04ffd3b2a0d4b0bcdf5590db9b SHA256 0cc65db4e62d1717f172260f9f9d9e4f54b45f6d7cf73bd2ab9d81b4680ffd51
-MISC ChangeLog 21284 RMD160 032be05779ae81cd98c7f96d5dea87e00c3bf4a3 SHA1 b6e1f2fd5dbb29de94313c74cd087c920cdc0d62 SHA256 630ab808e99d67afcfc72dfb426f970a24ba35ef5a52bf8dbb20dea40c0d3582
-MISC metadata.xml 2385 RMD160 c0ccadcdbb3de0a54c4979b8ea37adbffca55aa3 SHA1 2347aa755e7d48e4b204166414079dbc83f536e4 SHA256 5189a8407db0b9fecf8edfde4f3162659e709915ce0dcb2f4428b56a2477cb01
+MISC ChangeLog 21669 RMD160 de0922a9b8bdfbf91ad6866aea473fa04fe5a054 SHA1 35652f3a604190e46f22986be5834dee9544be61 SHA256 6f5bbc45920779a25812df2921dc246fe821dab2bb6fa34b51fdc40c3cc8b06f
+MISC metadata.xml 2492 RMD160 29bb6fbaa920f8dc9aa3611411a037f55ee53b56 SHA1 ee6b921fddd02f0c723433ad59ef3380bb015a19 SHA256 06d20e43690b44177a32ab9d0ab410f04dff23ba8eb3541c8fb59a43bb2f981d
diff --git a/net-print/hplip/hplip-3.9.8-r2.ebuild b/net-print/hplip/hplip-3.9.8-r2.ebuild
new file mode 100644
index 000000000000..7fd0f9b33b16
--- /dev/null
+++ b/net-print/hplip/hplip-3.9.8-r2.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r2.ebuild,v 1.1 2009/10/14 22:05:24 billie Exp $
+
+EAPI="2"
+
+inherit fdo-mime linux-info python autotools
+
+DESCRIPTION="HP Linux Imaging and Printing System. Includes printer, scanner, fax drivers and service tools."
+HOMEPAGE="http://hplip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax gtk +hpcups hpijs libnotify minimal parport policykit qt3 qt4 scanner snmp static-ppds -udev-acl"
+
+# Note : libusb-compat untested (calchan 20090516)
+
+COMMON_DEPEND="
+	virtual/ghostscript
+	media-libs/jpeg
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
+	udev-acl? ( >=sys-fs/udev-145[extras] )
+	!minimal? (
+		net-print/cups
+		virtual/libusb:0
+		>=dev-lang/python-2.4.4[threads,xml]
+		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+		snmp? (
+			net-analyzer/net-snmp
+			dev-libs/openssl
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	!minimal? (
+		kernel_linux? ( >=sys-fs/udev-114 )
+		scanner? (
+			dev-python/imaging
+			gtk? ( media-gfx/xsane )
+			!gtk? ( media-gfx/sane-frontends )
+		)
+		fax? (
+			dev-python/reportlab
+			sys-apps/dbus
+			dev-python/dbus-python
+		)
+		qt3? ( !qt4? (
+			dev-python/PyQt
+		) )
+		qt4? (
+			dev-python/PyQt4[dbus,X]
+			dev-python/pygobject
+			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() {
+	! use qt3 && ! use qt4 && ewarn "You need USE=qt4 or USE=qt3 for the hplip GUI."
+
+	use scanner && ! use gtk && ewarn "You need USE=gtk 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."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
+		-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
+		base/utils.py  || die "Sed base/utils.py failed"
+
+	# bug 98428
+	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" hpssd.py || die "Sed hpssd.py failed"
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die "Sed installer/core_install.py failed"
+
+	# SYSFS deprecated - https://bugs.launchpad.net/hplip/+bug/346390
+	sed -i -e "s/SYSFS/ATTRS/g" -e "s/sysfs/attrs/g" data/rules/56-hpmud_support.rules \
+		data/rules/55-hpmud.rules || die "Sed 55-hpmud.rules 56-hpmud_support.rules failed"
+
+	sed -i \
+		-e s:/usr/lib/cups/driver:$(cups-config --serverbin)/driver:g \
+		installer/core_install.py || die "Sed installer/core_install.py failed"
+
+	# Use system foomatic-rip instead of foomatic-rip-hplip
+	local i
+	for i in ppd/{hpcups,hpijs}/*.ppd.gz
+	do
+		rm -f ${i}.temp
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp || die "Sed *.ppd.gz failed"
+		mv ${i}.temp ${i}
+	done
+
+	local qt_ver
+	if use qt3 || use qt4 ; then
+		use qt3 && qt_ver="3"
+		use qt4 && qt_ver="4"
+		sed -i \
+			-e "s/%s --force-startup/%s --force-startup --qt${qt_ver}/" \
+			-e "s/'--force-startup'/'--force-startup', '--qt${qt_ver}'/" \
+			base/device.py || die "Sed base/device.py failed"
+		sed -i \
+			-e "s/Exec=hp-systray/Exec=hp-systray --qt${qt_ver}/" \
+			hplip-systray.desktop.in || die "Sed hplip-systray.desktop.in failed"
+	fi
+
+	# htmldocs are not installed under docdir/html
+	# the following sed enables --htmldir configure switch in src_configure
+	if use doc ; then
+			sed -i -e 's/www\([0-9]\)dir = $(docdir)/www\1dir = $(htmldir)/g' Makefile.am || die "Sed Makefile.am failed"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local drv_build gui_build myconf
+
+	if use qt3 || use qt4 ; then
+		gui_build="--enable-gui-build"
+		if use qt4 ; then
+			gui_build="${gui_build} --enable-qt4 --disable-qt3"
+			if use policykit ; then
+				myconf="--enable-policykit"
+			else
+				myconf="--disable-policykit"
+			fi
+		else
+			use qt3 && gui_build="${gui_build} --enable-qt3 --disable-qt4"
+		fi
+	else
+		gui_build="--disable-gui-build"
+	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="${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
+	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
+	fi
+
+	econf \
+		--disable-dependency-tracking \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-new-hpcups \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--htmldir=/usr/share/doc/${P}/html \
+		${drv_build} \
+		${gui_build} \
+		${myconf} \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable minimal hpijs-only-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 "Emake install failed"
+
+	# Bug #201023
+	rm -f "${D}"/etc/sane.d/dll.conf
+
+	# bug 106035/259763
+	if ! use qt3 && ! use qt4 ; then
+		rm -r "${D}"/usr/share/applications "${D}"/etc/xdg
+	fi
+
+	# kde3 autostart hack
+	if [[ -d /usr/kde/3.5/share/autostart ]] && use !minimal ; then
+		insinto /usr/kde/3.5/share/autostart
+		doins hplip-systray.desktop
+	fi
+}
+
+pkg_preinst() {
+	# avoid collisions with cups-1.2 compat symlinks
+	if [ -e "${ROOT}"/usr/lib/cups/backend/hp ] && [ -e "${ROOT}"/usr/libexec/cups/backend/hp ] ; then
+		rm "${ROOT}"/usr/libexec/cups/backend/hp{,fax}
+	fi
+}
+
+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, and may also"
+	elog "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 access it."
+	elog
+	elog "This release doesn't use an init script anymore, so you should probably do a"
+	elog "'rc-update del hplip' if you are updating from an old version."
+}
+
+pkg_postrm() {
+	use !minimal && python_mod_cleanup /usr/share/${PN}
+	fdo-mime_desktop_database_update
+}
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index 79b07509f1de..b7e1465270a9 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -43,6 +43,8 @@
     <flag name='snmp'>Add support for <pkg>net-analyzer/net-snmp</pkg> 
     which enables this driver to work over networks (both for server and 
     client)</flag>
+	<flag name='udev-acl'>Install udev acl rules. This needs
+	<pkg>sys-fs/udev</pkg> with acl support.</flag>
     <flag name="cups">
       Build the hpcups driver for cups.
     </flag>