Version bump.

4 files changed, 255 insertions, 1 deletions

diff --git a/net-print/pnm2ppa/ChangeLog b/net-print/pnm2ppa/ChangeLog
index 4bb1f5dc9a1d..01b70a4fa51c 100644
--- a/net-print/pnm2ppa/ChangeLog
+++ b/net-print/pnm2ppa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/pnm2ppa
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/ChangeLog,v 1.5 2002/07/14 20:41:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/ChangeLog,v 1.6 2002/10/29 14:56:39 aliz Exp $
+
+*pnm2ppa-1.11pre2 (29 Oct 2002)
+
+  29 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Original ebuild for version 1.10 contributed by 
+  Christopher Hurler <chris@horler.demon.co.uk> in #5644.
 
 *pnm2ppa-1.0.91-r3 (17 Apr 2002)
 
diff --git a/net-print/pnm2ppa/files/digest-pnm2ppa-1.11.2 b/net-print/pnm2ppa/files/digest-pnm2ppa-1.11.2
new file mode 100644
index 000000000000..0248116e0e15
--- /dev/null
+++ b/net-print/pnm2ppa/files/digest-pnm2ppa-1.11.2
@@ -0,0 +1,2 @@
+MD5 15219416df9a7cecea956824c2f61775 pnm2ppa-1.11pre2.tar.gz 189584
+MD5 00366b61ee4a1ed0c91a4192e94358a2 howto.tgz 36007
diff --git a/net-print/pnm2ppa/files/pnm2ppa-1.11.2-gentoo.diff b/net-print/pnm2ppa/files/pnm2ppa-1.11.2-gentoo.diff
new file mode 100644
index 000000000000..b49565086164
--- /dev/null
+++ b/net-print/pnm2ppa/files/pnm2ppa-1.11.2-gentoo.diff
@@ -0,0 +1,132 @@
+diff -ru ./Makefile /var/tmp/portage/pnm2ppa-1.11.2/work/pnm2ppa-1.11pre2/Makefile
+--- Makefile  2002-10-04 06:07:36.000000000 +0000
++++ Makefile      2002-10-29 14:25:53.000000000 +0000
+@@ -5,9 +5,9 @@
+ # paths to locations where the pnm2ppa binary, the configuration file,
+ # and the man page should be installed.   On some systems (like Solaris)
+ # the install command requires the syntax BINDIR="-f /usr/local/bin".
+-BINDIR="/usr/local/bin"
++BINDIR="/usr/bin"
+ CONFDIR="/etc"
+-MANDIR="/usr/local/man/man1"
++MANDIR="/usr/share/man/man1"
+
+ #compiler and linker options:
+ CC=gcc
+diff -ru ./lpd/ascii.if /var/tmp/portage/pnm2ppa-1.11.2/work/pnm2ppa-1.11pre2/lpd/ascii.if
+--- lpd/ascii.if      2000-10-28 14:58:07.000000000 +0000
++++ lpd/ascii.if  2002-10-29 14:26:27.000000000 +0000
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # for printing black and white text (ascii) files.
+-FILTER="/usr/local/bin/bw.if"
++FILTER="/usr/bin/bw.if"
+ #FILTER="/usr/local/bin/bweco.if"
+ #------enscript command line--------------------------
+ enscript -2rj -p- | $FILTER
+diff -ru ./lpd/bw.if /var/tmp/portage/pnm2ppa-1.11.2/work/pnm2ppa-1.11pre2/lpd/bw.if
+--- lpd/bw.if 2000-10-28 14:58:07.000000000 +0000
++++ lpd/bw.if     2002-10-29 14:26:43.000000000 +0000
+@@ -6,7 +6,7 @@
+ #PAPER=a4
+ #PAPER=a3
+ #PPAOPTS="-B 2"
+-PNM2PPA="/usr/local/bin/pnm2ppa"
++PNM2PPA="/usr/bin/pnm2ppa"
+ #------------------dont change below this line----------------------
+ gs -sDEVICE=pbmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \
+ $PNM2PPA --bw $PPAOPTS -i - -o -
+diff -ru ./lpd/bweco.if /var/tmp/portage/pnm2ppa-1.11.2/work/pnm2ppa-1.11pre2/lpd/bweco.if
+--- lpd/bweco.if      2000-10-28 14:58:07.000000000 +0000
++++ lpd/bweco.if  2002-10-29 14:26:52.000000000 +0000
+@@ -6,7 +6,7 @@
+ #PAPER=a4
+ #PAPER=a3
+ #PPAOPTS="-B 2"
+-PNM2PPA="/usr/local/bin/pnm2ppa"
++PNM2PPA="/usr/bin/pnm2ppa"
+ #------------------dont change below this line----------------------
+ gs -sDEVICE=pbmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \
+ $PNM2PPA --bw --eco $PPAOPTS -i - -o -
+diff -ru ./lpd/color.if /var/tmp/portage/pnm2ppa-1.11.2/work/pnm2ppa-1.11pre2/lpd/color.if
+--- lpd/color.if      2000-10-28 14:58:07.000000000 +0000
++++ lpd/color.if  2002-10-29 14:27:03.000000000 +0000
+@@ -6,7 +6,7 @@
+ #PAPER=a4
+ #PAPER=a3
+ #PPAOPTS="-p"
+-PNM2PPA="/usr/local/bin/pnm2ppa"
++PNM2PPA="/usr/bin/pnm2ppa"
+ #------------------dont change below this line----------------------
+ gs -sDEVICE=ppmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \
+ $PNM2PPA $PPAOPTS -i - -o -
+diff -ru ./lpd/coloreco.if /var/tmp/portage/pnm2ppa-1.11.2/work/pnm2ppa-1.11pre2/lpd/coloreco.if
+--- lpd/coloreco.if   2000-10-28 14:58:07.000000000 +0000
++++ lpd/coloreco.if       2002-10-29 14:27:11.000000000 +0000
+@@ -6,7 +6,7 @@
+ #PAPER=a4
+ #PAPER=a3
+ #PPAOPTS="--fd"
+-PNM2PPA="/usr/local/bin/pnm2ppa"
++PNM2PPA="/usr/bin/pnm2ppa"
+ #------------------dont change below this line----------------------
+ gs -sDEVICE=ppmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \
+ $PNM2PPA --eco $PPAOPTS -i - -o -
+--- /tmp/lpdsetup       2002-10-29 14:31:18.000000000 +0000
++++ lpd/lpdsetup        2002-10-29 14:31:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-INSTALLDIR="/usr/local/bin"
++INSTALLDIR="/usr/bin"
+ SPOOLDIR="/var/spool/lpd"
+ PAPER=letter
+ for paper in letter legal a3 a4 ; do
+diff -ru ./lpd/printcap /var/tmp/portage/pnm2ppa-1.11.2/work/pnm2ppa-1.11pre2/lpd/printcap
+--- lpd/printcap      2000-10-27 18:12:23.000000000 +0000
++++ lpd/printcap  2002-10-29 14:27:51.000000000 +0000
+@@ -6,7 +6,7 @@
+         :sd=/var/spool/lpd/coloreco:\
+         :lf=/var/spool/lpd/coloreco/log:\
+         :af=/var/spool/lpd/coloreco/acct:\
+-        :if=/usr/local/bin/coloreco.if:\
++        :if=/usr/bin/coloreco.if:\
+         :la:mx#0:\
+         :sh:sf:
+
+@@ -16,7 +16,7 @@
+         :sd=/var/spool/lpd/color:\
+         :lf=/var/spool/lpd/color/log:\
+         :af=/var/spool/lpd/color/acct:\
+-        :if=/usr/local/bin/color.if:\
++        :if=/usr/bin/color.if:\
+         :la:mx#0:\
+         :sh:sf:
+
+@@ -26,7 +26,7 @@
+         :sd=/var/spool/lpd/bw:\
+         :lf=/var/spool/lpd/bw/log:\
+         :af=/var/spool/lpd/bw/acct:\
+-        :if=/usr/local/bin/bw.if:\
++        :if=/usr/bin/bw.if:\
+         :la:mx#0:\
+         :sh:sf:
+
+@@ -36,7 +36,7 @@
+         :sd=/var/spool/lpd/bweco:\
+         :lf=/var/spool/lpd/bweco/log:\
+         :af=/var/spool/lpd/bweco/acct:\
+-        :if=/usr/local/bin/bweco.if:\
++        :if=/usr/bin/bweco.if:\
+         :la:mx#0:\
+         :sh:sf:
+
+@@ -46,7 +46,7 @@
+         :sd=/var/spool/lpd/ascii:\
+         :lf=/var/spool/lpd/ascii/log:\
+         :af=/var/spool/lpd/ascii/acct:\
+-        :if=/usr/local/bin/ascii.if:\
++        :if=/usr/bin/ascii.if:\
+         :la:mx#0:\
+         :sh:sf:
+
+
diff --git a/net-print/pnm2ppa/pnm2ppa-1.11.2.ebuild b/net-print/pnm2ppa/pnm2ppa-1.11.2.ebuild
new file mode 100644
index 000000000000..97c29b7ee00d
--- /dev/null
+++ b/net-print/pnm2ppa/pnm2ppa-1.11.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/pnm2ppa-1.11.2.ebuild,v 1.1 2002/10/29 14:56:39 aliz Exp $
+
+# Note: this also d/ls the hp-ppa-howto and installs it under /usr/share/doc/${P}
+
+MY_P=${P/.2/pre2}
+
+S=${WORKDIR}/${MY_P}
+SRC_URI="mirror://sourceforge/pnm2ppa/${MY_P}.tar.gz
+	 mirror://sourceforge/pnm2ppa/howto.tgz"
+
+HOMEPAGE="http://pnm2ppa.sourceforge.net"
+KEYWORDS="~x86"
+SLOT="0"
+DESCRIPTION="Print driver for Hp Deskjet 710, 712, 720, 722, 820, 1000 series"
+LICENSE="GPL-2"
+
+# note: this doesn't depend on virtual/lpr, because it can work on its own,
+# just without queueing etc. since it's not just a driver but a standalone
+# executable.
+DEPEND="gtk? ( x11-libs/gtk+ )
+	ncurses? ( sys-libs/ncurses )"
+	
+RDEPEND="${DEPEND}
+	app-text/enscript
+	dev-util/dialog"
+
+src_unpack() {
+    unpack ${MY_P}.tar.gz
+    cd ${S}
+    unpack howto.tgz
+
+    patch -l -p0 < ${FILESDIR}/${PF}-gentoo.diff
+}
+
+src_compile() {
+	export CFLAGS="-DNDEBUG ${CFLAGS}"
+	
+	emake CFLAGS="${CFLAGS} -DLANG_EN" || die
+
+	cd ${S}/ppa_protocol
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install () {
+	dodir /usr/bin
+	dodir /etc
+	dodir /usr/share/man/man1
+
+	make	\
+		BINDIR=${D}/usr/bin	\
+		CONFDIR=${D}/etc	\
+		MANDIR=${D}/usr/share/man/man1	\
+		install || die
+
+	exeinto /usr/bin
+	doexe utils/Linux/detect_ppa utils/Linux/test_ppa
+ 	
+	insinto /usr/share/pnm2ppa/lpd
+	doins ${S}/lpd/*
+	exeinto /usr/share/pnm2ppa/lpd
+	doexe ${S}/lpd/lpdsetup
+
+	insinto /usr/share/pnm2ppa/pdq
+	doins ${S}/pdq/*
+	
+	# Interfaces for configuration of integration with lpd
+	# These are not installed because we do not assume that
+	# lpd, ncurses, gtk, but the sources are provided.  Thus,
+	# if the headers were found they would have been built.
+
+	exeinto /usr/share/pnm2ppa/sample_scripts
+	doexe ${S}/sample_scripts/*
+
+	cd ${S}/pdq
+	exeinto /etc/pdq/drivers/ghostscript
+	doexe gs-pnm2ppa
+	exeinto /etc/pdq/interfaces
+	doexe dummy
+
+	# possibly not needed	
+	#rm ${D}/etc/printcap.*
+	
+	cd ${S}/docs/en
+	dodoc CALIBRATION*txt COLOR*txt PPA*txt RELEASE*
+	dodoc CREDITS INSTALL LICENSE README TODO
+	
+	cd sgml
+	insinto /usr/share/doc/${P}
+	doins *.sgml
+
+	cd ${S}
+	dohtml -r .
+
+}
+
+pkg_postinst() {
+	einfo "Now, you *must* edit /etc/pnm2ppa.conf and choose (at least)"
+	einfo "your printer model and papersize."
+	einfo ""
+	einfo "Run calibrate_ppa to calibrate color offsets."
+	einfo ""   
+    	einfo "Read the docs in /usr/share/pnm2ppa/ to configure the printer,"
+	einfo "configure lpr substitutes, cups, pdq, networking etc."
+ 	einfo ""
+	einfo "Note that lpr and pdq drivers *have* been installed, but if your"
+	einfo "config file management has /etc blocked (the default), they have"
+	einfo "been installed under different filenames. Read the appropriate"
+	einfo "Gentoo documentation for more info."
+	einfo ""
+	einfo "Note: lpr has been configured for default papersize letter"
+}
+