12 files changed, 8 insertions, 336 deletions
diff --git a/app-text/gv/ChangeLog b/app-text/gv/ChangeLog
index 1fe0e28d32a5..b44323c605bb 100644
--- a/app-text/gv/ChangeLog
+++ b/app-text/gv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/gv
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/ChangeLog,v 1.46 2006/04/02 10:23:37 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/ChangeLog,v 1.47 2006/04/02 10:27:14 genstef Exp $
+
+  02 Apr 2006; Stefan Schweizer <genstef@gentoo.org>
+  -files/gv-3.5.8-antialias.patch, -files/gv-3.5.8-r2-gentoo.diff,
+  -files/gv-3.5.8-setenv.diff, -files/gv-3.6.1-scrollbar.patch,
+  -files/3.5.8-gcc3.patch, -gv-3.5.8-r4.ebuild, -gv-3.6.1.ebuild,
+  -gv-3.6.1-r1.ebuild:
+  remove old
 
   02 Apr 2006; Bryan Østergaard <kloeri@gentoo.org gv-3.6.1-r2.ebuild:
   Stable on alpha, bug 127641.
diff --git a/app-text/gv/files/3.5.8-gcc3.patch b/app-text/gv/files/3.5.8-gcc3.patch
deleted file mode 100644
index f218edc7039c..000000000000
--- a/app-text/gv/files/3.5.8-gcc3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- source/paths.h.orig Sun Apr  6 00:00:00 1997
-+++ source/paths.h      Fri Jul 18 19:18:09 2003
-@@ -34,9 +34,9 @@
- #   define INC_XMU(aaa) <XMU_DIRECTORY/aaa>
- #   define INC_XAW(aaa) <XAW_DIRECTORY/aaa>
- #else
--#   define INC_X11(aaa) <X11/##aaa##>
--#   define INC_XMU(aaa) <X11/Xmu/##aaa##>
--#   define INC_XAW(aaa) <X11/Xaw3d/##aaa##>
-+#   define INC_X11(aaa) <X11/aaa>
-+#   define INC_XMU(aaa) <X11/Xmu/aaa>
-+#   define INC_XAW(aaa) <X11/Xaw3d/aaa>
- #endif
- 
- #endif /* _PATHS_H_ */
-
diff --git a/app-text/gv/files/digest-gv-3.5.8-r4 b/app-text/gv/files/digest-gv-3.5.8-r4
deleted file mode 100644
index 1396a41e501f..000000000000
--- a/app-text/gv/files/digest-gv-3.5.8-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0fb8b33ec888f8eacdc965602299d3a4 gv-3.5.8-debian.diff.gz 9506
-MD5 8f2f0bd97395d6cea52926ddee736da8 gv-3.5.8.tar.gz 369609
diff --git a/app-text/gv/files/digest-gv-3.6.1 b/app-text/gv/files/digest-gv-3.6.1
deleted file mode 100644
index 1a712bf913c0..000000000000
--- a/app-text/gv/files/digest-gv-3.6.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ace080d647b70f46fca7946e9543b79e gv-3.6.1.tar.gz 453921
-MD5 3743ff030e1e4ea448ba1199503bd702 gv_3.6.1-10.diff.gz 30253
diff --git a/app-text/gv/files/digest-gv-3.6.1-r1 b/app-text/gv/files/digest-gv-3.6.1-r1
deleted file mode 100644
index 1a712bf913c0..000000000000
--- a/app-text/gv/files/digest-gv-3.6.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ace080d647b70f46fca7946e9543b79e gv-3.6.1.tar.gz 453921
-MD5 3743ff030e1e4ea448ba1199503bd702 gv_3.6.1-10.diff.gz 30253
diff --git a/app-text/gv/files/gv-3.5.8-antialias.patch b/app-text/gv/files/gv-3.5.8-antialias.patch
deleted file mode 100644
index 09661293ed58..000000000000
--- a/app-text/gv/files/gv-3.5.8-antialias.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/gv_user_res.dat.org	2004-04-08 12:33:57.400203510 +0200
-+++ source/gv_user_res.dat	2004-04-08 12:34:03.500279743 +0200
-@@ -8,7 +8,7 @@
- GV.fallbackOrientation:	portrait
- GV.swapLandscape:	False
- GV.autoCenter:		True
--GV.antialias:		False
-+GV.antialias:		True
- GV.respectDSC:		True
- GV.ignoreEOF:		True
- GV.confirmPrint:	True
diff --git a/app-text/gv/files/gv-3.5.8-r2-gentoo.diff b/app-text/gv/files/gv-3.5.8-r2-gentoo.diff
deleted file mode 100644
index 4be1611aedc9..000000000000
--- a/app-text/gv/files/gv-3.5.8-r2-gentoo.diff
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ur gv-3.5.8.orig/source/file.c gv-3.5.8/source/file.c
---- gv-3.5.8.orig/source/file.c	1997-06-07 00:00:00.000000000 +0200
-+++ gv-3.5.8/source/file.c	2002-09-26 23:56:00.000000000 +0200
-@@ -285,6 +285,22 @@
- }
- 
- /*############################################################*/
-+/* file_nameIsDangerous */
-+/*############################################################*/
-+
-+char *file_charsAllowedInName = "+,-./:=@\\^_";
-+
-+int
-+file_nameIsDangerous(fn)
-+  char *fn;
-+{
-+  for (; *fn; fn++)
-+    if (!isalnum(*fn) && !strchr(file_charsAllowedInName, *fn))
-+      return(1);
-+  return(0);
-+}
-+
-+/*############################################################*/
- /* file_pdfname2psname */
- /* If the file ends in .pdf, change this to .ps.*/
- /* Return pointer to temp copy if changed, else to input string. */
-diff -ur gv-3.5.8.orig/source/file.h gv-3.5.8/source/file.h
---- gv-3.5.8.orig/source/file.h	1997-04-26 00:00:00.000000000 +0200
-+++ gv-3.5.8/source/file.h	2002-09-26 23:28:38.000000000 +0200
-@@ -70,6 +70,14 @@
- #endif
- );
- 
-+extern char *file_charsAllowedInName;
-+
-+extern int			file_nameIsDangerous (
-+#if NeedFunctionPrototypes
-+   char *
-+#endif
-+);
-+
- extern char*			file_pdfname2psname (
- #if NeedFunctionPrototypes
-    char *	/* name */
-diff -ur gv-3.5.8.orig/source/ps.c gv-3.5.8/source/ps.c
---- gv-3.5.8.orig/source/ps.c	1997-06-07 00:00:00.000000000 +0200
-+++ gv-3.5.8/source/ps.c	2002-09-27 00:29:35.000000000 +0200
-@@ -420,6 +420,16 @@
-       char cmd[512];
-       char s[512];
-       filename_unc=file_getTmpFilename(NULL,filename_raw);
-+      if (file_nameIsDangerous(filename))
-+	{
-+	  INFMESSAGE(the filename is dangerous)
-+	  sprintf(s, "The filename \"%s\" is dangerous: only alphanumeric "
-+		  "characters and \"%s\" are allowed.\n",
-+		  filename, file_charsAllowedInName);
-+	  NotePopupShowMessage(s);
-+	  ENDMESSAGE(psscan)
-+	  return(NULL);
-+	}
-       sprintf(cmd,cmd_uncompress,filename,filename_unc);
-       INFMESSAGE(is compressed)
-       INFSMESSAGE(uncompress command,cmd)
-@@ -491,6 +501,16 @@
-       char cmd[512];
-       char s[512];
-       filename_dsc=file_getTmpFilename(NULL,filename_raw);
-+      if (file_nameIsDangerous(filename))
-+	{
-+	  INFMESSAGE(the filename is dangerous)
-+	  sprintf(s, "The filename \"%s\" is dangerous: only alphanumeric "
-+		  "characters and \"%s\" are allowed.\n",
-+		  filename, file_charsAllowedInName);
-+	  NotePopupShowMessage(s);
-+	  ENDMESSAGE(psscan)
-+	  return(NULL);
-+	}
-       sprintf(cmd,cmd_scan_pdf,filename,filename_dsc);
-       INFMESSAGE(is PDF)
-       INFSMESSAGE(scan command,cmd)
diff --git a/app-text/gv/files/gv-3.5.8-setenv.diff b/app-text/gv/files/gv-3.5.8-setenv.diff
deleted file mode 100644
index 6c4ef2c26b26..000000000000
--- a/app-text/gv/files/gv-3.5.8-setenv.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- source/setenv.c.orig	Mon Mar 21 00:17:45 2005
-+++ source/setenv.c	Mon Mar 21 00:27:46 2005
-@@ -39,7 +39,7 @@
-  */
- int
- setenv(name, value, rewrite)
--	register char *name, *value;
-+	const char *name, *value;
- 	int rewrite;
- {
- 	extern char **environ;
-@@ -97,7 +97,7 @@
-  */
- void
- unsetenv(name)
--	char	*name;
-+	const char	*name;
- {
- 	extern char **environ;
- 	register char **P;
-
diff --git a/app-text/gv/files/gv-3.6.1-scrollbar.patch b/app-text/gv/files/gv-3.6.1-scrollbar.patch
deleted file mode 100644
index 7b2428335553..000000000000
--- a/app-text/gv/files/gv-3.6.1-scrollbar.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gv-3.6.1/configure~	2004-12-19 19:16:47.000000000 +0100
-+++ gv-3.6.1/configure	2005-10-31 16:11:27.000000000 +0100
-@@ -5354,12 +5354,12 @@
-    { (exit 1); exit 1; }; } ;;
-  esac
- else
--  opt_scrollbar_code=false
-+  opt_scrollbar_code=true
- fi;
- 
- 
- 
--if test x$debug = xtrue; then
-+if test x$opt_scrollbar_code = xtrue; then
-   USE_SCROLLBAR_CODE_TRUE=
-   USE_SCROLLBAR_CODE_FALSE='#'
- else
diff --git a/app-text/gv/gv-3.5.8-r4.ebuild b/app-text/gv/gv-3.5.8-r4.ebuild
deleted file mode 100644
index 71546cec9b21..000000000000
--- a/app-text/gv/gv-3.5.8-r4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.5.8-r4.ebuild,v 1.16 2006/01/29 15:44:27 blubb Exp $
-
-inherit eutils
-
-DESCRIPTION="gv is used to view PostScript and PDF documents using Ghostscript"
-HOMEPAGE="http://wwwthep.physik.uni-mainz.de/~plass/gv/"
-SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gv/unix/${P}.tar.gz
-		mirror://gentoo/${P}-debian.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc amd64 ~mips ~ppc-macos ppc64"
-IUSE=""
-
-RDEPEND="|| ( (
-			x11-libs/libXmu
-			x11-libs/libXpm
-			x11-libs/libXp
-		) virtual/x11
-	)
-	x11-libs/Xaw3d
-	virtual/ghostscript"
-
-# There's probably more, but ghostscript also depends on it,
-# so I can't identify it
-DEPEND="${RDEPEND}
-	|| ( (
-			x11-misc/imake
-			x11-libs/libXt
-		) virtual/x11
-	)"
-PROVIDE="virtual/pdfviewer
-	virtual/psviewer"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${P}-debian.diff
-}
-
-src_compile() {
-
-	use ppc-macos && epatch ${FILESDIR}/${P}-setenv.diff
-
-	cp config.Unix 1
-	sed -e 's:usr/local:usr:' 1 > config.Unix
-	sed -i -e "s:SCRATCH_DIR = ~/:SCRATCH_DIR = /tmp/:g" config.Unix
-	rm 1
-
-	xmkmf || die
-	make Makefiles || die
-
-	cd source
-	sed -i \
-		-e 's/install.man:: gv.man/install.man::/' \
-		-e 's/all:: gv./\#all:: gv./' \
-		-e '/gv.man/ c \#removed by sed for ebuilding' \
-		Makefile
-	if [ ! "`grep gv.man Makefile`" = "" ] ; then
-		ewarn "sed didn't completely remove gv.man references from the Makefile."
-		ewarn "We'll just run make and pray."
-	fi
-
-	cd ${S}
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	make GV_DOCDIR=${D}/usr/share/doc/${PF} install.doc || die
-	newman doc/gv.man gv.1
-}
diff --git a/app-text/gv/gv-3.6.1-r1.ebuild b/app-text/gv/gv-3.6.1-r1.ebuild
deleted file mode 100644
index 4fe65bc737f1..000000000000
--- a/app-text/gv/gv-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.6.1-r1.ebuild,v 1.2 2006/01/03 09:57:25 genstef Exp $
-
-inherit eutils
-
-DESCRIPTION="gv is used to view PostScript and PDF documents using Ghostscript"
-HOMEPAGE="http://www.gnu.org/software/gv/"
-SRC_URI="ftp://ftp.gnu.org/gnu/gv/${P}.tar.gz
-	mirror://debian/pool/main/g/gv/gv_3.6.1-10.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64 ~mips ~ppc-macos ~ppc64"
-IUSE=""
-
-RDEPEND="|| ( (
-			x11-libs/libXmu
-			x11-libs/libXpm
-			x11-libs/libXp
-		) virtual/x11
-	)
-	x11-libs/Xaw3d
-	virtual/ghostscript"
-
-# There's probably more, but ghostscript also depends on it,
-# so I can't identify it
-DEPEND="${RDEPEND}
-	|| ( (
-			x11-misc/imake
-			x11-libs/libXt
-		) virtual/x11
-	)"
-PROVIDE="virtual/pdfviewer
-	virtual/psviewer"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-landscape.patch
-	epatch ${FILESDIR}/${P}-setenv.patch
-	epatch ${FILESDIR}/${P}-a0.patch
-	epatch ${DISTDIR}/gv_3.6.1-10.diff.gz
-	epatch ${FILESDIR}/${P}-scrollbar.patch
-}
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	einstall destdir=${D} || die
-	dodoc AUTHORS ChangeLog INSTALL README TODO
-}
diff --git a/app-text/gv/gv-3.6.1.ebuild b/app-text/gv/gv-3.6.1.ebuild
deleted file mode 100644
index fd0b1a4fc854..000000000000
--- a/app-text/gv/gv-3.6.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.6.1.ebuild,v 1.3 2006/01/03 09:57:25 genstef Exp $
-
-inherit eutils
-
-DESCRIPTION="gv is used to view PostScript and PDF documents using Ghostscript"
-HOMEPAGE="http://www.gnu.org/software/gv/"
-SRC_URI="ftp://ftp.gnu.org/gnu/gv/${P}.tar.gz
-	mirror://debian/pool/main/g/gv/gv_3.6.1-10.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64 ~mips ~ppc-macos ~ppc64"
-IUSE=""
-
-RDEPEND="|| ( (
-			x11-libs/libXmu
-			x11-libs/libXpm
-			x11-libs/libXp
-		) virtual/x11
-	)
-	x11-libs/Xaw3d
-	virtual/ghostscript"
-
-# There's probably more, but ghostscript also depends on it,
-# so I can't identify it
-DEPEND="${RDEPEND}
-	|| ( (
-			x11-misc/imake
-			x11-libs/libXt
-		) virtual/x11
-	)"
-PROVIDE="virtual/pdfviewer
-	virtual/psviewer"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-landscape.patch
-	epatch ${FILESDIR}/${P}-setenv.patch
-	epatch ${FILESDIR}/${P}-a0.patch
-	epatch ${DISTDIR}/gv_3.6.1-10.diff.gz
-}
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	einstall destdir=${D} || die
-	dodoc AUTHORS ChangeLog INSTALL README TODO
-}