add new libggi patch, provided by KIMURA Masaru <hiyuh.root@gmail.com> in bug 183427

Package-Manager: portage-2.1.2.7

4 files changed, 93 insertions, 20 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 97d327a6d72b..8c1c4ecab4c2 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.19 2007/06/26 21:28:38 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.20 2007/06/27 16:59:06 opfer Exp $
+
+  27 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/gnuplot-4.2.0-libggi.patch, gnuplot-4.2.0.ebuild:
+  add new libggi patch, provided by KIMURA Masaru <hiyuh.root@gmail.com> in
+  bug 183427
 
   26 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
   -files/gnuplot-3.8j-amd64.diff, -gnuplot-4.2_rc1.ebuild,
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 44ca467e41ed..9269aae9c7ba 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnuplot-4.0-filled-arrow.patch 1349 RMD160 99c620fda889773a4814726e339e51095924a38b SHA1 8a32dfc108e1a82fd013899a194f9a31e1e0ac0a SHA256 aa3adb859e5ed943d948e8817e24b9f3e391411684ca4bdea5485374d976e652
 MD5 7af7e5f057531526e6c3447bf18c2ed8 files/gnuplot-4.0-filled-arrow.patch 1349
 RMD160 99c620fda889773a4814726e339e51095924a38b files/gnuplot-4.0-filled-arrow.patch 1349
@@ -9,6 +6,10 @@ AUX gnuplot-4.0-libggi.patch 8426 RMD160 db33b7eb0567f9ae7f8a35acd8c64df6ebb3b33
 MD5 90a70f64e3230aaa6bdeca743f16a85a files/gnuplot-4.0-libggi.patch 8426
 RMD160 db33b7eb0567f9ae7f8a35acd8c64df6ebb3b330 files/gnuplot-4.0-libggi.patch 8426
 SHA256 6214ec1a19417febf2cb1e068924762706859b1392719ad497bccb98a6bc1bab files/gnuplot-4.0-libggi.patch 8426
+AUX gnuplot-4.2.0-libggi.patch 2437 RMD160 ef60c994bf2b34ca42a7e487a1fec89c01eb1530 SHA1 dc566b4c6406c135e2505132fca598ea52da7b24 SHA256 7263c8b22a2c7691e4cae85be6ea284846e4c5d328c894d174221cb2ffd3b3d3
+MD5 ab8fc7f4c7f2f539a28dbc0bc5294851 files/gnuplot-4.2.0-libggi.patch 2437
+RMD160 ef60c994bf2b34ca42a7e487a1fec89c01eb1530 files/gnuplot-4.2.0-libggi.patch 2437
+SHA256 7263c8b22a2c7691e4cae85be6ea284846e4c5d328c894d174221cb2ffd3b3d3 files/gnuplot-4.2.0-libggi.patch 2437
 AUX header-order.patch 1692 RMD160 d9b45d996958e41b7b4bbc9d33cdb1018f718dc4 SHA1 2e59302f469c31ee14bbe6b2f1658e571342e7e9 SHA256 d0feb2cd13afae70d558fd3c4d1284383e7ccb4d1d14527d9564ffe0e9b0d7c1
 MD5 6bd90ea3b0173af9fe24085ca37fbfa3 files/header-order.patch 1692
 RMD160 d9b45d996958e41b7b4bbc9d33cdb1018f718dc4 files/header-order.patch 1692
@@ -27,14 +28,14 @@ EBUILD gnuplot-4.0-r2.ebuild 4121 RMD160 47cba5b17283cb00cd6035d7f9cd8613578bb69
 MD5 9effa0ca0bd7e2336c35afb29b1e060c gnuplot-4.0-r2.ebuild 4121
 RMD160 47cba5b17283cb00cd6035d7f9cd8613578bb69a gnuplot-4.0-r2.ebuild 4121
 SHA256 f680e93d2fa19a3cbc1801cb965062ac2065e06837bddce8e16b245334488b3f gnuplot-4.0-r2.ebuild 4121
-EBUILD gnuplot-4.2.0.ebuild 4787 RMD160 9ce02bb0c3a5159dbb6b9abd8865f98c9be9bbb2 SHA1 3b6bb3403498bcabc04a1cde439fee448cd42097 SHA256 1434d02aa612eb289877fe86106b8734d8bae5797fd851d550b22858b6017d87
-MD5 c7efbb3f950bd1b08f4558a71e963520 gnuplot-4.2.0.ebuild 4787
-RMD160 9ce02bb0c3a5159dbb6b9abd8865f98c9be9bbb2 gnuplot-4.2.0.ebuild 4787
-SHA256 1434d02aa612eb289877fe86106b8734d8bae5797fd851d550b22858b6017d87 gnuplot-4.2.0.ebuild 4787
-MISC ChangeLog 9665 RMD160 7ab2206bf2596dc5be198f768c765bb30f499f39 SHA1 9bdd616fb3112ffe1fa3b83af3b78046192b60a6 SHA256 d7c8e52f41e9e54b68bf5921cd214d228e436095d97183b079bceeb262aaef01
-MD5 d036b24de9599b9608e947259f667efa ChangeLog 9665
-RMD160 7ab2206bf2596dc5be198f768c765bb30f499f39 ChangeLog 9665
-SHA256 d7c8e52f41e9e54b68bf5921cd214d228e436095d97183b079bceeb262aaef01 ChangeLog 9665
+EBUILD gnuplot-4.2.0.ebuild 4869 RMD160 a0f35e5d7e219c062802b3e055d4f51d00fdf959 SHA1 61f4dea1587b3f69eb29a8815bacbac310f394ad SHA256 13a6e49fc1cb395ee95fbe031d58eb8ee1a1a3a02ead9993cb0e2eae0f9775e1
+MD5 e5af72cc34ce6f1bfc57cc75d0d10363 gnuplot-4.2.0.ebuild 4869
+RMD160 a0f35e5d7e219c062802b3e055d4f51d00fdf959 gnuplot-4.2.0.ebuild 4869
+SHA256 13a6e49fc1cb395ee95fbe031d58eb8ee1a1a3a02ead9993cb0e2eae0f9775e1 gnuplot-4.2.0.ebuild 4869
+MISC ChangeLog 9869 RMD160 6a3589c072751e186de8a7a816d39e9c6faf7fbd SHA1 d57f9539c590f4b79b7de1ff5b175a0d52c4ff43 SHA256 ca2928be6e58e416f75d86cee242dc5fa15da977c84c29b3e824a3c7cba6e01a
+MD5 5379f95d5194b7df45623e9e78bbf1d6 ChangeLog 9869
+RMD160 6a3589c072751e186de8a7a816d39e9c6faf7fbd ChangeLog 9869
+SHA256 ca2928be6e58e416f75d86cee242dc5fa15da977c84c29b3e824a3c7cba6e01a ChangeLog 9869
 MISC metadata.xml 281 RMD160 9578b17bd8b0f05da3044064822e531912d1817c SHA1 709ef0382fe7ec2d3746554f452ebd91bc0014f0 SHA256 702dd681c8877369b1ee1553a05fccbbb8633cb96c893f28a4dbcb5492d74511
 MD5 bd00d3bd41c122c9fc97c6aaaa7e468a metadata.xml 281
 RMD160 9578b17bd8b0f05da3044064822e531912d1817c metadata.xml 281
@@ -48,10 +49,3 @@ SHA256 911f90b2bf05ec39c8895c5391d384465266d4a5357e1b95259ef2ab05656610 files/di
 MD5 46bf95697418c0c80329a089d6e9738d files/digest-gnuplot-4.2.0 244
 RMD160 1dce5fef245bd7df3e9ee4e50fc2cda367c211ee files/digest-gnuplot-4.2.0 244
 SHA256 67b29005a738bc6ea31297b4881661ef3534c7e58e8a7b926fb925877d64497c files/digest-gnuplot-4.2.0 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGgYUNNQqtfCuFneMRApElAKCZfRGDeCMj6Y2Zx+7NdFmPvyYq0ACgmtvF
-4jPjYkY9+SuDMxoj3n/5arY=
-=B+qV
------END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.0-libggi.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.0-libggi.patch
new file mode 100644
index 000000000000..94b0beecdebf
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-4.2.0-libggi.patch
@@ -0,0 +1,68 @@
+--- gnuplot-4.2.0/term/ggi.trm.orig	2007-06-27 14:37:05.000000000 +0900
++++ gnuplot-4.2.0/term/ggi.trm	2007-06-27 14:53:54.000000000 +0900
+@@ -116,9 +116,9 @@
+ } 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_y __PROTO((int32_t y));
+ 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 +134,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 *s));
+ #endif /* USE_MOUSE */
+ 
+ TERM_PUBLIC int GGI_make_palette __PROTO((t_sm_palette*));
+@@ -645,7 +645,7 @@
+ 
+ /* translate ggi keysym to gnuplot keysym */
+ TERM_PUBLIC int
+-GGI_from_keysym(uint32 keysym)
++GGI_from_keysym(uint32_t keysym)
+ {
+     switch (keysym) {
+ 	case GIIUC_BackSpace:
+@@ -811,7 +811,7 @@
+ }
+ 
+ TERM_PUBLIC int
+-GGI_from_button(uint32 button)
++GGI_from_button(uint32_t button)
+ {
+     switch (button) {
+     case GII_PBUTTON_LEFT:
+@@ -827,7 +827,7 @@
+ }
+ 
+ TERM_PUBLIC int
+-GGI_y(sint32 y)
++GGI_y(int32_t y)
+ {
+     return GGIymax - y;
+ }
+@@ -1363,7 +1363,7 @@
+ }
+ 
+ TERM_PUBLIC void
+-GGI_set_clipboard(const char s[])
++GGI_set_clipboard(const char *s)
+ {
+     /* XXX: not implemented */
+     (void) s;			/* avoid -Wunused */
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.0.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.0.ebuild
index 96d1d2343c4b..fac80263934f 100644
--- a/sci-visualization/gnuplot/gnuplot-4.2.0.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.0.ebuild,v 1.3 2007/06/19 06:18:02 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.0.ebuild,v 1.4 2007/06/27 16:59:06 opfer Exp $
 
 inherit eutils elisp-common wxwidgets
 
@@ -46,6 +46,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-libggi.patch
+}
+
 src_compile() {
 	# See bug #156427.
 	if use tetex ; then