summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-07-23 21:11:23 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-07-23 21:11:23 +0000
commit7796475c79d470dab6846255cdfab3a0cc8425fa (patch)
treedabcc70402cb1598a44afc0e1fcf8f33613f3dd2 /dev-python/h5py
parentUse virtual/jpeg. (diff)
downloadhistorical-7796475c79d470dab6846255cdfab3a0cc8425fa.tar.gz
historical-7796475c79d470dab6846255cdfab3a0cc8425fa.tar.bz2
historical-7796475c79d470dab6846255cdfab3a0cc8425fa.zip
Fix building with Python 2.7 (bug #327859).
Package-Manager: portage-HEAD/cvs/Linux x86_64
Diffstat (limited to 'dev-python/h5py')
-rw-r--r--dev-python/h5py/ChangeLog6
-rw-r--r--dev-python/h5py/Manifest5
-rw-r--r--dev-python/h5py/files/h5py-1.3.0-python-2.7.patch13
-rw-r--r--dev-python/h5py/h5py-1.3.0.ebuild9
4 files changed, 28 insertions, 5 deletions
diff --git a/dev-python/h5py/ChangeLog b/dev-python/h5py/ChangeLog
index 02b639761496..469ea5a54483 100644
--- a/dev-python/h5py/ChangeLog
+++ b/dev-python/h5py/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/h5py
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/ChangeLog,v 1.3 2010/07/23 20:51:56 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/ChangeLog,v 1.4 2010/07/23 21:11:23 arfrever Exp $
+
+ 23 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ h5py-1.3.0.ebuild, +files/h5py-1.3.0-python-2.7.patch:
+ Fix building with Python 2.7 (bug #327859).
23 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
h5py-1.3.0.ebuild:
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index e660df617563..b0d29584a149 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,4 +1,5 @@
+AUX h5py-1.3.0-python-2.7.patch 319 RMD160 051913e8b73df8412090d2f586771351f158f36f SHA1 745b5ad0f7aefd2b4cd06db56adf571d3289ac93 SHA256 82cab5ec7d08dc6d0f5d95b7c3613ca3354ca5b71b24a0e949db9e09c041a3e2
DIST h5py-1.3.0.tar.gz 1533645 RMD160 49e475ca6bf2de375eb98b5c8cca78b534d1ef6f SHA1 9398cb3a11ea7f6b62738330206c7dce7c7c2132 SHA256 1708268a86252f94154d854157d33a7ab48d7ec6d09515dd414a01f87019928a
-EBUILD h5py-1.3.0.ebuild 773 RMD160 20459abcb4d48a8a6f5aaef03e5cc5710070b638 SHA1 9a4915c9264f462f4db55f853b148d2a8d0d22e4 SHA256 ed41d4d849fb8b4e0af9d1327e816ae4f4dcc9d36e1c216175b5c8176177f84c
-MISC ChangeLog 1395 RMD160 708bffa057260d7d2c2cd3476d32c0720e343306 SHA1 41d377e3975a2e1ab7c2b4fe4e7401de802da1a3 SHA256 93743cb8d2ad3f11a102cabfa9466f2281be0498b6cf771863120806e3b6a307
+EBUILD h5py-1.3.0.ebuild 866 RMD160 61e560d12e8853ce33386877b21c51964eb2452c SHA1 6d708da6556335946f6c604ef4ed20604905cb39 SHA256 27f5613b25a6c381cfd318d1e8f391384bfb2f6e8b8dd184f3101f416e277ee6
+MISC ChangeLog 1572 RMD160 61f9bcb717c495460c1b2aea277d233468dc69df SHA1 86f095251de7238ef4e97bf3d0be0b7ab879ee32 SHA256 399d29f38627e7aecf9bafd0a452fbe40018751eaedc18e8f1478e2a04328973
MISC metadata.xml 685 RMD160 f3c9b3d97b716f571966e1d5568d429b71fd9858 SHA1 0b553cb79ce4685a77c38dbf38f1d664a974e075 SHA256 7fa1a12493813c68dddc29b3a7f4fd6519e258684dbeb189e442af3ab3ce6c6c
diff --git a/dev-python/h5py/files/h5py-1.3.0-python-2.7.patch b/dev-python/h5py/files/h5py-1.3.0-python-2.7.patch
new file mode 100644
index 000000000000..93a5014c0bbb
--- /dev/null
+++ b/dev-python/h5py/files/h5py-1.3.0-python-2.7.patch
@@ -0,0 +1,13 @@
+https://code.google.com/p/h5py/issues/detail?id=123
+
+--- detect.py
++++ detect.py
+@@ -9,7 +9,7 @@
+ """
+
+ from distutils import ccompiler
+- from distutils.core import CompileError, LinkError
++ from distutils.errors import CompileError, LinkError
+ import subprocess
+
+ cc = ccompiler.new_compiler()
diff --git a/dev-python/h5py/h5py-1.3.0.ebuild b/dev-python/h5py/h5py-1.3.0.ebuild
index 4ed50c67bb2b..ef680dead6e8 100644
--- a/dev-python/h5py/h5py-1.3.0.ebuild
+++ b/dev-python/h5py/h5py-1.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/h5py-1.3.0.ebuild,v 1.2 2010/07/23 20:51:56 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/h5py-1.3.0.ebuild,v 1.3 2010/07/23 21:11:23 arfrever Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
DISTUTILS_SRC_TEST="setup.py"
-inherit distutils
+inherit distutils eutils
DESCRIPTION="A simple Python interface to HDF5 files."
HOMEPAGE="http://h5py.alfven.org/ http://code.google.com/p/h5py/ http://pypi.python.org/pypi/h5py"
@@ -26,3 +26,8 @@ RDEPEND="${DEPEND}"
PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-python-2.7.patch"
+ distutils_src_prepare
+}