[gentoo-commits] proj/sci:master commit in: sci-chemistry/mgltools-gle/files/, sci-chemistry/mgltools-gle/

[gentoo-commits] proj/sci:master commit in: sci-chemistry/mgltools-gle/files/, sci-chemistry/mgltools-gle/

[Justin Lecher]

commit:     ec0c1d4e03c03cbf2764ab41b358ca236542de31
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 17:14:06 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 17:14:06 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ec0c1d4e

sci-chemistry/mgltools-gle: Add fix for newer swig

Package-Manager: portage-2.2.18

 sci-chemistry/mgltools-gle/ChangeLog               |  4 ++
 .../files/mgltools-gle-1.5.6-swig.patch            | 43 ++++++++++++++++++++++
 .../mgltools-gle/mgltools-gle-1.5.6.ebuild         |  1 +
 3 files changed, 48 insertions(+)

diff --git a/sci-chemistry/mgltools-gle/ChangeLog b/sci-chemistry/mgltools-gle/ChangeLog
index 3e99203..8a7ac42 100644
--- a/sci-chemistry/mgltools-gle/ChangeLog
+++ b/sci-chemistry/mgltools-gle/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  +files/mgltools-gle-1.5.6-swig.patch, mgltools-gle-1.5.6.ebuild:
+  sci-chemistry/mgltools-gle: Add fix for newer swig
+
   25 Mar 2015; Justin Lecher <jlec@gentoo.org> mgltools-gle-1.5.6.ebuild:
   sci-chemistry/mgltools-gle: Drop PYTHON_MODNAME and support for python2_6
 

diff --git a/sci-chemistry/mgltools-gle/files/mgltools-gle-1.5.6-swig.patch b/sci-chemistry/mgltools-gle/files/mgltools-gle-1.5.6-swig.patch
new file mode 100644
index 0000000..4b632df
--- /dev/null
+++ b/sci-chemistry/mgltools-gle/files/mgltools-gle-1.5.6-swig.patch
@@ -0,0 +1,43 @@
+ gle-1.5.6/gle/gle.i | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gle-1.5.6/gle/gle.i b/gle-1.5.6/gle/gle.i
+index bc48694..76170f1 100644
+--- a/gle-1.5.6/gle/gle.i
++++ b/gle-1.5.6/gle/gle.i
+@@ -149,7 +149,7 @@ glePolyCone_c4f (int npoints,	 /* numpoints in poly-line */
+                    gleColor4f color_array[1],	/* colors at polyline verts */
+                    gleDouble radius_array[1]); /* cone radii at polyline verts */
+ 
+-#typemaps for Numeric arrays
++/* typemaps for Numeric arrays */
+ DOUBLE_ARRAY2D( contour, [1][2], ncp )
+ %apply double ARRAY2D[ANY][ANY] { double cont_normal[1][2] };
+ %apply double VECTOR_NULL[ANY] { double up[3] };
+@@ -172,7 +172,7 @@ gleExtrusion_c4f (int ncp,         /* number of contour points */
+                 gleDouble point_array[1][3], /* polyline vertices */
+                 gleColor4f color_array[1]); /* colors at polyline verts */
+ 
+-#typemaps for Numeric arrays
++/* typemaps for Numeric arrays */
+ %apply double VECTOR[ANY] { double twist_array[1] };
+ 
+ /* extrude 2D contour, specifying local rotations (twists) */
+@@ -195,7 +195,7 @@ gleTwistExtrusion_c4f (int ncp,         /* number of contour points */
+                 gleDouble twist_array[1]);   /* countour twists (in degrees) */
+ 
+ 
+-#typemaps for Numeric arrays
++/* typemaps for Numeric arrays */
+ %apply double ARRAY3D_NULL[ANY][ANY][ANY] { double xform_array[1][2][3] };
+ 
+ /* extrude 2D contour, specifying local affine tranformations */
+@@ -218,7 +218,7 @@ gleSuperExtrusion_c4f (int ncp,  /* number of contour points */
+                 gleColor4f color_array[1],        /* color at polyline verts */
+                 gleDouble xform_array[1][2][3]);   /* 2D contour xforms */
+ 
+-#typemaps for Numeric arrays
++/* typemaps for Numeric arrays */
+ %apply double ARRAY2D_NULL[ANY][ANY] { double startXform[2][3] };
+ %apply double ARRAY2D_NULL[ANY][ANY] { double dXformdTheta[2][3] };
+ 

diff --git a/sci-chemistry/mgltools-gle/mgltools-gle-1.5.6.ebuild b/sci-chemistry/mgltools-gle/mgltools-gle-1.5.6.ebuild
index e5e1c86..90d8db8 100644
--- a/sci-chemistry/mgltools-gle/mgltools-gle-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-gle/mgltools-gle-1.5.6.ebuild
@@ -33,6 +33,7 @@ src_unpack() {
 }
 
 python_prepare_all() {
+	local PATCHES=( "${FILESDIR}"/${P}-swig.patch )
 	ecvs_clean
 	find "${S}" -name LICENSE -type f -delete || die