close #8664

6 files changed, 22 insertions, 47 deletions

diff --git a/net-print/hpijs/ChangeLog b/net-print/hpijs/ChangeLog
index 732b3aa1818a..b2ade1afac1c 100644
--- a/net-print/hpijs/ChangeLog
+++ b/net-print/hpijs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hpijs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/ChangeLog,v 1.6 2002/10/02 12:48:08 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/ChangeLog,v 1.7 2002/10/25 13:40:04 woodchip Exp $
+
+*hpijs-1.2.2-r1 (25 Oct 2002)
+
+  25 Oct 2002; Donny Davies <woodchip@gentoo.org> :
+  Add Richard Spencer-Smith's patch, thanks to Agile_MindNBody@Yahoo.com; #8664.
 
 *hpijs-1.2.2 (02 Oct 2002)
 
@@ -19,6 +24,7 @@
 
   14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> hpijs-1.1.ebuild :
   Added KEYWORDS.
+
   06 Jun 2002; Donny Davies <woodchip@gentoo.org> :
   Chase latest release, add LICENSE + SLOT; close #3080.
 
@@ -26,5 +32,6 @@
 
   14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> hpijs-1.0.4.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
+
   10 Apr 2002; Donny Davies <woodchip@gentoo.org> hpijs-1.0.4.ebuild :
   New package contributed by Steve Flack <steve_flack@ntlworld.com>.
diff --git a/net-print/hpijs/files/digest-hpijs-1.1 b/net-print/hpijs/files/digest-hpijs-1.1
deleted file mode 100644
index 9a0efb0c3fdb..000000000000
--- a/net-print/hpijs/files/digest-hpijs-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 be2ae5eb4e80a4cdce56a11fbde655fc hpijs-1.1.tar.gz 283448
diff --git a/net-print/hpijs/files/digest-hpijs-1.2.1 b/net-print/hpijs/files/digest-hpijs-1.2.1
deleted file mode 100644
index ee25f648842f..000000000000
--- a/net-print/hpijs/files/digest-hpijs-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09d99ba5ed63fd270f1aed27823fb0fb hpijs-1.2.1.tar.gz 301152
diff --git a/net-print/hpijs/files/digest-hpijs-1.2.2-r1 b/net-print/hpijs/files/digest-hpijs-1.2.2-r1
new file mode 100644
index 000000000000..ce60724bc7f5
--- /dev/null
+++ b/net-print/hpijs/files/digest-hpijs-1.2.2-r1
@@ -0,0 +1,2 @@
+MD5 5eae1f6ec44dce9a5ca250a18c7e3be6 hpijs-1.2.2.tar.gz 302285
+MD5 1f66241e844f3e1ffc3060df9658fb3a hpijs-1.2.2-rss.2.patch 33842
diff --git a/net-print/hpijs/hpijs-1.2.1.ebuild b/net-print/hpijs/hpijs-1.2.1.ebuild
deleted file mode 100644
index ce2cb9e3f80f..000000000000
--- a/net-print/hpijs/hpijs-1.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/hpijs-1.2.1.ebuild,v 1.3 2002/10/04 06:18:10 vapier Exp $
-
-# Though this program runs on it's own it makes no sense to run it without ghostscript
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The HP Inkjet server for Ghostscript. Provides best output for HP Inkjet Printers"
-HOMEPAGE="http://hpinkjet.sourceforge.net"
-KEYWORDS="x86 ppc"
-SRC_URI="mirror://sourceforge/hpinkjet/${P}.tar.gz"
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND} app-text/ghostscript"
-LICENSE="as-is"
-SLOT="0"
-
-src_compile () {
-	econf --host=${CHOST} || die "bad ./configure"
-	make || die "compile problem"
-}
-
-src_install () {
-	einstall || die
-	# fix the doc dir, it needs to have the package revision..
-	mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF}
-}
-
-pkg_postinst () {
-	if [ "`use cups`" ] ; then
-		einfo "To use the hpijs driver with the cups spooler, you will need the .ppd file"
-		einfo "for your printer.  You may obtain it from:"
-		einfo "http://www.linuxprinting.org/show_driver.cgi?driver=hpijs"
-		einfo "Install it in /usr/share/cups/model.  After restarting cups you should be"
-		einfo "able to use the new driver"
-	else
-		einfo "To use the hpijs driver with the PDQ spooler you will need the PDQ driver file"
-		einfo "for your printer from http://www.linuxprinting.org/show_driver.cgi?driver=hpijs"
-		einfo "This file should be installed in /etc/pdq/drivers"
-	fi
-}
diff --git a/net-print/hpijs/hpijs-1.1.ebuild b/net-print/hpijs/hpijs-1.2.2-r1.ebuild
index 5d6393b2125b..10515e33039c 100644
--- a/net-print/hpijs/hpijs-1.1.ebuild
+++ b/net-print/hpijs/hpijs-1.2.2-r1.ebuild
@@ -1,19 +1,27 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/hpijs-1.1.ebuild,v 1.3 2002/10/04 06:18:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/hpijs-1.2.2-r1.ebuild,v 1.1 2002/10/25 13:40:04 woodchip Exp $
 
 # Though this program runs on it's own it makes no sense to run it without ghostscript
 
+RSS_PATCH=${P}-rss.2.patch
+
 S=${WORKDIR}/${P}
 DESCRIPTION="The HP Inkjet server for Ghostscript. Provides best output for HP Inkjet Printers"
 HOMEPAGE="http://hpinkjet.sourceforge.net"
-KEYWORDS="x86"
-SRC_URI="mirror://sourceforge/hpinkjet/${P}.tar.gz"
+KEYWORDS="~x86 ~ppc"
+SRC_URI="mirror://sourceforge/hpinkjet/${P}.tar.gz
+	http://www.linuxprinting.org/download/printing/${PN}/${RSS_PATCH}"
 DEPEND="virtual/glibc"
 RDEPEND="${DEPEND} app-text/ghostscript"
 LICENSE="as-is"
 SLOT="0"
 
+src_unpack() {
+	unpack ${P}.tar.gz ; cd ${S}
+	patch -p1 <${DISTDIR}/${RSS_PATCH} || die
+}
+
 src_compile () {
 	econf --host=${CHOST} || die "bad ./configure"
 	make || die "compile problem"
@@ -31,7 +39,7 @@ pkg_postinst () {
 		einfo "for your printer.  You may obtain it from:"
 		einfo "http://www.linuxprinting.org/show_driver.cgi?driver=hpijs"
 		einfo "Install it in /usr/share/cups/model.  After restarting cups you should be"
-		einfo "able to use the new driver"
+		einfo "able to use the new driver."
 	else
 		einfo "To use the hpijs driver with the PDQ spooler you will need the PDQ driver file"
 		einfo "for your printer from http://www.linuxprinting.org/show_driver.cgi?driver=hpijs"