Post-stabilization cleanup. Kept version 1.6.10 due to bug #161926.

(Portage version: 2.1.2.9)

7 files changed, 5 insertions, 400 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index ad9a43fa6cc5..81d05306be11 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.66 2007/06/11 21:44:38 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.67 2007/06/16 15:21:45 calchan Exp $
+
+  16 Jun 2007; Denis Dupeyron <calchan@gentoo.org> -hplip-1.7.3.ebuild,
+  -hplip-1.7.4.ebuild, -hplip-1.7.4a.ebuild:
+  Post-stabilization cleanup. Kept version 1.6.10 due to bug #161926.
 
   11 Jun 2007; Daniel Gryniewicz <dang@gentoo.org> hplip-1.7.4a-r1.ebuild:
   Marked stable on amd64 for bug #181108
diff --git a/net-print/hplip/files/digest-hplip-1.7.3 b/net-print/hplip/files/digest-hplip-1.7.3
deleted file mode 100644
index f898348726ee..000000000000
--- a/net-print/hplip/files/digest-hplip-1.7.3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1c4b65222333d048450d37082d521b1e foomatic-db-hpijs-20060720.tar.gz 98252
-RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d foomatic-db-hpijs-20060720.tar.gz 98252
-SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e foomatic-db-hpijs-20060720.tar.gz 98252
-MD5 6921d256c9efc37446f5d2fad71979f8 hplip-1.7.3.tar.gz 13556732
-RMD160 dfed95da08f6d5384759b60fc49e8f7cdcbd5aa4 hplip-1.7.3.tar.gz 13556732
-SHA256 13276261eef92167bf1d36fe7331775a3c2428ab06cf34e68fd1e2409b1c614e hplip-1.7.3.tar.gz 13556732
diff --git a/net-print/hplip/files/digest-hplip-1.7.4 b/net-print/hplip/files/digest-hplip-1.7.4
deleted file mode 100644
index e223150978db..000000000000
--- a/net-print/hplip/files/digest-hplip-1.7.4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1c4b65222333d048450d37082d521b1e foomatic-db-hpijs-20060720.tar.gz 98252
-RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d foomatic-db-hpijs-20060720.tar.gz 98252
-SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e foomatic-db-hpijs-20060720.tar.gz 98252
-MD5 61bff0f674dff2c0ef0a077c0ce17a57 hplip-1.7.4.tar.gz 13565392
-RMD160 1e1cf865be6507fed0cc174eff5ad55002ea435a hplip-1.7.4.tar.gz 13565392
-SHA256 cb9c3531897af9613932fb9896ed2696f8903dd44b2a385a2faff0b819337aa5 hplip-1.7.4.tar.gz 13565392
diff --git a/net-print/hplip/files/digest-hplip-1.7.4a b/net-print/hplip/files/digest-hplip-1.7.4a
deleted file mode 100644
index 5fae59ecf518..000000000000
--- a/net-print/hplip/files/digest-hplip-1.7.4a
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1c4b65222333d048450d37082d521b1e foomatic-db-hpijs-20060720.tar.gz 98252
-RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d foomatic-db-hpijs-20060720.tar.gz 98252
-SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e foomatic-db-hpijs-20060720.tar.gz 98252
-MD5 210e948d1f1f376426a2cca0ed9d1e6c hplip-1.7.4a.tar.gz 13566965
-RMD160 e2777b8b065abe385bfe557b9eed86848029e2c9 hplip-1.7.4a.tar.gz 13566965
-SHA256 903957b1b1aa86438d546a205a3d526a600b1e56754a5ba5ce99228a26cc475e hplip-1.7.4a.tar.gz 13566965
diff --git a/net-print/hplip/hplip-1.7.3.ebuild b/net-print/hplip/hplip-1.7.3.ebuild
deleted file mode 100644
index 864f15bda244..000000000000
--- a/net-print/hplip/hplip-1.7.3.ebuild
+++ /dev/null
@@ -1,124 +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-1.7.3.ebuild,v 1.3 2007/04/07 13:00:58 genstef Exp $
-
-inherit eutils
-
-DB_V=20060720
-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
-	foomaticdb? (
-		http://gentooexperimental.org/~genstef/dist/foomatic-db-hpijs-${DB_V}.tar.gz
-		http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-${DB_V}.tar.gz
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cups foomaticdb snmp qt3 ppds scanner X"
-
-DEPEND=">=dev-lang/python-2.2.0
-	snmp? ( >=net-analyzer/net-snmp-5.0.9 )
-	!net-print/hpijs
-	!net-print/hpoj
-	virtual/ghostscript
-	scanner? (
-		>=media-gfx/sane-backends-1.0.9
-		X? ( || (
-			>=media-gfx/xsane-0.89
-			>=media-gfx/sane-frontends-1.0.9
-			) )
-		!X? ( || (
-			>=media-gfx/sane-frontends-1.0.9
-			>=media-gfx/xsane-0.89
-			) )
-	)
-	qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
-	>=dev-libs/libusb-0.1.10a
-	sys-apps/hotplug-base
-	net-print/cups
-	foomaticdb? ( net-print/foomatic-db-engine )
-	>=net-print/foomatic-filters-3.0.2"
-RDEPEND="${DEPEND}"
-
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug 98428
-	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \
-		hpssd.py
-}
-src_compile() {
-	econf \
-		$(use_enable snmp network-build) \
-		$(use_enable cups cups-install) \
-		$(use_enable ppds foomatic-install) \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		econf || die "econf failed"
-		rm -fR data-generators/hpijs-rss
-		emake || die "emake failed"
-	fi
-}
-
-
-src_install() {
-	# cups-1.2 installation paths, make sure that the .desktop is installed
-	sed -i -e "s:/usr/lib/cups:$(cups-config --serverbin):" \
-		-e 's:\(ICON_FILE = \).*:\1hplip.desktop:' \
-		-e 's:\(ICON_PATH = \).*:\1/usr/share/applications:' \
-		Makefile
-
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/hplip.init.d hplip
-
-	if use scanner; then
-		dodir /usr/$(get_libdir)/sane
-		for i in libsane-hpaio.{la,so{,.1{,.0.0}}}; do
-			dosym /usr/$(get_libdir)/${i} /usr/$(get_libdir)/sane/${i}; done
-	else
-		rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.{la,so{,.1{,.0.0}}}
-		rm -f "${D}"/etc/sane.d/dll.conf
-	fi
-
-	# bug 106035
-	if ! use qt3 ; then
-		rm -f "${D}"/usr/{bin/hp-,share/hplip/}{print,toolbox}
-		rm -f "${D}"/usr/share/applications/hplip.desktop
-		rm -f "${D}"/usr/lib/menu/hplip
-	fi
-
-	rm -rf ${D}/$(cups-config --serverbin)/filter ${D}/usr/bin/foomatic-rip
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-}
-
-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() {
-	einfo "You need the qt3 useflag enabled to use the guy configurator hp-setup"
-}
diff --git a/net-print/hplip/hplip-1.7.4.ebuild b/net-print/hplip/hplip-1.7.4.ebuild
deleted file mode 100644
index a727502376a7..000000000000
--- a/net-print/hplip/hplip-1.7.4.ebuild
+++ /dev/null
@@ -1,124 +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-1.7.4.ebuild,v 1.1 2007/04/23 22:29:26 vanquirius Exp $
-
-inherit eutils
-
-DB_V=20060720
-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
-	foomaticdb? (
-		http://gentooexperimental.org/~genstef/dist/foomatic-db-hpijs-${DB_V}.tar.gz
-		http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-${DB_V}.tar.gz
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cups foomaticdb snmp qt3 ppds scanner X"
-
-DEPEND=">=dev-lang/python-2.2.0
-	snmp? ( >=net-analyzer/net-snmp-5.0.9 )
-	!net-print/hpijs
-	!net-print/hpoj
-	virtual/ghostscript
-	scanner? (
-		>=media-gfx/sane-backends-1.0.9
-		X? ( || (
-			>=media-gfx/xsane-0.89
-			>=media-gfx/sane-frontends-1.0.9
-			) )
-		!X? ( || (
-			>=media-gfx/sane-frontends-1.0.9
-			>=media-gfx/xsane-0.89
-			) )
-	)
-	qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
-	>=dev-libs/libusb-0.1.10a
-	sys-apps/hotplug-base
-	net-print/cups
-	foomaticdb? ( net-print/foomatic-db-engine )
-	>=net-print/foomatic-filters-3.0.2"
-RDEPEND="${DEPEND}"
-
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug 98428
-	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \
-		hpssd.py
-}
-src_compile() {
-	econf \
-		$(use_enable snmp network-build) \
-		$(use_enable cups cups-install) \
-		$(use_enable ppds foomatic-install) \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		econf || die "econf failed"
-		rm -fR data-generators/hpijs-rss
-		emake || die "emake failed"
-	fi
-}
-
-
-src_install() {
-	# cups-1.2 installation paths, make sure that the .desktop is installed
-	sed -i -e "s:/usr/lib/cups:$(cups-config --serverbin):" \
-		-e 's:\(ICON_FILE = \).*:\1hplip.desktop:' \
-		-e 's:\(ICON_PATH = \).*:\1/usr/share/applications:' \
-		Makefile
-
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/hplip.init.d hplip
-
-	if use scanner; then
-		dodir /usr/$(get_libdir)/sane
-		for i in libsane-hpaio.{la,so{,.1{,.0.0}}}; do
-			dosym /usr/$(get_libdir)/${i} /usr/$(get_libdir)/sane/${i}; done
-	else
-		rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.{la,so{,.1{,.0.0}}}
-		rm -f "${D}"/etc/sane.d/dll.conf
-	fi
-
-	# bug 106035
-	if ! use qt3 ; then
-		rm -f "${D}"/usr/{bin/hp-,share/hplip/}{print,toolbox}
-		rm -f "${D}"/usr/share/applications/hplip.desktop
-		rm -f "${D}"/usr/lib/menu/hplip
-	fi
-
-	rm -rf ${D}/$(cups-config --serverbin)/filter ${D}/usr/bin/foomatic-rip
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-}
-
-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() {
-	einfo "You need the qt3 useflag enabled to use the guy configurator hp-setup"
-}
diff --git a/net-print/hplip/hplip-1.7.4a.ebuild b/net-print/hplip/hplip-1.7.4a.ebuild
deleted file mode 100644
index ed6afc7071e5..000000000000
--- a/net-print/hplip/hplip-1.7.4a.ebuild
+++ /dev/null
@@ -1,133 +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-1.7.4a.ebuild,v 1.1 2007/04/27 06:58:42 calchan Exp $
-
-inherit eutils
-
-DB_V=20060720
-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
-	foomaticdb? (
-		http://gentooexperimental.org/~genstef/dist/foomatic-db-hpijs-${DB_V}.tar.gz
-		http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-${DB_V}.tar.gz
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cups fax foomaticdb parport ppds qt3 scanner snmp X"
-
-DEPEND="!net-print/hpijs
-	!net-print/hpoj
-	dev-libs/openssl
-	virtual/ghostscript
-	>=media-libs/jpeg-6b
-	net-print/cups
-	dev-libs/libusb
-	>=dev-lang/python-2.2
-	net-print/foomatic-filters
-	fax? ( >=dev-lang/python-2.3
-		dev-python/reportlab )
-	foomaticdb? ( net-print/foomatic-db-engine )
-	snmp? ( net-analyzer/net-snmp )
-	qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
-	scanner? (
-		>=media-gfx/sane-backends-1.0.9
-		X? ( || (
-			>=media-gfx/xsane-0.89
-			>=media-gfx/sane-frontends-1.0.9
-			) )
-		!X? ( || (
-			>=media-gfx/sane-frontends-1.0.9
-			>=media-gfx/xsane-0.89
-			) )
-	)"
-RDEPEND="${DEPEND}"
-
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug 98428
-	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \
-		hpssd.py
-}
-src_compile() {
-	econf \
-		$(use_enable cups cups-install) \
-		$(use_enable fax fax-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable ppds foomatic-install) \
-		$(use_enable qt3 gui-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		econf || die "econf failed"
-		rm -fR data-generators/hpijs-rss
-		emake || die "emake failed"
-	fi
-}
-
-
-src_install() {
-	# cups-1.2 installation paths, make sure that the .desktop is installed
-	sed -i -e "s:/usr/lib/cups:$(cups-config --serverbin):" \
-		-e 's:\(ICON_FILE = \).*:\1hplip.desktop:' \
-		-e 's:\(ICON_PATH = \).*:\1/usr/share/applications:' \
-		Makefile
-
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/hplip.init.d hplip
-
-	if use scanner; then
-		dodir /usr/$(get_libdir)/sane
-		for i in libsane-hpaio.{la,so{,.1{,.0.0}}}; do
-			dosym /usr/$(get_libdir)/${i} /usr/$(get_libdir)/sane/${i}; done
-	else
-		rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.{la,so{,.1{,.0.0}}}
-		rm -f "${D}"/etc/sane.d/dll.conf
-	fi
-
-	# bug 106035
-	if ! use qt3 ; then
-		rm -f "${D}"/usr/{bin/hp-,share/hplip/}{print,toolbox}
-		rm -f "${D}"/usr/share/applications/hplip.desktop
-		rm -f "${D}"/usr/lib/menu/hplip
-	fi
-
-	rm -rf ${D}/$(cups-config --serverbin)/filter ${D}/usr/bin/foomatic-rip
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-}
-
-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() {
-	if ! use qt3 ; then
-		elog "You need to enable the qt3 useflag to use the GUI"
-	fi
-}