QA

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 51 insertions, 493 deletions

diff --git a/net-print/pnm2ppa/files/pnm2ppa-1.0.91-r3-gentoo.diff b/net-print/pnm2ppa/files/pnm2ppa-1.0.91-r3-gentoo.diff
deleted file mode 100644
index d24db3f8ec5b..000000000000
--- a/net-print/pnm2ppa/files/pnm2ppa-1.0.91-r3-gentoo.diff
+++ /dev/null
@@ -1,286 +0,0 @@
-diff -urN pnm2ppa.orig/docs/en/INSTALL pnm2ppa/docs/en/INSTALL
---- pnm2ppa.orig/docs/en/INSTALL	Wed Jul  4 10:13:12 2001
-+++ pnm2ppa/docs/en/INSTALL	Wed Apr 17 01:31:54 2002
-@@ -39,8 +39,8 @@
- 
- make install
- 
--to install the binaries (by default, in /usr/local/bin/) , 
--the manpage (in /usr/local/man/man1), and the sample
-+to install the binaries (by default, in /usr/bin/) , 
-+the manpage (in /usr/share/man/man1), and the sample
- configuration file (/etc/pnm2ppa.conf).  You may change these locations
- by editing the Makefile.
- 
-@@ -70,7 +70,7 @@
- not really needed.)
- 
- 
--If this script is placed in /usr/local/bin/ppaprint ,
-+If this script is placed in /usr/bin/ppaprint ,
- 
- ppaprint file.ps
- 
-diff -urN pnm2ppa.orig/docs/en/INSTALL.SUSE pnm2ppa/docs/en/INSTALL.SUSE
---- pnm2ppa.orig/docs/en/INSTALL.SUSE	Fri Oct 27 12:29:12 2000
-+++ pnm2ppa/docs/en/INSTALL.SUSE	Wed Apr 17 01:31:54 2002
-@@ -5,8 +5,8 @@
- 
- 
- Follow the standard installation instructions in INSTALL and CALIBRATION.  
--The driver pnm2ppa is installed to /usr/local/bin. The manual page
--pnm2ppa.1 is installed in /usr/local/man/man1. 
-+The driver pnm2ppa is installed to /usr/bin. The manual page
-+pnm2ppa.1 is installed in /usr/share/man/man1. 
- 
- 2. To integrate pnm2ppa into the BSD print spooler of the Linux system we 
- create   printer spoolers in /etc/printcap, to print 
-diff -urN pnm2ppa.orig/lpd/README.lpd pnm2ppa/lpd/README.lpd
---- pnm2ppa.orig/lpd/README.lpd	Sat Oct 28 07:58:07 2000
-+++ pnm2ppa/lpd/README.lpd	Wed Apr 17 01:31:54 2002
-@@ -22,7 +22,7 @@
- ./lpdsetup  a4
- ./lpdsetup  a3
- 
--This installs the filters in /usr/local/bin and creates the corresponding 
-+This installs the filters in /usr/bin and creates the corresponding 
- spool directories /var/spool/lpd/color, etc, You must be root to do this.
- 
- You may wish to edit the options specified in the filter files 
-diff -urN pnm2ppa.orig/lpd/ascii.if pnm2ppa/lpd/ascii.if
---- pnm2ppa.orig/lpd/ascii.if	Sat Oct 28 07:58:07 2000
-+++ pnm2ppa/lpd/ascii.if	Wed Apr 17 01:31:54 2002
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # for printing black and white text (ascii) files.
--FILTER="/usr/local/bin/bw.if"
--#FILTER="/usr/local/bin/bweco.if"
-+FILTER="/usr/bin/bw.if"
-+#FILTER="/usr/bin/bweco.if"
- #------enscript command line--------------------------
- enscript -2rj -p- | $FILTER
- 
-diff -urN pnm2ppa.orig/lpd/bw.if pnm2ppa/lpd/bw.if
---- pnm2ppa.orig/lpd/bw.if	Sat Oct 28 07:58:07 2000
-+++ pnm2ppa/lpd/bw.if	Wed Apr 17 01:31:54 2002
-@@ -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 -urN pnm2ppa.orig/lpd/bweco.if pnm2ppa/lpd/bweco.if
---- pnm2ppa.orig/lpd/bweco.if	Sat Oct 28 07:58:07 2000
-+++ pnm2ppa/lpd/bweco.if	Wed Apr 17 01:31:54 2002
-@@ -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 -urN pnm2ppa.orig/lpd/color.if pnm2ppa/lpd/color.if
---- pnm2ppa.orig/lpd/color.if	Sat Oct 28 07:58:07 2000
-+++ pnm2ppa/lpd/color.if	Wed Apr 17 01:31:54 2002
-@@ -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 -urN pnm2ppa.orig/lpd/coloreco.if pnm2ppa/lpd/coloreco.if
---- pnm2ppa.orig/lpd/coloreco.if	Sat Oct 28 07:58:07 2000
-+++ pnm2ppa/lpd/coloreco.if	Wed Apr 17 01:31:54 2002
-@@ -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 -
-diff -urN pnm2ppa.orig/lpd/lpdsetup pnm2ppa/lpd/lpdsetup
---- pnm2ppa.orig/lpd/lpdsetup	Fri Oct 27 12:29:12 2000
-+++ pnm2ppa/lpd/lpdsetup	Wed Apr 17 01:31:54 2002
-@@ -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 -urN pnm2ppa.orig/lpd/printcap pnm2ppa/lpd/printcap
---- pnm2ppa.orig/lpd/printcap	Fri Oct 27 11:12:23 2000
-+++ pnm2ppa/lpd/printcap	Wed Apr 17 01:31:54 2002
-@@ -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 -urN pnm2ppa.orig/pnm2ppa.c pnm2ppa/pnm2ppa.c
---- pnm2ppa.orig/pnm2ppa.c	Sat Nov 11 11:53:03 2000
-+++ pnm2ppa/pnm2ppa.c	Wed Apr 17 01:32:35 2002
-@@ -17,6 +17,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#define _GNU_SOURCE 
- #include <string.h>
- #include <sys/stat.h>
- #include <unistd.h>
-@@ -156,7 +157,7 @@
- 	    a user-specifed file *File_path may later be opened;
- 	    should any extra validation of this be performed now ?
- 	  */
--	  path = File_path;
-+	  path = strndup( File_path, MAXPATHLEN );
- 	  return path;
- 	}
-     }
-diff -urN pnm2ppa.orig/pnm2ppa.conf pnm2ppa/pnm2ppa.conf
---- pnm2ppa.orig/pnm2ppa.conf	Sat Oct 28 08:02:57 2000
-+++ pnm2ppa/pnm2ppa.conf	Wed Apr 17 01:31:54 2002
-@@ -12,7 +12,6 @@
- # will be used.   The printer version can also be set with the command line
- # option e.g., "-v 720".
- 
--version   ERROR    # PNM2PPA WIIL *NOT* WORK UNTIUL THIS ENTRY IS REMOVED!!!!
- #version  720	# 710, 712, 722 also acceptable
- #version  820
- #version 1000
-diff -urN pnm2ppa.orig/ppaSet-beta1/install pnm2ppa/ppaSet-beta1/install
---- pnm2ppa.orig/ppaSet-beta1/install	Wed Jul  4 10:13:12 2001
-+++ pnm2ppa/ppaSet-beta1/install	Wed Apr 17 01:31:54 2002
-@@ -3,7 +3,7 @@
- if [ "$4" = "" ]
- then
- 	echo "usage: install <basedir> <bindir> <calibrate_ppa> <pnm2ppa>"
--	echo "example: install /usr/local/ppaSet/ /usr/local/bin /usr/local/bin/calibrate_ppa /usr/local/bin/pnm2ppa"
-+	echo "example: install /usr/ppaSet/ /usr/bin /usr/bin/calibrate_ppa /usr/bin/pnm2ppa"
- 	exit 1
- fi
- 
-@@ -92,15 +92,15 @@
- then
- 	if [ "$WHAT" = "2" ]
- 	then
--		cp -v /etc/printcap /etc/printcap.old
--		cat $BASEDIR/printcap.add >> /etc/printcap
-+		cp -v ${D}/etc/printcap ${D}/etc/printcap.old
-+		cat $BASEDIR/printcap.add >> ${D}/etc/printcap
- 	else
--		cp -v /etc/printcap /etc/printcap.old
--		cp -v $BASEDIR/printcap.only /etc/printcap
-+		cp -v ${D}/etc/printcap ${D}/etc/printcap.old
-+		cp -v $BASEDIR/printcap.only ${D}/etc/printcap
- 	fi
--	install --verbose -d /var/spool/lpd/ppa
--	touch /var/spool/lpd/ppa/log
--	touch /var/spool/lpd/ppa/acct
-+	install --verbose -d ${D}/var/spool/lpd/ppa
-+	touch ${D}/var/spool/lpd/ppa/log
-+	touch ${D}/var/spool/lpd/ppa/acct
- fi
- 
- #echo " "
-diff -urN pnm2ppa.orig/ppaSet-beta1/ppaSetBase.h pnm2ppa/ppaSet-beta1/ppaSetBase.h
---- pnm2ppa.orig/ppaSet-beta1/ppaSetBase.h	Wed Jul  4 10:13:12 2001
-+++ pnm2ppa/ppaSet-beta1/ppaSetBase.h	Wed Apr 17 01:31:54 2002
-@@ -3,22 +3,22 @@
- 
- // The default paths, if not given
- #ifndef BASEDIR
--#define BASEDIR "/usr/local/ppaSet"
-+#define BASEDIR "/usr/ppaSet"
- #endif
- #ifndef TEST
--#define TEST "/usr/local/ppaSet/test"
-+#define TEST "/usr/ppaSet/test"
- #endif
- #ifndef CALIBRATION
--#define CALIBRATION "/usr/local/ppaSet/calibration"
-+#define CALIBRATION "/usr/ppaSet/calibration"
- #endif
- #ifndef GAMMAREF
--#define GAMMAREF "/usr/local/ppaSet/gammaRef"
-+#define GAMMAREF "/usr/ppaSet/gammaRef"
- #endif
- #ifndef NOGAMMA
--#define NOGAMMA "/usr/local/ppaSet/noGamma"
-+#define NOGAMMA "/usr/ppaSet/noGamma"
- #endif
- #ifndef CLEAN
--#define CLEAN "/usr/local/ppaSet/cleanHeads"
-+#define CLEAN "/usr/ppaSet/cleanHeads"
- #endif
- #ifndef LPR
- #define LPR "/usr/bin/lpr"
-diff -urN pnm2ppa.orig/ppaSet-beta1/printcap.add pnm2ppa/ppaSet-beta1/printcap.add
---- pnm2ppa.orig/ppaSet-beta1/printcap.add	Wed Jul  4 10:13:12 2001
-+++ pnm2ppa/ppaSet-beta1/printcap.add	Wed Apr 17 01:31:54 2002
-@@ -5,5 +5,5 @@
-         :sd=/var/spool/lpd/ppa:\
-         :lf=/var/spool/lpd/ppa/log:\
-         :af=/var/spool/lpd/ppa/acct:\
--        :if=/usr/local/bin/ppa.if:\
-+        :if=/usr/bin/ppa.if:\
-         :la:mx#0:
-diff -urN pnm2ppa.orig/ppaSet-beta1/printcap.only pnm2ppa/ppaSet-beta1/printcap.only
---- pnm2ppa.orig/ppaSet-beta1/printcap.only	Wed Jul  4 10:13:12 2001
-+++ pnm2ppa/ppaSet-beta1/printcap.only	Wed Apr 17 01:31:54 2002
-@@ -5,5 +5,5 @@
-         :sd=/var/spool/lpd/ppa:\
-         :lf=/var/spool/lpd/ppa/log:\
-         :af=/var/spool/lpd/ppa/acct:\
--        :if=/usr/local/bin/ppa.if:\
-+        :if=/usr/bin/ppa.if:\
-         :la:mx#0:
diff --git a/net-print/pnm2ppa/files/pnm2ppa-1.11.2-gentoo.diff b/net-print/pnm2ppa/files/pnm2ppa-1.11.2-gentoo.diff
deleted file mode 100644
index 7cf1ab937756..000000000000
--- a/net-print/pnm2ppa/files/pnm2ppa-1.11.2-gentoo.diff
+++ /dev/null
@@ -1,132 +0,0 @@
-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 -
---- lpd/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.12.ebuild b/net-print/pnm2ppa/pnm2ppa-1.12.ebuild
index 7baab5bd3d63..d6c16ccd160e 100644
--- a/net-print/pnm2ppa/pnm2ppa-1.12.ebuild
+++ b/net-print/pnm2ppa/pnm2ppa-1.12.ebuild
@@ -1,111 +1,87 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/pnm2ppa-1.12.ebuild,v 1.12 2004/08/08 00:29:38 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/pnm2ppa-1.12.ebuild,v 1.13 2009/07/18 18:08:35 ssuominen Exp $
 
-# Note: this also d/ls the hp-ppa-howto and installs it under /usr/share/doc/${P}
-
-SRC_URI="mirror://sourceforge/pnm2ppa/${P}.tar.gz
-	 mirror://sourceforge/pnm2ppa/howto.tgz"
+inherit flag-o-matic toolchain-funcs
 
+DESCRIPTION="Print driver for Hp Deskjet 710, 712, 720, 722, 820, 1000 series"
 HOMEPAGE="http://pnm2ppa.sourceforge.net"
-KEYWORDS="x86 ~amd64"
+SRC_URI="mirror://sourceforge/pnm2ppa/${P}.tar.gz"
+
+KEYWORDS="~amd64 x86"
 SLOT="0"
-DESCRIPTION="Print driver for Hp Deskjet 710, 712, 720, 722, 820, 1000 series"
 LICENSE="GPL-2"
-IUSE="gtk ncurses"
-
-# note: this doesn't depend on virtual/lpr, because it can work on its own,
-# just without queuing etc. since it's not just a driver but a standalone
-# executable.
-DEPEND="gtk? ( x11-libs/gtk+ )
-	ncurses? ( sys-libs/ncurses )"
+IUSE=""
 
+RDEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}
 	app-text/enscript
 	dev-util/dialog"
 
 src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	unpack howto.tgz
-
-	patch -l -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.diff
 }
 
 src_compile() {
-	export CFLAGS="-DNDEBUG ${CFLAGS}"
+	append-flags -DNDEBUG
 
-	emake CFLAGS="${CFLAGS} -DLANG_EN" || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -DLANG_EN" \
+		|| die "emake failed"
 
-	cd ${S}/ppa_protocol
-	emake CFLAGS="${CFLAGS}" || die
+	cd ppa_protocol
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install () {
-	dodir /usr/bin
-	dodir /etc
-	dodir /usr/share/man/man1
+	dodir /etc /usr/{bin,share/man/man1}
 
-	make	\
-		BINDIR=${D}/usr/bin	\
-		CONFDIR=${D}/etc	\
-		MANDIR=${D}/usr/share/man/man1	\
-		install || die
+	emake BINDIR="${D}/usr/bin" CONFDIR="${D}/etc" \
+		MANDIR="${D}/usr/share/man/man1" install \
+		|| die "emake install failed"
 
-	exeinto /usr/bin
-	doexe utils/Linux/detect_ppa utils/Linux/test_ppa
+	dobin utils/Linux/detect_ppa utils/Linux/test_ppa || die "dobin failed"
 
-	insinto /usr/share/pnm2ppa/lpd
-	doins ${S}/lpd/*
+	insinto /usr/share/pnm2ppa
+	doins -r lpd pdq || die "doins failed"
 	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.
+	doexe lpd/lpdsetup || die "doexe failed"
 
 	exeinto /usr/share/pnm2ppa/sample_scripts
-	doexe ${S}/sample_scripts/*
+	doexe sample_scripts/* || die "doexe failed"
 
-	cd ${S}/pdq
+	cd "${S}"/pdq
 	exeinto /etc/pdq/drivers/ghostscript
-	doexe gs-pnm2ppa
+	doexe gs-pnm2ppa || die "doexe failed"
 	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
+	doexe dummy || die "doexe failed"
 
-	cd sgml
-	insinto /usr/share/doc/${P}
-	doins *.sgml
+	cd "${S}"/docs/en
+	dodoc CALIBRATION*txt COLOR*txt PPA*txt RELEASE* CREDITS README \
+		TODO || die "dodoc failed"
 
-	cd ${S}
-	dohtml -r .
+	cd "${S}"/docs/en/sgml
+	insinto /usr/share/doc/${PF}
+	doins *.sgml || die "doins failed"
 
+	cd "${S}"
+	dohtml -r . || die "dohtml failed"
 }
 
 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"
+	elog "Now, you *must* edit /etc/pnm2ppa.conf and choose (at least)"
+	elog "your printer model and papersize."
+	echo ""
+	elog "Run calibrate_ppa to calibrate color offsets."
+	echo ""
+	elog "Read the docs in /usr/share/pnm2ppa/ to configure the printer,"
+	elog "configure lpr substitutes, cups, pdq, networking etc."
+	echo ""
+	elog "Note that lpr and pdq drivers *have* been installed, but if your"
+	elog "config file management has /etc blocked (the default), they have"
+	elog "been installed under different filenames. Read the appropriate"
+	elog "Gentoo documentation for more info."
+	echo ""
+	elog "Note: lpr has been configured for default papersize letter"
 }