fixes #3062, + cleanups

13 files changed, 4 insertions, 528 deletions

diff --git a/app-text/ghostscript/files/digest-ghostscript-6.53-r2 b/app-text/ghostscript/files/digest-ghostscript-6.53-r2
deleted file mode 100644
index 1541c6b91453..000000000000
--- a/app-text/ghostscript/files/digest-ghostscript-6.53-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 fc61954bddd6252f992b8bc1f4cc8761 ghostscript-6.53.tar.bz2 3899811
-MD5 8250132d6fcc6eb1419f505f06c7690b ghostscript-fonts-std-6.0.tar.gz 1881034
-MD5 62f59f0bf0b4d2843cc9953f3b4f894f gimp-print-4.2.1.tar.gz 4691313
-MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
diff --git a/app-text/ghostscript/files/digest-ghostscript-7.05 b/app-text/ghostscript/files/digest-ghostscript-7.05
deleted file mode 100644
index 6bf899394224..000000000000
--- a/app-text/ghostscript/files/digest-ghostscript-7.05
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 821caada7e265ea5b698a78e6b029734 ghostscript-7.05.tar.bz2 4103119
-MD5 8250132d6fcc6eb1419f505f06c7690b ghostscript-fonts-std-6.0.tar.gz 1881034
-MD5 33457d3f37de7ef03d2eea05a9e6aa4f gnu-gs-fonts-other-6.0.tar.gz 796086
-MD5 ec11b9ef72ecaabb61eeba27e93f9f2b lxm3200-0.4.1-gs5.50-src.tar.gz 37283
diff --git a/app-text/ghostscript/files/digest-ghostscript-7.05-r1 b/app-text/ghostscript/files/digest-ghostscript-7.05-r1
deleted file mode 100644
index 5328062a505f..000000000000
--- a/app-text/ghostscript/files/digest-ghostscript-7.05-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 821caada7e265ea5b698a78e6b029734 ghostscript-7.05.tar.bz2 4103119
-MD5 8250132d6fcc6eb1419f505f06c7690b ghostscript-fonts-std-6.0.tar.gz 1881034
-MD5 33457d3f37de7ef03d2eea05a9e6aa4f gnu-gs-fonts-other-6.0.tar.gz 796086
-MD5 ec11b9ef72ecaabb61eeba27e93f9f2b lxm3200-0.4.1-gs5.50-src.tar.gz 37283
-MD5 971a14d35f61ea19871616f437e199a2 cups-1.1.15-1-source.tar.bz2 2962392
diff --git a/app-text/ghostscript/files/ghostscript-6.53-gdi-gentoo.diff b/app-text/ghostscript/files/ghostscript-6.53-gdi-gentoo.diff
deleted file mode 100644
index b24468727e28..000000000000
--- a/app-text/ghostscript/files/ghostscript-6.53-gdi-gentoo.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- ghostscript-6.53/src/devs.mak_orig	2002-03-07 09:59:27.000000000 +0100
-+++ ghostscript-6.53/src/devs.mak	2002-03-07 10:32:11.000000000 +0100
-@@ -618,6 +618,18 @@
-  $(gdevpxat_h) $(gdevpxen_h) $(gdevpxop_h) $(gdevpxut_h) $(stream_h)
- 	$(GLCC) $(GLO_)gdevlj56.$(OBJ) $(C_) $(GLSRC)gdevlj56.c
- 
-+### ---------------- The Samsung SmartGDI laser printer devices --------- ###
-+### Note : this driver is used by Samsung SmartGDI compatible printers.   ###
-+### 	   
-+
-+GDIMONO=$(GLOBJ)gdevgdi.$(OBJ) $(HPPCL)
-+
-+$(GLOBJ)gdevgdi.$(OBJ): $(GLSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h)
-+	$(GLCC) $(GLO_)gdevgdi.$(OBJ) $(C_) $(GLSRC)gdevgdi.c
-+
-+$(DD)gdi.dev: $(GDIMONO) $(DD)page.dev
-+	$(SETPDEV) $(DD)gdi $(GDIMONO)
-+
- ### -------------------- The ijs client ----------------- ###
- 
- ijs_=$(GLOBJ)gdevijs.$(OBJ) $(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_client.$(OBJ) \
---- ghostscript-6.53/src/unix-gcc.mak_orig	2002-03-07 10:01:15.000000000 +0100
-+++ ghostscript-6.53/src/unix-gcc.mak	2002-03-07 10:02:28.000000000 +0100
-@@ -395,7 +395,7 @@
- 
- DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev
- DEVICE_DEVS2=
--DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev $(DD)lj5mono.dev $(DD)lj5gray.dev
-+DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev $(DD)lj5mono.dev $(DD)lj5gray.dev $(DD)gdi.dev
- DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev $(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev
- DEVICE_DEVS5=$(DD)uniprint.dev $(DD)ijs.dev
- DEVICE_DEVS6=$(DD)bj10e.dev $(DD)bj200.dev $(DD)bjc600.dev $(DD)bjc800.dev
diff --git a/app-text/ghostscript/files/ghostscript-6.53-gimpprint-gentoo.diff b/app-text/ghostscript/files/ghostscript-6.53-gimpprint-gentoo.diff
deleted file mode 100644
index d77cc94230ec..000000000000
--- a/app-text/ghostscript/files/ghostscript-6.53-gimpprint-gentoo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- ghostscript-6.53/src/unixlink.mak_orig	2002-03-07 13:40:11.000000000 +0100
-+++ ghostscript-6.53/src/unixlink.mak	2002-03-07 13:40:22.000000000 +0100
-@@ -67,6 +67,9 @@
- 	$(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) -o $(GS_XE)
- 	$(ECHOGS_XE) -a $(ldt_tr) -n -s $(PSOBJ)gs.$(OBJ) -s
- 	cat $(ld_tr) >>$(ldt_tr)
-+	cp $(ldt_tr) $(ldt_tr)_orig
-+	sed -e "s#-lXt#-L${BUILD_PREFIX}/ghostscript-6.53-r1/work/gimp-print-4.2.0/src/main/.libs/ -lgimpprint -lXt#g" \
-+		$(ldt_tr)_orig > $(ldt_tr)
- 	$(ECHOGS_XE) -a $(ldt_tr) -s - $(EXTRALIBS) $(STDLIBS)
- 	if [ x$(XLIBDIR) != x ]; then LD_RUN_PATH=$(XLIBDIR); export LD_RUN_PATH; fi; \
- 	XCFLAGS= XINCLUDE= XLDFLAGS= XLIBDIRS= XLIBS= \
diff --git a/app-text/ghostscript/files/ghostscript-6.53-hpdj_margins.patch b/app-text/ghostscript/files/ghostscript-6.53-hpdj_margins.patch
deleted file mode 100644
index 81f75b08a258..000000000000
--- a/app-text/ghostscript/files/ghostscript-6.53-hpdj_margins.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur ghostscript-6.53.orig/src/gdevijs.c ghostscript-6.53/src/gdevijs.c
---- ghostscript-6.53.orig/src/gdevijs.c	2002-04-28 13:10:09.000000000 -0500
-+++ ghostscript-6.53/src/gdevijs.c	2002-04-28 13:10:46.000000000 -0500
-@@ -401,10 +401,10 @@
- 
- 	if (code == 0) {
- 	    m[0] = printable_left;
--	    m[1] = printable_top;
-+	    m[3] = printable_top;
- 	    m[2] = ijsdev->MediaSize[0] * (1.0 / 72) -
- 		printable_left - printable_width;
--	    m[3] = ijsdev->MediaSize[1] * (1.0 / 72) -
-+	    m[1] = ijsdev->MediaSize[1] * (1.0 / 72) -
- 		printable_top - printable_height;
- 	    gx_device_set_margins((gx_device *)ijsdev, m, true);
- 	    sprintf (buf, "%gx%g", printable_left, printable_top);
diff --git a/app-text/ghostscript/files/ghostscript-6.53-missquotes.patch b/app-text/ghostscript/files/ghostscript-6.53-missquotes.patch
deleted file mode 100644
index 9370f85ba998..000000000000
--- a/app-text/ghostscript/files/ghostscript-6.53-missquotes.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Nur gs7.00.orig/lib/dvipdf gs7.00/lib/dvipdf
---- gs7.00.orig/lib/dvipdf	Thu Mar  9 09:40:39 2000
-+++ gs7.00/lib/dvipdf	Sun Apr 15 23:31:36 2001
-@@ -22,7 +22,7 @@
- 	exit 1
- fi
- 
--infile=$1;
-+infile="$1";
- 
- if [ $# -eq 1 ]
- then
-@@ -33,7 +33,7 @@
- 	esac
- 	outfile="${base}.pdf"
- else
--	outfile=$2
-+	outfile="$2"
- fi
- 
- # Doing an initial 'save' helps keep fonts from being flushed between pages.
-diff -Nur gs7.00.orig/lib/pdf2dsc gs7.00/lib/pdf2dsc
---- gs7.00.orig/lib/pdf2dsc	Fri Dec 29 06:03:49 2000
-+++ gs7.00/lib/pdf2dsc	Sun Apr 15 23:32:43 2001
-@@ -20,7 +20,7 @@
- 
- pdffile=$1
- dscfile=$2
--: ${dscfile:=`echo $pdffile | sed 's,\.[^/.]*,,'`.dsc}
-+: ${dscfile:=`echo "$pdffile" | sed 's,\.[^/.]*,,'`.dsc}
- 
- exec gs -q -dNODISPLAY -dSAFER -dDELAYSAFER\
-     -sPDFname="$pdffile" -sDSCname="$dscfile" pdf2dsc.ps -c quit
-diff -Nur gs7.00.orig/lib/pdf2ps gs7.00/lib/pdf2ps
---- gs7.00.orig/lib/pdf2ps	Fri May 19 08:38:25 2000
-+++ gs7.00/lib/pdf2ps	Sun Apr 15 23:33:20 2001
-@@ -14,7 +14,7 @@
- 
- if [ $# -eq 2 ] 
- then
--    outfile=$2
-+    outfile="$2"
- elif [ $# -eq 1 ]
- then
-     outfile=`basename "$1" \.pdf`.ps
-diff -Nur gs7.00.orig/lib/pfbtopfa gs7.00/lib/pfbtopfa
---- gs7.00.orig/lib/pfbtopfa	Wed Apr 12 19:41:41 2000
-+++ gs7.00/lib/pfbtopfa	Sun Apr 15 23:33:52 2001
-@@ -4,7 +4,7 @@
- 
- if [ $# -eq 2 ] 
- then
--    outfile=$2
-+    outfile="$2"
- elif [ $# -eq 1 ]
- then
-     outfile=`basename "$1" \.pfb`.pfa
-diff -Nur gs7.00.orig/lib/ps2epsi gs7.00/lib/ps2epsi
---- gs7.00.orig/lib/ps2epsi	Wed Apr  4 23:05:00 2001
-+++ gs7.00/lib/ps2epsi	Sun Apr 15 23:36:15 2001
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # $Id: ghostscript-6.53-missquotes.patch,v 1.1 2002/04/28 18:40:09 jnelson Exp $
- 
--tmpfile=/tmp/ps2epsi$$
-+tmpfile=`mktemp /tmp/$0.XXXXXX` || exit 1
- 
- export outfile
- 
-@@ -10,7 +10,7 @@
- 	exit 1
- fi
- 
--infile=$1;
-+infile="$1";
- 
- if [ $# -eq 1 ]
- then
-@@ -22,9 +22,9 @@
- 	  *.epsf)	base=`basename "${infile}" .epsf` ;;
- 	  *)		base=`basename "${infile}"` ;;
- 	esac
--	outfile=${base}.epsi
-+	outfile="${base}.epsi"
- else
--	outfile=$2
-+	outfile="$2"
- fi
- 
- ls -l "${infile}" |
diff --git a/app-text/ghostscript/files/ghostscript-6.53-r2-gimpprint-gentoo.diff b/app-text/ghostscript/files/ghostscript-6.53-r2-gimpprint-gentoo.diff
deleted file mode 100644
index b99f38d13c8b..000000000000
--- a/app-text/ghostscript/files/ghostscript-6.53-r2-gimpprint-gentoo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- ghostscript-6.53/src/unixlink.mak_orig	2002-03-07 13:40:11.000000000 +0100
-+++ ghostscript-6.53/src/unixlink.mak	2002-03-07 13:40:22.000000000 +0100
-@@ -67,6 +67,9 @@
- 	$(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) -o $(GS_XE)
- 	$(ECHOGS_XE) -a $(ldt_tr) -n -s $(PSOBJ)gs.$(OBJ) -s
- 	cat $(ld_tr) >>$(ldt_tr)
-+	cp $(ldt_tr) $(ldt_tr)_orig
-+	sed -e "s#-lXt#-L${BUILD_PREFIX}/ghostscript-6.53-r2/work/gimp-print-4.2.1/src/main/.libs/ -lgimpprint -lXt#g" \
-+		$(ldt_tr)_orig > $(ldt_tr)
- 	$(ECHOGS_XE) -a $(ldt_tr) -s - $(EXTRALIBS) $(STDLIBS)
- 	if [ x$(XLIBDIR) != x ]; then LD_RUN_PATH=$(XLIBDIR); export LD_RUN_PATH; fi; \
- 	XCFLAGS= XINCLUDE= XLDFLAGS= XLIBDIRS= XLIBS= \
diff --git a/app-text/ghostscript/files/ghostscript-6.53-setuid.patch b/app-text/ghostscript/files/ghostscript-6.53-setuid.patch
deleted file mode 100644
index 09afeee093dd..000000000000
--- a/app-text/ghostscript/files/ghostscript-6.53-setuid.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- gs/src/imainarg.c.orig	Mon Dec  6 08:11:52 1999
-+++ gs/src/imainarg.c	Thu Mar 30 23:01:34 2000
-@@ -48,6 +48,18 @@
- #include "iutil.h"
- #include "ivmspace.h"
- 
-+/* Change by Torsten Landschoff <torsten@debian.org>:
-+ * We need to store the original rights when run with setuid so we can
-+ * regain privileges when opening the vga library for instance.
-+ *   -- Thu, 30 Mar 2000 22:47:22 +0200 */
-+
-+#include <unistd.h>
-+
-+uid_t privileged_uid;
-+gid_t privileged_gid; 
-+
-+/* --- end change --- */
-+
- /* Import operator procedures */
- extern int zflush(P1(i_ctx_t *));
- extern int zflushpage(P1(i_ctx_t *));
-@@ -127,6 +139,20 @@
-     arg_list args;
-     FILE *stdfiles[3];
-     int code;
-+
-+    /* Change by Torsten Landschoff <torsten@debian.org>:
-+     * We want to give up privileges as soon as possible when running suid.
-+     * Right, you would not want to run a piece of software as complex as
-+     * Ghostscript with setuid but you need to if you want to use the 
-+     * svgalib as ordinary user. 
-+     *  -- Thu, 30 Mar 2000 22:46:19 +0200 */
-+
-+    /* save privileges */
-+    privileged_uid = geteuid();		privileged_gid = getegid();
-+    /* give up privileges */
-+    seteuid( getuid() );		setegid( getgid() );
-+     
-+    /* --- end change --- */
- 
-     gs_get_real_stdio(stdfiles);
-     arg_init(&args, (const char **)argv, argc,
---- gs/src/gdevl256.c.orig	Mon Jan 11 07:38:07 1999
-+++ gs/src/gdevl256.c	Thu Mar 30 23:03:57 2000
-@@ -38,6 +38,17 @@
- #include <vga.h>
- #include <vgagl.h>
- 
-+/* Change by Torsten Landschoff <torsten@debian.org>:
-+ * I changed imainarg.c to drop privileges as soon as possible when 
-+ * running setuid. We need to get back elevated rights when we want 
-+ * to open the vga library. Declare the two variables from imainarg.c
-+ * holding the privileges and include unistd.h for user management.
-+ *  -- Thu, 30 Mar 2000 22:59:53 +0200 */
-+
-+#include <unistd.h>
-+extern uid_t privileged_uid;
-+extern gid_t privileged_gid;
-+
- /* The color map for dynamically assignable colors. */
- #define first_dc_index 64
- private int next_dc_index;
-@@ -107,7 +118,19 @@
-     int vgamode;
-     int width, height;
- 
-+    /* Change by Torsten Landschoff <torsten@debian.org>:
-+     * We need to restore the privileges we gave up in imainarg.c to open
-+     * the vga device. 
-+     * -- Thu, 30 Mar 2000 23:03:12 +0200 */
-+
-+    /* re-obtain privileges */
-+    seteuid( privileged_uid );	setegid( privileged_gid );
-     vga_init();
-+    /* give away privileges */
-+    seteuid( getuid() );	setegid( getgid() );
-+
-+    /* --- end change --- */
-+
-     vgamode = vga_getdefaultmode();
-     if (vgamode == -1)
- 	vgamode = G320x200x256;
diff --git a/app-text/ghostscript/ghostscript-6.53-r2.ebuild b/app-text/ghostscript/ghostscript-6.53-r2.ebuild
deleted file mode 100644
index 33ece56d9fcd..000000000000
--- a/app-text/ghostscript/ghostscript-6.53-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>, Geert Bevin <gbevin@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-6.53-r2.ebuild,v 1.1 2002/04/28 18:40:09 jnelson Exp $
-
-GPV="4.2.1"
-
-JPEG=jpegsrc.v6b.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU Ghostscript"
-SRC_URI="http://download.sourceforge.net/ghostscript/${P}.tar.bz2
-	http://download.sourceforge.net/gs-fonts/ghostscript-fonts-std-6.0.tar.gz
-	http://download.sourceforge.net/gimp-print/gimp-print-${GPV}.tar.gz
-	ftp://ftp.uu.net/graphics/jpeg/${JPEG}"
-
-# NOTES:
-# Why aren't we using configure (for ghostscript)?
-
-# When I run configure (for gimp-print), there are some questions:
-#
-# Which of the following do we want to say 'yes'?
-# checking whether to build CUPS driver... no
-# checking whether to build translated CUPS PPD files... yes
-# checking whether to use level 3 PostScript... no
-# checking whether to build ghostscript driver... no
-# checking whether to build foomatic data files... no
-# checking whether to build GIMP plugin... no
-# 
-# and no?
-# checking whether to build escputil... yes
-# checking whether to build libgimpprint... yes
-
-DEPEND="virtual/glibc
-	virtual/x11
-        sys-libs/zlib
-        media-libs/libpng
-        media-libs/jpeg"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-
-	unpack ${A}
-	
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}-gdi-gentoo.diff || die
-	patch -p1 < ${FILESDIR}/${P}-r2-gimpprint-gentoo.diff || die
-	cp ${FILESDIR}/gdevgdi.c ${S}/src || die
-        
-        # additional patches taken from the PLD SRPM
-	# fix some shellscripts to wrap their filename arguments in double-quotes
-        patch -p1 < ${FILESDIR}/${P}-missquotes.patch || die
-	# when using svga output, save and restore the uid because
-	# ghostscript needs to be setuid. This make gs only be suid
-	# only as long as necessary.
-        patch -p1 < ${FILESDIR}/${P}-setuid.patch || die
-        
-        # a patch right from HP to fix some margin issues with deskjets
-	patch -p1 < ${FILESDIR}/${P}-hpdj_margins.patch || die
-
-	local tmpdir=${JPEG/src.v/-}
-	tmpdir=${tmpdir/.tar.gz/}
-	mv ${WORKDIR}/${tmpdir} ${S}/jpeg || die
-	
-#	tmpdir=${ZLIB/.tar.bz2/}
-#	mv ${WORKDIR}/${tmpdir} ${S}/zlib || die
-
-#	tmpdir=${LIBPNG/.tar.bz2/}
-#	mv ${WORKDIR}/${tmpdir} ${S}/libpng || die
-
-	cd ${WORKDIR}/gimp-print-${GPV}
-	./configure --without-gimp --enable-static --disable-shared || die
-	cd ${WORKDIR}/gimp-print-${GPV}/src/ghost
-	cp *.c ${S}/src || die
-	cd ${WORKDIR}/gimp-print-${GPV}/include/gimp-print
-	mkdir ${S}/src/gimp-print
-	cp *.h ${S}/src/gimp-print || die
-	cat contrib.mak.addon >> ${S}/src/contrib.mak
-	
-	cd ${S}/src
-	cp unix-gcc.mak unix-gcc.mak.orig
-	sed -e "s:^DEVICE_DEVS6=:DEVICE_DEVS6=\$\(DD\)stp\.dev :" \
-        	-e "s:SHARE_LIBPNG=0:SHARE_LIBPNG=1:" \
-        	-e "s:SHARE_ZLIB=0:SHARE_ZLIB=1:" \
-		-e "s:CFLAGS_STANDARD=-O2:CFLAGS_STANDARD=${CFLAGS}:" \
-		-e "s:XLIBDIRS=-L/usr/X11/lib:XLIBDIRS=-L/usr/X11R6/lib:" \
-		-e "s:XLIBS=Xt Xext X11:XLIBS=Xt SM ICE Xext X11:" \
-		unix-gcc.mak.orig > unix-gcc.mak
-}
-
-src_compile() {
-
-	cd ${WORKDIR}/gimp-print-${GPV}
-	emake || die
-
-	cd ${S}
-	ln -sf src/unix-gcc.mak Makefile
-	emake prefix=/usr || die
-}
-
-src_install() {
-
-	dodir /usr/{bin,share/man/man1}
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		install || die
-
-	mv ${D}/usr/bin/gs ${D}/usr/bin/gs-${PV}
-	dosym /usr/bin/gs-${PV} /usr/bin/gs
-
-	cd ${WORKDIR}
-	cp -a fonts ${D}/usr/share/ghostscript
-	cd ${S}
-
-	dodir /usr/share/doc/${PF}
-	rm -rf ${D}/usr/share/ghostscript/${PV}/doc
-	dodoc doc/README doc/PUBLIC doc/COPYING*
-	dohtml doc/*
-	insinto /usr/share/emacs/site-lisp
-	doins doc/gsdoc.el
-
-	cd ${WORKDIR}/gimp-print-${GPV}
-	dobin src/escputil/escputil
-	docinto stp
-	dodoc README* COPYING ChangeLog
-}
diff --git a/app-text/ghostscript/ghostscript-7.05-r1.ebuild b/app-text/ghostscript/ghostscript-7.05-r1.ebuild
deleted file mode 100644
index a2bf3618121b..000000000000
--- a/app-text/ghostscript/ghostscript-7.05-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Markus Krainer <markus-krainer@chello.at>
-# /space/gentoo/cvsroot/gentoo-x86/skel.ebuild,v 1.5 2002/04/29 22:56:53 sandymac Exp
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU Ghostscript"
-SRC_URI="http://download.sourceforge.net/ghostscript/${P}.tar.bz2
-	 http://download.sourceforge.net/gs-fonts/ghostscript-fonts-std-6.0.tar.gz
-	 http://download.sourceforge.net/gs-fonts/gnu-gs-fonts-other-6.0.tar.gz
-	 http://lxm3200.sourceforge.net/lxm3200-0.4.1-gs5.50-src.tar.gz"
-
-use cups && SRC_URI="${SRC_URI}
-	ftp://ftp.easysw.com/pub/cups/1.1.15/cups-1.1.15-1-source.tar.bz2"
-
-DEPEND="virtual/glibc
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.1
-	>=sys-libs/zlib-1.1.4
-	X? ( virtual/x11 )
-	cups? ( >=net-print/cups-1.1.15 )"
-SLOT="0"
-
-src_unpack() {
-
-unpack ${P}.tar.bz2
-unpack ghostscript-fonts-std-6.0.tar.gz
-unpack gnu-gs-fonts-other-6.0.tar.gz
-unpack lxm3200-0.4.1-gs5.50-src.tar.gz
-if [ -n "`use cups`" ]
-then
-	unpack cups-1.1.15-1-source.tar.bz2
-	cp -r cups-1.1.15/pstoraster ${S}
-	cd ${S}
-	cat pstoraster/ghostscript-705.patch | patch -p1 -d ${S} || die "gs patch failed"
-	cat ${FILESDIR}/lxm3200-cups.diff | patch -p1 -d ${S} || die "lxm3200 patch failed"
-else
-	cd ${WORKDIR}
-	patch -p0 < ${FILESDIR}/lxm3200-gentoo.diff
-fi
-
-cp ${WORKDIR}/lxm3200-0.4.1-gs5.50-src/gdevlx32.c ${S}/src/
-
-}
-
-
-src_compile() {
-	use X && myconf="--with-x"
-	use X || myconf="--without-x"
-	use cups && myconf="${myconf} --enable-cups"
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-gimp-print \
-		${myconf} || die "./configure failed"
-
-
-	make || die "make failed"
-}
-
-src_install() {
-
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		install_prefix=${D} \
-		install || die "make install failed"
-
-	cd ${WORKDIR}
-	cp -a fonts ${D}/usr/share/ghostscript
-	cd ${S}
-
-	rm -fr ${D}/usr/share/ghostscript/7.05/doc
-	dodoc doc/README doc/COPYING doc/COPYING.LGPL
-	dohtml doc/*.html doc/*.htm
-	insinto /usr/share/emacs/site-lisp
-	doins doc/gsdoc.el
-}
diff --git a/app-text/ghostscript/ghostscript-7.05-r2.ebuild b/app-text/ghostscript/ghostscript-7.05-r2.ebuild
index a2bf3618121b..7303bbe8014c 100644
--- a/app-text/ghostscript/ghostscript-7.05-r2.ebuild
+++ b/app-text/ghostscript/ghostscript-7.05-r2.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Markus Krainer <markus-krainer@chello.at>
-# /space/gentoo/cvsroot/gentoo-x86/skel.ebuild,v 1.5 2002/04/29 22:56:53 sandymac Exp
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.05-r2.ebuild,v 1.2 2002/07/05 00:03:31 verwilst Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU Ghostscript"
@@ -12,13 +11,15 @@ SRC_URI="http://download.sourceforge.net/ghostscript/${P}.tar.bz2
 
 use cups && SRC_URI="${SRC_URI}
 	ftp://ftp.easysw.com/pub/cups/1.1.15/cups-1.1.15-1-source.tar.bz2"
-
+HOMEPAGE="http://www.cs.wisc.edu/~ghost/"
 DEPEND="virtual/glibc
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.1
 	>=sys-libs/zlib-1.1.4
 	X? ( virtual/x11 )
 	cups? ( >=net-print/cups-1.1.15 )"
+RDEPEND="${DEPEND}"
+LICENSE="GPL-2"
 SLOT="0"
 
 src_unpack() {
diff --git a/app-text/ghostscript/ghostscript-7.05.ebuild b/app-text/ghostscript/ghostscript-7.05.ebuild
deleted file mode 100644
index 6a674aa90695..000000000000
--- a/app-text/ghostscript/ghostscript-7.05.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Markus Krainer <markus-krainer@chello.at>
-# /space/gentoo/cvsroot/gentoo-x86/skel.ebuild,v 1.5 2002/04/29 22:56:53 sandymac Exp
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU Ghostscript"
-SRC_URI="http://download.sourceforge.net/ghostscript/${P}.tar.bz2
-	 http://download.sourceforge.net/gs-fonts/ghostscript-fonts-std-6.0.tar.gz
-	 http://download.sourceforge.net/gs-fonts/gnu-gs-fonts-other-6.0.tar.gz
-	 http://lxm3200.sourceforge.net/lxm3200-0.4.1-gs5.50-src.tar.gz"
-
-DEPEND="virtual/glibc
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.1
-	>=sys-libs/zlib-1.1.4
-	X? ( virtual/x11 )"
-SLOT="0"
-
-src_unpack() {
-
-unpack ${P}.tar.bz2
-unpack ghostscript-fonts-std-6.0.tar.gz
-unpack gnu-gs-fonts-other-6.0.tar.gz
-unpack lxm3200-0.4.1-gs5.50-src.tar.gz
-
-cd ${WORKDIR}
-patch -p0 < ${FILESDIR}/lxm3200-gentoo.diff
-
-cp ${WORKDIR}/lxm3200-0.4.1-gs5.50-src/gdevlx32.c ${S}/src/
-
-}
-
-
-src_compile() {
-	use X && myconf="--with-x"
-	use X || myconf="--without-x"
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-gimp-print \
-		${myconf} || die "./configure failed"
-
-	make || die "make failed"
-}
-
-src_install() {
-
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		install || die "make install failed"
-
-	cd ${WORKDIR}
-	cp -a fonts ${D}/usr/share/ghostscript
-	cd ${S}
-
-	rm -fr ${D}/usr/share/ghostscript/7.05/doc
-	dodoc doc/README doc/COPYING doc/COPYING.LGPL
-	dohtml doc/*.html doc/*.htm
-	insinto /usr/share/emacs/site-lisp
-	doins doc/gsdoc.el
-}