Added a patch to compile with gsl >= 1.13, thanks Kacper Kowalik, closing bug #286605

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

4 files changed, 75 insertions, 4 deletions

diff --git a/dev-python/pygsl/ChangeLog b/dev-python/pygsl/ChangeLog
index c99a53077c28..b03ff1362529 100644
--- a/dev-python/pygsl/ChangeLog
+++ b/dev-python/pygsl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pygsl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygsl/ChangeLog,v 1.10 2009/09/04 20:20:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygsl/ChangeLog,v 1.11 2009/09/30 18:55:08 bicatali Exp $
+
+  30 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> pygsl-0.9.4.ebuild,
+  +files/pygsl-0.9.4-obsolete-units.patch:
+  Added a patch to compile with gsl >= 1.13, thanks Kacper Kowalik, closing
+  bug #286605
 
   04 Sep 2009; Patrick Lauer <patrick@gentoo.org> -pygsl-0.9.3.ebuild:
   Remove old
diff --git a/dev-python/pygsl/Manifest b/dev-python/pygsl/Manifest
index b335c595917a..56f175de829f 100644
--- a/dev-python/pygsl/Manifest
+++ b/dev-python/pygsl/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pygsl-0.9.4-obsolete-units.patch 2624 RMD160 ebaef09ea83ce42589156bd4fa85f71638cce751 SHA1 d71e74ddc8072335b878770058c2dedb695fff51 SHA256 9d6d05c853ea1d13d6c5ddf89da45c8671c0566d1a7be02d35280b2a47d76e69
 DIST pygsl-0.9.4.tar.gz 663425 RMD160 316f6fe27573d18a1162534aec62868e1c0f15bd SHA1 563f12799cdf5fa394d5829575bc6c2509925576 SHA256 ec40bff48afd1ded866ae1ae49c6a19fd6c4c9bb9dd1620cd55555cb696dd0b9
-EBUILD pygsl-0.9.4.ebuild 803 RMD160 5a321e33d9399e72a1799cdd8046f1fe3022eaeb SHA1 e1c56dd3863aff7838839837dbcb7ffe1b226489 SHA256 9329f79f0152dabb9c86038f8f500ffd6d2b56b2478ac3c8910a08560847ab66
-MISC ChangeLog 1579 RMD160 48056c1731304b60ff16ae3b8096ad448a859a7a SHA1 acfbc908e921e253bc7b522a6552063c360e2861 SHA256 b2ccf2ee472ad3dbd0119a8393be7523eea51d9c9ed26c3fb8dcc64d7fc63de2
+EBUILD pygsl-0.9.4.ebuild 916 RMD160 0624ace74da7965f61e294b230ac291ac2d2c965 SHA1 d32f2042028248ec50109cb21b3af619a3d9792a SHA256 011ef2b41c8ba8f702a35ead5f3813e04974ffa54f85c73633eab2c368963a09
+MISC ChangeLog 1789 RMD160 c8ed106f490b96148d054ac9516998ed081ed8cf SHA1 9d26513c946dadf8dce5732967647f5ce5f610b8 SHA256 c4f93e50e1293e0ad19f5cb6b9ad79edfca40b71a43fbcb4b896992a4265dc67
 MISC metadata.xml 283 RMD160 904f8833d39785cbd4b547172584d8344378325c SHA1 4cc078946ad8ac81fec28818802d48462e3cc7cf SHA256 04693fd82b398ced879a6019aba2480bd089026b0d4c8ac3d82c4b4a29c0c719
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrDqZUACgkQ1ycZbhPLE2DT2ACbBPCR3XTiTc6TDiXFCM8dgtr9
+tj0AoI+y9+VrV+QVZm+viwJ8FO6ybRzT
+=pmI8
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pygsl/files/pygsl-0.9.4-obsolete-units.patch b/dev-python/pygsl/files/pygsl-0.9.4-obsolete-units.patch
new file mode 100644
index 000000000000..5f047e6a3fe6
--- /dev/null
+++ b/dev-python/pygsl/files/pygsl-0.9.4-obsolete-units.patch
@@ -0,0 +1,50 @@
+--- pygsl-0.9.4.orig/src/const_cgs_array.c	2005-04-27 09:53:37.000000000 +0200
++++ pygsl-0.9.4/src/const_cgs_array.c	2009-09-28 17:37:26.981970170 +0200
+@@ -14,10 +14,10 @@
+ {"mass_neutron",GSL_CONST_CGS_MASS_NEUTRON,"g"},
+ {"rydberg",GSL_CONST_CGS_RYDBERG,"g cm^2 / s^2"},
+ {"boltzmann",GSL_CONST_CGS_BOLTZMANN,"g cm^2 / K s^2"},
+-{"bohr_magneton",GSL_CONST_CGS_BOHR_MAGNETON,"A cm^2"},
+-{"nuclear_magneton",GSL_CONST_CGS_NUCLEAR_MAGNETON,"A cm^2"},
+-{"electron_magnetic_moment",GSL_CONST_CGS_ELECTRON_MAGNETIC_MOMENT,"A cm^2"},
+-{"proton_magnetic_moment",GSL_CONST_CGS_PROTON_MAGNETIC_MOMENT,"A cm^2"},
++/*{"bohr_magneton",GSL_CONST_CGS_BOHR_MAGNETON,"A cm^2"},*/
++/*{"nuclear_magneton",GSL_CONST_CGS_NUCLEAR_MAGNETON,"A cm^2"},*/
++/*{"electron_magnetic_moment",GSL_CONST_CGS_ELECTRON_MAGNETIC_MOMENT,"A cm^2"},*/
++/*{"proton_magnetic_moment",GSL_CONST_CGS_PROTON_MAGNETIC_MOMENT,"A cm^2"},*/
+ {"molar_gas",GSL_CONST_CGS_MOLAR_GAS,"g cm^2 / K mol s^2"},
+ {"standard_gas_volume",GSL_CONST_CGS_STANDARD_GAS_VOLUME,"cm^3 / mol"},
+ {"minute",GSL_CONST_CGS_MINUTE,"s"},
+@@ -76,9 +76,9 @@
+ {"psi",GSL_CONST_CGS_PSI,"g / cm s^2"},
+ {"poise",GSL_CONST_CGS_POISE,"g / cm s"},
+ {"stokes",GSL_CONST_CGS_STOKES,"cm^2 / s"},
+-{"faraday",GSL_CONST_CGS_FARADAY,"A s / mol"},
+-{"electron_charge",GSL_CONST_CGS_ELECTRON_CHARGE,"A s"},
+-{"gauss",GSL_CONST_CGS_GAUSS,"g / A s^2"},
++/*{"faraday",GSL_CONST_CGS_FARADAY,"A s / mol"},*/
++/*{"electron_charge",GSL_CONST_CGS_ELECTRON_CHARGE,"A s"},*/
++/*{"gauss",GSL_CONST_CGS_GAUSS,"g / A s^2"},*/
+ {"stilb",GSL_CONST_CGS_STILB,"cd / cm^2"},
+ {"lumen",GSL_CONST_CGS_LUMEN,"cd sr"},
+ {"lux",GSL_CONST_CGS_LUX,"cd sr / cm^2"},
+@@ -87,7 +87,7 @@
+ {"lambert",GSL_CONST_CGS_LAMBERT,"cd sr / cm^2"},
+ {"footlambert",GSL_CONST_CGS_FOOTLAMBERT,"cd sr / cm^2"},
+ {"curie",GSL_CONST_CGS_CURIE,"1 / s"},
+-{"roentgen",GSL_CONST_CGS_ROENTGEN,"A s / g"},
++/*{"roentgen",GSL_CONST_CGS_ROENTGEN,"A s / g"},*/
+ {"rad",GSL_CONST_CGS_RAD,"cm^2 / s^2"},
+ {"solar_mass",GSL_CONST_CGS_SOLAR_MASS,"g"},
+ {"bohr_radius",GSL_CONST_CGS_BOHR_RADIUS,"cm"},
+--- pygsl-0.9.4.orig/src/const_cgsm_array.c	2006-12-21 13:20:15.000000000 +0100
++++ pygsl-0.9.4/src/const_cgsm_array.c	2009-09-28 17:37:49.301970158 +0200
+@@ -77,7 +77,7 @@
+ {"stokes",GSL_CONST_CGSM_STOKES,"cm^2 / s"},
+ {"faraday",GSL_CONST_CGSM_FARADAY,"abamp s / mol"},
+ {"electron_charge",GSL_CONST_CGSM_ELECTRON_CHARGE,"abamp s"},
+-{"gauss",GSL_CONST_CGSM_GAUSS,"g / abamp s^2"},
++/*{"gauss",GSL_CONST_CGSM_GAUSS,"g / abamp s^2"},*/
+ {"stilb",GSL_CONST_CGSM_STILB,"cd / cm^2"},
+ {"lumen",GSL_CONST_CGSM_LUMEN,"cd sr"},
+ {"lux",GSL_CONST_CGSM_LUX,"cd sr / cm^2"},
diff --git a/dev-python/pygsl/pygsl-0.9.4.ebuild b/dev-python/pygsl/pygsl-0.9.4.ebuild
index 9ad72c56588c..52df5f6bf33f 100644
--- a/dev-python/pygsl/pygsl-0.9.4.ebuild
+++ b/dev-python/pygsl/pygsl-0.9.4.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygsl/pygsl-0.9.4.ebuild,v 1.2 2009/04/06 14:39:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygsl/pygsl-0.9.4.ebuild,v 1.3 2009/09/30 18:55:08 bicatali Exp $
 
+EAPI=2
 inherit distutils
 
 DESCRIPTION="A Python interface for the GNU scientific library (gsl)."
@@ -17,6 +18,10 @@ DEPEND="sci-libs/gsl
 	dev-python/numpy"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	has_version '>=sci-libs/gsl-1.13' && epatch "${FILESDIR}"/${P}-obsolete-units.patch
+}
+
 src_test() {
 	cd "${S}/tests"
 	PYTHONPATH=$(ls -d ../build/lib*) "${python}" run_test.py || die "tests failed"