summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-03-06 22:10:34 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-03-06 22:10:34 +0000
commit00ce16f2303a359d0e54d9a91751189d13b15dfe (patch)
tree9489145560a12585059fa66ce4aa9fd632e094e2 /dev-python/pyzmq
parentThe old patch seemed to have incorrect line endings in it and would not apply... (diff)
downloadhistorical-00ce16f2303a359d0e54d9a91751189d13b15dfe.tar.gz
historical-00ce16f2303a359d0e54d9a91751189d13b15dfe.tar.bz2
historical-00ce16f2303a359d0e54d9a91751189d13b15dfe.zip
Support Python 3. Restrict Jython ABIs. Fix dependencies. Set PYTHON_MODNAME. Fix src_test().
Package-Manager: portage-2.2.0_alpha26_p7/cvs/Linux x86_64
Diffstat (limited to 'dev-python/pyzmq')
-rw-r--r--dev-python/pyzmq/Manifest2
-rw-r--r--dev-python/pyzmq/pyzmq-2.0.10.1.ebuild25
2 files changed, 15 insertions, 12 deletions
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 8faee7de4276..5e8969cf21d7 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,4 +1,4 @@
DIST pyzmq-2.0.10.1.tar.gz 1381577 RMD160 cf77e189188599ced96e71a51145255e7c295203 SHA1 303155731262997dcf70ec1eb9e6daf858c8af7d SHA256 f6d9d8a16cda85e7ff88ab3a3a6fd718d790c7cfdb3b8d21f27258e8247266fd
-EBUILD pyzmq-2.0.10.1.ebuild 1196 RMD160 b7632da330d479f8ce93814c2d603fbde62ecf1e SHA1 041dfcdcc794942cc66e302550d218a1adc73000 SHA256 a082ea25d2a28f122603b8e6e8bb1b6b1fb11e91da767ef1c02f3801494dc5ec
+EBUILD pyzmq-2.0.10.1.ebuild 1448 RMD160 a0af1d26619bd566dc00ce4ae31a30f3a5beb3e5 SHA1 db3b69400cb3fc3f8852c7f82f9f852fba9cca5f SHA256 a433c0188943330fb524f39029f7b40d6c3f38d2770aa101f1479582c991757d
MISC ChangeLog 351 RMD160 2d5dfd26aadd0530bdd8feb2924dd0266c71f560 SHA1 c8cd7921a8b267705ed829919e888334776fdf35 SHA256 216911c13974a7ade7951d01628ecf45b9b5873cab03e4464b8825c6d6d36731
MISC metadata.xml 259 RMD160 4b781a038008fac445e4154045f964b64ad59e75 SHA1 9809d89f3360f9f7537c2bb480d6bcbe942c6ea0 SHA256 0fb1da675767b69b5bd240d135effe2fc500e8b997a5f4eed212e5b26d027972
diff --git a/dev-python/pyzmq/pyzmq-2.0.10.1.ebuild b/dev-python/pyzmq/pyzmq-2.0.10.1.ebuild
index a83f19eafd8b..7061cd81eea1 100644
--- a/dev-python/pyzmq/pyzmq-2.0.10.1.ebuild
+++ b/dev-python/pyzmq/pyzmq-2.0.10.1.ebuild
@@ -1,11 +1,12 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-2.0.10.1.ebuild,v 1.1 2011/03/04 17:27:48 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-2.0.10.1.ebuild,v 1.2 2011/03/06 22:10:34 arfrever Exp $
EAPI="3"
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="*:2.5"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
+RESTRICT_PYTHON_ABIS="2.4 *-jython"
+DISTUTILS_SRC_TEST="nosetests"
inherit distutils
@@ -18,26 +19,28 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc"
-DEPEND="net-libs/zeromq
- dev-python/setuptools
- doc? ( >=dev-python/sphinx-0.6 )"
-RDEPEND=""
+RDEPEND="net-libs/zeromq"
+DEPEND="${RDEPEND}
+ dev-python/setuptools
+ doc? ( >=dev-python/sphinx-0.6 )"
DOCS="README.rst"
+PYTHON_MODNAME="zmq"
src_compile() {
distutils_src_compile
if use doc; then
einfo "Generation of documentation"
- cd docs
- PYTHONPATH=".." emake html || die "Building of documentation failed"
+ pushd docs > /dev/null
+# PYTHONPATH="$(ls -d ../build-$(PYTHON -f --ABI)/lib.*)" emake html || die "Generation of documentation failed"
+ PYTHONPATH=".." emake html || die "Generation of documentation failed"
+ popd > /dev/null
fi
}
src_test() {
testing() {
- "$(PYTHON)" setup.py build_ext --inplace
- "$(PYTHON)" setup.py test
+ PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" nosetests -sv $(ls -d build-${PYTHON_ABI}/lib.*)
}
python_execute_function testing
}