--- hplip-3.9.8.ebuild	2009-09-24 21:55:40.000000000 +0200
+++ hplip-3.9.8-r1.ebuild	2009-10-10 03:11:59.000000000 +0200
@@ -1,38 +1,32 @@
 # 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.ebuild,v 1.1 2009/09/24 19:55:40 flameeyes Exp $
+# $Header: $
 
 EAPI="2"
 
-inherit eutils fdo-mime linux-info python autotools
+inherit fdo-mime linux-info python autotools
 
-DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
+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 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-IUSE="+cups cupsddk dbus doc fax gtk minimal parport policykit ppds qt3 qt4 scanner snmp"
+IUSE="doc fax gtk +hpcups hpijs libnotify minimal parport policykit qt3 qt4 scanner snmp -static"
 
 # Note : libusb-compat untested (calchan 20090516)
 
-DEPEND="!net-print/hpijs
-	!net-print/hpoj
-	>=dev-lang/python-2.4.4[threads]
+COMMON_DEPEND="
 	virtual/ghostscript
 	media-libs/jpeg
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	!static? ( net-print/cupsddk )
 	!minimal? (
 		net-print/cups
 		virtual/libusb:0
-		cupsddk? (
-			foomatic? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-			|| ( >=net-print/cups-1.4.0 net-print/cupsddk )
-		)
-		ppds? (
-			foomatic? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-		)
+		>=dev-lang/python-2.4.4[threads,xml]
 		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
 		snmp? (
 			net-analyzer/net-snmp
@@ -40,33 +34,34 @@
 		)
 	)"
 
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
 	!minimal? (
 		kernel_linux? ( >=sys-fs/udev-114 )
 		scanner? (
 			dev-python/imaging
-			dev-python/reportlab
 			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[X]
-		)
-		dbus? (
-			sys-apps/dbus
-			dev-python/dbus-python
-			dev-python/pygobject
-		)
-		policykit? (
-			sys-auth/policykit
+			dev-python/PyQt4[dbus,X]
 			dev-python/pygobject
-			dev-python/dbus-python
+			libnotify? (
+				dev-python/notify-python
+			)
+			policykit? (
+				sys-auth/policykit
+			)
 		)
 	)"
 
@@ -74,18 +69,19 @@
 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=qt3 or USE=qt4 for the hplip GUI."
+	! 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 ppds && ! use cupsddk && ! use cups; then
-		ewarn "Installing neither static (USE=-ppds) nor dynamic (USE=-cupsddk) PPD files,"
-		ewarn "nor hpcups driver (USE=-cups) which is probably not what you want."
-		ewarn "You will almost certainly not be able to print (recommended: USE=\"cups -cupsddk -ppds\")."
+	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 hpijs driver only, make sure you know what you are doing."
+		ewarn "Installing driver portions only, make sure you know what you are doing."
 	else
 		use parport && linux-info_pkg_setup
 	fi
@@ -94,111 +90,138 @@
 src_prepare() {
 	sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
 		-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
-		base/utils.py  || die "Patching base/utils.py failed"
+		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 "Patching hpssd.py failed"
+	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 core_install.py"
+		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 || die "sed failed"
+	sed -i -e "s/SYSFS/ATTRS/g" -e "s/sysfs/attrs/g" data/rules/56-hpmud_support.rules \
+		|| die "Sed data/rules/56-hpmud_support.rules failed"
 
 	# Replace udev rules, see bug #197726.
 	mv data/rules/40-hplip.rules data/rules/70-hplip.rules || die
 	sed -i \
 		-e "s/40-hplip.rules/70-hplip.rules/g" \
-		Makefile.am */*.html || die "sed failed"
+		Makefile.am */*.html || die "Sed Makefile.am */*.html failed"
 
 	sed -i \
 		-e s:/usr/lib/cups/driver:$(cups-config --serverbin)/driver:g \
-		installer/core_install.py || die "sed core_install.py"
+		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 "*.ppd.gz sed failed"
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp || die "Sed *.ppd.gz failed"
 		mv ${i}.temp ${i}
 	done
 
-	# Qt4 is still undocumented by upstream, so use with caution
 	local qt_ver
-	use qt3 && qt_ver="3"
-	use qt4 && qt_ver="4"
 	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 failed"
+			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 failed"
+			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 myconf
+	local drv_build gui_build myconf
 
 	if use qt3 || use qt4 ; then
-		local gui_build="--enable-gui-build"
-		if 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
-		local gui_build="--disable-gui-build"
+		gui_build="--disable-gui-build"
 	fi
 
-	if use cupsddk; then
-		myconf="${myconf} $(use_enable foomatic foomatic-drv-install)"
+	if use fax || use qt4 ; then
+		myconf="${myconf} --enable-dbus-build"
 	else
-		myconf="${myconf} --disable-foomatic-drv-install"
+		myconf="${myconf} --disable-dbus-build"
 	fi
 
-	if use ppds; then
-		myconf="${myconf} $(use_enable foomatic foomatic-ppd-install)"
-	else
-		myconf="${myconf} --disable-foomatic-ppd-install"
+	if use hpcups ; then
+		drv_build="${drv_build} $(use_enable hpcups hpcups-install)"
+		if use static ; 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 ; 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 \
-		--disable-foomatic-rip-hplip-install \
+		--htmldir=/usr/share/doc/${P}/html \
 		--enable-udev-acl-rules \
-		${myconf} \
+		${drv_build} \
 		${gui_build} \
+		${myconf} \
 		$(use_enable doc doc-build) \
-		$(use_enable cups hpcups-install) \
-		$(use_enable ppds cups-ppd-install) \
-		$(use_enable cupsddk cups-drv-install) \
-		$(use_enable dbus dbus-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 policykit policykit)
+		$(use_enable snmp network-build)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die "Emake install failed"
 	rm -f "${D}"/etc/sane.d/dll.conf
 
 	use minimal && rm -r "${D}"/usr/$(get_libdir)
 
 	# bug 106035/259763
-	if ! use qt3 && ! use qt4; then
+	if ! use qt3 && ! use qt4 ; then
 		rm -r "${D}"/usr/share/applications "${D}"/etc/xdg
 	fi
 
@@ -207,21 +230,17 @@
 		insinto /usr/kde/3.5/share/autostart
 		doins hplip-systray.desktop
 	fi
-
-	pushd doc
-	dohtml -r *
-	popd
 }
 
 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
+	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() {
-	python_mod_optimize /usr/share/${PN}
+	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"
@@ -234,6 +253,6 @@
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
+	use !minimal && python_mod_cleanup /usr/share/${PN}
 	fdo-mime_desktop_database_update
 }