cleanups, mark 1.7.1 stable

(Portage version: 2.0.51.19)

6 files changed, 9 insertions, 151 deletions

diff --git a/net-print/hpijs/ChangeLog b/net-print/hpijs/ChangeLog
index ff0f30e26a3b..d8d91e975f26 100644
--- a/net-print/hpijs/ChangeLog
+++ b/net-print/hpijs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/hpijs
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/ChangeLog,v 1.35 2004/12/31 11:26:09 lanius Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/ChangeLog,v 1.36 2005/06/06 22:29:50 lanius Exp $
+
+  06 Jun 2005; Heinrich Wendel <lanius@gentoo.org> -hpijs-1.4.1.ebuild,
+  -hpijs-1.6.1.ebuild, hpijs-1.7.1.ebuild:
+  cleanups, mark 1.7.1 stable
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-print/hpijs/files/digest-hpijs-1.4.1 b/net-print/hpijs/files/digest-hpijs-1.4.1
deleted file mode 100644
index 19978c27c8b5..000000000000
--- a/net-print/hpijs/files/digest-hpijs-1.4.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fff91a62e0917a5fac6111f524ed7d21 hpijs-1.4.1.tar.gz 529300
-MD5 524e062489894daf6929c1591f7832b0 foomatic-db-hpijs-1.4-1.tar.gz 83326
diff --git a/net-print/hpijs/files/digest-hpijs-1.6.1 b/net-print/hpijs/files/digest-hpijs-1.6.1
deleted file mode 100644
index 60bba798aa6d..000000000000
--- a/net-print/hpijs/files/digest-hpijs-1.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03563d737f03ff94432423ad885db763 hpijs-1.6.1.tar.gz 614264
diff --git a/net-print/hpijs/hpijs-1.4.1.ebuild b/net-print/hpijs/hpijs-1.4.1.ebuild
deleted file mode 100644
index 6d06c8f96beb..000000000000
--- a/net-print/hpijs/hpijs-1.4.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/hpijs-1.4.1.ebuild,v 1.11 2004/06/25 00:39:34 agriffis Exp $
-
-inherit gnuconfig eutils
-
-DESCRIPTION="The HP Inkjet server for Ghostscript. Provides best output for HP Inkjet Printers and some LaserJets"
-HOMEPAGE="http://hpinkjet.sourceforge.net"
-KEYWORDS="x86 ppc alpha sparc hppa amd64"
-SRC_URI="mirror://sourceforge/hpinkjet/${P}.tar.gz
-	http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-1.4-1.tar.gz"
-DEPEND="virtual/ghostscript
-	cups? ( net-print/cups )
-	net-print/foomatic-filters
-	foomaticdb? ( net-print/foomatic-db-engine )"
-LICENSE="BSD"
-SLOT="0"
-IUSE="cups foomaticdb ppds"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	gnuconfig_update
-	epatch ${FILESDIR}/hpijs-${PV}-rss.1.patch
-}
-
-src_compile() {
-	econf --disable-cups-install \
-		$(use_enable ppds foomatic-install) || die "econf failed"
-
-	sed -i -e 's|/usr/share/cups|${prefix}/share/cups|g' \
-		-e 's|/usr/lib/cups|${prefix}/lib/cups|g' Makefile \
-		|| die "sed failed"
-
-	make || die "make failed"
-
-	if use foomaticdb; then
-		cd ${WORKDIR}/foomatic-db-hpijs-1.4-1
-		econf || die "econf failed"
-		rm -fR data-generators/hpijs-rss
-		make || die
-	fi
-}
-
-src_install () {
-	einstall || die
-
-	if use cups && use ppds; then
-		dodir /usr/share/cups/model
-		dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-	fi
-
-	use ppds && rm -f ${D}/usr/bin/foomatic-rip
-
-	if use foomaticdb; then
-		cd ../foomatic-db-hpijs-1.4-1
-		make DESTDIR=${D} install || die
-	fi
-}
-
-pkg_postinst () {
-	einfo "To use the hpijs driver with the PDQ spooler you will need the PDQ"
-	einfo "driver file for your printer from"
-	einfo "http://www.linuxprinting.org/show_driver.cgi?driver=hpijs"
-	einfo "This file should be installed in /etc/pdq/drivers"
-	einfo
-	einfo "The hpijs ebuild no longer creates the ppds automatically, please use"
-	einfo "foomatic to do so or remerge hpijs with the ppds use flag."
-}
diff --git a/net-print/hpijs/hpijs-1.6.1.ebuild b/net-print/hpijs/hpijs-1.6.1.ebuild
deleted file mode 100644
index 7e9c9a7fefd0..000000000000
--- a/net-print/hpijs/hpijs-1.6.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/hpijs-1.6.1.ebuild,v 1.3 2004/08/04 20:56:49 lanius Exp $
-
-inherit eutils gnuconfig
-
-DB_V=${PV}-20031125
-DESCRIPTION="The HP Inkjet server for Ghostscript. Provides best output for HP Inkjet Printers and some LaserJets"
-HOMEPAGE="http://hpinkjet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hpinkjet/${P}.tar.gz"
-#	http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-${DB_V}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
-#IUSE="cups foomaticdb ppds"
-IUSE="cups ppds"
-
-DEPEND="virtual/ghostscript
-	cups? ( net-print/cups )
-	net-print/foomatic-filters"
-	#foomaticdb? ( net-print/foomatic-db-engine )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	gnuconfig_update
-	#epatch ${FILESDIR}/${P}-gcc34.patch
-	epatch ${FILESDIR}/hpijs-1.4.1-rss.1.patch
-}
-
-src_compile () {
-	econf --disable-cups-install \
-		$(use_enable ppds foomatic-install) || die "econf failed"
-
-	sed -i -e 's|/usr/share/cups|${prefix}/share/cups|g' \
-		-e 's|/usr/lib/cups|${prefix}/lib/cups|g' Makefile \
-		|| die "sed failed"
-
-	make || die "make failed"
-
-	#if use foomaticdb ; then
-	#	cd ${WORKDIR}/foomatic-db-hpijs-${DB_V}
-	#	econf || die "econf failed"
-	#	rm -fR data-generators/hpijs-rss
-	#	make || die
-	#fi
-}
-
-src_install() {
-	einstall || die
-
-	if use cups && use ppds ; then
-		dodir /usr/share/cups/model
-		dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-	fi
-
-	use ppds && rm -f ${D}/usr/bin/foomatic-rip
-
-	#if use foomaticdb ; then
-	#	cd ../foomatic-db-hpijs-${DB_V}
-	#	make DESTDIR=${D} install || die
-	#fi
-}
-
-pkg_postinst() {
-	einfo "To use the hpijs driver with the PDQ spooler you will need the PDQ"
-	einfo "driver file for your printer from"
-	einfo "http://www.linuxprinting.org/show_driver.cgi?driver=hpijs"
-	einfo "This file should be installed in /etc/pdq/drivers"
-	einfo
-	einfo "The hpijs ebuild no longer creates the ppds automatically, please use"
-	einfo "foomatic to do so or remerge hpijs with the ppds use flag."
-}
diff --git a/net-print/hpijs/hpijs-1.7.1.ebuild b/net-print/hpijs/hpijs-1.7.1.ebuild
index 3a6ef2358092..1570576015a4 100644
--- a/net-print/hpijs/hpijs-1.7.1.ebuild
+++ b/net-print/hpijs/hpijs-1.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/hpijs-1.7.1.ebuild,v 1.2 2004/12/31 11:26:09 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/hpijs-1.7.1.ebuild,v 1.3 2005/06/06 22:29:50 lanius Exp $
 
 inherit eutils gnuconfig
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/hpinkjet/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
+KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa amd64"
 IUSE="cups foomaticdb ppds"
 
 DEPEND="virtual/ghostscript