Set SUPPORT_PYTHON_ABIS. Fix building with Python >=2.5 on 64-bit architectures. Fix tests (bug #318405).

Package-Manager: portage-HEAD/cvs/Linux x86_64

5 files changed, 45 insertions, 34 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/Manifest b/dev-python/eunuchs/Manifest
index 8407bc984279..a4c78d0ca0c1 100644
--- a/dev-python/eunuchs/Manifest
+++ b/dev-python/eunuchs/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX eunuchs-20050320.1-python-2.5.patch 262 RMD160 c291df4e14237c140584d791f58c7e17534ad19d SHA1 8ca553a9ee0b583dcc6ff1008c06b5a1a24eac67 SHA256 85fdab2e42a9b3b827c31f724ec2273b3c5f71aea48174e5d18d30eb88bb4e64
 DIST eunuchs_20050320.1.tar.gz 8448 RMD160 7c224f906874d2e79302e6950d491dc8f1122d03 SHA1 8fa630851c791e48d110f9bb9833518b42c520c6 SHA256 2ca782d49b4065b37226f2a3f839e73d5d4c78d661ec9d2cf6219887135f9408
-EBUILD eunuchs-20050320.1.ebuild 665 RMD160 2892680c1ef46357e218227f60c8e9e742879faa SHA1 8a2d27dc3611f44dacde0ad2cbe911cad8b1ee6f SHA256 6731efce68d9517e0eb04d34b4291bd120c8eec459827c313f47beeda3e9155d
-MISC ChangeLog 744 RMD160 12a89d05d70707a27e251298f1514ed7dbe26034 SHA1 517d601223eeb56888d243439206f6787540c812 SHA256 3b8efa3fc5dea0b05442c88456475dd4bac52466be675da7b248b5903bd5c51d
+EBUILD eunuchs-20050320.1.ebuild 908 RMD160 68b6b7d7387f28784485e43fb7117aedf742e337 SHA1 f3edcde27f03c568dfacd65649c86803dc907379 SHA256 fa97b577c6871051fa5812366f1ac64dfe0c14da918eb952514162737ba90015
+MISC ChangeLog 1003 RMD160 435e885ab837f89fc96a013a57e5c48f4f863801 SHA1 3ab6fbe9b918903256ce897bbbd9413d803c8b34 SHA256 a2c49c7603211e6cb5316c617cf35c71bc1f60f5d4b9b1ddfb4208209a44d5e1
 MISC metadata.xml 578 RMD160 05ab64b0d54c5886d0f99215e3b285586d5bcda2 SHA1 eb07bc5067d1e15db5b1f96c0c0a864f845abd12 SHA256 6896949291fb29ffc2fac69631756310bc873a836638655e436bae02f2982238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH2BofyuNVb5qfaOYRAgx8AKClLtiWRrnB+Qo2CBltAenQiLBgHQCeNszn
-wRIXQ1K6KcQ6kaECjlcy2Bo=
-=CeHg
------END PGP SIGNATURE-----
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
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index cfd15b076ad6..33e0b97e4df8 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST py-1.2.1.tar.gz 380065 RMD160 caa18f71fb6f0970fa5dc9cb71b2a424dc461264 SHA1 724445612fa77cdc61e0dd554cd46a6e69b3d6bb SHA256 d00f34e4828b1274dcbf0a3e3812d2464cc0d457160df682824e28c29d52ee7f
 DIST py-1.3.1.tar.gz 409863 RMD160 bd1fd0812b1eb73cb472a43d6d28b8240f1e69a2 SHA1 ad6abb6c8b2f03409873b9d848dd4ac868f9a141 SHA256 238094dffb39a1b3cdecac651170f5469329c9ecaf6d1e84381f62a9f6106028
 DIST py-1.3.2.tar.gz 450941 RMD160 71cb1f41e9bdddae191758a08b7ca8aaeea7bdad SHA1 dd5ad5c592230955bb8fe5bc24a5b1b4095e68b4 SHA256 6d446de2055e48cf95f708b7ac386549522c3463ffb1dfd031edfb798ced1cb3
 EBUILD py-1.2.1.ebuild 819 RMD160 542b46031444ccee3ffccc1495f28d9244d677e3 SHA1 d4aa3682f31fedf853f4b435562e6f196f3b351a SHA256 21c02c7d810b9c9afb171861b1cf91374b995c94ce83eef7a15cb412de112a48
 EBUILD py-1.3.1.ebuild 819 RMD160 36f070f74e56121e4df514770ccf274d0ea5b678 SHA1 74b11a7e6d0b3a3a6f6ff6b5617b52baf4cd2731 SHA256 c82ad0934dc1672eaaabadd2ae01d0d6ffe1312fc811303b6cf9a6a11739699f
-EBUILD py-1.3.2.ebuild 1075 RMD160 65c300b77b4d16b79a0208470fef532b6994e8a8 SHA1 9b268803ab5d0177883e519d81a8bb8fdccded25 SHA256 d2af1d2e0e2c018008be46b2ba744d8c2f308d634b2ba4b87f09783349c98192
+EBUILD py-1.3.2.ebuild 1085 RMD160 5dffb880ad165957d5b73e203a5c99d8cc968499 SHA1 aa4a026e662ea03be49a91333ca9acd2dba0e233 SHA256 c9a43be677fc618e78f460cf13317d9c6780dc3d653193066315d47afd479bdd
 MISC ChangeLog 5018 RMD160 58c6de8e932e61e0274606ed7ec65cc19818f397 SHA1 a8728a2c184060e468165dca45ad0aa26a560d77 SHA256 89a8a55b586ad9cf22dabd78eb795cd619eacfc9be4cbbd8f86baf59a8daeff6
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkxHSaYACgkQkKaRLQcq0GIW1wCgjbBBH60yq2kcBCfwZY5/Czuj
-3ZAAn3AV1HXlakMICgEqx/RJnVFHU7q5
-=a2pl
------END PGP SIGNATURE-----