Cleanup.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo i686

7 files changed, 7 insertions, 694 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/Manifest b/net-print/hplip/Manifest
index ddfc3c350f6c..08a0697dd654 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,16 +1,7 @@
 AUX 70-hpmud.rules 763 RMD160 b8326b26658b8e8355ae3d74423b51e2e15001e2 SHA1 fdb6b4937a814db50dc3ac3ca9b9c04cb44a6590 SHA256 6e7f2a0fd5a2111505066a412daea0d29c1ce858f09dbbaa489bb5a2f231e837
-DIST hplip-2.7.10.tar.gz 14441901 RMD160 1bbfd405eb3d75fa38c0f2fc485438ee064ccce9 SHA1 722e95d0a2b5e4b9535a68c94ed3aef0f3c28ab6 SHA256 e289d5f6190caf4596f6770037569638d96915583339933d6c202f35fc02d8c3
-DIST hplip-2.7.12.tar.gz 14543662 RMD160 6d278ccd3d19df46c6d7fc6bd1b9a6b995749f88 SHA1 4a80e46a633674db53d8063349b8bbb3f9070d49 SHA256 22c1b626c633acac74ab5f7994060304570a81a038f2be5b9e35e44e938a30a0
-DIST hplip-2.8.2.tar.gz 158117 RMD160 3ee6fca8eef6c11f2f98bdc6477a521fd98336e1 SHA1 1ad853bee10fe8cafec960ca646e300e9f56b782 SHA256 a0e14f0489d2385341d823292bb02f3fbdc1ddce54f7091ab0aa4012ffeb7376
-DIST hplip-2.8.5.tar.gz 15307909 RMD160 67c32175635828160995b0dafede339dfb986364 SHA1 f393ed57d3b5bb811551896a3a08fad268733f24 SHA256 9d78597a6d7d10f07f4fbe4fd023d4ccd9f1aab77ab902d92e5cc60a03928f6c
 DIST hplip-2.8.6b.tar.gz 10955713 RMD160 fa903344c59f4bc474aeb049dd75631e72435b92 SHA1 b15e1dcb00d745ccc424633a84ba062c307740f9 SHA256 aa1094f0f91bbc0b5a611ce6ece40651edc7b3da8fa111921a3524916fc179fa
 DIST hplip-2.8.7.tar.gz 11009952 RMD160 20fcfe78aeac118d128e4c13f31532609a0485cd SHA1 f66ac8ace9eaacc4146bda55ff5063323b4e5843 SHA256 5e6bfd621f1f57593fea5c745ad177138ae8e77c53f5548dfb1ea55111e144d2
-EBUILD hplip-2.7.10.ebuild 4049 RMD160 c17835ca07868e4ae83a7bdfef86d4e663aefdb3 SHA1 d1acdaff237aeb2f941cfaf8c9214aecf7d89130 SHA256 f1473d68cfd129c274e1791e1789561cd694de069c2875ac0f46125bc118db5d
-EBUILD hplip-2.7.12-r1.ebuild 4156 RMD160 64e1752d02c1c7a96f2c8e6fd7e7e2c07b875ea8 SHA1 afb0d9a3b182e153189deee297472a9d89ab8db4 SHA256 155db5c6b1ff7a5e1f5946359f46034e64ee9af14e32ad676a175fad019bf8d0
-EBUILD hplip-2.7.12.ebuild 4053 RMD160 d611810ff118f923e20163187d203b454f3b08b9 SHA1 9a65992aa1ea0b0ebcd28cf40363729dceb38e3d SHA256 547209f50f10cc5a1e55f32ce16bb30db4d53666378a663f2aae523052949864
-EBUILD hplip-2.8.2.ebuild 4592 RMD160 aab228762a8719450b504794ac3d65a871738e3b SHA1 a1eeaecd17bf86dd83c842b38567feb6f06357a3 SHA256 90af3dc5697f02df7be2e24eea0cf3a2743960410c6267285561f2cf5bd83382
-EBUILD hplip-2.8.5.ebuild 4286 RMD160 0709b4781da6bcb9e32f81092b28cfba910e5ca7 SHA1 4fe6b04bfbc958f0b55c3bbf577881e316175c74 SHA256 b3420b603ee93146ca9116bec1d3cdf210c1a9dcf962020dbde3ec1699150441
 EBUILD hplip-2.8.6b.ebuild 5129 RMD160 58d1d76c7751a1771e17f494088be874c75a8c03 SHA1 ae07bc0161b64790263ea1a3e6de1276b5c1299d SHA256 a3c20dc29d341fccb16295465f98a677eb1ecb6598fdd8e1d60b8a5798a361d0
 EBUILD hplip-2.8.7.ebuild 5265 RMD160 d3e16759118c9755190427f7c28775d98eb4ab71 SHA1 d4267e4773a51cde802df84c45c08f450b288169 SHA256 aed6a6184f176ffc57eee788543ae1d67d81ec078dea156a7275d1bd6d7f29a0
-MISC ChangeLog 17967 RMD160 392b17de658e2e4de2d9af4b4f6b51d61ef712e7 SHA1 1fd37d026bfa95c32933de5b4bad0611e298f170 SHA256 0c58c1e5ba64584083f81f25f6350ac590037ca31ae393035d7a75622fe1e8e7
+MISC ChangeLog 18145 RMD160 b311d13e73b5706b330cbe069d5a024035006aa0 SHA1 9aed3c8ece4b42cfb8cb886e50f5728ba5e4ada9 SHA256 9d41f212b0f6f13ebd281ac5a0840af3e7aa35e08ef59062eb4dce72ad93de7c
 MISC metadata.xml 1592 RMD160 caf7fbb9f3e8f1fecfbe22963bcd0d29d5adb1c4 SHA1 c325171f26bb06a71a0d21e56faf4558359fe1e0 SHA256 27bc66ec46984e674466082e820d3d6065f3b83b4563d1e3d5e2f0243a55137c
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."
-}