sci-visualization/gnuplot: fixed bug #294467

(Portage version: 2.1.6.13/git/Linux i686)
 (Signed Manifest commit)

1 files changed, 36 insertions, 24 deletions

diff --git a/sci-visualization/gnuplot/files/gnuplot-4.5.9999-gentoo-version.patch b/sci-visualization/gnuplot/files/gnuplot-4.5.9999-gentoo-version.patch
index f3ecf426d..505b7438e 100644
--- a/sci-visualization/gnuplot/files/gnuplot-4.5.9999-gentoo-version.patch
+++ b/sci-visualization/gnuplot/files/gnuplot-4.5.9999-gentoo-version.patch
@@ -1,8 +1,33 @@
 Add special version identification and Gentoo contact information,
 in order to fulfil provisions 2 through 4 of the gnuplot licence.
 
+--- docs/gnuplot.doc	26 Nov 2009 17:23:45 -0000	1.590
++++ docs/gnuplot.doc	28 Nov 2009 12:06:11 -0000
+@@ -204,6 +204,8 @@
+ 
+  Bug reports and code contributions should be uploaded to the trackers at
+            http://sourceforge.net/projects/gnuplot/support
++ and
++           http://bugs.gentoo.org/
+  Please check previous bug reports if the bug you want to report has not been
+  already fixed in a newer version of gnuplot.
+ 
+--- docs/gnuplot.texi	18 Oct 2009 21:31:13 -0000	1.125
++++ docs/gnuplot.texi	28 Nov 2009 12:06:18 -0000
+@@ -330,6 +330,11 @@
+       http://sourceforge.net/projects/gnuplot
+ 
+ @end example
++and
++@example
++      http://bugs.gentoo.org/
++
++@end example
+ 
+ The list of those interested in beta-test versions is:
+ @example
 --- src/plot.c	31 Oct 2009 03:22:37 -0000	1.105
-+++ src/plot.c	2 Nov 2009 20:08:59 -0000
++++ src/plot.c	28 Nov 2009 12:06:18 -0000
 @@ -374,9 +374,11 @@
  		    "  -h, --help\n"
  		    "  -p  --persist\n"
@@ -18,24 +43,19 @@ in order to fulfil provisions 2 through 4 of the gnuplot licence.
  	    return 0;
  
  	} else if (!strncmp(argv[i], "-persist", 2) || !strcmp(argv[i], "--persist")) {
---- src/show.c	31 Oct 2009 21:58:47 -0000	1.228
-+++ src/show.c	2 Nov 2009 20:09:00 -0000
-@@ -1015,7 +1015,7 @@
- 
-     fprintf(fp, "%s\n\
+--- src/show.c	16 Nov 2009 10:29:37 -0000	1.229
++++ src/show.c	28 Nov 2009 12:06:19 -0000
+@@ -1017,7 +1017,7 @@
+     strcpy(fmt, "\
+ %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\
-@@ -1027,11 +1027,12 @@
- %s\tgnuplot home:     http://www.gnuplot.info\n\
- %s\tgnuplot FAQ:      FAQ.pdf and %s\n\
- %s\treport bugs:      http://sf.net/projects/gnuplot/support\n\
-+%s\tgentoo bugs:      %s\n\
- %s\tmailing list:     %s\n\
- %s\n",
+@@ -1038,7 +1038,7 @@
+     fprintf(fp, fmt,
  	    p,			/* empty line */
  	    p, PROGRAM,
 -	    p, gnuplot_version, gnuplot_patchlevel,
@@ -43,16 +63,8 @@ in order to fulfil provisions 2 through 4 of the gnuplot licence.
  	    p, gnuplot_date,
  	    p, os_name, os_rel,
  	    p,			/* empty line */
-@@ -1043,6 +1044,7 @@
- 	    p,			/* empty line */
- 	    p, faq_location,	/* FAQ */
- 	    p,			/* empty line */
-+	    p, gentoo_bugtracker,
- 	    p, help_email,	/* mailing list */
- 	    p);			/* empty line */
- 
---- src/version.c	18 Oct 2009 21:10:06 -0000	1.93
-+++ src/version.c	2 Nov 2009 20:09:00 -0000
+--- src/version.c	5 Nov 2009 19:19:38 -0000	1.94
++++ src/version.c	28 Nov 2009 12:06:19 -0000
 @@ -46,6 +46,9 @@
  
  const char faq_location[] = FAQ_LOCATION;
@@ -64,7 +76,7 @@ in order to fulfil provisions 2 through 4 of the gnuplot licence.
  
  /* #define RELEASE_VERSION 1 */
 --- src/version.h	5 Aug 2006 21:33:15 -0000	1.5
-+++ src/version.h	2 Nov 2009 20:09:00 -0000
++++ src/version.h	28 Nov 2009 12:06:19 -0000
 @@ -47,6 +47,9 @@
  extern const char bug_email[];
  extern const char help_email[];