From: Ulrich Müller Date: Mon, 28 Nov 2011 08:41:45 +0000 (+0000) Subject: Remove unused patch files. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f41bee4687a1d011d56d2a2e4e4f3e50c9ceb5bc;p=gentoo.git Remove unused patch files. Package-Manager: portage-2.1.10.39/cvs/Linux x86_64 --- 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 + -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 -gnuplot-4.2.6-r2.ebuild, gnuplot-4.4.2-r1.ebuild, gnuplot-4.4.3-r1.ebuild: diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest index e03d1efcc922..b3fea4d35aee 100644 --- a/sci-visualization/gnuplot/Manifest +++ b/sci-visualization/gnuplot/Manifest @@ -1,28 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX gnuplot-4.2.2-disable_texi_generation.patch 763 RMD160 99368c05fe2907f445a49b4d0be782f0384f319e SHA1 17723d5e5a12eef274b6f9216c9a9cbbe05cba1e SHA256 87a3bed1e3be244a511f1cbeb9852484da59decdae75635ae900fbafe5db02f6 -AUX gnuplot-4.2.3-app-defaults.patch 2097 RMD160 d0764b54424cfec60b22e498b8624801559e3526 SHA1 bac7dd281e679a6c638f7ba1b211e13443221486 SHA256 91cab9715e99c5e394ac6e08f17ef8063d3f0b574e0404fc5e6b643b26fddaf3 -AUX gnuplot-4.2.3-disable-texhash.patch 677 RMD160 b299c7425e735ebad6afa1e2d154190fb2f3fdf8 SHA1 6e5f25a0283b2dd887738d8caee7c92d1905b1cc SHA256 af25fded8998eb48ea0b89f9ce0d5322721088c2b69a360ec7928a7f6115873e -AUX gnuplot-4.2.5-configure-pkgconfig.patch 484 RMD160 d1d8031382b8062c393fa430eb69f74f68d93c64 SHA1 e749dbd1cf8047a6274182cc0e2317d3f1b09a2e SHA256 58d0c0106337c5f48ad2f75671566556c055eb58ee016c4a125dbc6fd434d1b6 -AUX gnuplot-gentoo-version.patch 2079 RMD160 394bee0853cb9343864342a2a11a4453af30e22e SHA1 337c0b3b329965c01d75decf49a7ef678e3d46a9 SHA256 c6c1b8a6ccc9d8aeaa12d178f5e91653d4f7f5f9c49eae1feb1ec3f7267670e1 DIST gnuplot-4.4.2.tar.gz 3299690 RMD160 077d6d353e0370d1f8463693380030722f5789af SHA1 35666be22e877ade5e272199d3d81555c141cef5 SHA256 37e8c8d4838fb84a3ad97a6c4823f086b929cb18d6613a2d0e8227ce0d4de9e4 DIST gnuplot-4.4.3-texinfo-update.patch.gz 7519 RMD160 73188caf8edbc84d11b43ea16a93fb5c9bece959 SHA1 dbd8d69214ae99411a2ffcc63f309cd342622865 SHA256 6153e081a0165682b052188a0166408e353a03be5fa1465d889c75f56d32700a DIST gnuplot-4.4.3.tar.gz 3305912 RMD160 90290eb2b6b9404dc520080439bdee9056e61fc4 SHA1 a4d315b9288739e3cbaa04d8ddda7861b4009bd4 SHA256 6faa236ed5c744f34a9ac58ef89dab6177a15c5835dc3644a0a12779439426e6 DIST gnuplot-4.4.4.tar.gz 3328278 RMD160 7e1d039c05c46fa38b53a3c4afbd328509da901d SHA1 d4f143eade1f8d8b27be44cbda431d37a71c6a31 SHA256 d228599d08d5f87bcb79af8af8bb432c77d942802b1643f920c7baaeaf1ddbfd EBUILD gnuplot-4.4.2-r1.ebuild 6158 RMD160 4b31a2b6240fc957304a5db5c3fb3cd37dd12b32 SHA1 5e1eb21a80d67472ecde1648d0ad456431167a2a SHA256 5fef0cb9cd88d3446c98539220fa807b89ae0db5977329ab578a34d01c7bd6eb -EBUILD gnuplot-4.4.3-r1.ebuild 6818 RMD160 a2c9616b1e9c755298b6940754a2b96ba6245e80 SHA1 2fa3180fe50ef9874d9e4c05cebc554f9a08abe7 SHA256 84c75e14e2bb617f5c89e5e9a9be267a64dd38970ef33874b468255920cfd60f +EBUILD gnuplot-4.4.3-r1.ebuild 6822 RMD160 16cf62476b3ee217ddcda45c82e26977ad87c119 SHA1 405efe0aa3edf3e210324fcf36f7a67ac0389490 SHA256 46f55e88250d46f1f309a583ac982a4ee00e5128401e894a527c2b4355260f58 EBUILD gnuplot-4.4.4.ebuild 6722 RMD160 2c63f1f97a845ae641c947bcd61bfb90cb9c9fae SHA1 1415611fd244b95e154800d0e8024de3f0b27f24 SHA256 24eb1b38df2c0c6ff483700e247ffeab1b10c2a95f60da2acdb7e4d78a48f12d -MISC ChangeLog 30986 RMD160 499efbd81630b302ccb48150f826f61d331de470 SHA1 e257574d000bde2c7ee981dd98c6f4373eb180d3 SHA256 f521913486a2fc8b1f744bb031658225e7b9c7c2e65d0493682d53ea22e6c286 +MISC ChangeLog 31317 RMD160 18be2181fddb532c519f1b897a6b2a02e9133a5a SHA1 eb81c3787937041251f99ac27d668be667aab228 SHA256 024d8c927feec0a5f8bf90b3988422f2c3f7b3d19f9e4f076a1e836655d22c75 MISC metadata.xml 827 RMD160 e6b9c60a2d8ad33c3ed2c649ead9e836b1a54fdb SHA1 23524656ce50cf1b1b44fda522c79c6ce78afa1b SHA256 d98221cb62667b8e7eaafa41b3a89be5bf2b9fbfc958b3adde99150839403ea5 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJO0xyXAAoJEOeBhlrCAAWGGwAH/jRhMZ6Pp64ckAXQoyJ51+Sr -IGmsx7qe1AfhfDTyAaBfQ+rIB8do9EBPK1aMLH5QC1fYLoUi6CPEeziWMZldRHFo -f1mSFWCXaDm6hiFqVEnd7g36Orpl+xW9V13jEXNjy0Y3IulT+ktCE9JOBgHY+b2Z -Lk6Z3732e8jbmrXOi2CTq2fDzxQHAD9ieGAriXWHb/UJ8IrKkxV3R+UpCc14rAPg -MwV+DjqooA+nRfTKhWz8RVBAy9/YNaVhEBk1QvzZYpJg2wkbA95GXxh+2vgLrqEC -lPfs95kegxA/3ACKcUgru7+z2QKvkjX35ZNtxxoynQczYL/XLzvtW5kUiu/JjOg= -=8zic +iEYEARECAAYFAk7TS4EACgkQOeoy/oIi7uxwTQCeL4jiarJRXnVC0lLybVs8YxxM +ryYAoN5xdKo37Xaj67Loc8jPT/EBIvAZ +=+DOw -----END PGP SIGNATURE----- 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/"