Remove unused patch files.

(Portage version: 2.1.10.39/cvs/Linux x86_64)

7 files changed, 11 insertions, 188 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index c0f2098cc250..25ebc703b37d 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.169 2011/11/28 05:30:57 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.170 2011/11/28 08:41:45 ulm Exp $
+
+  28 Nov 2011; Ulrich Mueller <ulm@gentoo.org>
+  -files/gnuplot-4.2.2-disable_texi_generation.patch,
+  -files/gnuplot-4.2.3-app-defaults.patch,
+  -files/gnuplot-4.2.3-disable-texhash.patch,
+  -files/gnuplot-4.2.5-configure-pkgconfig.patch, gnuplot-4.4.3-r1.ebuild,
+  -files/gnuplot-gentoo-version.patch:
+  Remove unused patch files.
 
   28 Nov 2011; Christoph Junghans <ottxor@gentoo.org> -gnuplot-4.2.6-r2.ebuild,
   gnuplot-4.4.2-r1.ebuild, gnuplot-4.4.3-r1.ebuild:
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.2-disable_texi_generation.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.2-disable_texi_generation.patch
deleted file mode 100644
index 81d9eee90c86..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.2.2-disable_texi_generation.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/194216
-Texinfo source is already shipped, so separate preparation not needed
-and error-prone
-
---- docs/Makefile.in	2007-10-30 20:35:47.000000000 +0100
-+++ docs/Makefile.in	2007-10-30 21:57:52.000000000 +0100
-@@ -348,16 +348,6 @@
- gnuplot.info: $(srcdir)/gnuplot.texi
- 	$(MAKEINFO) -I$(srcdir) $(srcdir)/gnuplot.texi --no-split --output=$@
- 
--# Thanks to Bruce Ravel for doc2texi.el!
--$(srcdir)/gnuplot.texi: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
--	@echo "Creating texinfo"
--	@if test "$(EMACS)" != no; then \
--	   cd $(srcdir) ;  \
--	   $(EMACS) -batch -l doc2texi.el -f d2t-doc-to-texi ; \
--	else \
--	   echo "No emacs found - cannot create texinfo file" ; \
--	fi
--
- # this is how to make OS/2 ipfc documentation
- ipf: gnuplot.ipf
- 
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch
deleted file mode 100644
index 16e1b0122d78..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-http://bugs.gentoo.org/219323
-Don't store resource files in deprecated location
-Reported upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1953742&group_id=2055&atid=102055
-
---- gnuplot-4.2.3-orig/configure.in	2008-03-04 19:36:53.000000000 +0100
-+++ gnuplot-4.2.3/configure.in	2008-04-26 11:44:59.000000000 +0200
-@@ -1024,6 +1024,10 @@
- fi
- AC_SUBST(LISPDIR)
- 
-+dnl Location of application defaults
-+AC_ARG_VAR(appdefaultdir,[Directory for application defaults])
-+test -z "$appdefaultdir" && appdefaultdir='${sysconfdir}/X11/app-defaults'
-+
- dnl Substitute variables
- AC_SUBST(PACKAGE)
- AC_SUBST(VERSION_MAJOR)
---- gnuplot-4.2.3-orig/share/Makefile.am	2008-03-05 04:38:59.000000000 +0100
-+++ gnuplot-4.2.3/share/Makefile.am	2008-04-26 11:44:59.000000000 +0200
-@@ -5,8 +5,6 @@
- 
- SUBDIRS = LaTeX
- 
--appdefaultdir = $(libdir)/X11/app-defaults
--
- APPDEFAULTFILES = Gnuplot
- 
- appdefault_DATA = $(APPDEFAULTFILES)
---- gnuplot-4.2.3-orig/src/Makefile.am	2007-08-26 19:50:20.000000000 +0200
-+++ gnuplot-4.2.3/src/Makefile.am	2008-04-26 11:44:59.000000000 +0200
-@@ -25,7 +25,10 @@
- noinst_PROGRAMS = bf_test
- 
- XLIBS = @LIBRARIES_FOR_X@
--AM_CPPFLAGS = -I../term -I$(top_srcdir)/term -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\"
-+AM_CPPFLAGS = -I../term -I$(top_srcdir)/term \
-+ -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" \
-+ -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DAppDefDir=\"$(appdefaultdir)\" \
-+ -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\"
- 
- gnuplot_SOURCES = alloc.c alloc.h ansichek.h axis.c axis.h \
- breaders.c breaders.h bitmap.c bitmap.h color.c color.h command.c \
---- gnuplot-4.2.3-orig/src/gplt_x11.c	2007-12-10 00:55:27.000000000 +0100
-+++ gnuplot-4.2.3/src/gplt_x11.c	2008-04-26 11:45:18.000000000 +0200
-@@ -4787,7 +4787,9 @@
- */
- #define On(v) ( !strncasecmp(v, "on", 2) || !strncasecmp(v, "true", 4) )
- 
-+#ifndef AppDefDir
- #define AppDefDir "/usr/lib/X11/app-defaults"
-+#endif
- #ifndef MAXHOSTNAMELEN
- #define MAXHOSTNAMELEN 64
- #endif
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.3-disable-texhash.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.3-disable-texhash.patch
deleted file mode 100644
index 2c0b0aae8ccd..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.2.3-disable-texhash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/201871
-Disable texhash to prevent sandbox violation
-
---- gnuplot-4.2.3-orig/share/LaTeX/Makefile.am	2006-10-02 23:05:30.000000000 +0200
-+++ gnuplot-4.2.3/share/LaTeX/Makefile.am	2008-08-26 20:09:43.000000000 +0200
-@@ -11,8 +11,7 @@
- 	  installdir=`kpsexpand '$$TEXMFLOCAL'/tex/latex/gnuplot |sed "s%^.*share/%$(prefix)/share/%"` ; \
- 	  $(top_srcdir)/mkinstalldirs $(DESTDIR)$$installdir ; \
- 	  if [ ! -f $(DESTDIR)$$installdir/gnuplot.cfg ]; then \
--	    $(INSTALL_DATA) $(srcdir)/gnuplot.cfg $(DESTDIR)$$installdir/gnuplot.cfg && \
--	    texhash; \
-+	    $(INSTALL_DATA) $(srcdir)/gnuplot.cfg $(DESTDIR)$$installdir/gnuplot.cfg; \
- 	  fi ; \
- 	  fi
- 
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.5-configure-pkgconfig.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.5-configure-pkgconfig.patch
deleted file mode 100644
index 7089de6a11ee..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.2.5-configure-pkgconfig.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/233475#c9
-Fix build issue with USE=wxwindows
-Patch from upstream (did not make it into gnuplot-4.2.5)
-
---- configure.in	8 May 2007 22:42:53 -0000	1.219
-+++ configure.in	16 Jul 2007 21:58:43 -0000	1.220
-@@ -853,6 +853,10 @@
-   cp ${srcdir}/tutorial/eg3.dat tutorial
- fi
- 
-+dnl explicit call to PKG_PROG_PKG_CONFIG because the first call to
-+dnl PKG_CHECK_MODULES may not happen
-+PKG_PROG_PKG_CONFIG
-+
- dnl  wxWidgets terminal
- 
- dnl wxWidgets terminal needs C++
diff --git a/sci-visualization/gnuplot/files/gnuplot-gentoo-version.patch b/sci-visualization/gnuplot/files/gnuplot-gentoo-version.patch
deleted file mode 100644
index b1a530a7dfe7..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-gentoo-version.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Add special version identification and Gentoo contact information,
-in order to fulfil provisions 2 through 4 of the gnuplot licence.
-
---- gnuplot-orig/src/plot.c
-+++ gnuplot/src/plot.c
-@@ -383,9 +383,11 @@
- 		    "  -V, --version\n"
- 		    "  -h, --help\n"
- 		    "  -e  \"command1; command2; ...\"\n"
--		    "gnuplot %s patchlevel %s\n"
--		    "Report bugs to %s\n",
--		    gnuplot_version, gnuplot_patchlevel, bug_email);
-+		    "gnuplot %s patchlevel %s (Gentoo revision %s)\n"
-+		    "Report bugs to <%s>\n"
-+		    "or to <%s>\n",
-+		    gnuplot_version, gnuplot_patchlevel, gentoo_revision,
-+		    gentoo_bugtracker, bug_email);
- 	    return 0;
- 	}
-     }
---- gnuplot-orig/src/show.c
-+++ gnuplot/src/show.c
-@@ -1052,7 +1052,7 @@
- 
-     fprintf(fp, "%s\n\
- %s\t%s\n\
--%s\tVersion %s patchlevel %s\n\
-+%s\tVersion %s patchlevel %s (Gentoo revision %s)\n\
- %s\tlast modified %s\n\
- %s\tSystem: %s %s\n\
- %s\n\
-@@ -1063,10 +1063,11 @@
- %s\tThe gnuplot FAQ is available from %s\n\
- %s\n\
- %s\tSend bug reports and suggestions to <%s>\n\
-+%s\tor to <%s>\n\
- %s\n",
- 	    p,			/* empty line */
- 	    p, PROGRAM,
--	    p, gnuplot_version, gnuplot_patchlevel,
-+	    p, gnuplot_version, gnuplot_patchlevel, gentoo_revision,
- 	    p, gnuplot_date,
- 	    p, os_name, os_rel,
- 	    p,			/* empty line */
-@@ -1076,6 +1077,7 @@
- 	    p,			/* Type `help` */
- 	    p, faq_location,
- 	    p,			/* empty line */
-+	    p, gentoo_bugtracker,
- 	    p, bug_email,
- 	    p);			/* empty line */
- 
---- gnuplot-orig/src/version.c
-+++ gnuplot/src/version.c
-@@ -46,6 +46,9 @@
- 
- const char faq_location[] = FAQ_LOCATION;
- 
-+const char gentoo_revision[] = GENTOO_REVISION;
-+const char gentoo_bugtracker[] = "http://bugs.gentoo.org/";
-+
- char *compile_options = (void *)0;	/* Will be loaded at runtime */
- 
- #define RELEASE_VERSION 1
---- gnuplot-orig/src/version.h
-+++ gnuplot/src/version.h
-@@ -47,6 +47,9 @@
- extern const char bug_email[];
- extern const char help_email[];
- 
-+extern const char gentoo_revision[];
-+extern const char gentoo_bugtracker[];
-+
- extern char os_name[];
- extern char os_rel[];
- 
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
index 5e13adeb28b8..6264bbea663c 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild,v 1.12 2011/11/28 05:30:57 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild,v 1.13 2011/11/28 08:41:45 ulm Exp $
 
 EAPI=3
 
-inherit elisp-common multilib wxwidgets
+inherit eutils elisp-common multilib wxwidgets
 
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"