summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-07-24 03:25:44 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-07-24 03:25:44 +0000
commitfef60b5b196d1edfb6361e62e15c614ed44afab8 (patch)
tree21aaeda481249764fa122acff020dc1c93c64d39 /dev-python
parentVersion bump (bug #327845). (diff)
downloadgentoo-2-fef60b5b196d1edfb6361e62e15c614ed44afab8.tar.gz
gentoo-2-fef60b5b196d1edfb6361e62e15c614ed44afab8.tar.bz2
gentoo-2-fef60b5b196d1edfb6361e62e15c614ed44afab8.zip
Set SUPPORT_PYTHON_ABIS. Fix building with Python >=2.5 on 64-bit architectures. Fix tests (bug #318405).
(Portage version: HEAD/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/eunuchs/ChangeLog9
-rw-r--r--dev-python/eunuchs/eunuchs-20050320.1.ebuild32
-rw-r--r--dev-python/eunuchs/files/eunuchs-20050320.1-python-2.5.patch11
3 files changed, 41 insertions, 11 deletions
diff --git a/dev-python/eunuchs/ChangeLog b/dev-python/eunuchs/ChangeLog
index 20d59493a37a..97fbe46eadee 100644
--- a/dev-python/eunuchs/ChangeLog
+++ b/dev-python/eunuchs/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-python/eunuchs
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/eunuchs/ChangeLog,v 1.4 2008/03/12 17:59:53 phreak Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eunuchs/ChangeLog,v 1.5 2010/07/24 03:25:43 arfrever Exp $
+
+ 24 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ eunuchs-20050320.1.ebuild, +files/eunuchs-20050320.1-python-2.5.patch:
+ Set SUPPORT_PYTHON_ABIS. Fix building with Python >=2.5 on 64-bit
+ architectures. Fix tests (bug #318405).
12 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
Removing Marien Zwart (marienz, #107204) from metadata.xml.
diff --git a/dev-python/eunuchs/eunuchs-20050320.1.ebuild b/dev-python/eunuchs/eunuchs-20050320.1.ebuild
index 251cea08ecf2..301ed8b1e793 100644
--- a/dev-python/eunuchs/eunuchs-20050320.1.ebuild
+++ b/dev-python/eunuchs/eunuchs-20050320.1.ebuild
@@ -1,8 +1,13 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/eunuchs/eunuchs-20050320.1.ebuild,v 1.2 2006/04/01 14:52:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eunuchs/eunuchs-20050320.1.ebuild,v 1.3 2010/07/24 03:25:43 arfrever Exp $
-inherit distutils
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils
DESCRIPTION="Missing manly parts of UNIX API for Python"
HOMEPAGE="http://www.inoi.fi/open/trac/eunuchs"
@@ -10,10 +15,23 @@ SRC_URI="mirror://debian/pool/main/e/${PN}/${PN}_${PV}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~ia64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~x86"
IUSE=""
-DEPEND="dev-lang/python"
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+ distutils_src_prepare
+ epatch "${FILESDIR}/${P}-python-2.5.patch"
+}
+
+src_test() {
+ testing() {
+ PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" examples/test-socketpair.py
+ }
+ python_execute_function testing
+}
src_install() {
distutils_src_install
@@ -21,7 +39,3 @@ src_install() {
docinto examples
dodoc examples/*
}
-
-src_test() {
- ${python} examples/test-socketpair.py || die "socketpair test failed"
-}
diff --git a/dev-python/eunuchs/files/eunuchs-20050320.1-python-2.5.patch b/dev-python/eunuchs/files/eunuchs-20050320.1-python-2.5.patch
new file mode 100644
index 000000000000..dfad7a8dce79
--- /dev/null
+++ b/dev-python/eunuchs/files/eunuchs-20050320.1-python-2.5.patch
@@ -0,0 +1,11 @@
+--- lib/eunuchs/sendmsg.c
++++ lib/eunuchs/sendmsg.c
+@@ -101,7 +101,7 @@
+ real_controllen += CMSG_SPACE(sizeof *info);
+ } else {
+ char *data;
+- int len;
++ Py_ssize_t len;
+
+ if (PyString_AsStringAndSize(rest, &data, &len))
+ return NULL; // TODO leaks