Cleanup.

(Portage version: 2.1.3.9)

5 files changed, 5 insertions, 236 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index ea0e7a28f2ad..d169cea94c45 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.74 2007/08/22 13:35:39 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.75 2007/09/20 08:25:31 calchan Exp $
+
+  20 Sep 2007; Denis Dupeyron <calchan@gentoo.org> -hplip-2.7.6.ebuild,
+  -hplip-2.7.7.ebuild:
+  Cleanup.
 
 *hplip-2.7.7-r2 (22 Aug 2007)
 
diff --git a/net-print/hplip/files/digest-hplip-2.7.6 b/net-print/hplip/files/digest-hplip-2.7.6
deleted file mode 100644
index a8df550a25c1..000000000000
--- a/net-print/hplip/files/digest-hplip-2.7.6
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 b623b7d06e033e1a8e8db6852b72887b hplip-2.7.6-1.patch 641
-RMD160 8fb3653de10a49188fe067bb5b6b8b1e749b5759 hplip-2.7.6-1.patch 641
-SHA256 9d7d2c0bfbab48e87a7fc88c82c3a210ead2c39da54e1a6c05e8bef8ac56ca24 hplip-2.7.6-1.patch 641
-MD5 7493f4d53ec98123d69c9b36318cc1f5 hplip-2.7.6.tar.gz 14025487
-RMD160 3cf9b11907cd2678880b8ddfc184ba2f20227976 hplip-2.7.6.tar.gz 14025487
-SHA256 d4ec63934b13ea36b1bd10aa785ff58affcc454721f526ab059b0f399ac56ac5 hplip-2.7.6.tar.gz 14025487
diff --git a/net-print/hplip/files/digest-hplip-2.7.7 b/net-print/hplip/files/digest-hplip-2.7.7
deleted file mode 100644
index 3dbaf8aeb6e1..000000000000
--- a/net-print/hplip/files/digest-hplip-2.7.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 086bd6a306fa2dfbd6e8c962fddcdef4 hplip-2.7.7.tar.gz 14412854
-RMD160 d3bc36b44b2fd07d8938fce2f508bbc9b4c47b5b hplip-2.7.7.tar.gz 14412854
-SHA256 0804bda4dd18480597bf408351fe56412b84f737d2554b07aafaa1fb089674ba hplip-2.7.7.tar.gz 14412854
diff --git a/net-print/hplip/hplip-2.7.6.ebuild b/net-print/hplip/hplip-2.7.6.ebuild
deleted file mode 100644
index fd91774f01b5..000000000000
--- a/net-print/hplip/hplip-2.7.6.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.6.ebuild,v 1.4 2007/07/28 07:50:02 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
-	mirror://sourceforge/hplip/${P}-1.patch"
-
-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
-	dev-libs/openssl
-	virtual/ghostscript
-	>=media-libs/jpeg-6b
-	>=net-print/cups-1.2
-	dev-libs/libusb
-	>=dev-lang/python-2.2
-	net-print/foomatic-filters
-	fax? ( >=dev-lang/python-2.3 )
-	snmp? ( net-analyzer/net-snmp )"
-
-RDEPEND="${DEPEND}
-	fax? ( dev-python/reportlab )
-	X? ( >=dev-python/PyQt-3.14 )
-	scanner? (
-		X? ( >=media-gfx/xsane-0.89 )
-		!X? ( >=media-gfx/sane-frontends-1.0.9 )
-		)"
-
-CONFIG_CHECK="PARPORT"
-ERROR_PARPORT="Please make sure Device Drivers -> Parallel port support is enabled in your kernel"
-
-pkg_setup() {
-	use parport && linux-info_pkg_setup
-
-	# 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
-
-	use ppds || ewarn "Not installing built-in PPD files. You need USE=ppds if you want to install them."
-	use minimal && ewarn "Installing hpijs driver only, make sure you know what you are doing."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${DISTDIR}/${P}-1.patch"
-
-	sed -i -e "s:toolbox:toolbox.py:" hplip.desktop.in || die "Patching hplip.desktop.in failed"
-	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"
-
-	# bug 161926, until fixed by upstream probably in 2.7.7
-	sed -i -e "s:if (!localOnly):if (1):" scan/sane/hpaio.c  || die "Patching scan/sane/hpaio.c failed"
-}
-
-src_compile() {
-	econf --disable-dependency-tracking \
-		--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
-}
-
-pkg_preinst() {
-	if use scanner; then
-		insinto /etc/sane.d
-		[ -e /etc/sane.d/dll.conf ] && cp /etc/sane.d/dll.conf .
-		[ -e ${ROOT}/etc/sane.d/dll.conf ] && cp ${ROOT}/etc/sane.d/dll.conf .
-		grep -q hpaio dll.conf || echo hpaio >> dll.conf
-		doins dll.conf
-	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."
-	einfo "This release doesn't use an init script anymore, so you should probably do a"
-	einfo "'rc-update del hplip' if you are updating."
-}
diff --git a/net-print/hplip/hplip-2.7.7.ebuild b/net-print/hplip/hplip-2.7.7.ebuild
deleted file mode 100644
index 97abf4e46d26..000000000000
--- a/net-print/hplip/hplip-2.7.7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.7.ebuild,v 1.1 2007/08/08 23:28:56 genstef 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
-	dev-libs/openssl
-	virtual/ghostscript
-	>=media-libs/jpeg-6b
-	>=net-print/cups-1.2
-	dev-libs/libusb
-	>=dev-lang/python-2.2
-	net-print/foomatic-filters
-	fax? ( >=dev-lang/python-2.3 )
-	snmp? ( net-analyzer/net-snmp )"
-
-RDEPEND="${DEPEND}
-	fax? ( dev-python/reportlab )
-	X? ( >=dev-python/PyQt-3.14 )
-	scanner? (
-		X? ( >=media-gfx/xsane-0.89 )
-		!X? ( >=media-gfx/sane-frontends-1.0.9 )
-		)"
-
-CONFIG_CHECK="PARPORT"
-ERROR_PARPORT="Please make sure Device Drivers -> Parallel port support is enabled in your kernel"
-
-pkg_setup() {
-	use parport && linux-info_pkg_setup
-
-	# 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
-
-	use ppds || ewarn "Not installing built-in PPD files. You need USE=ppds if you want to install them."
-	use minimal && ewarn "Installing hpijs driver only, make sure you know what you are doing."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s:toolbox:toolbox.py:" hplip.desktop.in || die "Patching hplip.desktop.in failed"
-	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"
-
-	# bug 161926, until fixed by upstream probably in 2.7.7
-	sed -i -e "s:if (!localOnly):if (1):" scan/sane/hpaio.c  || die "Patching scan/sane/hpaio.c 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"
-}
-
-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
-}
-
-pkg_preinst() {
-	if use scanner; then
-		insinto /etc/sane.d
-		[ -e /etc/sane.d/dll.conf ] && cp /etc/sane.d/dll.conf .
-		[ -e ${ROOT}/etc/sane.d/dll.conf ] && cp ${ROOT}/etc/sane.d/dll.conf .
-		grep -q hpaio dll.conf || echo hpaio >> dll.conf
-		doins dll.conf
-	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."
-}