Version bump thanks to Manfred Knick in bug #292915. Remove old versions and unused files files. Cleanup metadata.xml.

(Portage version: 2.1.6.13/cvs/Linux i686)

6 files changed, 82 insertions, 577 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 5c6bc970003b..5bab7c4d391f 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.130 2009/10/15 18:21:29 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.131 2009/11/12 21:34:46 billie Exp $
+
+*hplip-3.9.10 (12 Nov 2009)
+
+  12 Nov 2009; Daniel Pielmeier <billie@gentoo.org>
+  -files/hplip-3.9.2-high_cpu_utilization_logout.patch, -hplip-3.9.8.ebuild,
+  -hplip-3.9.8-r1.ebuild, -hplip-3.9.8-r2.ebuild, +hplip-3.9.10.ebuild,
+  metadata.xml:
+  Version bump thanks to Manfred Knick in bug #292915. Remove old versions
+  and unused files files. Cleanup metadata.xml.
 
 *hplip-3.9.8-r3 (15 Oct 2009)
 
diff --git a/net-print/hplip/files/hplip-3.9.2-high_cpu_utilization_logout.patch b/net-print/hplip/files/hplip-3.9.2-high_cpu_utilization_logout.patch
deleted file mode 100644
index 6d2e06b37ef2..000000000000
--- a/net-print/hplip/files/hplip-3.9.2-high_cpu_utilization_logout.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: hpdio.py
-===================================================================
---- hpdio.py	(revision 10469)
-+++ hpdio.py	(working copy)
-@@ -85,12 +85,20 @@
-                 r, w, e = select.select([r2], [], [r2], 1.0)
-             except KeyboardInterrupt:
-                 break
-+            except select.error, e:
-+                if e[0] == errno.EINTR:
-+                    continue
-+                else:
-+                    break
- 
-             if not r: continue
-             if e: break
- 
-             m = ''.join([m, os.read(r2, fmt_size)])
- 
-+            if not m:
-+                break
-+
-             while len(m) >= fmt_size:
-                 response.clear()
-                 event = device.Event(*struct.unpack(fmt, m[:fmt_size]))
diff --git a/net-print/hplip/hplip-3.9.8-r2.ebuild b/net-print/hplip/hplip-3.9.10.ebuild
index 7fd0f9b33b16..ea99a6d78a26 100644
--- a/net-print/hplip/hplip-3.9.8-r2.ebuild
+++ b/net-print/hplip/hplip-3.9.10.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.1 2009/11/12 21:34:46 billie Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ 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"
+IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt3 qt4 scanner snmp static-ppds -udev-acl zeroconf"
 
 # Note : libusb-compat untested (calchan 20090516)
 
@@ -22,10 +22,10 @@ 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 ) )
+	!static-ppds? ( || ( >=net-print/cups-1.4.0[zeroconf?] net-print/cupsddk ) )
 	udev-acl? ( >=sys-fs/udev-145[extras] )
 	!minimal? (
-		net-print/cups
+		net-print/cups[zeroconf?]
 		virtual/libusb:0
 		>=dev-lang/python-2.4.4[threads,xml]
 		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
@@ -83,6 +83,8 @@ pkg_setup() {
 
 	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
@@ -141,7 +143,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local drv_build gui_build myconf
+	local gui_build myconf drv_build minimal_build
 
 	if use qt3 || use qt4 ; then
 		gui_build="--enable-gui-build"
@@ -156,7 +158,7 @@ src_configure() {
 			use qt3 && gui_build="${gui_build} --enable-qt3 --disable-qt4"
 		fi
 	else
-		gui_build="--disable-gui-build"
+		gui_build="--disable-gui-build --disable-qt3 --disable-qt4"
 	fi
 
 	if use fax || use qt4 ; then
@@ -166,7 +168,7 @@ src_configure() {
 	fi
 
 	if use hpcups ; then
-		drv_build="${drv_build} $(use_enable hpcups hpcups-install)"
+		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"
@@ -174,6 +176,9 @@ src_configure() {
 			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
@@ -185,24 +190,41 @@ src_configure() {
 			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-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} \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable new-hpcups new-hpcups) \
 		$(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) \
@@ -238,13 +260,18 @@ 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 "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 access it."
+	elog "If your device is connected using USB, users will need to be in the lp group to"
+	elog "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."
+	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. If you"
+	elog "prefer the SLP method you have to choose this when configuring the device."
 }
 
 pkg_postrm() {
diff --git a/net-print/hplip/hplip-3.9.8-r1.ebuild b/net-print/hplip/hplip-3.9.8-r1.ebuild
deleted file mode 100644
index 704557e5574d..000000000000
--- a/net-print/hplip/hplip-3.9.8-r1.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# 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-r1.ebuild,v 1.2 2009/10/14 18:03:04 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"
-
-# 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 ) )
-	!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 \
-		|| 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 Makefile.am */*.html 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 \
-		--enable-udev-acl-rules \
-		${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)
-}
-
-src_install() {
-	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
-		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/hplip-3.9.8.ebuild b/net-print/hplip/hplip-3.9.8.ebuild
deleted file mode 100644
index d0450eba1a2d..000000000000
--- a/net-print/hplip/hplip-3.9.8.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# 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.2 2009/10/14 18:03:04 billie Exp $
-
-EAPI="2"
-
-inherit eutils fdo-mime linux-info python autotools
-
-DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner 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"
-
-IUSE="+cups cupsddk dbus doc fax +foomatic gtk minimal parport policykit ppds qt3 qt4 scanner snmp"
-
-# Note : libusb-compat untested (calchan 20090516)
-
-DEPEND="!net-print/hpijs
-	!net-print/hpoj
-	>=dev-lang/python-2.4.4[threads]
-	virtual/ghostscript
-	media-libs/jpeg
-	!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] )
-		)
-		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
-		)
-	)"
-
-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 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\")."
-	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
-	fi
-}
-
-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"
-
-	# bug 98428
-	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" hpssd.py || die "Patching 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"
-
-	# 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"
-
-	# 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"
-
-	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/{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"
-		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
-		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"
-		sed -i \
-			-e "s/Exec=hp-systray/Exec=hp-systray --qt${qt_ver}/" \
-			hplip-systray.desktop.in || die "sed failed"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	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
-
-	if use cupsddk; then
-		myconf="${myconf} $(use_enable foomatic foomatic-drv-install)"
-	else
-		myconf="${myconf} --disable-foomatic-drv-install"
-	fi
-
-	if use ppds; then
-		myconf="${myconf} $(use_enable foomatic foomatic-ppd-install)"
-	else
-		myconf="${myconf} --disable-foomatic-ppd-install"
-	fi
-
-	econf \
-		--disable-dependency-tracking \
-		--disable-cups11-build \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--disable-foomatic-rip-hplip-install \
-		--enable-udev-acl-rules \
-		${myconf} \
-		${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) \
-		$(use_enable policykit policykit)
-}
-
-src_install() {
-	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
-		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
-
-	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
-		rm "${ROOT}"/usr/libexec/cups/backend/hp{,fax}
-	fi
-}
-
-pkg_postinst() {
-	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() {
-	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 cbfc8b78c86b..55a6fab67449 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -20,53 +20,44 @@
   </maintainer>
 
   <use>
-    <flag name='cupsddk'>Add support for <pkg>net-print/cupsddk</pkg> which 
+    <flag name="doc">Build documentation</flag>
+    <flag name="cupsddk">Add support for <pkg>net-print/cupsddk</pkg> which 
     enables dynamic PPD files (recommended)</flag>
-    <flag name='dbus'>Add support for <pkg>sys-apps/dbus</pkg> which enables 
+    <flag name="dbus">Add support for <pkg>sys-apps/dbus</pkg> which enables 
     better communications with your device (recommended)</flag>
-    <flag name='doc'>Build documentation</flag>
-    <flag name='fax'>Enable fax on multifunction devices which support it</flag>
-    <flag name='gtk'>Enable GTK+ dependencies, currently only the scanner GUI 
-    with USE=scanner.</flag>
-    <flag name='minimal'>Only build internal hpijs driver (not recommended at 
+    <flag name="fax">Enable fax on multifunction devices which support 
+    it</flag>
+    <flag name="gtk">Enable GTK+ dependencies, currently only the scanner GUI 
+    with USE=scanner</flag>
+    <flag name="hpcups">Build the hpcups driver for cups (by HP)</flag>
+    <flag name="hpijs">Build the IJS driver for cups (Foomatic)</flag>
+    <flag name="libnotify">Enables desktop notifications</flag>
+    <flag name="minimal">Only build internal hpijs driver (not recommended at 
     all, make sure you know what you are doing)</flag>
-    <flag name='parport'>Enable parallel port for devices which require 
+    <flag name="new-hpcups">Build the new hpcups driver for cups which is no 
+    longer based on APDK (by HP)</flag>
+    <flag name="parport">Enable parallel port for devices which require 
     it</flag>
-    <flag name='ppds'>Use precompiled PPD files (obsolete, use cupsddk 
+    <flag name="policykit">Enable sys-auth/policykit authentication 
+    support</flag>
+    <flag name="ppds">Use precompiled PPD files (obsolete, use cupsddk 
     instead)</flag>
-    <flag name='qt3'>Enable graphical interface using Qt 3; when both qt3 and
-	qt4 USE flags are enabled then qt4 has priority over qt3</flag>
-    <flag name='qt4'>Enable graphical interface using Qt 4; when both qt3 and
-	qt4 USE flags are enabled then qt4 has priority over qt3</flag>
-    <flag name='scanner'>Enable scanner on multifunction devices which support 
-    it </flag>
-    <flag name='snmp'>Add support for <pkg>net-analyzer/net-snmp</pkg> 
-    which enables this driver to work over networks (both for server and 
+    <flag name="qt3">Enable graphical interface using Qt 3; when both qt3 and 
+    qt4 USE flags are enabled then qt4 has priority over qt3</flag>
+    <flag name="qt4">Enable graphical interface using Qt 4; when both qt3 and 
+    qt4 USE flags are enabled then qt4 has priority over qt3</flag>
+    <flag name="scanner">Enable scanner on multifunction devices which support 
+    it</flag>
+    <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='zeroconf'>Zeroconf support. Enable this flag to make use of the
-    mDNS network search for network attached printers.</flag>
-    <flag name="cups">
-      Build the hpcups driver for cups.
-    </flag>
-    <flag name="foomatic">
-      Build the IJS/foomatic driver for cups.
-    </flag>
-
-    <flag name="hpcups">
-      Build the hpcups driver for cups (by HP).
-    </flag>
-
-    <flag name="hpijs">
-      Build the IJS driver for cups (Foomatic)
-    </flag>
-
-    <flag name="static-ppds">
-      Use statically-generated PPDs instead of Dynamic PPDs. This is
-      deprecated, and this USE flag is thus suggested to stay turned
-      off.
-    </flag>
+    <flag name="static-ppds">Use statically-generated PPDs instead of Dynamic 
+    PPDs. This is deprecated, and this USE flag is thus suggested to stay 
+    turned off</flag>
+    <flag name="udev-acl">Install udev acl rules which needs 
+    <pkg>sys-fs/udev</pkg> with acl support</flag>
+    <flag name="zeroconf">Zeroconf support. Enable this flag to make use of the
+    mDNS network search for network attached printers</flag>
   </use>
 
 </pkgmetadata>