clean up

(Portage version: 2.1.4.4)

5 files changed, 6 insertions, 452 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index eef4d213e671..f450f75d9d33 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.68 2008/04/24 12:19:54 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.69 2008/04/24 12:24:24 opfer Exp $
+
+  24 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
+  -files/gnuplot-4.0-filled-arrow.patch, -files/gnuplot-4.0-libggi.patch,
+  -files/pdflib-6-compat.patch, -files/header-order.patch:
+  clean up
 
 *gnuplot-4.2.3 (24 Apr 2008)
 
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.0-filled-arrow.patch b/sci-visualization/gnuplot/files/gnuplot-4.0-filled-arrow.patch
deleted file mode 100644
index f20970926355..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.0-filled-arrow.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur gnuplot-4.0.0/src/term.c gnuplot-4.0.0-new/src/term.c
---- gnuplot-4.0.0/src/term.c	2004-04-13 13:24:02.000000000 -0400
-+++ gnuplot-4.0.0-new/src/term.c	2007-01-21 12:14:08.000000000 -0500
-@@ -927,7 +927,7 @@
- 	    ym = (int) (dy2 + backlen * sin( phi + beta ));
- 	}
- #ifdef PM3D
--	if (curr_arrow_headfilled==2) {
-+	if (curr_arrow_headfilled==2 && !clip_point(ex,ey)) {
- 	    /* draw filled forward arrow head */
- 	    filledhead[0].x = ex + xm;
- 	    filledhead[0].y = ey + ym;
-@@ -939,7 +939,8 @@
- 	    filledhead[3].y = ey + y2;
- 	    filledhead[4].x = ex + xm;
- 	    filledhead[4].y = ey + ym;
--	    (*t->filled_polygon) (5, filledhead);
-+	    if (t->filled_polygon)
-+	      (*t->filled_polygon) (5, filledhead);
- 	}
- #endif
- 	/* draw outline of forward arrow head */
-@@ -956,7 +957,7 @@
- 	}
- 	if (head == 2) { /* backward arrow head */
- #ifdef PM3D
--	    if (curr_arrow_headfilled==2) {
-+	    if (curr_arrow_headfilled==2 && !clip_point(sx,sy)) {
- 		/* draw filled backward arrow head */
- 		filledhead[0].x = sx - xm;
- 		filledhead[0].y = sy - ym;
-@@ -968,7 +969,8 @@
- 		filledhead[3].y = sy - y2;
- 		filledhead[4].x = sx - xm;
- 		filledhead[4].y = sy - ym;
--		(*t->filled_polygon) (5, filledhead);
-+		if (t->filled_polygon)
-+  		  (*t->filled_polygon) (5, filledhead);
- 	    }
- #endif
- 	    /* draw outline of backward arrow head */
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.0-libggi.patch b/sci-visualization/gnuplot/files/gnuplot-4.0-libggi.patch
deleted file mode 100644
index af4bda970e2b..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.0-libggi.patch
+++ /dev/null
@@ -1,352 +0,0 @@
---- gnuplot-4.0.0/term/ggi.trm.orig	2006-03-24 16:25:59.000000000 +0900
-+++ gnuplot-4.0.0/term/ggi.trm	2006-03-24 16:29:09.000000000 +0900
-@@ -116,9 +116,8 @@
- } GGI_vertex_t;
- 
- TERM_PUBLIC long int GGI_SetTime(const struct timeval* current);
--TERM_PUBLIC int GGI_from_keysym __PROTO((uint32 keysym));
--TERM_PUBLIC int GGI_from_button __PROTO((uint32 button));
--TERM_PUBLIC int GGI_y __PROTO((sint32 y));
-+TERM_PUBLIC int GGI_from_keysym __PROTO((uint32_t keysym));
-+TERM_PUBLIC int GGI_from_button __PROTO((uint32_t button));
- TERM_PUBLIC int GGI_dispatch_event __PROTO((const ggi_event* event));
- TERM_PUBLIC int GGI_eventually_update_modifiers __PROTO((const ggi_event* event, const int add));
- TERM_PUBLIC int GGI_waitforinput __PROTO((void));
-@@ -134,13 +133,13 @@
- TERM_PUBLIC void GGI_save_puts __PROTO((GGI_vertex_t* v, const int tag));
- TERM_PUBLIC void GGI_set_vertex __PROTO((GGI_vertex_t* v, const int x, const int y, const char* str, const int tag));
- TERM_PUBLIC void GGI_abort_zooming __PROTO((void));
--TERM_PUBLIC void GGI_put_tmptext __PROTO((int, const char str[]));
--TERM_PUBLIC void GGI_relative __PROTO((int r[2]));
-+TERM_PUBLIC void GGI_put_tmptext __PROTO((int, const char *str));
-+TERM_PUBLIC void GGI_relative __PROTO((int *r));
- TERM_PUBLIC void GGI_clear_hline __PROTO((int x1, int x2, int y));
- TERM_PUBLIC void GGI_clear_vline __PROTO((int y1, int y2, int x));
- TERM_PUBLIC void GGI_draw_hline __PROTO((int x1, int x2, int y));
- TERM_PUBLIC void GGI_draw_vline __PROTO((int y1, int y2, int x));
--TERM_PUBLIC void GGI_set_clipboard __PROTO((const char[]));
-+TERM_PUBLIC void GGI_set_clipboard __PROTO((const char*));
- #endif /* USE_MOUSE */
- 
- #ifdef PM3D
-@@ -488,8 +487,7 @@
-     setvbuf(stdin, (char*)0, _IONBF, 0);
- }
- 
--TERM_PUBLIC void GGI_linetype(linetype)
--    int linetype;
-+TERM_PUBLIC void GGI_linetype(int linetype)
- {
-     if(linetype==-2) ggiSetGCForeground(GGIvisual,GGIborderColor);
-     if(linetype==-1) ggiSetGCForeground(GGIvisual,GGIaxisColor);
-@@ -498,11 +496,10 @@
-     ggiSetGCForeground(GGIvisual,GGIcolors[linetype]);
- }
- 
--TERM_PUBLIC void GGI_move(x,y)
--    unsigned int x,y;
-+TERM_PUBLIC void GGI_move(unsigned int x, unsigned int y)
- {
-     GGIx=x;
--    GGIy=GGI_y(y);
-+    GGIy=GGIymax - y;
- }
- 
- TERM_PUBLIC void
-@@ -588,14 +585,12 @@
- #endif
- }
- 
--TERM_PUBLIC void GGI_put_text(x,y,str)
--    unsigned int x,y;
--    const char *str;
-+TERM_PUBLIC void GGI_put_text(unsigned int x, unsigned int y, const char *str)
- {
-     ggi_pixel current_foreground;
-     ggiGetGCForeground(GGIvisual,&current_foreground);
-     ggiSetGCForeground(GGIvisual,GGIborderColor);
--    ggiPuts(GGIvisual,x,GGI_y(y) - 4 /* ? (joze ? */,str);
-+    ggiPuts(GGIvisual,x,GGIymax - y - 4 /* ? (joze ? */,str);
-     ggiSetGCForeground(GGIvisual,current_foreground);
- }
- 
-@@ -613,9 +608,7 @@
- }
- 
- TERM_PUBLIC void
--GGI_fillbox(style, x, y, w, h)
--int style;
--unsigned int x, y, w, h;
-+GGI_fillbox(int style, unsigned int x, unsigned int y, unsigned int w, unsigned int h)
- {
-     /* when is this called ? */
-     /* ULIG: the style parameter is now used for the fillboxes style
-@@ -644,10 +637,9 @@
- #endif
- }
- 
--TERM_PUBLIC void GGI_vector(x,y)
--    unsigned int x,y;
-+TERM_PUBLIC void GGI_vector(unsigned int x, unsigned int y)
- {
--    y = GGI_y(y);
-+    y = GGIymax - y;
-     ggiDrawLine(GGIvisual,GGIx,GGIy,x,y);
-     GGIx=x;
-     GGIy=y;
-@@ -657,8 +649,7 @@
- 
- /* tranlate ggi keysym to gnuplot keysym */
- TERM_PUBLIC int
--GGI_from_keysym(keysym)
--    uint32 keysym;
-+GGI_from_keysym(uint32_t keysym)
- {
-     switch (keysym) {
- 	case GIIUC_BackSpace:
-@@ -812,8 +803,7 @@
- }
- 
- TERM_PUBLIC long int
--GGI_SetTime(current)
--    const struct timeval* current;
-+GGI_SetTime(const struct timeval* current)
- {
-     /* --> dsec in musec */
-     int dsec = (current->tv_sec - GGI_timestamp.tv_sec) * 1000000;
-@@ -824,8 +814,7 @@
- }
- 
- TERM_PUBLIC int
--GGI_from_button(button)
--    uint32 button;
-+GGI_from_button(uint32_t button)
- {
-     switch (button) {
- 	case GII_PBUTTON_LEFT:
-@@ -841,16 +830,7 @@
- }
- 
- TERM_PUBLIC int
--GGI_y(y)
--    sint32 y;
--{
--    return GGIymax - y;
--}
--
--TERM_PUBLIC int
--GGI_eventually_update_modifiers(event, add)
--    const ggi_event* event;
--    const int add;
-+GGI_eventually_update_modifiers(const ggi_event* event, const int add)
- {
-     int mod = 0;
-     int old_modifiers = GGI_modifiers;
-@@ -882,7 +862,7 @@
- 
- 	gp_ev.type = GE_modifier;
- 	gp_ev.mx   = GGI_mouse_x;
--	gp_ev.my   = GGI_y(GGI_mouse_y);
-+	gp_ev.my   = GGIymax - GGI_mouse_y;
- 	gp_ev.par1 = 0;
- 	gp_ev.par2 = 0;
- 	gp_ev.par1 = GGI_modifiers;
-@@ -894,14 +874,13 @@
- }
- 
- TERM_PUBLIC int
--GGI_dispatch_event(event)
--    const ggi_event* event;
-+GGI_dispatch_event(const ggi_event* event)
- {
-     struct gp_event_t gp_ev;
- 
-     gp_ev.type = 0;
-     gp_ev.mx   = GGI_mouse_x;
--    gp_ev.my   = GGI_y(GGI_mouse_y);
-+    gp_ev.my   = GGIymax - GGI_mouse_y;
-     gp_ev.par1 = 0;
-     gp_ev.par2 = 0;
- 
-@@ -1037,9 +1016,7 @@
- }
- 
- TERM_PUBLIC void
--GGI_clear(v, tag)
--    const GGI_vertex_t* v;
--    const int tag;
-+GGI_clear(const GGI_vertex_t* v, const int tag)
- {
-     if (tag && v->width) {
- 	/* turn off current */
-@@ -1049,9 +1026,7 @@
- }
- 
- TERM_PUBLIC void
--GGI_save_puts(v, tag)
--    GGI_vertex_t* v;
--    const int tag;
-+GGI_save_puts(GGI_vertex_t* v, const int tag)
- {
-     GGI_clear(v, tag);
- 
-@@ -1067,12 +1042,7 @@
- }
- 
- TERM_PUBLIC void
--GGI_set_vertex(v, x, y, str, tag)
--    GGI_vertex_t* v;
--    const int x;
--    const int y;
--    const char* str;
--    const int tag;
-+GGI_set_vertex(GGI_vertex_t* v, const int x, const int y, const char* str, const int tag)
- {
-     GGI_clear(v, tag);
- 
-@@ -1091,8 +1061,7 @@
- }
- 
- TERM_PUBLIC void
--GGI_relative(r)
--    int r[2];
-+GGI_relative(int *r)
- {
-     int diff = r[1] - r[0];
-     if (diff < 0) {
-@@ -1104,10 +1073,7 @@
- }
- 
- TERM_PUBLIC void
--GGI_clear_hline(x1, x2, y)
--    int x1;
--    int x2;
--    int y;
-+GGI_clear_hline(int x1, int x2, int y)
- {
-     if (GGI_saved_canvas && x1 >= 0 && x2 >= 0 && y >= 0) {
- 	int r[2];
-@@ -1122,10 +1088,7 @@
- }
- 
- TERM_PUBLIC void
--GGI_clear_vline(y1, y2, x)
--    int y1;
--    int y2;
--    int x;
-+GGI_clear_vline(int y1, int y2, int x)
- {
-     if (GGI_saved_canvas && y1 >= 0 && y2 >= 0 && x >= 0) {
- 	int r[2];
-@@ -1140,10 +1103,7 @@
- }
- 
- TERM_PUBLIC void
--GGI_draw_hline(x1, x2, y)
--    int x1;
--    int x2;
--    int y;
-+GGI_draw_hline(int x1, int x2, int y)
- {
-     if (x1 >= 0 && x2 >= 0 && y >= 0) {
- 	int r[2];
-@@ -1157,10 +1117,7 @@
- }
- 
- TERM_PUBLIC void
--GGI_draw_vline(y1, y2, x)
--    int y1;
--    int y2;
--    int x;
-+GGI_draw_vline(int y1, int y2, int x)
- {
-     if (y1 >= 0 && y2 >= 0 && x >= 0) {
- 	int r[2];
-@@ -1308,9 +1265,7 @@
- }
- 
- TERM_PUBLIC void
--GGI_put_tmptext(i, str)
--    int i;
--    const char str[];
-+GGI_put_tmptext(int i, const char *str)
- {
-     char* second;
- 
-@@ -1364,8 +1319,7 @@
- }
- 
- TERM_PUBLIC void
--GGI_set_ruler(x, y)
--    int x, y;
-+GGI_set_ruler(int x, int y)
- {
-     if (x < 0) {
- 
-@@ -1377,14 +1331,13 @@
- 
-     } else {
- 	GGI_ruler.x = x;
--	GGI_ruler.y = GGI_y(y);
-+	GGI_ruler.y = GGIymax - y;
-     }
-     GGI_needs_update++;
- }
- 
- TERM_PUBLIC void
--GGI_set_cursor(c, x, y)
--    int c, x, y;
-+GGI_set_cursor(int c, int x, int y)
- {
-     /* TODO */
-     switch (c) {
-@@ -1402,8 +1355,7 @@
- }
- 
- TERM_PUBLIC void
--GGI_set_clipboard(s)
--    const char s[];
-+GGI_set_clipboard(const char *s)
- {
-     /* XXX: not implemented */
- }
-@@ -1411,8 +1363,7 @@
- 
- #ifdef PM3D
- TERM_PUBLIC int
--GGI_make_palette(palette)
--    t_sm_palette *palette;
-+GGI_make_palette(t_sm_palette *palette)
- {
-     /* reallocate only, if it has changed */
-     if (palette && (GGI_save_pal.colorFormulae < 0
-@@ -1454,8 +1405,7 @@
- }
- 
- TERM_PUBLIC void
--GGI_set_color(gray)
--    double gray;
-+GGI_set_color(double gray)
- {
-     if (GGIvisual) {
- 	int idx = (gray <= 0) ? 0 : (int)(gray * ggi_pm3d_colors);
-@@ -1470,9 +1420,7 @@
- 
- #ifdef ENABLE_XMI
- TERM_PUBLIC void
--GGI_filled_polygon(points, corners)
--    int points;
--    gpiPoint *corners;
-+GGI_filled_polygon(int points, gpiPoint *corners)
- {
-     static miPoint offset = {0, 0};
-     if (GGI_miPaintedSet) {
-@@ -1485,7 +1433,7 @@
- 	}
- 	for (i = 0; i < MI_POINTS; i++) {
- 	    mi_corners[i].x = corners[i].x;
--	    mi_corners[i].y = GGI_y(corners[i].y);
-+	    mi_corners[i].y = GGIymax - corners[i].y;
- 	}
- 	miFillPolygon(GGIvisual, GGI_miPaintedSet, GGI_miGC,
- 	    MI_SHAPE_GENERAL, MI_COORD_MODE_ORIGIN, MI_POINTS, mi_corners);
diff --git a/sci-visualization/gnuplot/files/header-order.patch b/sci-visualization/gnuplot/files/header-order.patch
deleted file mode 100644
index 82ba590fcb2b..000000000000
--- a/sci-visualization/gnuplot/files/header-order.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/term.h	2004-04-13 19:24:02.000000000 +0200
-+++ src/term.h.new	2004-05-05 11:16:41.216200736 +0200
-@@ -270,6 +270,20 @@
- /****************************************************************************/
- /* These terminals can be used on any system */
- 
-+/* NOTE THAT PNG AND JPEG SUPPORT REQUIRE SEPARATE LIBRARIES */
-+/* There are 2 flavors of PNG support                                        */
-+/* If you are using an old version of libgd in order to get true GIF support */
-+/* then the best we can do is use a separate poor-quality PNG driver png.trm */
-+/* But if you are using a newer libgd then it provides full blown support    */
-+/* for both PNG and JPEG in term/gd.trm                                      */
-+#ifdef HAVE_LIBPNG
-+# if defined(HAVE_GD_PNG) || defined(HAVE_GD_JPEG)
-+#  include "gd.trm"
-+# else
-+#  include "png.trm"
-+# endif
-+#endif
-+
- #ifdef X11
- # include "x11.trm"		/* X Window System */
- # include "xlib.trm"		/* dumps x11 commands to gpoutfile */
-@@ -351,20 +365,6 @@
- # include "pdf.trm"
- #endif
- 
--/* NOTE THAT PNG AND JPEG SUPPORT REQUIRE SEPARATE LIBRARIES */
--/* There are 2 flavors of PNG support                                        */
--/* If you are using an old version of libgd in order to get true GIF support */
--/* then the best we can do is use a separate poor-quality PNG driver png.trm */
--/* But if you are using a newer libgd then it provides full blown support    */
--/* for both PNG and JPEG in term/gd.trm                                      */
--#ifdef HAVE_LIBPNG
--# if defined(HAVE_GD_PNG) || defined(HAVE_GD_JPEG)
--#  include "gd.trm"
--# else
--#  include "png.trm"
--# endif
--#endif
--
- /* postscript */
- #include "post.trm"
- 
diff --git a/sci-visualization/gnuplot/files/pdflib-6-compat.patch b/sci-visualization/gnuplot/files/pdflib-6-compat.patch
deleted file mode 100644
index 3a25292d93d6..000000000000
--- a/sci-visualization/gnuplot/files/pdflib-6-compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN gnuplot-4.0.0.orig/term/pdf.trm gnuplot-4.0.0/term/pdf.trm
---- gnuplot-4.0.0.orig/term/pdf.trm	2004-04-10 08:55:17.000000000 -0700
-+++ gnuplot-4.0.0/term/pdf.trm	2005-05-24 15:33:52.000000000 -0700
-@@ -343,7 +343,9 @@
- 	myPDF = PDF_new();
- 
-     /*open new PDF file */ 
--    if (PDF_open_fp(myPDF, gpoutfile) == -1)
-+    /* HBB FIXME 20040708: PDF_open_file is deprecated, will have to
-+     * be re-done again soon. */
-+    if (PDF_open_file(myPDF, outstr) == -1)
- 	int_error(NO_CARET, "Error:cannot open PDF file .\n");
- 
- #ifdef PDF_DONT_COMPRESS