sci-chemistry/numbat: Add fix for gnuplot

Package-Manager: portage-2.2.0_alpha176/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 64 insertions, 8 deletions

diff --git a/sci-chemistry/numbat/ChangeLog b/sci-chemistry/numbat/ChangeLog
index 51cbfad3fee8..18f0a042349d 100644
--- a/sci-chemistry/numbat/ChangeLog
+++ b/sci-chemistry/numbat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/numbat
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/numbat/ChangeLog,v 1.3 2013/05/21 11:02:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/numbat/ChangeLog,v 1.4 2013/05/22 14:40:28 jlec Exp $
+
+*numbat-0.999-r1 (22 May 2013)
+
+  22 May 2013; Justin Lecher <jlec@gentoo.org> -numbat-0.999.ebuild,
+  +numbat-0.999-r1.ebuild, +files/numbat-0.999-gnuplot.patch:
+  Add fix for gnuplot
 
   21 May 2013; Justin Lecher <jlec@gentoo.org> Manifest:
   Fix Manifest
diff --git a/sci-chemistry/numbat/Manifest b/sci-chemistry/numbat/Manifest
index b986ae598c45..1d6b6eef8fa0 100644
--- a/sci-chemistry/numbat/Manifest
+++ b/sci-chemistry/numbat/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX numbat-0.999-gnuplot.patch 2048 SHA256 689e9690e92f531ffbbdfbb7620c5ba4f9f2cb2531c6b3267aac502bd541e5aa SHA512 dd646e8f6652a63cb4e1c97830a755629e45d20fa13431f628b66fe8a5062b7bd7ebacddb3dbcca5aeeac3ae0d89f59c61036c1a3639d25fe0426ada77a888bb WHIRLPOOL 18248ba1654f499af5c4ba22e9a03ba010b3d3c359976014bf1a0e3a584f424e61e5be868a941b1e0dd842d20ee671634c67d661114258467ff2d6492dd67b6a
 DIST Numbat-0.999.tar.gz 1791471 SHA256 aef72903f262c5a25e542429f3cc7aca4d2dbc920c08b59847d5cb325855e9ab SHA512 0887f77905bbb476b0d12a7015d5d5745023740acc974ea9cd452de7d38a75a92e6090015127588b38ba62353d38c2be20f57be5df3011b51050c4934dfd206c WHIRLPOOL 8282bf5481a93d17a833f809c28d927d681d6d5016552a07b9267bdb78e99fc568370321567d7d6a87a84f31eea8fae9494c1ae8c0109157fca779c7c06805d9
-EBUILD numbat-0.999.ebuild 1052 SHA256 eef2f1f0358e58b428815eb2a8ccc2e159c019a5377b7f5dc86f8e4a4847096f SHA512 a6784558fdf2b9b570c63f24ad4392fad0119c05f036343a03780b50010d0ac18c637e230093da5a9f481c601004cf3452ae7d59d3df7d7bc1709fa59d5adb6f WHIRLPOOL 19b913d2394e19b9f168a42d4eb6c81bb900d9776ae9393e7beeadfdd53526374f634a56914ce845c8b1dc707a1eb4916d4565d9214f3ccbe4906748b53b6206
-MISC ChangeLog 509 SHA256 2c033c851d0c166c58a6424e53263711e6387126b6924263108c02f54632611c SHA512 174bb4999e639a1b5656d88d4d21dcda1e761fa3e92ceb228855cdc1a89378846ed53f33660b5cb2949dff45148ef422fc1a429cd4731587afff252d412778a4 WHIRLPOOL fe54a19f5fdac3db167720ff712ce9a3f9f1eb1a292814661c42cb723e58ed5aa24e2cf419345e61ab50a6081ba7c657c4b822164722aac021211423044d0304
+EBUILD numbat-0.999-r1.ebuild 1191 SHA256 d2d4a70914c9a0eaef027ed2c4ff9ae633e12736b0744d64ae8f196845c8a499 SHA512 ca263893689b7cde6e74a55b0ea3cca06d2995b7c1326522d87c317141017810daadb541362379b0d463b7620e2ce7795e2b32d1c9331be801f8b731f3e32184 WHIRLPOOL 2a92b605b00fe00b7f2b370feee50ab749278045a9245ba197e6c40308d3c64fbbd179a88de9358689fcfb43dc427a987e5b695731fc8a39de4fc27fac3c860e
+MISC ChangeLog 695 SHA256 7a057f9001163360fe83457617413cca318326a1b6a704d6d58fbec64d58dcb7 SHA512 8eb3d41d769d0be4f2b8fc8d49c58ed682b81e615535c5bce482165aecf910b3434d7009fb55d26375a0c78b20dc534e0a5ac9367dbd8ac8c76a93cfe858b8ba WHIRLPOOL f33a3a491ed15f04491bc30328ac563a78ea017806aa0f6c70ce1929b9c3304fe21d644fa3ab9ee7ca27e5b04a2ba2702c3a4ddaaa5fcd655237addfd487aa12
 MISC metadata.xml 815 SHA256 d206519f00fba341f9532a4d4718574b324095004b39f8d4195914d61cd150d9 SHA512 4d1e29bee0ab5335e1b6684f613d34e29f5b336bb8b64701661c39b80a3029b445d561115f520b3416224ccb02f8e799d2e35e03990a2f1184743448d875c6d6 WHIRLPOOL 485d3f6f307bbebb38bd50ba868edd7149e2ca6b4757aa3b84f79c4b7455d8469ddb643986ecaed93bc83846cae1551f2035fe67fcbbefc24ae082113896b478
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlGbVD8ACgkQgAnW8HDreRYyBACfbb3a+KsnyeLLLaHEKmkjwu4G
-nvUAnikMEivbTJ8zZb0HI3iDO0Jsx8eP
-=sJmU
+iEYEAREKAAYFAlGc2N4ACgkQgAnW8HDreRbGiQCdFv6PxOH63EQRBF6KGOrk1Ze+
+fNsAnRgwXu9/6n+hERmmf1zUUs1aQ0+u
+=v0yU
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/numbat/files/numbat-0.999-gnuplot.patch b/sci-chemistry/numbat/files/numbat-0.999-gnuplot.patch
new file mode 100644
index 000000000000..942f5871e50b
--- /dev/null
+++ b/sci-chemistry/numbat/files/numbat-0.999-gnuplot.patch
@@ -0,0 +1,42 @@
+ src/error_analysis.c | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/error_analysis.c b/src/error_analysis.c
+index eb86a6f..c0edf5f 100644
+--- a/src/error_analysis.c
++++ b/src/error_analysis.c
+@@ -848,11 +848,11 @@ void write_sanson_mac(FILE * F, char * name_plot, char * name_world, int number_
+     }
+ 
+     fprintf(F, "reset\n");
+-    fprintf(F, "set noxtics\n");
+-    fprintf(F, "set noytics\n");
++    fprintf(F, "unset xtics\n");
++    fprintf(F, "unset ytics\n");
+     fprintf(F, "set angles degrees\n");
+-    fprintf(F, "set nogrid\n");
+-    fprintf(F, "set noborder\n");
++    fprintf(F, "unset grid\n");
++    fprintf(F, "unset border\n");
+     //fprintf(F, "width=40\n");
+     //fprintf(F, "height=width*(3./4.)\n");
+     //fprintf(F, "set xrange [-width : width]\n");
+@@ -867,12 +867,12 @@ void write_sanson_mac(FILE * F, char * name_plot, char * name_world, int number_
+     fprintf(F, "YC(lat,lon)=(lon-long0)*cos(lat)\n");
+     fprintf(F, "plot '%s'  using (YC($2,$1)):(XC($2,$1)) t '' with lines lw 0.1 lt -1", name_world);
+     for(i = 0; i < number_of_tensor; i++){
+-        fprintf(F, ", '%s' using (YC($%d,$%d)):(XC($%d,$%d)) t '' with points %d", name_plot,
+-                6*i+2, 6*i+1, 6*i+2, 6*i+1, 3*i+1);
+-        fprintf(F, ", '%s' using (YC($%d,$%d)):(XC($%d,$%d)) t '' with points %d", name_plot,
+-                6*i+4, 6*i+3, 6*i+4, 6*i+3, 3*i+2);
+-        fprintf(F, ", '%s' using (YC($%d,$%d)):(XC($%d,$%d)) t '' with points %d", name_plot,
+-                6*i+6, 6*i+5, 6*i+6, 6*i+5, 3*i+3);
++        fprintf(F, ", '%s' using (YC($%d,$%d)):(XC($%d,$%d)) t '' with points", name_plot,
++                6*i+2, 6*i+1, 6*i+2, 6*i+1);
++        fprintf(F, ", '%s' using (YC($%d,$%d)):(XC($%d,$%d)) t '' with points", name_plot,
++                6*i+4, 6*i+3, 6*i+4, 6*i+3);
++        fprintf(F, ", '%s' using (YC($%d,$%d)):(XC($%d,$%d)) t '' with points", name_plot,
++                6*i+6, 6*i+5, 6*i+6, 6*i+5);
+     }
+     fprintf(F, "\n");
+     //fprintf(F, "pause 2\n");
diff --git a/sci-chemistry/numbat/numbat-0.999.ebuild b/sci-chemistry/numbat/numbat-0.999-r1.ebuild
index 1793ed83e78c..d60efcd9d35f 100644
--- a/sci-chemistry/numbat/numbat-0.999.ebuild
+++ b/sci-chemistry/numbat/numbat-0.999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/numbat/numbat-0.999.ebuild,v 1.2 2013/05/21 10:58:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/numbat/numbat-0.999-r1.ebuild,v 1.1 2013/05/22 14:40:28 jlec Exp $
 
 EAPI=5
 
@@ -28,15 +28,22 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
 	sci-chemistry/molmol
-	sci-chemistry/pymol"
+	sci-chemistry/pymol
+	sci-visualization/gnuplot"
 
 S="${WORKDIR}"/${MY_P}
 
+PATCHES=(
+#	"${FILESDIR}"/${P}-glade.patch
+	"${FILESDIR}"/${P}-gnuplot.patch )
+
 src_prepare() {
 	sed \
 		-e '/COPYING/d' \
 		-e "s:doc/numbat:share/doc/${PF}:g" \
 		-i Makefile.am src/common.h || die
+	rm missing
+	emake distclean
 	autotools-utils_src_prepare
 }