added metadata.xml / remove old files

11 files changed, 10 insertions, 1382 deletions

diff --git a/net-print/pnm2ppa/Manifest b/net-print/pnm2ppa/Manifest
index 20575964883a..ecd36575cb39 100644
--- a/net-print/pnm2ppa/Manifest
+++ b/net-print/pnm2ppa/Manifest
@@ -1,19 +1,11 @@
-MD5 1ca58b2f4948498a7edf92208be8f721 files/digest-pnm2ppa-1.0.91 116
-MD5 1ca58b2f4948498a7edf92208be8f721 files/digest-pnm2ppa-1.0.91-r1 116
-MD5 1ca58b2f4948498a7edf92208be8f721 files/digest-pnm2ppa-1.0.91-r2 116
+MD5 4bb3b59ae16c51c54ef86338a76c5721 ChangeLog 2661
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 aa7e51440168114bb182436c2e9c606f pnm2ppa-1.0.91-r3.ebuild 5152
+MD5 09a43032074c9cdfa9957ec32a3d38fe pnm2ppa-1.11.2.ebuild 2962
+MD5 8fab40cd6052e69dd613b48d9be59c70 pnm2ppa-1.12.ebuild 2932
 MD5 1ca58b2f4948498a7edf92208be8f721 files/digest-pnm2ppa-1.0.91-r3 116
 MD5 59bee745e2c3c4448a94e43af5b5cd58 files/digest-pnm2ppa-1.11.2 121
 MD5 0a1deb7cd4d00d5222a2e71b4306dcde files/digest-pnm2ppa-1.12 117
-MD5 da94556ddd984ec0578fa9ec5c372484 files/pnm2ppa-1.0.91-gentoo.diff 8635
-MD5 e3bf9a1f6dd7e650cc2d264efbf35411 files/pnm2ppa-1.0.91-r1-gentoo.diff 9331
-MD5 69670e401de69f7d13821ce079810bc6 files/pnm2ppa-1.0.91-r2-gentoo.diff 9691
 MD5 b7783e45b34f277f06eadf8b46b8122c files/pnm2ppa-1.0.91-r3-gentoo.diff 9871
 MD5 88e6cfa11d99e9cd06994395cc7ff624 files/pnm2ppa-1.11.2-gentoo.diff 4756
 MD5 14e1353c336c8e9e338797281608b4bf files/pnm2ppa-1.12-gentoo.diff 4351
-MD5 1614497551d3a36899a3bbc2c18aa74c pnm2ppa-1.0.91-r1.ebuild 5167
-MD5 67b523ddf9f8eae58519d77c8c3a683a pnm2ppa-1.0.91-r2.ebuild 5167
-MD5 aa7e51440168114bb182436c2e9c606f pnm2ppa-1.0.91-r3.ebuild 5152
-MD5 1bf8646504d07ada20a98739017619cf pnm2ppa-1.0.91.ebuild 5510
-MD5 09a43032074c9cdfa9957ec32a3d38fe pnm2ppa-1.11.2.ebuild 2962
-MD5 8fab40cd6052e69dd613b48d9be59c70 pnm2ppa-1.12.ebuild 2932
-MD5 4bb3b59ae16c51c54ef86338a76c5721 ChangeLog 2661
diff --git a/net-print/pnm2ppa/files/digest-pnm2ppa-1.0.91 b/net-print/pnm2ppa/files/digest-pnm2ppa-1.0.91
deleted file mode 100644
index 90b75899d8fb..000000000000
--- a/net-print/pnm2ppa/files/digest-pnm2ppa-1.0.91
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 df9010964688456f99467210ea5cbc7f pnm2ppa-1.0.91.tgz 370824
-MD5 00366b61ee4a1ed0c91a4192e94358a2 howto.tgz 36007
diff --git a/net-print/pnm2ppa/files/digest-pnm2ppa-1.0.91-r1 b/net-print/pnm2ppa/files/digest-pnm2ppa-1.0.91-r1
deleted file mode 100644
index 90b75899d8fb..000000000000
--- a/net-print/pnm2ppa/files/digest-pnm2ppa-1.0.91-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 df9010964688456f99467210ea5cbc7f pnm2ppa-1.0.91.tgz 370824
-MD5 00366b61ee4a1ed0c91a4192e94358a2 howto.tgz 36007
diff --git a/net-print/pnm2ppa/files/digest-pnm2ppa-1.0.91-r2 b/net-print/pnm2ppa/files/digest-pnm2ppa-1.0.91-r2
deleted file mode 100644
index 90b75899d8fb..000000000000
--- a/net-print/pnm2ppa/files/digest-pnm2ppa-1.0.91-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 df9010964688456f99467210ea5cbc7f pnm2ppa-1.0.91.tgz 370824
-MD5 00366b61ee4a1ed0c91a4192e94358a2 howto.tgz 36007
diff --git a/net-print/pnm2ppa/files/pnm2ppa-1.0.91-gentoo.diff b/net-print/pnm2ppa/files/pnm2ppa-1.0.91-gentoo.diff
deleted file mode 100644
index 77c0346e0a27..000000000000
--- a/net-print/pnm2ppa/files/pnm2ppa-1.0.91-gentoo.diff
+++ /dev/null
@@ -1,242 +0,0 @@
-diff -ur pnm2ppa.orig/docs/en/INSTALL pnm2ppa/docs/en/INSTALL
---- pnm2ppa.orig/docs/en/INSTALL	Wed Jul  4 20:13:12 2001
-+++ pnm2ppa/docs/en/INSTALL	Mon Jul 23 20:33:21 2001
-@@ -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/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 -ur pnm2ppa.orig/docs/en/INSTALL.SUSE pnm2ppa/docs/en/INSTALL.SUSE
---- pnm2ppa.orig/docs/en/INSTALL.SUSE	Fri Oct 27 21:29:12 2000
-+++ pnm2ppa/docs/en/INSTALL.SUSE	Mon Jul 23 20:33:10 2001
-@@ -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/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 -ur pnm2ppa.orig/lpd/README.lpd pnm2ppa/lpd/README.lpd
---- pnm2ppa.orig/lpd/README.lpd	Sat Oct 28 16:58:07 2000
-+++ pnm2ppa/lpd/README.lpd	Mon Jul 23 20:33:28 2001
-@@ -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 -ur pnm2ppa.orig/lpd/ascii.if pnm2ppa/lpd/ascii.if
---- pnm2ppa.orig/lpd/ascii.if	Sat Oct 28 16:58:07 2000
-+++ pnm2ppa/lpd/ascii.if	Mon Jul 23 20:33:35 2001
-@@ -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 -ur pnm2ppa.orig/lpd/bw.if pnm2ppa/lpd/bw.if
---- pnm2ppa.orig/lpd/bw.if	Sat Oct 28 16:58:07 2000
-+++ pnm2ppa/lpd/bw.if	Mon Jul 23 20:16:02 2001
-@@ -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 -ur pnm2ppa.orig/lpd/bweco.if pnm2ppa/lpd/bweco.if
---- pnm2ppa.orig/lpd/bweco.if	Sat Oct 28 16:58:07 2000
-+++ pnm2ppa/lpd/bweco.if	Mon Jul 23 20:16:02 2001
-@@ -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 -ur pnm2ppa.orig/lpd/color.if pnm2ppa/lpd/color.if
---- pnm2ppa.orig/lpd/color.if	Sat Oct 28 16:58:07 2000
-+++ pnm2ppa/lpd/color.if	Mon Jul 23 20:16:02 2001
-@@ -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 -ur pnm2ppa.orig/lpd/coloreco.if pnm2ppa/lpd/coloreco.if
---- pnm2ppa.orig/lpd/coloreco.if	Sat Oct 28 16:58:07 2000
-+++ pnm2ppa/lpd/coloreco.if	Mon Jul 23 20:16:02 2001
-@@ -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 -ur pnm2ppa.orig/lpd/lpdsetup pnm2ppa/lpd/lpdsetup
---- pnm2ppa.orig/lpd/lpdsetup	Fri Oct 27 21:29:12 2000
-+++ pnm2ppa/lpd/lpdsetup	Mon Jul 23 20:16:02 2001
-@@ -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 -ur pnm2ppa.orig/lpd/printcap pnm2ppa/lpd/printcap
---- pnm2ppa.orig/lpd/printcap	Fri Oct 27 20:12:23 2000
-+++ pnm2ppa/lpd/printcap	Mon Jul 23 20:16:02 2001
-@@ -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 -ur pnm2ppa.orig/ppaSet-beta1/install pnm2ppa/ppaSet-beta1/install
---- pnm2ppa.orig/ppaSet-beta1/install	Wed Jul  4 20:13:12 2001
-+++ pnm2ppa/ppaSet-beta1/install	Mon Jul 23 20:32:57 2001
-@@ -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
- 
-diff -ur pnm2ppa.orig/ppaSet-beta1/ppa.if pnm2ppa/ppaSet-beta1/ppa.if
---- pnm2ppa.orig/ppaSet-beta1/ppa.if	Wed Jul  4 20:13:12 2001
-+++ pnm2ppa/ppaSet-beta1/ppa.if	Mon Jul 23 20:32:29 2001
-@@ -1,5 +1,5 @@
- #!/bin/sh
--PATH=/usr/local/bin:/usr/local/sbin/:/usr/bin/:/usr/sbin:/bin:/sbin
-+PATH=/usr/bin/:/usr/sbin:/bin:/sbin
- 
- # Is the next lines are not variable asignements, you haven't used the
- # usual method for installing, as you must have done
-diff -ur pnm2ppa.orig/ppaSet-beta1/ppaSetBase.h pnm2ppa/ppaSet-beta1/ppaSetBase.h
---- pnm2ppa.orig/ppaSet-beta1/ppaSetBase.h	Wed Jul  4 20:13:12 2001
-+++ pnm2ppa/ppaSet-beta1/ppaSetBase.h	Mon Jul 23 20:32:08 2001
-@@ -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 -ur pnm2ppa.orig/ppaSet-beta1/printcap.add pnm2ppa/ppaSet-beta1/printcap.add
---- pnm2ppa.orig/ppaSet-beta1/printcap.add	Wed Jul  4 20:13:12 2001
-+++ pnm2ppa/ppaSet-beta1/printcap.add	Mon Jul 23 20:31:38 2001
-@@ -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 -ur pnm2ppa.orig/ppaSet-beta1/printcap.only pnm2ppa/ppaSet-beta1/printcap.only
---- pnm2ppa.orig/ppaSet-beta1/printcap.only	Wed Jul  4 20:13:12 2001
-+++ pnm2ppa/ppaSet-beta1/printcap.only	Mon Jul 23 20:32:37 2001
-@@ -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.0.91-r1-gentoo.diff b/net-print/pnm2ppa/files/pnm2ppa-1.0.91-r1-gentoo.diff
deleted file mode 100644
index 6a3075d0d968..000000000000
--- a/net-print/pnm2ppa/files/pnm2ppa-1.0.91-r1-gentoo.diff
+++ /dev/null
@@ -1,266 +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	Thu Apr 11 06:19:13 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	Thu Apr 11 06:19:13 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	Thu Apr 11 06:19:13 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	Thu Apr 11 06:19:13 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	Thu Apr 11 06:19:13 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	Thu Apr 11 06:19:13 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	Thu Apr 11 06:19:13 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	Thu Apr 11 06:19:13 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	Thu Apr 11 06:19:13 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	Thu Apr 11 06:19:13 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.conf pnm2ppa/pnm2ppa.conf
---- pnm2ppa.orig/pnm2ppa.conf	Sat Oct 28 08:02:57 2000
-+++ pnm2ppa/pnm2ppa.conf	Thu Apr 11 06:19:13 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	Thu Apr 11 06:20:08 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	Thu Apr 11 06:19:13 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	Thu Apr 11 06:19:13 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	Thu Apr 11 06:19:13 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.0.91-r2-gentoo.diff b/net-print/pnm2ppa/files/pnm2ppa-1.0.91-r2-gentoo.diff
deleted file mode 100644
index f892f584029f..000000000000
--- a/net-print/pnm2ppa/files/pnm2ppa-1.0.91-r2-gentoo.diff
+++ /dev/null
@@ -1,278 +0,0 @@
-diff -urN pnm2ppa-old/docs/en/INSTALL pnm2ppa/docs/en/INSTALL
---- pnm2ppa-old/docs/en/INSTALL	Wed Jul  4 10:13:12 2001
-+++ pnm2ppa/docs/en/INSTALL	Sun Apr 14 13:41:46 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-old/docs/en/INSTALL.SUSE pnm2ppa/docs/en/INSTALL.SUSE
---- pnm2ppa-old/docs/en/INSTALL.SUSE	Fri Oct 27 12:29:12 2000
-+++ pnm2ppa/docs/en/INSTALL.SUSE	Sun Apr 14 13:41:46 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-old/lpd/README.lpd pnm2ppa/lpd/README.lpd
---- pnm2ppa-old/lpd/README.lpd	Sat Oct 28 07:58:07 2000
-+++ pnm2ppa/lpd/README.lpd	Sun Apr 14 13:41:46 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-old/lpd/ascii.if pnm2ppa/lpd/ascii.if
---- pnm2ppa-old/lpd/ascii.if	Sat Oct 28 07:58:07 2000
-+++ pnm2ppa/lpd/ascii.if	Sun Apr 14 13:41:46 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-old/lpd/bw.if pnm2ppa/lpd/bw.if
---- pnm2ppa-old/lpd/bw.if	Sat Oct 28 07:58:07 2000
-+++ pnm2ppa/lpd/bw.if	Sun Apr 14 13:41:46 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-old/lpd/bweco.if pnm2ppa/lpd/bweco.if
---- pnm2ppa-old/lpd/bweco.if	Sat Oct 28 07:58:07 2000
-+++ pnm2ppa/lpd/bweco.if	Sun Apr 14 13:41:46 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-old/lpd/color.if pnm2ppa/lpd/color.if
---- pnm2ppa-old/lpd/color.if	Sat Oct 28 07:58:07 2000
-+++ pnm2ppa/lpd/color.if	Sun Apr 14 13:41:46 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-old/lpd/coloreco.if pnm2ppa/lpd/coloreco.if
---- pnm2ppa-old/lpd/coloreco.if	Sat Oct 28 07:58:07 2000
-+++ pnm2ppa/lpd/coloreco.if	Sun Apr 14 13:41:46 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-old/lpd/lpdsetup pnm2ppa/lpd/lpdsetup
---- pnm2ppa-old/lpd/lpdsetup	Fri Oct 27 12:29:12 2000
-+++ pnm2ppa/lpd/lpdsetup	Sun Apr 14 13:41:46 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-old/lpd/printcap pnm2ppa/lpd/printcap
---- pnm2ppa-old/lpd/printcap	Fri Oct 27 11:12:23 2000
-+++ pnm2ppa/lpd/printcap	Sun Apr 14 13:41:46 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-old/pnm2ppa.c pnm2ppa/pnm2ppa.c
---- pnm2ppa-old/pnm2ppa.c	Sat Nov 11 11:53:03 2000
-+++ pnm2ppa/pnm2ppa.c	Sun Apr 14 13:47:01 2002
-@@ -156,7 +156,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-old/pnm2ppa.conf pnm2ppa/pnm2ppa.conf
---- pnm2ppa-old/pnm2ppa.conf	Sat Oct 28 08:02:57 2000
-+++ pnm2ppa/pnm2ppa.conf	Sun Apr 14 13:41:46 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-old/ppaSet-beta1/install pnm2ppa/ppaSet-beta1/install
---- pnm2ppa-old/ppaSet-beta1/install	Wed Jul  4 10:13:12 2001
-+++ pnm2ppa/ppaSet-beta1/install	Sun Apr 14 13:41:46 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-old/ppaSet-beta1/ppaSetBase.h pnm2ppa/ppaSet-beta1/ppaSetBase.h
---- pnm2ppa-old/ppaSet-beta1/ppaSetBase.h	Wed Jul  4 10:13:12 2001
-+++ pnm2ppa/ppaSet-beta1/ppaSetBase.h	Sun Apr 14 13:41:46 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-old/ppaSet-beta1/printcap.add pnm2ppa/ppaSet-beta1/printcap.add
---- pnm2ppa-old/ppaSet-beta1/printcap.add	Wed Jul  4 10:13:12 2001
-+++ pnm2ppa/ppaSet-beta1/printcap.add	Sun Apr 14 13:41:46 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-old/ppaSet-beta1/printcap.only pnm2ppa/ppaSet-beta1/printcap.only
---- pnm2ppa-old/ppaSet-beta1/printcap.only	Wed Jul  4 10:13:12 2001
-+++ pnm2ppa/ppaSet-beta1/printcap.only	Sun Apr 14 13:41:46 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/metadata.xml b/net-print/pnm2ppa/metadata.xml
new file mode 100644
index 000000000000..1fa0ca569505
--- /dev/null
+++ b/net-print/pnm2ppa/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+</pkgmetadata>
diff --git a/net-print/pnm2ppa/pnm2ppa-1.0.91-r1.ebuild b/net-print/pnm2ppa/pnm2ppa-1.0.91-r1.ebuild
deleted file mode 100644
index 024df3b9ce87..000000000000
--- a/net-print/pnm2ppa/pnm2ppa-1.0.91-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/pnm2ppa-1.0.91-r1.ebuild,v 1.8 2003/02/13 15:26:19 vapier Exp $
-# Note: this also d/ls the hp-ppa-howto and installs it under /usr/share/doc/${P}
-
-IUSE="gtk"
-
-# pnm2ppa is a print filter for HP's line of Winprinters which use a proprietary
-# protocol called ppa (Print Performance Architecture). Like Winmodems, Winprinters
-# don't have a microprocessor; your main CPU does all the hard work.
-# Winprinters: Hp Deskjet 710, 712, 720, 722, 820, 1000 series.
-# pnm2ppa can work on its own or via lpr or pdq.
-
-# The ebuild in general seems a bit flaky, anyone who has a ppa printer
-# please check it out and tell me if it worked.
-
-# Description of accompanying patch: install into /usr instead of /usr/local
-# and use env. var. CFLAGS. Took a lot of changes though.
-
-S=${WORKDIR}/${PN}
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-	 mirror://sourceforge/${PN}/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="sys-libs/glibc
-	sys-libs/ncurses
-	gtk? ( x11-libs/gtk+ )"
-	
-RDEPEND="${DEPEND}
-	app-text/enscript
-	dev-util/dialog"
-
-src_unpack() {
-    
-    cd ${WORKDIR}
-    unpack ${P}.tgz
-    cd ${S}
-    unpack howto.tgz
-
-	cd ${WORKDIR}
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-    
-}
-
-src_compile() {
-    
-	export CFLAGS="-DNDEBUG ${CFLAGS}"
-	
-    emake 	\
-		CFLAGS="${CFLAGS}" || die
-		
-    
-    cd ${S}/ppa_protocol
-    emake 	\
-		CFLAGS="${CFLAGS}" || die
-    
-    cd ${S}/ppaSet-beta1
-    # This requires gtk, ncurses etc. on which we don't want to depend
-    # so we simply fail if they aren't installed
-    echo "The following may fail, don't pay attention to any error"
-    sleep 1s
-
-    use gtk &&	\
-		make 	\
-			BASEDIR=/usr/share/pnm2ppa/ppaSet	\
-			BINDIR=/usr/bin	\
-			PNM2PPA=/usr/bin/pnm2ppa	\
-			CALIBRATE_PPA=/usr/bin/calibrate_ppa	\
-			CFLAGS="${CFLAGS}" gPpaSet 
-
-	make 	\
-		BASEDIR=/usr/share/pnm2ppa/ppaSet	\
-		BINDIR=/usr/bin	\
-		PNM2PPA=/usr/bin/pnm2ppa	\
-		CALIBRATE_PPA=/usr/bin/calibrate_ppa	\
-		CFLAGS="${CFLAGS}" nPpaSet
-
-    make	\
-		BASEDIR=/usr/share/pnm2ppa/ppaSet	\
-		BINDIR=/usr/bin	\
-		PNM2PPA=/usr/bin/pnm2ppa	\
-		CALIBRATE_PPA=/usr/bin/calibrate_ppa	\
-		CFLAGS="${CFLAGS}"
-}
-
-src_install () {
-	
-	dodir /usr/bin
-	dodir /etc
-	dodir /usr/share/man/man1
-
-	make	\
-		INSTALLDIR=${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.
-	cd ${S}/ppaSet-beta1
-#	dodir /usr/share/pnm2ppa/ppaSet-beta1
-	exeinto /usr/share/pnm2ppa/ppaSet-beta1
-	doexe calibration cleanHeads gammaRef install noGamma ppa.if test
-
-#	dodir /usr/share/pnm2ppa/sample_scripts
-	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
-	
-    cd ${S}/ppaSet-beta1
-	use gtk &&	\
-		yes "" | make	\
-			BASEDIR=${D}/usr/ppaSet	\
-			BINDIR=${D}/usr/bin	\
-			PNM2PPA=${D}/usr/bin/pnm2ppa	\
-			CALIBRATE_PPA=${D}/usr/bin/calibrate_ppa	\
-			install-g
-
-	yes "" | make	\
-		BASEDIR=${D}/usr/ppaSet	\
-		BINDIR=${D}/usr/bin	\
-		PNM2PPA=${D}/usr/bin/pnm2ppa	\
-		CALIBRATE_PPA=${D}/usr/bin/calibrate_ppa	\
-		install-n
-
-	yes "" | make	\
-		BASEDIR=${D}/usr/ppaSet	\
-		BINDIR=${D}/usr/bin	\
-		PNM2PPA=${D}/usr/bin/pnm2ppa	\
-		CALIBRATE_PPA=${D}/usr/bin/calibrate_ppa	\
-		install
-	
-	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 .
-
-	#clean up
-	rm -f ${D}/usr/bin/gPpaSet
-	rm -f ${D}/usr/bin/nPpaSet
-
-	dosym /usr/ppaSet/gPpaSet /usr/bin/gPpaSet
-	dosym /usr/ppaSet/nPpaSet /usr/bin/nPpaSet
-
-}
-
-pkg_postinst() {
-
-    einfo "
-    Now, you *must* edit /etc/pnm2ppa.conf and choose (at least)
-    your printer model and papersize.
-    
-    Run calibrate_ppa to calibrate color offsets.
-    
-    Read the docs in /usr/share/pnm2ppa/ to configure the printer,
-    configure lpr substitutes, cups, pdq, networking etc.
-    
-    Note that lpr and pdq drivers *have* been installed, but if your
-    config file management has /etc blocked (the default), they have
-    been installed under different filenames. Read the appropriate
-    Gentoo documentation for more info.
-    
-    Note: lpr has been configured for default papersize letter
-    "
-    
-}
diff --git a/net-print/pnm2ppa/pnm2ppa-1.0.91-r2.ebuild b/net-print/pnm2ppa/pnm2ppa-1.0.91-r2.ebuild
deleted file mode 100644
index d67443e95e37..000000000000
--- a/net-print/pnm2ppa/pnm2ppa-1.0.91-r2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/pnm2ppa-1.0.91-r2.ebuild,v 1.8 2003/02/13 15:26:25 vapier Exp $
-# Note: this also d/ls the hp-ppa-howto and installs it under /usr/share/doc/${P}
-
-IUSE="gtk"
-
-# pnm2ppa is a print filter for HP's line of Winprinters which use a proprietary
-# protocol called ppa (Print Performance Architecture). Like Winmodems, Winprinters
-# don't have a microprocessor; your main CPU does all the hard work.
-# Winprinters: Hp Deskjet 710, 712, 720, 722, 820, 1000 series.
-# pnm2ppa can work on its own or via lpr or pdq.
-
-# The ebuild in general seems a bit flaky, anyone who has a ppa printer
-# please check it out and tell me if it worked.
-
-# Description of accompanying patch: install into /usr instead of /usr/local
-# and use env. var. CFLAGS. Took a lot of changes though.
-
-S=${WORKDIR}/${PN}
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-	 mirror://sourceforge/${PN}/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="sys-libs/glibc
-	sys-libs/ncurses
-	gtk? ( x11-libs/gtk+ )"
-	
-RDEPEND="${DEPEND}
-	app-text/enscript
-	dev-util/dialog"
-
-src_unpack() {
-    
-    cd ${WORKDIR}
-    unpack ${P}.tgz
-    cd ${S}
-    unpack howto.tgz
-
-	cd ${WORKDIR}
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-    
-}
-
-src_compile() {
-    
-	export CFLAGS="-DNDEBUG ${CFLAGS}"
-	
-    emake 	\
-		CFLAGS="${CFLAGS}" || die
-		
-    
-    cd ${S}/ppa_protocol
-    emake 	\
-		CFLAGS="${CFLAGS}" || die
-    
-    cd ${S}/ppaSet-beta1
-    # This requires gtk, ncurses etc. on which we don't want to depend
-    # so we simply fail if they aren't installed
-    echo "The following may fail, don't pay attention to any error"
-    sleep 1s
-
-    use gtk &&	\
-		make 	\
-			BASEDIR=/usr/share/pnm2ppa/ppaSet	\
-			BINDIR=/usr/bin	\
-			PNM2PPA=/usr/bin/pnm2ppa	\
-			CALIBRATE_PPA=/usr/bin/calibrate_ppa	\
-			CFLAGS="${CFLAGS}" gPpaSet 
-
-	make 	\
-		BASEDIR=/usr/share/pnm2ppa/ppaSet	\
-		BINDIR=/usr/bin	\
-		PNM2PPA=/usr/bin/pnm2ppa	\
-		CALIBRATE_PPA=/usr/bin/calibrate_ppa	\
-		CFLAGS="${CFLAGS}" nPpaSet
-
-    make	\
-		BASEDIR=/usr/share/pnm2ppa/ppaSet	\
-		BINDIR=/usr/bin	\
-		PNM2PPA=/usr/bin/pnm2ppa	\
-		CALIBRATE_PPA=/usr/bin/calibrate_ppa	\
-		CFLAGS="${CFLAGS}"
-}
-
-src_install () {
-	
-	dodir /usr/bin
-	dodir /etc
-	dodir /usr/share/man/man1
-
-	make	\
-		INSTALLDIR=${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.
-	cd ${S}/ppaSet-beta1
-#	dodir /usr/share/pnm2ppa/ppaSet-beta1
-	exeinto /usr/share/pnm2ppa/ppaSet-beta1
-	doexe calibration cleanHeads gammaRef install noGamma ppa.if test
-
-#	dodir /usr/share/pnm2ppa/sample_scripts
-	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
-	
-    cd ${S}/ppaSet-beta1
-	use gtk &&	\
-		yes "" | make	\
-			BASEDIR=${D}/usr/ppaSet	\
-			BINDIR=${D}/usr/bin	\
-			PNM2PPA=${D}/usr/bin/pnm2ppa	\
-			CALIBRATE_PPA=${D}/usr/bin/calibrate_ppa	\
-			install-g
-
-	yes "" | make	\
-		BASEDIR=${D}/usr/ppaSet	\
-		BINDIR=${D}/usr/bin	\
-		PNM2PPA=${D}/usr/bin/pnm2ppa	\
-		CALIBRATE_PPA=${D}/usr/bin/calibrate_ppa	\
-		install-n
-
-	yes "" | make	\
-		BASEDIR=${D}/usr/ppaSet	\
-		BINDIR=${D}/usr/bin	\
-		PNM2PPA=${D}/usr/bin/pnm2ppa	\
-		CALIBRATE_PPA=${D}/usr/bin/calibrate_ppa	\
-		install
-	
-	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 .
-
-	#clean up
-	rm -f ${D}/usr/bin/gPpaSet
-	rm -f ${D}/usr/bin/nPpaSet
-
-	dosym /usr/ppaSet/gPpaSet /usr/bin/gPpaSet
-	dosym /usr/ppaSet/nPpaSet /usr/bin/nPpaSet
-
-}
-
-pkg_postinst() {
-
-    einfo "
-    Now, you *must* edit /etc/pnm2ppa.conf and choose (at least)
-    your printer model and papersize.
-    
-    Run calibrate_ppa to calibrate color offsets.
-    
-    Read the docs in /usr/share/pnm2ppa/ to configure the printer,
-    configure lpr substitutes, cups, pdq, networking etc.
-    
-    Note that lpr and pdq drivers *have* been installed, but if your
-    config file management has /etc blocked (the default), they have
-    been installed under different filenames. Read the appropriate
-    Gentoo documentation for more info.
-    
-    Note: lpr has been configured for default papersize letter
-    "
-    
-}
diff --git a/net-print/pnm2ppa/pnm2ppa-1.0.91.ebuild b/net-print/pnm2ppa/pnm2ppa-1.0.91.ebuild
deleted file mode 100644
index 232aca86fc47..000000000000
--- a/net-print/pnm2ppa/pnm2ppa-1.0.91.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/pnm2ppa-1.0.91.ebuild,v 1.11 2003/02/13 15:26:37 vapier Exp $
-# Note: this also d/ls the hp-ppa-howto and installs it under /usr/share/doc/${P}
-
-# pnm2ppa is a print filter for HP's line of Winprinters which use a proprietary
-# protocol called ppa (Print Performance Architecture). Like Winmodems, Winprinters
-# don't have a microprocessor; your main CPU does all the hard work.
-# Winprinters: Hp Deskjet 710, 712, 720, 722, 820, 1000 series.
-# pnm2ppa can work on its own or via lpr or pdq.
-
-# The ebuild in general seems a bit flaky, anyone who has a ppa printer
-# please check it out and tell me if it worked.
-
-# Description of accompanying patch: install into /usr instead of /usr/local
-# and use env. var. CFLAGS. Took a lot of changes though.
-
-S=${WORKDIR}/pnm2ppa
-SRC_URI="mirror://sourceforge/pnm2ppa/${P}.tgz
-	 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="sys-libs/glibc"
-RDEPEND="sys-libs/glibc app-text/enscript"
-
-src_unpack() {
-    
-    cd ${WORKDIR}
-    unpack ${P}.tgz
-    cd ${S}
-    unpack howto.tgz
-    
-}
-
-src_compile() {
-    
-    # there is no configure, so we patch various makefiles
-    # to intall into /usr and to include $CFLAGS optimization
-    cd ${WORKDIR}
-    patch -p0 <${FILESDIR}/${P}-gentoo.diff
-
-    cd ${S}
-    try emake
-    
-    cd ${S}/ppa_protocol
-    try emake
-    
-#    cd ${S}/ppaSet-beta1
-#    # This requires gtk, ncurses etc. on which we don't want to depend
-#    # so we simply fail if they aren't installed
-#    echo "The following may fail, don't pay attention to any error"
-#    sleep 1s
-#    emake gPpaSet 
-#    emake nPpaSet
-#    emake
-
-}
-
-src_install () {
-
-    # There are problems with the builtin make install.
-    
-    cd ${S}
-    
-    into /usr
-    dobin pnm2ppa calibrate_ppa
-    doman docs/en/pnm2ppa.1
-    
-    insinto /etc
-    doins pnm2ppa.conf
-    
-    # Install docs, filtering out distro-specific install documents
-    # Note: we don't use dodoc but rather doins because html/sgml/lyx docs
-    # shouldn't be gzipped IMHO
-    cd docs/en
-    insinto /usr/share/doc/${P}
-    doins CALIBRATION.* COLOR.* CREDITS INSTALL LICENSE PPA* README RELEASE-NOTES TODO
-    cd sgml
-    insinto /usr/share/doc/${P}/sgml
-    doins CALIBRATION.sgml COLOR.sgml PPA*
-    cd ${S}/howto
-    insinto /usr/share/doc/${P}/howto/
-    doins *
-    
-    cd ${S}/ppa_protocol
-    dobin parse_vlink
-    insinto /usr/share/doc/${P}/ppa_protocol/
-    doins *.html
-    
-    cd ${S}/utils/Linux
-    dobin detect_ppa test_ppa
-    
-    # Install various things into /usr/share/pnm2ppa
-    dodir /usr/share/pnm2ppa
-    cd ${D}/usr/share/pnm2ppa
-    
-    ln -s ../doc/${P} ./doc
-
-    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.
-    # We don't install them because we don't want to depend on lpd.
-    # ncurses, gtk (the interface libs) but we provide the source
-    # for the user. If gtk/ncurses headers are installed, they will
-    # have been built.
-    dodir /usr/share/pnm2ppa/ppaSet-beta1/dialog
-    insinto /usr/share/pnm2ppa/ppaSet-beta1
-    doins ${S}/ppaSet-beta1/*
-    insinto /usr/share/pnm2ppa/ppaSet-beta1/dialog
-    doins ${S}/ppaSet-beta1/dialog/*
-    exeinto /usr/share/pnm2ppa/ppaSet-beta1
-    cd ${S}/ppaSet-beta1
-    doexe calibration cleanHeads gammaRef install noGamma ppa.if test
-    
-    dodir /usr/share/pnm2ppa/sample_scripts
-    exeinto /usr/share/pnm2ppa/sample_scripts
-    doexe ${S}/sample_scripts/*
-
-    dodir /usr/share/pnm2ppa/testpages
-    insinto /usr/share/pnm2ppa/testpages
-    doins ${S}/testpages/*
-    
-    # Install lpr filters: add them to the end of the existing printcap.
-    # We have /etc protection as default, so it's safe, but easier to
-    # setup later.
-    dodir /etc
-    cp /etc/printcap ${D}/etc/printcap.current
-    cp ${S}/lpd/printcap ${D}/etc/printcap.new
-    cat ${D}/etc/printcap.current ${D}/etc/printcap.new > ${D}/etc/printcap
-    rm ${D}/etc/printcap.*
-    # run provided script (I patched it), it needs its dir as pwd
-    cd ${S}/lpd
-    DESTDIR=${D} ./lpdsetup
-    
-    # Install pdq filters, need to be activated via configuration via xpdq
-    cd ${S}/pdq
-    exeinto /etc/pdq/drivers/ghostscript
-    doexe gs-pnm2ppa
-    exeinto /etc/pdq/interfaces
-    doexe dummy    
-    
-}
-
-pkg_postinst() {
-
-    echo "
-    Now, you *must* edit /etc/pnm2ppa.conf and choose (at least)
-    your printer model and papersize.
-    
-    Run calibrate_ppa to calibrate color offsets.
-    
-    Read the docs in /usr/share/pnm2ppa/ to configure the printer,
-    configure lpr substitutes, cups, pdq, networking etc.
-    
-    Note that lpr and pdq drivers *have* been installed, but if your
-    config file management has /etc blocked (the default), they have
-    been installed under different filenames. Read the appropriate
-    Gentoo documentation for more info.
-    
-    Note: lpr has been configured for default papersize letter
-    "
-    
-}