--- hplip-3.9.8.ebuild	2009-09-30 13:04:02.000000000 +0200
+++ hplip-3.9.8-r1.ebuild	2009-09-30 13:23:21.000000000 +0200
@@ -1,93 +1,92 @@
 # 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="dbus doc fax gtk +hpcups hpijs parport policykit qt3 qt4 scanner snmp -static"
 
 # Note : libusb-compat untested (calchan 20090516)
 
-DEPEND="!net-print/hpijs
-	!net-print/hpoj
+COMMON_DEPEND="
+	media-libs/jpeg
 	>=dev-lang/python-2.4.4[threads]
 	virtual/ghostscript
-	media-libs/jpeg
-	!minimal? (
+	net-print/cups
+	virtual/libusb:0
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	hpcups? (
 		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] )
-		)
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl
-		)
+		net-print/cupsddk
+	)
+	scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+	snmp? (
+		net-analyzer/net-snmp
+		dev-libs/openssl
 	)"
 
-RDEPEND="${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
-		)
-		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/pygobject
-			dev-python/dbus-python
-		)
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	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
+	)
+	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/pygobject
+		dev-python/dbus-python
 	)"
 
 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=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."
-	else
-		use parport && linux-info_pkg_setup
+	use parport && linux-info_pkg_setup
+
+	if use fax && ! use dbus ; then
+		eerror "USE=fax needs USE=dbus."
+
+		die "fax USE flag need dbus USE flag"
 	fi
 }
 
@@ -144,47 +143,57 @@
 }
 
 src_configure() {
-	local myconf
+	local drv_build gui_build
 
 	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"
 		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)"
-	else
-		myconf="${myconf} --disable-foomatic-drv-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 ppds; then
-		myconf="${myconf} $(use_enable foomatic foomatic-ppd-install)"
-	else
-		myconf="${myconf} --disable-foomatic-ppd-install"
+	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-foomatc-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-hpijs-only-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 \
 		--enable-udev-acl-rules \
-		${myconf} \
+		${drv_build} \
 		${gui_build} \
 		$(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) \
@@ -195,15 +204,13 @@
 	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
 
 	# kde3 autostart hack
-	if [[ -d /usr/kde/3.5/share/autostart ]] && use !minimal ; then
+	if [[ -d /usr/kde/3.5/share/autostart ]] ; then
 		insinto /usr/kde/3.5/share/autostart
 		doins hplip-systray.desktop
 	fi
@@ -215,7 +222,7 @@
 
 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
 }