old, incompatible with stable png

Package-Manager: portage-2.2.0_alpha71_p73/cvs/Linux x86_64

10 files changed, 18 insertions, 444 deletions

diff --git a/media-libs/plotutils/ChangeLog b/media-libs/plotutils/ChangeLog
index 511f0537d821..7045a133ea36 100644
--- a/media-libs/plotutils/ChangeLog
+++ b/media-libs/plotutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/plotutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.58 2011/03/23 17:55:05 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.59 2011/10/31 16:07:05 ssuominen Exp $
+
+  31 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -plotutils-2.4.1-r4.ebuild, -files/plotutils-2.4.1-correct_test.patch,
+  -files/plotutils-2.4.1-gentoo.patch, -files/plotutils-2.4.1-rangecheck.patch,
+  -plotutils-2.5.ebuild, -plotutils-2.5.1.ebuild,
+  -files/plotutils-2.5.1-fix-tests.patch,
+  -files/plotutils-2.5-rangecheck.patch:
+  old
 
   23 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> plotutils-2.6.ebuild:
   ppc/ppc64 stable wrt #353433
diff --git a/media-libs/plotutils/Manifest b/media-libs/plotutils/Manifest
index 42c6645a77ce..3b546708760a 100644
--- a/media-libs/plotutils/Manifest
+++ b/media-libs/plotutils/Manifest
@@ -1,30 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX plotutils-2.4.1-correct_test.patch 693 RMD160 6651493db76b5151fab648e9f7407f09cc72d3d4 SHA1 22990ee2bc25d633f8e44261af3621fb5f7070ce SHA256 5a029cdfb118977236c09f9ca1d9214ffa1fbbd7279ac414b2154281daf5cf8d
-AUX plotutils-2.4.1-gentoo.patch 2619 RMD160 369fe57883906de848cc4dbf3ce87658ec5fa12a SHA1 eaa92cc7a0d83e61b2db4bdcf20dfb6f68a67e7c SHA256 c736cc1e56c2b0e87bd2974288d2da7b1f235ca161a4bf638e7c5fdaae752534
-AUX plotutils-2.4.1-rangecheck.patch 1858 RMD160 bd7e70840a7031fe85419be38d6d77dfde585f1b SHA1 d00a9d7067d3c22ae444213312e8f313923d8801 SHA256 79db278a29e1332bd2c1025d916906766032e30d9cf43a91ff6018a81f9a629c
-AUX plotutils-2.5-rangecheck.patch 1054 RMD160 55403e9c62f5a4e7b501c2a2edf3bc53bd6fa6e6 SHA1 03ab4724638e1201824dc24e069aecd6ee59e1f3 SHA256 f500b59d3262c54dcae740617a9c8b4fc3d1c64393f3735eb33feb6f1b08fd94
-AUX plotutils-2.5.1-fix-tests.patch 3155 RMD160 b6ad91763473db2c64eb088686eabbc290286b30 SHA1 414ac884a8d3391ea7e3eb2186370437192dee05 SHA256 b0d48766fcf3410f6f9a539e27ddccbea72fc72f4227c00f2d2fd7cd7c2d06d7
 AUX plotutils-2.5.1-rangecheck.patch 792 RMD160 238adf7049b776a609a5dfa7ae5864f554054e3c SHA1 8e233a9960631abfe90c6c1a672be33b014fd657 SHA256 492e98caa77ab7b7baa80d5b2a1b0a92f4042bcdf13ee73f6c9155ffb363f43a
 AUX plotutils-2.6-libpng-1.5.patch 575 RMD160 f04f9a4a27dc9afc20577850922c6859c3d21df2 SHA1 426f6ee04186af5059ab54322efaf0a6a976682b SHA256 4c24410f137f2d07131ebd2d3a2b72897cd1a9e25b8cdf09696d96e3cb49d46d
 AUX plotutils-2.6-makefile.patch 2921 RMD160 3856f8a90e26ae715420a3333f081b7d895e2262 SHA1 2e44af9522edeaee0e89dc6bac72c967098c0792 SHA256 d94474025b8f71ff28fdc65a49343defa87074383349b4679dc6e1a9315d0f4d
-DIST plotutils-2.4.1.tar.gz 3316030 RMD160 02dd8d914cc769e10beb2e556efb7fe76350370d SHA1 e39ce89048a578683ad76f3284bb79adfb0adc22 SHA256 117638fb606a2ab56147f7e72bc872f6a65eee492ff2430e1f9d614acae50668
-DIST plotutils-2.5.1.tar.gz 3630999 RMD160 f6ee967ea32818f63d6ccf2c581ed0c2963a52ea SHA1 19e27da53f2c3b6227584c6bdf88759f217926f0 SHA256 c6a54c7089d3b9ede8584b8dc30fbd2efc9a99efa426f3ab5e7e947921839cf1
-DIST plotutils-2.5.tar.gz 3686955 RMD160 106ee9c827fc6eef99762f88afb0f85a42e2e300 SHA1 156c2a4d3a950d627ff2fb50dffe9a098cbc50a1 SHA256 b402546feb34f6762faf26aa7c621c6261f79d2eb4d9a2b26824855203c26826
 DIST plotutils-2.6.tar.gz 3657562 RMD160 2a32244eb20e00b82a0742dde7b690f688e82774 SHA1 7921301d9dfe8991e3df2829bd733df6b2a70838 SHA256 4f4222820f97ca08c7ea707e4c53e5a3556af4d8f1ab51e0da6ff1627ff433ab
-EBUILD plotutils-2.4.1-r4.ebuild 2615 RMD160 0f67113c6edee1119755d24a354c18cd2c79e4ad SHA1 4b8029b7076ee513400ffbf1f0eac13787e8e64c SHA256 1f8f22145369683bedc7bf04b7d2669bd1d02b9017b78a3a89a7ae99fe8e8bc2
-EBUILD plotutils-2.5.1.ebuild 2555 RMD160 ae2715330cc97b396aaeb35ba44a237fc39a49ba SHA1 ca6f01c87b537e7a831d2e200c994123b9b443e0 SHA256 6c3d44f45c252ffa84bfa090bda02dd2ee1b8b83dacae6bed82433ad0eee0ac1
-EBUILD plotutils-2.5.ebuild 2517 RMD160 7fe0cdfe5f967e7c9e40931c5bd37f37fb725db6 SHA1 241b7c45020e3e1bf67bee70f3b98cb43920c7e4 SHA256 c87a3013e090d4c1e0552323e64ccfd9d6ec1f7fa72f39127926be8324f079f9
 EBUILD plotutils-2.6.ebuild 1979 RMD160 f5cd489ae2770cd67c8109e15644c9a9c46199ab SHA1 f4175df895f3f4c350423875a97aceae6b9cb6b6 SHA256 8b251b77dbc98896e05028e7c48114c3db57d8f8be41c27274739c73fbce1b0b
-MISC ChangeLog 7497 RMD160 52148742cfb5b613c8b7cd6f316f035d22990f1e SHA1 e32131477dcab13552ff3f1d8a92ec4d5084e76b SHA256 f54b39652501006c704d27539a20477b7ab41add798b3944af17713e9948cc7d
+MISC ChangeLog 7843 RMD160 1e011996f47c3a27614b0f912e8717670986467a SHA1 a31ce8e089a9b48af88b8da44a5e61cd50249af5 SHA256 ac567470ec13b64664d067a3ea2b9e8666f5f79437bdd9426df117ca99127544
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk2KM/8ACgkQIiMqcbOVdxSxLgP/VUIhAgTS8cUf/J14Kasm1TMt
-ugXLUzlDxUf6dw53NvgE6GA6/Je3HvYIbno24PDIbZ+ryrz7qPLy0sp+dl5AkDK6
-Ke5X2dRK0JapsbOxdHq/3BMTsZM1HyoSvsMZf/s/C56XaHxdWz7OuOqeYHBCixG1
-kuAPFUdW7RjDFVB03Q0=
-=mVtO
+iQEcBAEBAgAGBQJOrsemAAoJEEdUh39IaPFNTPgIAI6ooBQzsTwwlwy0ZTZgoM8Q
+VL645EfOaRvrCHxMND57qtvvheDNSNpCNYZwQOeWNPenAyDWH+nKiutBs8jxCYdp
+vY3WF1/lP5lawyFDoonNMren6WDC6TqDEmDQ5CifEhhWQ1Wyt69ag65peygMwspk
+GrdnSgGBv+MZ3jfCvZf+O1seo6MzJ+kJBjo4VrDW05AhAd/ne4NMkGHfqKYpx50V
+HKMOrQDhNwBh2nNcTVCm0On9Qhq1YVHPEuvNbt6iJ210/M1G9HPggVdU8b7AScA5
+7idvwO+UQVThcZg0hF+fYrgftQBJPDLVNipj/djgInr+YvMvxNSMHIXMielXv4U=
+=zz/2
 -----END PGP SIGNATURE-----
diff --git a/media-libs/plotutils/files/plotutils-2.4.1-correct_test.patch b/media-libs/plotutils/files/plotutils-2.4.1-correct_test.patch
deleted file mode 100644
index 9b92e34e9b37..000000000000
--- a/media-libs/plotutils/files/plotutils-2.4.1-correct_test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/test/plot2ps.xout	2007-03-13 07:23:11.000000000 +0100
-+++ b//test/plot2ps.xout	2007-03-13 07:23:46.000000000 +0100
-@@ -1,7 +1,6 @@
- %!PS-Adobe-3.0 EPSF-3.0
- %%Creator: GNU libplot drawing library 4.1
- %%Title: PostScript plot
--%%CreationDate: Fri Jun 16 21:08:33 2000
- %%DocumentData: Clean7Bit
- %%LanguageLevel: 1
- %%Pages: 1
-@@ -294,7 +293,7 @@
- gsave
- fgred fggreen fgblue setrgbcolor
- /fontDict printFont findfont printSize scalefont dup setfont def
--/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end
-+/descender fontDict begin 0 fontDict /FontBBox get 1 get FontMatrix end
- transform exch pop def
- /vertoffset 1 printSize sub descender sub def {
- 0 vertoffset moveto show
diff --git a/media-libs/plotutils/files/plotutils-2.4.1-gentoo.patch b/media-libs/plotutils/files/plotutils-2.4.1-gentoo.patch
deleted file mode 100644
index 136cd060d315..000000000000
--- a/media-libs/plotutils/files/plotutils-2.4.1-gentoo.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- plotutils-2.4.1/libplot/g_write.c~	Fri May 19 18:10:01 2000
-+++ plotutils-2.4.1/libplot/g_write.c	Sun Jun 16 03:22:30 2002
-@@ -40,7 +40,7 @@
-     }
- #ifdef LIBPLOTTER
-   else if (data->outstream)
--    data->outstream->write(c, n);
-+    data->outstream->write ((const char*)c, n);
- #endif
- }
- 
---- plotutils-2.4.1/libplot/i_rle.c~	Sun Jun 27 18:58:10 1999
-+++ plotutils-2.4.1/libplot/i_rle.c	Sun Jun 16 03:22:30 2002
-@@ -78,7 +78,7 @@
-   else if (rle->outstream)
-     {
-       rle->outstream->put ((unsigned char)(rle->oblen));
--      rle->outstream->write (&(rle->oblock[0]), rle->oblen);
-+      rle->outstream->write ((const char*)(&rle->oblock[0]), rle->oblen);
-     }
- #endif  
- 
---- plotutils-2.4.1/libplot/n_write.c~	Fri Jun 16 07:42:13 2000
-+++ plotutils-2.4.1/libplot/n_write.c	Sun Jun 16 03:22:30 2002
-@@ -208,7 +208,7 @@
- 		  linebuf[pos++] = '0';
- 		if (pos >= MAX_PBM_PIXELS_PER_LINE || i == (width - 1))
- 		  {
--		    stream->write (linebuf, pos);
-+		    stream->write ((const char*)linebuf, pos);
- 		    stream->put ('\n');
- 
- 		    pos = 0;
-@@ -253,7 +253,7 @@
- 		  rowbuf[bytecount++] = outbyte;
- 		}
- 	      /* emit row of bytes */
--	      stream->write (rowbuf, bytecount);
-+	      stream->write ((const char*)rowbuf, bytecount);
- 	    }
- 
- 	  free (rowbuf);
-@@ -366,7 +366,7 @@
- 		num_pixels++;
- 		if (num_pixels >= MAX_PGM_PIXELS_PER_LINE || i == (width - 1))
- 		  {
--		    stream->write (linebuf, pos);
-+		    stream->write ((const char*)linebuf, pos);
- 		    stream->put ('\n');
- 
- 		    num_pixels = 0;
-@@ -392,7 +392,7 @@
- 	    {
- 	      for (i = 0; i < width; i++)
- 		rowbuf[i] = pixmap[j][i].u.rgb[0];
--	      stream->write (rowbuf, width);
-+	      stream->write ((const char*)rowbuf, width);
- 	    }
- 	  free (rowbuf);
- 	}
-@@ -514,7 +514,7 @@
- 		num_pixels++;
- 		if (num_pixels >= MAX_PPM_PIXELS_PER_LINE || i == (width - 1))
- 		  {
--		    stream->write (linebuf, pos);
-+		    stream->write ((const char*)linebuf, pos);
- 		    stream->put ('\n');
- 
- 		    num_pixels = 0;
-@@ -542,7 +542,7 @@
- 	      for (i = 0; i < width; i++)
- 		for (component = 0; component < 3; component++)
- 		  rowbuf[3 * i + component] = pixmap[j][i].u.rgb[component];
--	      stream->write (rowbuf, 3 * width);
-+	      stream->write ((const char*)rowbuf, 3 * width);
- 	    }
- 	  free (rowbuf);
- 	}
---- plotutils-2.4.1/libplot/z_write.c~	Tue Jun 20 06:34:42 2000
-+++ plotutils-2.4.1/libplot/z_write.c	Sun Jun 16 03:22:30 2002
-@@ -484,7 +484,7 @@
-   ostream *stream;
- 
-   stream = (ostream *)png_get_io_ptr (png_ptr);
--  stream->write (data, length);
-+  stream->write ((const char*)data, length);
- }
- 
- static void 
diff --git a/media-libs/plotutils/files/plotutils-2.4.1-rangecheck.patch b/media-libs/plotutils/files/plotutils-2.4.1-rangecheck.patch
deleted file mode 100644
index d3346b74ab0a..000000000000
--- a/media-libs/plotutils/files/plotutils-2.4.1-rangecheck.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-*** plotutils-2.4.1/graph/plotter.c.orig	Thu Mar  2 22:05:24 2000

---- plotutils-2.4.1/graph/plotter.c	Tue Apr 29 01:48:09 2003

-***************

-*** 1045,1051 ****

-    multigrapher->x_trans.output_min = 0.0;

-    multigrapher->x_trans.output_max = (double)PLOT_SIZE;

-    multigrapher->x_trans.output_range = multigrapher->x_trans.output_max - multigrapher->x_trans.output_min;

-!   multigrapher->x_trans.output_min = 0.0;

-    multigrapher->y_trans.output_max = (double)PLOT_SIZE;

-    multigrapher->y_trans.output_range = multigrapher->y_trans.output_max - multigrapher->y_trans.output_min;

-  

---- 1045,1051 ----

-    multigrapher->x_trans.output_min = 0.0;

-    multigrapher->x_trans.output_max = (double)PLOT_SIZE;

-    multigrapher->x_trans.output_range = multigrapher->x_trans.output_max - multigrapher->x_trans.output_min;

-!   multigrapher->y_trans.output_min = 0.0;

-    multigrapher->y_trans.output_max = (double)PLOT_SIZE;

-    multigrapher->y_trans.output_range = multigrapher->y_trans.output_max - multigrapher->y_trans.output_min;

-  

-*** plotutils-2.4.1/libplot/p_header.h.orig	Mon Sep  6 01:08:46 1999

---- plotutils-2.4.1/libplot/p_header.h	Wed Dec  3 23:43:54 2003

-***************

-*** 288,294 ****

-  gsave\n\

-  fgred fggreen fgblue setrgbcolor\n\

-  /fontDict printFont findfont printSize scalefont dup setfont def\n\

-! /descender fontDict begin 0 [FontBBox] 1 get FontMatrix end\n\

-  transform exch pop def\n\

-  /vertoffset 1 printSize sub descender sub def {\n\

-  0 vertoffset moveto show\n\

---- 288,294 ----

-  gsave\n\

-  fgred fggreen fgblue setrgbcolor\n\

-  /fontDict printFont findfont printSize scalefont dup setfont def\n\

-! /descender fontDict begin 0 fontDict /FontBBox get 1 get FontMatrix end\n\

-  transform exch pop def\n\

-  /vertoffset 1 printSize sub descender sub def {\n\

-  0 vertoffset moveto show\n\

diff --git a/media-libs/plotutils/files/plotutils-2.5-rangecheck.patch b/media-libs/plotutils/files/plotutils-2.5-rangecheck.patch
deleted file mode 100644
index 16dd2cd07738..000000000000
--- a/media-libs/plotutils/files/plotutils-2.5-rangecheck.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** plotutils-2.4.1/graph/plotter.c.orig	Thu Mar  2 22:05:24 2000

---- plotutils-2.4.1/graph/plotter.c	Tue Apr 29 01:48:09 2003

-***************

-*** 1045,1051 ****

-    multigrapher->x_trans.output_min = 0.0;

-    multigrapher->x_trans.output_max = (double)PLOT_SIZE;

-    multigrapher->x_trans.output_range = multigrapher->x_trans.output_max - multigrapher->x_trans.output_min;

-!   multigrapher->x_trans.output_min = 0.0;

-    multigrapher->y_trans.output_max = (double)PLOT_SIZE;

-    multigrapher->y_trans.output_range = multigrapher->y_trans.output_max - multigrapher->y_trans.output_min;

-  

---- 1045,1051 ----

-    multigrapher->x_trans.output_min = 0.0;

-    multigrapher->x_trans.output_max = (double)PLOT_SIZE;

-    multigrapher->x_trans.output_range = multigrapher->x_trans.output_max - multigrapher->x_trans.output_min;

-!   multigrapher->y_trans.output_min = 0.0;

-    multigrapher->y_trans.output_max = (double)PLOT_SIZE;

-    multigrapher->y_trans.output_range = multigrapher->y_trans.output_max - multigrapher->y_trans.output_min;

-  

diff --git a/media-libs/plotutils/files/plotutils-2.5.1-fix-tests.patch b/media-libs/plotutils/files/plotutils-2.5.1-fix-tests.patch
deleted file mode 100644
index 889c2b2b374c..000000000000
--- a/media-libs/plotutils/files/plotutils-2.5.1-fix-tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Source: Santiago M. Mola <coldwind@gentoo.org>
-Upstream: Sent.
-Reason: Reference test results are outdated.(Gentoo bug #238818).
---- plotutils-2.5.1.orig/test/plot2ps.xout	2008-09-26 23:48:15.000000000 +0200
-+++ plotutils-2.5.1/test/plot2ps.xout	2008-09-26 23:48:35.000000000 +0200
-@@ -1,5 +1,5 @@
- %!PS-Adobe-3.0 EPSF-3.0
--%%Creator: GNU libplot drawing library 4.2
-+%%Creator: GNU libplot drawing library 4.3
- %%Title: PostScript plot
- %%CreationDate: Fri Dec  9 13:09:44 2005
- %%DocumentData: Clean7Bit
-diff -ur plotutils-2.5.1.orig/test/plot2svg.xout plotutils-2.5.1/test/plot2svg.xout
---- plotutils-2.5.1.orig/test/plot2svg.xout	2008-09-26 23:48:15.000000000 +0200
-+++ plotutils-2.5.1/test/plot2svg.xout	2008-09-26 23:57:27.000000000 +0200
-@@ -2,10 +2,10 @@
- <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
- <svg version="1.1" baseProfile="full" id="body" width="8in" height="8in" viewBox="0 0 1 1" preserveAspectRatio="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
- <title>SVG drawing</title>
--<desc>This was produced by version 4.2 of GNU libplot, a free library for exporting 2-D vector graphics.</desc>
-+<desc>This was produced by version 4.3 of GNU libplot, a free library for exporting 2-D vector graphics.</desc>
- <rect id="background" x="0" y="0" width="1" height="1" stroke="none" fill="white"/>
--<g id="content" transform="translate(0,1) scale(1,-1) scale(0.00024414) " xml:space="preserve" stroke="black" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10.433" stroke-dasharray="none" stroke-dashoffset="0" stroke-opacity="1" fill="none" fill-rule="even-odd" fill-opacity="1" font-style="normal" font-variant="normal" font-weight="normal" font-stretch="normal" font-size-adjust="none" letter-spacing="normal" word-spacing="normal" text-anchor="start">
--<text transform="translate(2048,3222.5) scale(1,-1) " font-family="Times-Roman,Times,serif" font-size="184.32px" text-anchor="middle" alignment-baseline="text-after-edge" stroke="none" fill="black" >A Sample Plot</text>
-+<g id="content" transform="translate(0,1) scale(1,-1) scale(0.00024414) " xml:space="preserve" stroke="black" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10.433" stroke-dasharray="none" stroke-dashoffset="0" stroke-opacity="1" fill="none" fill-rule="evenodd" fill-opacity="1" font-style="normal" font-variant="normal" font-weight="normal" font-stretch="normal" font-size-adjust="none" letter-spacing="normal" word-spacing="normal" text-anchor="start">
-+<text transform="translate(2048,3262.7) scale(1,-1) scale(9.216) " font-family="Times-Roman,Times,serif" font-size="20px" text-anchor="middle" stroke="none" fill="black" >A Sample Plot</text>
- <rect x="1024" y="1024" width="2048" height="2048" stroke-width="4.8188" />
- <polyline points="1001.7,946.04 1001.7,886.46 994.21,882.73 " stroke-width="5.2876" stroke-linecap="round" stroke-linejoin="round" />
- <polyline points="1005.4,942.31 1005.4,886.46 1016.6,879.01 " stroke-width="5.2876" stroke-linecap="round" stroke-linejoin="round" />
diff --git a/media-libs/plotutils/plotutils-2.4.1-r4.ebuild b/media-libs/plotutils/plotutils-2.4.1-r4.ebuild
deleted file mode 100644
index 69047e7212a0..000000000000
--- a/media-libs/plotutils/plotutils-2.4.1-r4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.4.1-r4.ebuild,v 1.14 2007/07/22 09:33:22 dberkholz Exp $
-
-inherit libtool eutils flag-o-matic
-
-#The plotutils package contains extra X fonts.	These fonts are not installed
-#in the current ebuild.	 The commented out ebuild lines below are for future
-#reference when this ebuild may be updated to install the fonts.
-#NOTE: The current method does not play nice with X and sandbox.  Most of the
-#font installation procedures should probably be moved to pkg_postinst.
-#See Bug# 30 at http://bugs.gentoo.org/show_bug.cgi?id=30
-
-DESCRIPTION="a powerful C/C++ function library for exporting 2-D vector graphics"
-HOMEPAGE="http://www.gnu.org/software/plotutils/"
-SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="X"
-
-DEPEND="media-libs/libpng
-	X? ( x11-libs/libXaw
-		x11-proto/xextproto
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/plotutils-2.4.1-gentoo.patch"
-	epatch "${FILESDIR}/plotutils-2.4.1-rangecheck.patch"
-	epatch "${FILESDIR}/plotutils-2.4.1-correct_test.patch"
-
-}
-
-src_compile() {
-	replace-cpu-flags k6 k6-2 k6-3 i586
-	elibtoolize
-
-	#enable build of C++ version
-	local myconf="--enable-libplotter"
-
-	#The following two additional configure options may be of interest
-	#to users with specific printers, i.e. HP LaserJets with PCL 5 or HP-GL/2.
-	#Not sure if enabling screws the pooch for those without these printers.
-	#--enable-ps-fonts-in-pcl --enable-lj-fonts-in-ps
-
-	use X \
-		&& myconf="${myconf} --with-x --enable-libxmi" \
-		|| myconf="${myconf} --without-x"
-
-	econf ${myconf} || die "./configure failed"
-	emake || die "Parallel Make Failed"
-}
-
-src_install() {
-	einstall datadir="${D}/usr/share" || die "Installation Failed"
-
-	dodoc AUTHORS COMPAT ChangeLog INSTALL* \
-		KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO
-}
-
-pkg_postinst() {
-	if use X; then
-		elog "There are extra fonts available in plotutils package."
-		elog "The current ebuild does not install them for you."
-		elog "You may want to do so, but you will have to do it"
-		elog "manually. You are on your own for now."
-		elog "See /usr/share/doc/${P}/INSTALL.fonts"
-		elog ""
-		elog "If you manually install the extra fonts and use the"
-		elog "program xfig, you might want to recompile to take"
-		elog "advantage of the additional ps fonts."
-		elog "Also, it is possible to enable ghostscript and possibly"
-		elog "your printer to use the HP fonts."
-	fi
-}
diff --git a/media-libs/plotutils/plotutils-2.5.1.ebuild b/media-libs/plotutils/plotutils-2.5.1.ebuild
deleted file mode 100644
index 6adc677b3f8e..000000000000
--- a/media-libs/plotutils/plotutils-2.5.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.5.1.ebuild,v 1.8 2009/01/07 15:58:17 ranger Exp $
-
-inherit libtool eutils flag-o-matic
-
-#The plotutils package contains extra X fonts.	These fonts are not installed
-#in the current ebuild.	 The commented out ebuild lines below are for future
-#reference when this ebuild may be updated to install the fonts.
-#NOTE: The current method does not play nice with X and sandbox.  Most of the
-#font installation procedures should probably be moved to pkg_postinst.
-#See Bug# 30 at http://bugs.gentoo.org/show_bug.cgi?id=30
-
-DESCRIPTION="a powerful C/C++ function library for exporting 2-D vector graphics"
-HOMEPAGE="http://www.gnu.org/software/plotutils/"
-SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE="X"
-
-DEPEND="media-libs/libpng
-	X? ( x11-libs/libXaw
-		x11-proto/xextproto
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-rangecheck.patch"
-	epatch "${FILESDIR}/${P}-fix-tests.patch"
-	elibtoolize
-}
-
-src_compile() {
-	# bug #14488
-	replace-cpu-flags k6 k6-2 k6-3 i586
-
-	#enable build of C++ version
-	local myconf="--enable-libplotter"
-
-	#The following two additional configure options may be of interest
-	#to users with specific printers, i.e. HP LaserJets with PCL 5 or HP-GL/2.
-	#Not sure if enabling screws the pooch for those without these printers.
-	#--enable-ps-fonts-in-pcl --enable-lj-fonts-in-ps
-
-	use X \
-		&& myconf="${myconf} --with-x --enable-libxmi" \
-		|| myconf="${myconf} --without-x"
-
-	econf ${myconf} || die "./configure failed"
-	emake || die "Parallel Make Failed"
-}
-
-src_install() {
-	einstall datadir="${D}/usr/share" || die "Installation Failed"
-
-	dodoc AUTHORS COMPAT ChangeLog INSTALL* \
-		KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO
-}
-
-pkg_postinst() {
-	if use X; then
-		elog "There are extra fonts available in plotutils package."
-		elog "The current ebuild does not install them for you."
-		elog "You may want to do so, but you will have to do it"
-		elog "manually. You are on your own for now."
-		elog "See /usr/share/doc/${P}/INSTALL.fonts"
-		elog ""
-		elog "If you manually install the extra fonts and use the"
-		elog "program xfig, you might want to recompile to take"
-		elog "advantage of the additional ps fonts."
-		elog "Also, it is possible to enable ghostscript and possibly"
-		elog "your printer to use the HP fonts."
-	fi
-}
diff --git a/media-libs/plotutils/plotutils-2.5.ebuild b/media-libs/plotutils/plotutils-2.5.ebuild
deleted file mode 100644
index 883c45c23bdc..000000000000
--- a/media-libs/plotutils/plotutils-2.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.5.ebuild,v 1.2 2008/10/15 13:13:23 aballier Exp $
-
-inherit libtool eutils flag-o-matic
-
-#The plotutils package contains extra X fonts.	These fonts are not installed
-#in the current ebuild.	 The commented out ebuild lines below are for future
-#reference when this ebuild may be updated to install the fonts.
-#NOTE: The current method does not play nice with X and sandbox.  Most of the
-#font installation procedures should probably be moved to pkg_postinst.
-#See Bug# 30 at http://bugs.gentoo.org/show_bug.cgi?id=30
-
-DESCRIPTION="a powerful C/C++ function library for exporting 2-D vector graphics"
-HOMEPAGE="http://www.gnu.org/software/plotutils/"
-SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE="X"
-
-DEPEND="media-libs/libpng
-	X? ( x11-libs/libXaw
-		x11-proto/xextproto
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/plotutils-2.5-rangecheck.patch"
-
-}
-
-src_compile() {
-	replace-cpu-flags k6 k6-2 k6-3 i586
-	elibtoolize
-
-	#enable build of C++ version
-	local myconf="--enable-libplotter"
-
-	#The following two additional configure options may be of interest
-	#to users with specific printers, i.e. HP LaserJets with PCL 5 or HP-GL/2.
-	#Not sure if enabling screws the pooch for those without these printers.
-	#--enable-ps-fonts-in-pcl --enable-lj-fonts-in-ps
-
-	use X \
-		&& myconf="${myconf} --with-x --enable-libxmi" \
-		|| myconf="${myconf} --without-x"
-
-	econf ${myconf} || die "./configure failed"
-	emake || die "Parallel Make Failed"
-}
-
-src_install() {
-	einstall datadir="${D}/usr/share" || die "Installation Failed"
-
-	dodoc AUTHORS COMPAT ChangeLog INSTALL* \
-		KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO
-}
-
-pkg_postinst() {
-	if use X; then
-		elog "There are extra fonts available in plotutils package."
-		elog "The current ebuild does not install them for you."
-		elog "You may want to do so, but you will have to do it"
-		elog "manually. You are on your own for now."
-		elog "See /usr/share/doc/${P}/INSTALL.fonts"
-		elog ""
-		elog "If you manually install the extra fonts and use the"
-		elog "program xfig, you might want to recompile to take"
-		elog "advantage of the additional ps fonts."
-		elog "Also, it is possible to enable ghostscript and possibly"
-		elog "your printer to use the HP fonts."
-	fi
-}