version bump

4 files changed, 175 insertions, 2 deletions

diff --git a/net-print/hpijs/Manifest b/net-print/hpijs/Manifest
index 41e3eb518399..9e24556289a8 100644
--- a/net-print/hpijs/Manifest
+++ b/net-print/hpijs/Manifest
@@ -1,9 +1,9 @@
-MD5 2d8e0004d1b78e89e01a7a02a028ffa5 ChangeLog 1527
+MD5 aa437b847b37a12c04060fd2df1ab35c ChangeLog 1572
 MD5 b5d0832a52412ad4f493931254b372ef hpijs-1.2.2-r1.ebuild 1697
 MD5 0377dd078d150bee0932a8e9f314349d hpijs-1.2.2.ebuild 1505
 MD5 bda7c182e6c9efa8c1fea711917c85eb hpijs-1.3.1.ebuild 1483
 MD5 e1a13618d261ad09f57440e7813f6b5f hpijs-1.3.ebuild 1506
-MD5 230f3e5d96df5854333463e32386c906 hpijs-1.4.1.ebuild 1895
+MD5 e06539e4080ee167cfc7428116f90701 hpijs-1.4.1.ebuild 1992
 MD5 87ebdebe7df10e17d9ae4de8eb1cba8f files/digest-hpijs-1.2.2 63
 MD5 f70bb3ce628e7e39a89afcf922e251d7 files/digest-hpijs-1.2.2-r1 130
 MD5 c5858503b70f8327b8a5e70507770dcf files/digest-hpijs-1.3 61
diff --git a/net-print/hpijs/files/digest-hpijs-1.4.1 b/net-print/hpijs/files/digest-hpijs-1.4.1
new file mode 100644
index 000000000000..19978c27c8b5
--- /dev/null
+++ b/net-print/hpijs/files/digest-hpijs-1.4.1
@@ -0,0 +1,2 @@
+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/hpijs-1.4.1-rss.1.patch b/net-print/hpijs/files/hpijs-1.4.1-rss.1.patch
new file mode 100644
index 000000000000..91b1bff24975
--- /dev/null
+++ b/net-print/hpijs/files/hpijs-1.4.1-rss.1.patch
@@ -0,0 +1,104 @@
+diff -r -N -u hpijs-1.4.1/breaks_open.cpp hpijs-1.4.1-rss.1/breaks_open.cpp
+--- hpijs-1.4.1/breaks_open.cpp	Wed May  7 20:34:48 2003
++++ hpijs-1.4.1-rss.1/breaks_open.cpp	Thu Jun  5 23:18:50 2003
+@@ -1078,7 +1078,10 @@
+ 
+ {
+ 0,  0,  255,    0,
+-0,  1,  255,    0,
++// 2001.06.16 mrb: changed the value to 0. With the original "1"
++//                 the printer sometimes prints empty lines...
++//0,	1,	255,	0,
++0,	 0,  255,    0,
+ 0,  3,  255,    0,
+ 0,  5,  255,    0,
+ 0,  7,  255,    0,
+diff -r -N -u hpijs-1.4.1/dj660_maps.cpp hpijs-1.4.1-rss.1/dj660_maps.cpp
+--- hpijs-1.4.1/dj660_maps.cpp	Wed May  7 20:34:47 2003
++++ hpijs-1.4.1-rss.1/dj660_maps.cpp	Thu Jun  5 23:18:50 2003
+@@ -38,7 +38,10 @@
+ //const
+ uint32_t ulMapVOLTAIRE_CCM_KCMY[ 9 * 9 * 9 ]=
+     {
+-        422720226UL, 142187374UL, 94354238UL, 62442785UL, 45668877UL, 27648516UL, 8972032UL, 7335680UL, 5895424UL,
++// 2001.06.14 mrb: Replaced the first entry so the printer will
++// use only the black pen when he should print real black.
++//		422720226UL, 142187374UL, 94354238UL, 62442785UL, 45668877UL, 27648516UL, 8972032UL, 7335680UL, 5895424UL, 
++ 		226UL, 142187374UL, 94354238UL, 62442785UL, 45668877UL, 27648516UL, 8972032UL, 7335680UL, 5895424UL,
+ 2519110233UL, 807846483UL, 391693109UL, 260029471UL, 143570703UL, 42776580UL, 8501760UL, 7782400UL, 6539520UL,
+ 3072173868UL, 1881129514UL, 841465387UL, 524792087UL, 358391818UL, 174364420UL, 40408577UL, 6920704UL, 6530560UL,
+ 3407591425UL, 2551891200UL, 1612695808UL, 824489479UL, 506699268UL, 306153730UL, 105283329UL, 5144320UL, 5737216UL,
+diff -r -N -u hpijs-1.4.1/dj690_maps.cpp hpijs-1.4.1-rss.1/dj690_maps.cpp
+--- hpijs-1.4.1/dj690_maps.cpp	Wed May  7 20:34:47 2003
++++ hpijs-1.4.1-rss.1/dj690_maps.cpp	Thu Jun  5 23:18:50 2003
+@@ -38,7 +38,10 @@
+ uint32_t ulMapCONQUEST_CMYK[ 9 * 9 * 9 ]=
+ // CONQUEST_CMYK
+     {
+- 337848575UL,   37838470UL,  155209268UL,  137905152UL,   36454656UL,    2310144UL,
++// 2001.06.14 mrb: Replaced the first entry so the printer will
++// use only the black pen when he should print real black.
++// 337848575UL,   37838470UL,  155209268UL,  137905152UL,   36454656UL,    2310144UL, 
++ 226UL,   37838470UL,  155209268UL,  137905152UL,   36454656UL,    2310144UL,
+    2179072UL,    2051072UL,    1733120UL, 2013280119UL,  385897321UL,  303379741UL,
+  270610688UL,  102772224UL,    1844992UL,    1911552UL,    1847296UL,    1784832UL,
+ 2080387626UL, 1157643294UL,  452996881UL,  335555072UL,  202384384UL,   50991872UL,
+diff -r -N -u hpijs-1.4.1/dj895_maps.cpp hpijs-1.4.1-rss.1/dj895_maps.cpp
+--- hpijs-1.4.1/dj895_maps.cpp	Wed May  7 20:34:47 2003
++++ hpijs-1.4.1-rss.1/dj895_maps.cpp	Thu Jun  5 23:18:50 2003
+@@ -37,7 +37,10 @@
+ 
+ uint32_t ulMapVENICE_KCMY[ 9*9*9 ]=
+ {
+-1819176703UL, 79494215UL, 112983330UL, 79035667UL, 78183948UL, 60489224UL, 59571718UL, 42007811UL, 7405312UL,
++// 2001.06.14 mrb: Replaced the first entry so the printer will
++// use only the black pen when he should print real black.
++//1819176703UL, 79494215UL, 112983330UL, 79035667UL, 78183948UL, 60489224UL, 59571718UL, 42007811UL, 7405312UL, 
++226UL, 79494215UL, 112983330UL, 79035667UL, 78183948UL, 60489224UL, 59571718UL, 42007811UL, 7405312UL,
+ 4230922555UL, 655358293UL, 176553263UL, 128253208UL, 61209869UL, 60751368UL, 26606852UL, 9305345UL, 8650496UL,
+ 4248940299UL, 3776766759UL, 756415798UL, 308083743UL, 142671120UL, 59440646UL, 9239553UL, 9109248UL, 8779520UL,
+ 4248086274UL, 4214276619UL, 2786390812UL, 942206231UL, 491516427UL, 224131588UL, 6616320UL, 7399168UL, 7857664UL,
+diff -r -N -u hpijs-1.4.1/dj895_maps2.cpp hpijs-1.4.1-rss.1/dj895_maps2.cpp
+--- hpijs-1.4.1/dj895_maps2.cpp	Wed May  7 20:34:47 2003
++++ hpijs-1.4.1-rss.1/dj895_maps2.cpp	Thu Jun  5 23:18:50 2003
+@@ -179,7 +179,10 @@
+ 
+ uint32_t ulMapVENICE_Binary_KCMY[ 9*9*9 ]=
+ {
+-1819176648UL,   64158794UL,   80805158UL,   80215318UL,   62389519UL,   61406730UL,
++// 2001.06.14 mrb: Replaced the first entry so the printer will
++// use only the black pen when he should print real black.
++//1819176648UL,   64158794UL,   80805158UL,   80215318UL,   62389519UL,   61406730UL, 
++226UL,   64158794UL,   80805158UL,   80215318UL,   62389519UL,   61406730UL,
+   60292615UL,   42401028UL,    7601920UL, 4230922301UL,  571406681UL,  160889651UL,
+  113048859UL,   62717200UL,   45415944UL,   27917573UL,   10419457UL,    9238272UL,
+ 4248940557UL, 3743081259UL,  790296119UL,  325515810UL,  127007505UL,   27196678UL,
+diff -r -N -u hpijs-1.4.1/dj970_maps.cpp hpijs-1.4.1-rss.1/dj970_maps.cpp
+--- hpijs-1.4.1/dj970_maps.cpp	Wed May  7 20:34:48 2003
++++ hpijs-1.4.1-rss.1/dj970_maps.cpp	Thu Jun  5 23:30:01 2003
+@@ -127,7 +127,11 @@
+ 
+ uint32_t ulMapBROADWAY_KCMY[ 9*9*9 ]=
+ {
+- 673723135UL,   26007371UL,    9756717UL,   10020638UL,   10022677UL,   10153743UL, 
++// 2003.06.05 rss:  Replaced the first entry so the printer will
++// (hopefully) use only the black pen when he should print real black.
++// Please report as a bug if it doesn't, or something worse happens.
++// 673723135UL,   26007371UL,    9756717UL,   10020638UL,   10022677UL,   10153743UL, 
++       226UL,   26007371UL,    9756717UL,   10020638UL,   10022677UL,   10153743UL, 
+   10285066UL,   10416133UL,    9169408UL, 3405886809UL,      59743UL,   23980849UL, 
+    9366812UL,   10153744UL,   10285066UL,   10153990UL,   10087424UL,    9169408UL, 
+ 3858807091UL, 2197868343UL,      60220UL,    4714015UL,    7270155UL,    8646656UL, 
+diff -r -N -u hpijs-1.4.1/dj970_maps3.cpp hpijs-1.4.1-rss.1/dj970_maps3.cpp
+--- hpijs-1.4.1/dj970_maps3.cpp	Wed May  7 20:34:48 2003
++++ hpijs-1.4.1-rss.1/dj970_maps3.cpp	Thu Jun  5 23:18:50 2003
+@@ -37,7 +37,8 @@
+ 
+ uint32_t ulMapBROADWAY_Draft_KCMY[ 9*9*9 ]=
+ {
+-1802205183UL,   22740362UL,    5832524UL,    5635892UL,    5570340UL,    5308188UL,
++//1802205183UL,   22740362UL,    5832524UL,    5635892UL,    5570340UL,    5308188UL,
++       226UL,   22740362UL,    5832524UL,    5635892UL,    5570340UL,    5308188UL,
+    5308180UL,    5504778UL,    5504768UL, 4278239136UL,      65446UL,    4194132UL,
+    5308210UL,    5373728UL,    5308182UL,    5504784UL,    5504776UL,    5504768UL,
+ 4278498896UL, 1862336354UL,      65388UL,    2621242UL,    4128540UL,    4718348UL,
diff --git a/net-print/hpijs/hpijs-1.4.1.ebuild b/net-print/hpijs/hpijs-1.4.1.ebuild
new file mode 100644
index 000000000000..3c5cc2203d54
--- /dev/null
+++ b/net-print/hpijs/hpijs-1.4.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2003/07/16 14:59:49 lanius Exp $
+
+DESCRIPTION="The HP Inkjet server for Ghostscript. Provides best output for HP Inkjet Printers"
+HOMEPAGE="http://hpinkjet.sourceforge.net"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+SRC_URI="mirror://sourceforge/hpinkjet/${P}.tar.gz
+	http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-1.4-1.tar.gz"
+DEPEND="app-text/ghostscript
+	cups? ( net-print/cups )
+	net-print/foomatic-filters
+	foomaticdb? ( net-print/foomatic-db-engine )"
+LICENSE="BSD"
+SLOT="0"
+IUSE="cups foomaticdb ppds"
+
+src_compile () {
+	use ppds \
+		&& myconf="--enable-foomatic-install" \
+		|| myconf="--disable-foomatic-install"
+
+	epatch ${FILESDIR}/hpijs-${PV}-rss.1.patch
+
+	econf --disable-cups-install ${myconf}
+
+	for i in Makefile; do 
+		mv $i $i.orig ;
+		cat $i.orig | \
+			sed -e 's|/usr/share/cups|${prefix}/share/cups|g' | sed -e 's|/usr/lib/cups|${prefix}/lib/cups|g' > $i
+	done
+
+	make || die "compile problem"
+
+	if [ `use foomaticdb` ]; then
+		cd ../foomatic-db-hpijs-1.4-1
+		econf
+		rm -fR data-generators/hpijs-rss
+		make || die
+		cd ../${P}
+	fi
+}
+
+src_install () {
+	einstall || die
+
+	if [ "`use cups`" -a "`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 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"
+	einfo
+	einfo "The hpijs ebuild no longer creates the ppds automatically, please use foomatic"
+	einfo "to do so or remerge hpijs with the ppds use flag."
+}