--- hplip-3.9.2.ebuild	2009-04-05 12:08:24.000000000 +0400
+++ hplip-3.9.4b.ebuild	2009-05-18 20:25:43.298843629 +0400
@@ -14,10 +14,11 @@
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
-IUSE="cupsddk dbus doc fax gtk minimal parport ppds qt3 qt4 scanner snmp"
+IUSE="cupsddk dbus doc fax gtk minimal parport policykit ppds qt3 qt4 scanner snmp"
 
 DEPEND="!net-print/hpijs
 	!net-print/hpoj
+	>=dev-lang/python-2.4.4[threads]
 	virtual/ghostscript
 	media-libs/jpeg
 	>=net-print/foomatic-filters-3.0.20080507[cups]
@@ -25,7 +26,10 @@
 		net-print/cups
 		dev-libs/libusb
 		cupsddk? ( net-print/cupsddk )
-		dbus? ( sys-apps/dbus )
+		dbus? (
+			sys-apps/dbus
+			dev-python/dbus-python
+		)
 		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
 		snmp? (
 			net-analyzer/net-snmp
@@ -38,18 +42,20 @@
 		!<sys-fs/udev-114
 		scanner? (
 			dev-python/imaging
+			dev-python/reportlab
 			gtk? ( media-gfx/xsane )
 			!gtk? ( media-gfx/sane-frontends )
 		)
+		fax? (
+			dev-python/reportlab
+		)
 		qt4? ( !qt3? (
 			dev-python/PyQt4
 			dbus? ( dev-python/dbus-python )
-			fax? ( dev-python/reportlab )
 		) )
 		qt3? (
 			dev-python/PyQt
 			dbus? ( dev-python/dbus-python )
-			fax? ( dev-python/reportlab )
 		)
 	)"
 
@@ -75,7 +81,6 @@
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-high_cpu_utilization_logout.patch
 	sed -i -e "s:\$(doc_DATA)::" Makefile.in || die "Patching Makefile.in failed"
 	sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
 		-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
@@ -94,13 +99,20 @@
 	cp "${FILESDIR}"/70-hpmud.rules data/rules
 	sed -i -e "s/55-hpmud.rules/70-hpmud.rules/g" Makefile.* */*.html || die "sed 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"
+
+	# plugins check
+	mv data/rules/56-hpmud_support.rules data/rules/71-hpmud_support.rules
+	sed -i -e "s/56-hpmud_support.rules/71-hpmud_support.rules/g" Makefile.* */*.html || die "sed failed"
+
 	sed -i \
 		-e s:/usr/lib/cups/driver:$(cups-config --serverbin)/driver:g \
 		installer/core_install.py || die "sed core_install.py"
 
 	# Use system foomatic-rip instead of foomatic-rip-hplip
 	local i
-	for i in ppd/*.ppd.gz
+	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"
@@ -125,10 +137,14 @@
 src_configure() {
 	if use qt3 || use qt4 ; then
 		local 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"
 	fi
-	use qt4 && gui_build="${gui_build} --enable-qt4 --disable-qt3"
 
 	econf \
 		--disable-dependency-tracking \
@@ -145,7 +161,8 @@
 		$(use_enable parport pp-build) \
 		$(use_enable ppds foomatic-ppd-install) \
 		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build)
+		$(use_enable snmp network-build) \
+		$(use_enable policykit policykit)
 }
 
 src_install() {
@@ -166,7 +183,7 @@
 	fi
 
 	# Do not install unzipped ppd files
-	rm -f "${D}"/usr/share/ppd/HP/*.ppd
+	rm -rf "${D}"/usr/share/ppd/HP/*.ppd
 }
 
 pkg_preinst() {