sci-visualization/gnuplot: fixed bug #294467

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

4 files changed, 47 insertions, 31 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 8fcf9bfd2..e55f51c06 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Nov 2009; Christoph Junghans <kleiner_otti@gmx.de>
+  gnuplot-4.5.9999.ebuild, files/gnuplot-4.5.9999-gentoo-version.patch:
+  updated gentoo-version patch (bug #294467
+
 *gnuplot-4.5.9999 (02 Nov 2009)
 
   02 Nov 2009; Christoph Junghans <kleiner_otti@gmx.de>
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index ae363eed2..a8b4718a9 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -4,14 +4,14 @@ Hash: SHA1
 AUX gnuplot-4.2.2-disable_texi_generation.patch 763 RMD160 99368c05fe2907f445a49b4d0be782f0384f319e SHA1 17723d5e5a12eef274b6f9216c9a9cbbe05cba1e SHA256 87a3bed1e3be244a511f1cbeb9852484da59decdae75635ae900fbafe5db02f6
 AUX gnuplot-4.2.3-disable-texhash.patch 677 RMD160 b299c7425e735ebad6afa1e2d154190fb2f3fdf8 SHA1 6e5f25a0283b2dd887738d8caee7c92d1905b1cc SHA256 af25fded8998eb48ea0b89f9ce0d5322721088c2b69a360ec7928a7f6115873e
 AUX gnuplot-4.5.9999-app-defaults.patch 2239 RMD160 a0a8a2152d6b168c0e6188e53a332bc00617a4e4 SHA1 c16852541488e952e99944f260002458fe9cec23 SHA256 a32cb28122d90f817472f73cc24ba9f39a6407a00ed2e5ae7bd6a671dc56020c
-AUX gnuplot-4.5.9999-gentoo-version.patch 2429 RMD160 f4d4ba88080c700e37435d99704e1d755547860a SHA1 e6ff423fc286fa9dc9c0e39a6a149d7a1fd98236 SHA256 21e217693f017911723b43ab58f230784e95273b1d0cda603fec105b0513a403
-EBUILD gnuplot-4.5.9999.ebuild 5846 RMD160 b63bd2174817b28f61fbb1b486389bbeb4f93ff6 SHA1 a5fd53459210ea6c29dfc05a54e972b4aeac3afa SHA256 8444827f97941c813ae45dfca1efab7203b0c89f0b7d627605a64b69db4173f6
-MISC ChangeLog 600 RMD160 cbb255e209ed6564c9d5444d7d88b68b20d8ac3c SHA1 15ec1bab3c7b242bc2cfe521237e56ef5f9c99a8 SHA256 339c0ff55e18a70db5a7b100e98b37ff1172de647d3f83e9569859e622faa976
+AUX gnuplot-4.5.9999-gentoo-version.patch 2768 RMD160 509c8fbd2b25dfd23acb5dd197d9ccff953c8e62 SHA1 c49276d83c260273bf531aab6c53e095f5047a8e SHA256 4aae78fa9d322a7579ea9951cff39d2ed684ab2dd3d67c28032ad15ec076c411
+EBUILD gnuplot-4.5.9999.ebuild 5842 RMD160 56ab983f010783fb89fbbf41ff851ff7f6e8dff0 SHA1 5d5697ece0395338f2877e988b02ca5ea199d706 SHA256 03320fea08d200529657749ad54d6355c9986614935afc7217a6f5ca46941d9e
+MISC ChangeLog 773 RMD160 b3461c914b15ba39557286b2d75138d8f1c5d122 SHA1 01f5eacdc6e98b1c7f5b164afe0c363432432198 SHA256 87986fdf021c2350a3e51833de8c8b6a962d9029c0b486285950fc67865a8a07
 MISC metadata.xml 257 RMD160 f2ffbaee54f8534e419eea137c2a4da199b8b06c SHA1 502dbf5dd161bee261a494c5aedd6ee339090cc7 SHA256 f0ff74df1828056b76a2c69ee634fefe487987533698f6d4c2403f20f707b9c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrvTUEACgkQy0OE/ans1/nLIQCeLcJQiIGNt+5oaY1O17SK4ydW
-zvIAn1hou0hW1zKdbMLThdfgrNwm9YLS
-=M5Xt
+iEYEARECAAYFAksRGnYACgkQy0OE/ans1/njrgCfRJhbO1cSBcLmFHqH5cKohnLa
+suYAn1rGh0x/D1FOmQP731MPiCpl6Wqq
+=+gxE
 -----END PGP SIGNATURE-----
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[];
diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
index 94a93cf41..d534fa8ac 100644
--- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
@@ -167,7 +167,7 @@ src_install () {
 		cd ..
 	fi
 
-	dodoc BUGS ChangeLog FAQ NEWS PATCHLEVEL PGPKEYS PORTING README* \
+	dodoc BUGS ChangeLog NEWS PATCHLEVEL PGPKEYS PORTING README* \
 		TODO VERSION
 	use lua && newdoc term/lua/README README-lua