Added a patch for python-3 at configure time

Package-Manager: portage-2.2.01.21476-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 25 insertions, 10 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index f841155ba9a5..d6352a7ed5cd 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/gdl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.37 2013/01/03 20:32:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.38 2013/01/04 21:50:58 bicatali Exp $
+
+  04 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> +files/0.9.3-numpy.patch,
+  gdl-0.9.3.ebuild:
+  Added a patch for python-3 at configure time
 
   03 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org>
   +files/0.9.3-netcdf-cxx.patch, gdl-0.9.3.ebuild:
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 733bf0e52438..cdae8675f084 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -8,17 +8,18 @@ AUX 0.9.2-proj4.patch 1185 SHA256 4c6b4d97823ddeebae4c3170dc80c14bb68681117de599
 AUX 0.9.2-semaphore.patch 770 SHA256 cbdfe65ddd23a62f04b2beee46f9f6e80bd12ff55a3563ea7059a7e2c083aac4 SHA512 6f921539e3dc09af453403f3b4137fc3e7d6fd4b81f05cb3214b4ab6a2feecbe2f3aeae1cdf03d92db13e60f7562825fa1a9bebfd75ac47fc6625b88f367b5ac WHIRLPOOL e1b8a55f0ce9d2626b53882528d0ee7056ad28ea5bbf746a7d77b4074d63977c1940bba478eb6b54a56d1b64e843a55106f53a21fb166d6566197828aef16208
 AUX 0.9.2-tests.patch 8616 SHA256 4cf7fa89353265361bdbcf38fbeb3bacb572f2b8920ca00a73ce1d66a57c5a9e SHA512 885d2196d617eb4d37bcba056ece4ffb06366847cc213f0ee8c0a693925d16f27131a5d5bd92c5a7a555876a8d40e0a27dd59113aab9f76c319288e38dccf01a WHIRLPOOL 1191100da88814048c8fbd1c3e5881b1ea99f03e1de4d5945214230b6c4617ed643794d5cadb497bb7228bc37c811fe4db2593eff711c447ae3a30a1f402524b
 AUX 0.9.3-netcdf-cxx.patch 1499 SHA256 549a1465c9ecf6d8c9018dad06b605fb3af99c8e78c7ae903625af4421b6a405 SHA512 3db71f92fd93f0ee6607dd8a64de11f2eba57a60fb6b9deaf2ce2410656b0db0bc552f8c2becc472d1c72ad144882fe74e30379d9c8b4c74d2f1d047c5489215 WHIRLPOOL 355483d0ce00bcf0f76d72424945d232e8de9fbfd34300fcc57e2ec2954c264e80fc574a533f40f5aad6e2d85d2dbf51cbd069d0189734dc8d6b2924addc99eb
+AUX 0.9.3-numpy.patch 441 SHA256 e6058d35a6d0b1f1343aa46a450c0c64be6980bf40af866ec211294d8acedbf4 SHA512 9e3c9c5cf1d257d8365900919636059ebe3070a8b362b60da49fb8706b4ff2300549e6ff66c51f655d8d31918310d0a8dac26c028a564ee4d9c29b2aab286b13 WHIRLPOOL c134d5f830cb5d3d793e58be4039b3e8603a5c276a8df62a487e56fad6ce19a3676589be9df2a4a02444bcd6e1a0f7a801eea42ea2a0c252924de56313e23373
 AUX 0.9.3-sstream.patch 891 SHA256 ef02cd0e1b2b80ee61096ea8867091b720b2111e841d6b4fe14b6986db4fa199 SHA512 d88c9ccab80ba0ec5d1e9b2e3d71be5d2c0c09aaef2ccf4d26cde2110a42eb23568b14f527ddefebc608f197a3e37bb539a2fc90a38a8059f76908dff3e3ddd7 WHIRLPOOL fac6aba02aa1d584a2d4d7bf17fc59bda8469fd5bfb241acfb3490e84dd518934c9c21a2b20d9a272cf6cb799c6f976964e7b71b204b5b39f9c27501b3d2c3a4
 DIST gdl-0.9.2.tar.gz 2436946 SHA256 59907d941877327e9653a9cda5d801ea0b45f67af4c7da22acfcdd7cad291acf SHA512 44531b03fa698f268eea7a4e9dfe9a2c5746b4432c0198d616eb0938e9d9228bb3a2e3cf70b86f26d4cd720bf626b8c85f19bb79d3218727eba57689e07c9367 WHIRLPOOL 6ee960519adb2f3850808fd690cfd77571ef625b1f82cbe81a93c30a96ae3a19f9716e00fd44e6d541abb3211d4c255b5f773113e095d0f64057493f1d33903d
 DIST gdl-0.9.3.tar.gz 2540106 SHA256 6d3c30c06ce2772a1017b3685dfc8fb74308e5f9d258fcb764b765c33d20f500 SHA512 63bb656c1280c24429dd0f8093f9ec7aab69b32e33b489461b863068409c7f49843e1997c2ff423fecf58d042e5d95d9b745f00495be4ea37ccb911936722e7c WHIRLPOOL 1652519dbdf99f95ec4ba11528c2d5dcfc3d40c708a01b390900002f6a9933800bee7af6af175452a3ecde517ce213791a06f779c85161e34c95616e9f0ccf60
 EBUILD gdl-0.9.2-r2.ebuild 3938 SHA256 73a024d8f5f4e95d4e0cd575134b879718c7467efd6119b724ad729c2437f0a6 SHA512 993be4950d9103e91b3028da8f1079948832e40d5d8b45adefab35cc22663cd7e8a0e8cbedb8dfbdb38f749ac1970402fcaebb9074a94d12d1e2ca14ff91298a WHIRLPOOL 81b7450b4e4789b035b7606436fabb1dc2e2ba1326540d85e9300ed2d3168d262fef5e46b7f598f678c9fb416c6262937fa886baefb7d3c21a92afc0596e3489
-EBUILD gdl-0.9.3.ebuild 4103 SHA256 87e306be78ba676720695cbad61b4e9ee5023463229c35b6793fb55d833a1c95 SHA512 07dd0856d1a57ea4a274f707de775a7ac166c705c4d7ae51ce9b42d2f545cbfb44a52144959886b9ca4e0390ff80d9b160aee39dad721ca116e675a46140caec WHIRLPOOL 4049516376ad6c19561231e7e44deaeb8012f97a8c68995ea596fbf3dae617e3d09345aff98a5849d2789682da5ce7b74016853b6fbb42a3dc24c2dbc6f658c5
-MISC ChangeLog 8433 SHA256 e383811037fe786756139847cbd1995e18d932988a7843787977f4c526349766 SHA512 13abeeec3e47d4267b739325dc613bf2726c92ddc454ca42d5db9af7b4e4ad93d472df162cf2c109aea0c9f3fd66bac7c9f8508dddcda805583127dc64d426f1 WHIRLPOOL e5dfb305cd479f5f060c855768944f5f6909ebf93c36c07cbbb9004be73511cf1a5eaab191bcb4610fdd0736c39270ef003f430ff08bb09f31ad9134ece378d1
+EBUILD gdl-0.9.3.ebuild 4108 SHA256 f368b948d20d7214075a0cc0e474b09eec54928c3bccaefed7ef3c5427aa77de SHA512 4abdaa99b305ef2c51c50aadd9148cd9857798005ffbbb2f22b06ba7ed9fb64101b147f9fdca5c80e98696ce8edb047dd4f37bdb60a1c21fce279d76e45b8cf1 WHIRLPOOL 7a9d306e29157a59852700dd6c63183b3ea02420412920c275483adca9eaeebf47ce8ff09f2ff4f934b80ba5669f0426ff26a01b7ffd00cfb42feb53ad4a3828
+MISC ChangeLog 8582 SHA256 b3b4d0aa6dde692a6c02fc7b29c352a53661a791b535a426c00b1eefd943032b SHA512 a412a74be9555eee619d7b7869fd7954d8d3268d77f36cefe66c4a3d535d0ecc5bb9eebc0ec9b453c3aff106e2e29578e8425aecd8aef43ed486205a53a91177 WHIRLPOOL a1018aa7654d365d9de605fcd305b961a449e06011626a90626765038cabd3f50938a43d32c6f17443400115c92b067d7e60a9bd17f74eec6e428ec1da9bc1ec
 MISC metadata.xml 868 SHA256 8fe2970b31ca708b5948308b6de3ddb28c097df8f4a542bf051857ca724897d6 SHA512 1f95c2d1f7791e6644fdd27ec08fe0096d0ac7c4b9232c89c236e5d50b9f99130904b056d42fb663e005acfe97781246402a12e0e955812cee0b4dca0a1e4f56 WHIRLPOOL 31b23b40fb3209f0529917ce29f8e231f44bc04a88630f3a4a907a1ba5c01f1e51bdd21c84dfd4b2e2bce613a8151ae9371f284d16229eb08c0ab961dad833ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDl6u0ACgkQ1ycZbhPLE2As0QCfeKN7FC8Ozu2jIRzFYVIBYyLk
-WV4An332SMedA/D1BUC+/NOcpjFe8qnQ
-=sIjf
+iEYEAREIAAYFAlDnTscACgkQ1ycZbhPLE2ALsQCeMAs6UqQyzsu4JZmVc22UWuBK
+9IAAn3rmZ8/U24XVCwI9yS+Mb3YdjmzF
+=yAfN
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/gdl/files/0.9.3-numpy.patch b/dev-lang/gdl/files/0.9.3-numpy.patch
new file mode 100644
index 000000000000..5c1814ffaf92
--- /dev/null
+++ b/dev-lang/gdl/files/0.9.3-numpy.patch
@@ -0,0 +1,11 @@
+--- CMakeModules/FindNumpy.cmake.orig	2013-01-04 13:32:52.094561564 -0800
++++ CMakeModules/FindNumpy.cmake	2013-01-04 13:46:02.228485462 -0800
+@@ -23,7 +23,7 @@
+ 
+ IF(PYTHON_EXECUTABLE)
+     EXEC_PROGRAM ("${PYTHON_EXECUTABLE}"
+-      ARGS "-c 'import numpy; print numpy.get_include()'"
++      ARGS "-c 'import numpy; print(numpy.get_include())'"
+       OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIR
+       RETURN_VALUE PYTHON_NUMPY_NOT_FOUND)
+ 
diff --git a/dev-lang/gdl/gdl-0.9.3.ebuild b/dev-lang/gdl/gdl-0.9.3.ebuild
index 16be3329acc1..c2cf6be229dd 100644
--- a/dev-lang/gdl/gdl-0.9.3.ebuild
+++ b/dev-lang/gdl/gdl-0.9.3.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.3.ebuild,v 1.3 2013/01/03 20:32:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.3.ebuild,v 1.4 2013/01/04 21:50:58 bicatali Exp $
 
 EAPI=4
 
 WX_GTK_VER="2.8"
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.3 2.7-pypy-*"
 
 inherit cmake-utils eutils wxwidgets python toolchain-funcs virtualx
 
-RESTRICT_PYTHON_ABIS="3.3 2.7-pypy-*"
-
 DESCRIPTION="Interactive Data Language compatible incremental compiler"
 HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
@@ -60,7 +59,7 @@ src_prepare() {
 	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
 
 	epatch "${FILESDIR}"/0.9.2-{antlr,proj4,include,tests,semaphore}.patch
-	epatch "${FILESDIR}"/0.9.3-{sstream,netcdf-cxx}.patch
+	epatch "${FILESDIR}"/0.9.3-{numpy,sstream,netcdf-cxx}.patch
 	# make sure antlr includes are from system and rebuild the sources with it
 	# https://sourceforge.net/tracker/?func=detail&atid=618685&aid=3465878&group_id=97659