Version bump. Remove old.

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

5 files changed, 21 insertions, 531 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 81211281f45e..cc5955302f5d 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.146 2010/02/12 19:09:57 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.147 2010/02/28 12:21:59 billie Exp $
+
+*hplip-3.10.2 (28 Feb 2010)
+
+  28 Feb 2010; Daniel Pielmeier <billie@gentoo.org> -hplip-3.9.4b-r1.ebuild,
+  -hplip-3.9.10.ebuild, -hplip-3.9.12.ebuild, +hplip-3.10.2.ebuild:
+  Version bump. Remove old.
 
   12 Feb 2010; Joseph Jezak <josejx@gentoo.org> hplip-3.9.12-r1.ebuild:
   Marked ppc/ppc64 stable for bug #304079.
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index d105b500ceef..fee451668ce6 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70-hpmud.rules 763 RMD160 b8326b26658b8e8355ae3d74423b51e2e15001e2 SHA1 fdb6b4937a814db50dc3ac3ca9b9c04cb44a6590 SHA256 6e7f2a0fd5a2111505066a412daea0d29c1ce858f09dbbaa489bb5a2f231e837
 AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
 AUX hplip-3.9.10-cupsddk.patch 1128 RMD160 de693684826251f595a54c32ac31ab1e1ff082ef SHA1 c95ed5c2313c951b543c1df58b179ee0f1290bd2 SHA256 80b09b3b6e24860aebdd856384261b7f7e1887a7779dec668693dcf10a1c159a
@@ -10,22 +7,12 @@ AUX hplip-3.9.12-cupsddk.patch 1265 RMD160 4f4cea73c0cfc6e830b27f4945e123e3cd490
 AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95dc SHA1 11d85332f0200f14bb4492c1528cebb2af72d6f0 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b083bb0cf1305d5d7a8cc5bd719
 AUX hplip-3.9.4+glibc-2.10.patch 1023 RMD160 9571a0c34421432f892a1535ff0bf6533dc3883c SHA1 1254a4c2b9f5d2e6a488b3b0567f7edda3ab7a26 SHA256 4ab1cde2cb9a405011faa5c3c3bf9d7c52ce97653a28aa056e01c71909d08b3b
 DIST hplip-2.8.6b.tar.gz 10955713 RMD160 fa903344c59f4bc474aeb049dd75631e72435b92 SHA1 b15e1dcb00d745ccc424633a84ba062c307740f9 SHA256 aa1094f0f91bbc0b5a611ce6ece40651edc7b3da8fa111921a3524916fc179fa
-DIST hplip-3.9.10.tar.gz 20999540 RMD160 65ea83e53bc19df0e2a054e723c74734fc5f39a8 SHA1 9c9a8b0bd990b7d6e29a9024ec80f3edceab269b SHA256 5dcde242478405a9f127a6a235a53f4d30a63725d9a6e4f4fda4662304e9723a
+DIST hplip-3.10.2.tar.gz 21446275 RMD160 4483bd497bbc272812c31db574b75f6e5c03b391 SHA1 7cdbb879cc122152aa9e3d5dc2d7dd3baf3b0604 SHA256 bb9a3aeda9a8d31f0cc790e629f14d2122f9bff111b0d3cc97ac19a8607d7956
 DIST hplip-3.9.12.tar.gz 21371447 RMD160 f1717e8bad043b54497489fa1a2764b3ac548094 SHA1 d4d659ae52f01055bfc7060e0d4e3c7354c1dee3 SHA256 1c53febe3101b3718d43c9176c08826a1a46c49a79c9f6445cd16981fbf2a12a
-DIST hplip-3.9.4b.tar.gz 15712313 RMD160 bfed762c59b8dc2210d450ba86a5636773831cc1 SHA1 d2b06f1ee347a1f3aacd6b52600d08fc71ac5b12 SHA256 57496c01fb3ead9678e630c1c4a385e156b76d328440da550ebfc24b95ff8b1a
 DIST hplip-3.9.8.tar.gz 15715640 RMD160 8b06537176bfb32d32ae20eec1cfa6765609ecc0 SHA1 bcf0d1d8d6a006dd00224b4f90c208c21af28e55 SHA256 6471d99bde2b1182f45082c50dbd9e424a3ec2c0e98c48c934a1cd0d4ccb4e36
 EBUILD hplip-2.8.6b.ebuild 5005 RMD160 82e7b5ead2995a382208be0718706f5f20d3960a SHA1 a42a1f47a85512a001b6bc4bb876f254328578f3 SHA256 f3fd276043f96b9d1354011b14d5966f074365f6b99734ad6b9c95af48d84bfb
-EBUILD hplip-3.9.10.ebuild 8322 RMD160 189c45a40ab8ca2acd4efeafdbe3e1c9d2dfad65 SHA1 13355b0dc3681da7ae15f96c2624675979316f98 SHA256 8d5afc2a1c9e9b1c1834128ee56b306cc701f025e9cbb666d5a753c8247772f3
+EBUILD hplip-3.10.2.ebuild 7571 RMD160 ed901422e3e5ccef6b9281d8da43b9cacab27e53 SHA1 c19f713e8dd92d1536f91ff55f8c7fddd85ea230 SHA256 ce356280399927363ba06743e2dd03935a4890f47ab32c9175643949db319864
 EBUILD hplip-3.9.12-r1.ebuild 8319 RMD160 e8f241c9dfe4b7937486b3b7223f795ccda54711 SHA1 b9d00592f698fdf88bbac190ee3bc7ff2d986710 SHA256 88be196de8ccd7b55e48e01e1fd14aa800b3a2045da4388112ebb13fdc971dea
-EBUILD hplip-3.9.12.ebuild 8153 RMD160 9239caece471cf0ef7c8b6d82fbb0a69b3af16d4 SHA1 7b759d9862d69db2f03604ad3e22be5459478d03 SHA256 5d897b8ea27b139f734f79f27afe6620575bd1b46fbf9bfd0bf6e394fec2637e
-EBUILD hplip-3.9.4b-r1.ebuild 6217 RMD160 f6904eaaae5bebc5d2c6f6c40bf7738a13226ca0 SHA1 b90c4b848f7e0f91e57c9110b3aced73bcaac512 SHA256 f88a37610deaf1158746d317064194f92911690e4b5f941e0e5ecb24e3fb251e
 EBUILD hplip-3.9.8-r3.ebuild 7779 RMD160 3f70dc5fdcb0bbc144fbc5c8f4447a610a4d73bc SHA1 b568fc96d26c07d19e6e9a43527836590a942b42 SHA256 6538e4aba085a1a148129faf620c39ca108f24bb83e3cebebf2fc817afe3b7e3
-MISC ChangeLog 25163 RMD160 806756d6ba0a591caa578aff0ad22dca4c3e9e1b SHA1 9e412d13b364bc8bb087d8a2cfe444d1c5849618 SHA256 1222345de7d56579483ee1d402f14a437a4cf5e26d770ba6709d2605e4edabaa
+MISC ChangeLog 25366 RMD160 f768be077fa00103566bf9b3835966165dc1c619 SHA1 18bdfd9ad4b35c92cb9105671aae0a1f80f91c0d SHA256 d6dd6b3e99b47a580a98053c1a6efb5658d0cd192d8f473d8b75c0fe41f64171
 MISC metadata.xml 2398 RMD160 ae945168b49eb9bef494295c09f2cc4fcd8cfb3d SHA1 a15f245061b070686071585f1a5bf7993e54e50a SHA256 e7502f347ef9fc7d4b6d2c79554531cf1cff901fed307f7d17b94fe09692cb71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkt1p1QACgkQcsIHjyDViGSw8wCg2HOCsODRynXZ66wavJ5ZV+/Q
-m/UAoJ3M+eiWvW559/wTAeDjWfoap73r
-=BStm
------END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.9.12.ebuild b/net-print/hplip/hplip-3.10.2.ebuild
index c42a3b64da3f..5c33b3973a70 100644
--- a/net-print/hplip/hplip-3.9.12.ebuild
+++ b/net-print/hplip/hplip-3.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.12.ebuild,v 1.4 2010/01/02 19:49:06 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.10.2.ebuild,v 1.1 2010/02/28 12:21:59 billie Exp $
 
 EAPI=2
 
@@ -17,19 +17,16 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 # zeroconf does not work properly with >=cups-1.4. thus support for it is also disabled in hplip.
 IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt4 scanner snmp static-ppds -udev-acl"
 
-# Note : libusb-compat untested (calchan 20090516)
-
 COMMON_DEPEND="
-	app-text/ghostscript-gpl
 	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 )
+		fax? ( sys-apps/dbus )
 		snmp? (
 			net-analyzer/net-snmp
 			dev-libs/openssl
@@ -40,21 +37,21 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig"
 
 RDEPEND="${COMMON_DEPEND}
+	>=app-text/ghostscript-gpl-8.70
+	dev-python/pygobject
+	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
 	!minimal? (
 		kernel_linux? ( >=sys-fs/udev-114 )
 		scanner? (
-			dev-python/imaging
 			gtk? ( media-gfx/xsane )
-			!gtk? ( media-gfx/sane-frontends )
+			!gtk? ( || ( media-gfx/sane-frontends dev-python/imaging ) )
 		)
 		fax? (
 			dev-python/reportlab
-			sys-apps/dbus
 			dev-python/dbus-python
 		)
 		qt4? (
 			dev-python/PyQt4[dbus,X]
-			dev-python/pygobject
 			libnotify? (
 				dev-python/notify-python
 			)
@@ -99,12 +96,16 @@ src_prepare() {
 
 	# Use cups-config when checking for cupsddk
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483136
-	epatch "${FILESDIR}"/${P}-cupsddk.patch
+	epatch "${FILESDIR}"/${PN}-3.9.12-cupsddk.patch
 
 	# htmldocs are not installed under docdir/html so enable htmldir configure switch
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483217
 	epatch "${FILESDIR}"/${PN}-3.9.10-htmldir.patch
 
+	# Increase systray check timeout for slower machines
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/335662
+	epatch "${FILESDIR}"/${PN}-3.9.12-systray.patch
+
 	# SYSFS deprecated but kept upstream for compatibility reasons
 	# Upstream bug: 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 \
@@ -125,18 +126,6 @@ src_prepare() {
 		mv ${i}.temp ${i}
 	done
 
-	local qt_ver
-	if use qt4 ; then
-		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 -i \
-			-e "s/Exec=hp-systray/Exec=hp-systray --qt${qt_ver}/" \
-			hplip-systray.desktop.in || die
-	fi
-
 	eautoreconf
 }
 
@@ -230,19 +219,6 @@ src_install() {
 	# Installed by sane-backends
 	# Gentoo Bug: #201023
 	rm -f "${D}"/etc/sane.d/dll.conf || die
-
-	# 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 || die
-	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} || die
-	fi
 }
 
 pkg_postinst() {
diff --git a/net-print/hplip/hplip-3.9.10.ebuild b/net-print/hplip/hplip-3.9.10.ebuild
deleted file mode 100644
index d752a479e34a..000000000000
--- a/net-print/hplip/hplip-3.9.10.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.8 2010/01/02 19:49:06 yngwin 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://hplipopensource.com/hplip-web/index.html"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# zeroconf does not work properly with >=cups-1.4. thus support for it is also disabled in hplip.
-IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt4 scanner snmp static-ppds -udev-acl"
-
-# Note : libusb-compat untested (calchan 20090516)
-
-COMMON_DEPEND="
-	app-text/ghostscript-gpl
-	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
-		)
-		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 qt4 && ewarn "You need USE=qt4 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."
-		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
-}
-
-src_prepare() {
-	# Do not install desktop files if there is no gui
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/452113
-	epatch "${FILESDIR}"/${P}-desktop.patch
-
-	# Browser detection through xdg-open
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/482674
-	epatch "${FILESDIR}"/${P}-browser.patch
-
-	# Use cups-config when checking for cupsddk
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483136
-	epatch "${FILESDIR}"/${P}-cupsddk.patch
-
-	# htmldocs are not installed under docdir/html so enable htmldir configure switch
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483217
-	epatch "${FILESDIR}"/${P}-htmldir.patch
-
-	# SYSFS deprecated but kept upstream for compatibility reasons
-	# Upstream bug: 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"
-
-	# 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"
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	local i
-	for i in ppd/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 qt4 ; then
-		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
-
-	eautoreconf
-}
-
-src_configure() {
-	local gui_build myconf drv_build minimal_build
-
-	if use qt4 ; then
-		gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
-		if use policykit ; then
-			myconf="--enable-policykit"
-		else
-			myconf="--disable-policykit"
-		fi
-	else
-		gui_build="--disable-gui-build --disable-qt3 --disable-qt4"
-	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="$(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
-	else
-		drv_build="--disable-hpcups-install --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	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
-	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-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-htmldir=/usr/share/doc/${P}/html \
-		${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 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"
-
-	# Installed by sane-backends
-	# Gentoo Bug: #201023
-	rm -f "${D}"/etc/sane.d/dll.conf
-
-	# 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,"
-	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"
-	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 on cups."
-	elog "If you prefer the SLP method you have to choose this when configuring the"
-	elog "device."
-}
-
-pkg_postrm() {
-	use !minimal && python_mod_cleanup /usr/share/${PN}
-	fdo-mime_desktop_database_update
-}
diff --git a/net-print/hplip/hplip-3.9.4b-r1.ebuild b/net-print/hplip/hplip-3.9.4b-r1.ebuild
deleted file mode 100644
index 2f5d791fe6a4..000000000000
--- a/net-print/hplip/hplip-3.9.4b-r1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.4b-r1.ebuild,v 1.8 2010/01/02 19:49:06 yngwin 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://hplipopensource.com/hplip-web/index.html"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="cupsddk dbus doc fax gtk minimal parport policykit ppds qt4 scanner snmp"
-
-# Note : libusb-compat untested (calchan 20090516)
-
-DEPEND="!net-print/hpijs
-	!net-print/hpoj
-	>=dev-lang/python-2.4.4[threads]
-	app-text/ghostscript-gpl
-	media-libs/jpeg
-	>=net-print/foomatic-filters-3.0.20080507[cups]
-	!minimal? (
-		net-print/cups
-		virtual/libusb:0
-		cupsddk? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
-		dbus? (
-			sys-apps/dbus
-			dev-python/dbus-python
-			dev-python/pygobject
-		)
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl
-		)
-	)"
-
-RDEPEND="${DEPEND}
-	!minimal? (
-		!<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? (
-			dev-python/PyQt4[X]
-		)
-		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 qt4 && ewarn "You need USE=qt4 for the hplip GUI."
-
-	use scanner && ! use gtk && ewarn "You need USE=gtk for the scanner GUI."
-
-	if ! use ppds && ! use cupsddk; then
-		ewarn "Installing neither static (USE=-ppds) nor dynamic (USE=-cupsddk) PPD files,"
-		ewarn "which is probably not what you want. You will almost certainly not be able to "
-		ewarn "print (recommended: USE=\"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"
-
-	# Replace udev rules, see bug #197726.
-	rm data/rules/55-hpmud.rules
-	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/{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 qt4 && qt_ver="4"
-	if 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
-
-	epatch "${FILESDIR}"/${PN}-3.9.4+glibc-2.10.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	if use qt4 ; then
-		local gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
-	else
-		local gui_build="--disable-gui-build"
-	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 \
-		${gui_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable cupsddk foomatic-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 ppds foomatic-ppd-install) \
-		$(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 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() {
-	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
-}