Cleanup.

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686)

6 files changed, 6 insertions, 684 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 3714a73f3300..18b0d7b8b4c2 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.109 2008/08/17 12:46:53 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.110 2008/08/17 13:04:08 calchan Exp $
+
+  17 Aug 2008; Denis Dupeyron <calchan@gentoo.org> -hplip-2.7.10.ebuild,
+  -hplip-2.7.12.ebuild, -hplip-2.7.12-r1.ebuild, -hplip-2.8.2.ebuild,
+  -hplip-2.8.5.ebuild:
+  Cleanup.
 
 *hplip-2.8.7 (17 Aug 2008)
 
diff --git a/net-print/hplip/hplip-2.7.10.ebuild b/net-print/hplip/hplip-2.7.10.ebuild
deleted file mode 100644
index bf13b5157a19..000000000000
--- a/net-print/hplip/hplip-2.7.10.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.10.ebuild,v 1.9 2008/03/24 19:38:18 calchan Exp $
-
-inherit eutils linux-info
-
-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 ppc ppc64 x86"
-IUSE="X doc fax minimal parport ppds scanner snmp"
-
-DEPEND="!net-print/hpijs
-	!net-print/hpoj
-	virtual/ghostscript
-	>=media-libs/jpeg-6b
-	net-print/foomatic-filters
-	!minimal? (
-		>=net-print/cups-1.2
-		dev-libs/libusb
-		scanner? ( >=media-gfx/sane-backends-1.0.9 )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl
-		)
-	)"
-
-RDEPEND="${DEPEND}
-	!minimal? (
-		!<sys-fs/udev-114
-		fax? ( dev-python/reportlab )
-		scanner? (
-			dev-python/imaging
-			X? ( >=media-gfx/xsane-0.89 )
-			!X? ( >=media-gfx/sane-frontends-1.0.9 )
-		)
-		X? ( >=dev-python/PyQt-3.14 )
-	)"
-
-CONFIG_CHECK="PARPORT PPDEV"
-ERROR_PARPORT="Please make sure you activate PARPORT and PPDEV support in the kernel."
-
-pkg_setup() {
-	if ! use ppds ; then
-		ewarn "Not installing built-in PPD files, which is probably not what you want."
-		ewarn "You need USE=ppds if you want to install them."
-	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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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'}/" \
-		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 */*/*.html
-}
-
-src_compile() {
-	econf \
-		--disable-cups11-build \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		$(use_enable minimal hpijs-only-build) \
-		$(use_enable doc doc-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable X gui-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable ppds foomatic-ppd-install) \
-		--disable-foomatic-xml-install \
-		|| die "econf failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	# bug 106035
-	use X || rm -Rf "${D}"/usr/share/applications
-
-	use minimal && rm -rf "${D}"/usr/lib
-}
-
-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 -f "${ROOT}"/usr/libexec/cups/backend/hp{,fax};
-	fi
-
-	# try to be very conservative as to when we screw around with config files
-	use minimal && return 0
-	use scanner || return 0
-	[[ ! -e ${ROOT}/etc/sane.d/dll.conf ]] && return 0
-	grep -qs '\<hpaio\>' "${ROOT}"/etc/sane.d/dll.conf && return 0
-
-	cp "${ROOT}"/etc/sane.d/dll.conf "${T}"/dll.conf || return 1
-	echo hpaio >> "${T}"/dll.conf
-	insinto /etc/sane.d
-	doins "${T}"/dll.conf
-}
-
-pkg_postinst() {
-	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."
-}
diff --git a/net-print/hplip/hplip-2.7.12-r1.ebuild b/net-print/hplip/hplip-2.7.12-r1.ebuild
deleted file mode 100644
index 955998e1addd..000000000000
--- a/net-print/hplip/hplip-2.7.12-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.12-r1.ebuild,v 1.4 2008/05/29 17:47:41 hawking Exp $
-
-inherit eutils linux-info python
-
-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 ~ppc ~ppc64 ~x86"
-IUSE="X doc fax minimal parport ppds scanner snmp"
-
-DEPEND="!net-print/hpijs
-	!net-print/hpoj
-	virtual/ghostscript
-	>=media-libs/jpeg-6b
-	net-print/foomatic-filters
-	!minimal? (
-		>=net-print/cups-1.2
-		dev-libs/libusb
-		scanner? ( >=media-gfx/sane-backends-1.0.9 )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl
-		)
-	)"
-
-RDEPEND="${DEPEND}
-	!minimal? (
-		!<sys-fs/udev-114
-		fax? ( dev-python/reportlab )
-		scanner? (
-			dev-python/imaging
-			X? ( >=media-gfx/xsane-0.89 )
-			!X? ( >=media-gfx/sane-frontends-1.0.9 )
-		)
-		X? ( >=dev-python/PyQt-3.14 )
-	)"
-
-CONFIG_CHECK="PARPORT PPDEV"
-ERROR_PARPORT="Please make sure you activate PARPORT and PPDEV support in the kernel."
-
-pkg_setup() {
-	if ! use ppds ; then
-		ewarn "Not installing built-in PPD files, which is probably not what you want."
-		ewarn "You need USE=ppds if you want to install them."
-	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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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'}/" \
-		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 */*/*.html
-}
-
-src_compile() {
-	econf \
-		--disable-cups11-build \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		$(use_enable minimal hpijs-only-build) \
-		$(use_enable doc doc-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable X gui-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable ppds foomatic-ppd-install) \
-		--disable-foomatic-xml-install \
-		|| die "econf failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	# bug 106035
-	use X || rm -Rf "${D}"/usr/share/applications
-
-	use minimal && rm -rf "${D}"/usr/lib
-}
-
-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 -f "${ROOT}"/usr/libexec/cups/backend/hp{,fax};
-	fi
-
-	# try to be very conservative as to when we screw around with config files
-	use minimal && return 0
-	use scanner || return 0
-	[[ ! -e ${ROOT}/etc/sane.d/dll.conf ]] && return 0
-	grep -qs '\<hpaio\>' "${ROOT}"/etc/sane.d/dll.conf && return 0
-
-	cp "${ROOT}"/etc/sane.d/dll.conf "${T}"/dll.conf || return 1
-	echo hpaio >> "${T}"/dll.conf
-	insinto /etc/sane.d
-	doins "${T}"/dll.conf
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/hplip
-	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/hplip
-}
diff --git a/net-print/hplip/hplip-2.7.12.ebuild b/net-print/hplip/hplip-2.7.12.ebuild
deleted file mode 100644
index 80035e22c283..000000000000
--- a/net-print/hplip/hplip-2.7.12.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.12.ebuild,v 1.5 2008/03/24 19:38:18 calchan Exp $
-
-inherit eutils linux-info
-
-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 ~ppc ~ppc64 ~x86"
-IUSE="X doc fax minimal parport ppds scanner snmp"
-
-DEPEND="!net-print/hpijs
-	!net-print/hpoj
-	virtual/ghostscript
-	>=media-libs/jpeg-6b
-	net-print/foomatic-filters
-	!minimal? (
-		>=net-print/cups-1.2
-		dev-libs/libusb
-		scanner? ( >=media-gfx/sane-backends-1.0.9 )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl
-		)
-	)"
-
-RDEPEND="${DEPEND}
-	!minimal? (
-		!<sys-fs/udev-114
-		fax? ( dev-python/reportlab )
-		scanner? (
-			dev-python/imaging
-			X? ( >=media-gfx/xsane-0.89 )
-			!X? ( >=media-gfx/sane-frontends-1.0.9 )
-		)
-		X? ( >=dev-python/PyQt-3.14 )
-	)"
-
-CONFIG_CHECK="PARPORT PPDEV"
-ERROR_PARPORT="Please make sure you activate PARPORT and PPDEV support in the kernel."
-
-pkg_setup() {
-	if ! use ppds ; then
-		ewarn "Not installing built-in PPD files, which is probably not what you want."
-		ewarn "You need USE=ppds if you want to install them."
-	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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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'}/" \
-		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 */*/*.html
-}
-
-src_compile() {
-	econf \
-		--disable-cups11-build \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		$(use_enable minimal hpijs-only-build) \
-		$(use_enable doc doc-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable X gui-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable ppds foomatic-ppd-install) \
-		--disable-foomatic-xml-install \
-		|| die "econf failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	# bug 106035
-	use X || rm -Rf "${D}"/usr/share/applications
-
-	use minimal && rm -rf "${D}"/usr/lib
-}
-
-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 -f "${ROOT}"/usr/libexec/cups/backend/hp{,fax};
-	fi
-
-	# try to be very conservative as to when we screw around with config files
-	use minimal && return 0
-	use scanner || return 0
-	[[ ! -e ${ROOT}/etc/sane.d/dll.conf ]] && return 0
-	grep -qs '\<hpaio\>' "${ROOT}"/etc/sane.d/dll.conf && return 0
-
-	cp "${ROOT}"/etc/sane.d/dll.conf "${T}"/dll.conf || return 1
-	echo hpaio >> "${T}"/dll.conf
-	insinto /etc/sane.d
-	doins "${T}"/dll.conf
-}
-
-pkg_postinst() {
-	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."
-}
diff --git a/net-print/hplip/hplip-2.8.2.ebuild b/net-print/hplip/hplip-2.8.2.ebuild
deleted file mode 100644
index f10beeaf89bd..000000000000
--- a/net-print/hplip/hplip-2.8.2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.8.2.ebuild,v 1.2 2008/04/04 16:14:51 mr_bones_ Exp $
-
-inherit eutils linux-info
-
-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 ~ppc ~ppc64 ~x86"
-
-# Some stuff commented out because I wasn't able to make dynamic PPD install work properly. If you can or
-# simply want to help with this feel free to contact me (calchan@gentoo.org).
-
-IUSE="X doc fax minimal parport ppds scanner snmp"
-#IUSE="X cupsddk doc fax minimal parport ppds scanner snmp"
-
-DEPEND="!net-print/hpijs
-	!net-print/hpoj
-	virtual/ghostscript
-	>=media-libs/jpeg-6b
-	net-print/foomatic-filters
-	!minimal? (
-		>=net-print/cups-1.2
-		dev-libs/libusb
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl
-		)
-	)"
-
-# The code snippet below should go in the '!minimal?' block above
-#	cupsddk? ( net-print/cupsddk )
-
-RDEPEND="${DEPEND}
-	!minimal? (
-		!<sys-fs/udev-114
-		fax? ( dev-python/reportlab )
-		scanner? (
-			dev-python/imaging
-			X? ( >=media-gfx/xsane-0.89 )
-			!X? ( >=media-gfx/sane-frontends-1.0.9 )
-		)
-		X? ( >=dev-python/PyQt-3.14 )
-	)"
-
-CONFIG_CHECK="PARPORT PPDEV"
-ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
-
-pkg_setup() {
-	if ! use ppds ; then
-		ewarn "Not installing built-in PPD files, which is probably not what you want. Without"
-		ewarn "them you will almost certainly not be able to print."
-		ewarn "You need USE=ppds if you want to install them."
-		epause
-	fi
-#	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 (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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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'}/" \
-		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 */*/*.html
-}
-
-src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-cups11-build \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		$(use_enable minimal hpijs-only-build) \
-		$(use_enable doc doc-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable X gui-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable ppds foomatic-ppd-install) \
-		$(use_enable ppds foomatic-rip-hplip-install) \
-		|| die "econf failed"
-	emake || die "Compilation failed"
-}
-
-# The code snippet below should go in the 'econf' block above
-#       $(use_enable cupsddk foomatic-drv-install) \
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	rm -f "${D}"/etc/sane.d/dll.conf
-
-	# bug 106035
-	use X || rm -Rf "${D}"/usr/share/applications
-
-	use minimal && rm -rf "${D}"/usr/lib
-}
-
-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 -f "${ROOT}"/usr/libexec/cups/backend/hp{,fax};
-	fi
-}
-
-pkg_postinst() {
-	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."
-}
diff --git a/net-print/hplip/hplip-2.8.5.ebuild b/net-print/hplip/hplip-2.8.5.ebuild
deleted file mode 100644
index b0b62a477142..000000000000
--- a/net-print/hplip/hplip-2.8.5.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.8.5.ebuild,v 1.2 2008/05/22 07:36:56 corsair Exp $
-
-inherit eutils linux-info
-
-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 ~ppc64 ~x86"
-
-IUSE="X cupsddk dbus doc fax minimal parport ppds scanner snmp"
-
-DEPEND="!net-print/hpijs
-	!net-print/hpoj
-	virtual/ghostscript
-	>=media-libs/jpeg-6b
-	>=net-print/foomatic-filters-3.0.20070501
-	!minimal? (
-		>=net-print/cups-1.2
-		dev-libs/libusb
-		cupsddk? ( net-print/cupsddk )
-		dbus? ( >=sys-apps/dbus-1.0.0 )
-		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
-			X? ( >=media-gfx/xsane-0.89 )
-			!X? ( >=media-gfx/sane-frontends-1.0.9 )
-		)
-		X? (
-			>=dev-python/PyQt-3.14
-			dbus? ( >=dev-python/dbus-python-0.80 )
-			fax? ( dev-python/reportlab )
-		)
-	)"
-
-CONFIG_CHECK="PARPORT PPDEV"
-ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
-
-pkg_setup() {
-	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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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'}/" \
-		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 */*/*.html
-
-	# Use system foomatic-rip instead of foomatic-rip-hplip
-	sed -i -e 's/foomatic-rip-hplip/foomatic-rip/' ppd/*.ppd || die "sed failed"
-}
-
-src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-cups11-build \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--disable-foomatic-rip-hplip-install \
-		$(use_enable X 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) \
-		|| die "econf failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	rm -f "${D}"/etc/sane.d/dll.conf
-
-	# bug 106035
-	use X || rm -Rf "${D}"/usr/share/applications
-
-	use minimal && rm -rf "${D}"/usr/lib
-}
-
-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 -f "${ROOT}"/usr/libexec/cups/backend/hp{,fax};
-	fi
-}
-
-pkg_postinst() {
-	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."
-}