dev-python/pyicu: Enable support for Python 3

svn path=/sunrise/; revision=12582

diff --git a/dev-python/pyicu/ChangeLog b/dev-python/pyicu/ChangeLog
index ddcf85a7f1b6b9f943eb39a966f3ee19cbe281c9..35ec9295ae0ed8f0b759dc0d823f1e847a778a8c 100644 (file)
--- a/dev-python/pyicu/ChangeLog
+++ b/dev-python/pyicu/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Dec 2011; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
+  pyicu-1.3.ebuild:
+  Enable support for Python 3
+
 *pyicu-1.3 (18 Dec 2011)
 
   18 Dec 2011; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>

diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 306fde3ac04710bddd9f7fe6b9fb664e0431391d..9a5f0c15d71988cf60fb79bfe3c37049ea26e03d 100644 (file)
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,5 +1,5 @@
 AUX r191-tzinfo.patch 4065 RMD160 8fea85a9c422490e31b954b9eee816124e6ffd97 SHA1 b4fc7c92fc891502522f59b2834a12337b03aede SHA256 3baab5c977bf2fc3f2c92ddb255a40f7752896f773e7d8aff38791fe6017a6e5
 DIST PyICU-1.3.tar.gz 208713 RMD160 9fe2972d3f4f9fc434e44e66423ad50001161f70 SHA1 b377c587d01a4e7e036336a42ddbfcf93f1ecf00 SHA256 8c97e9cbef321ace9f388f67eb20e662b3fe5900d675dc535e1a930cf154303e
-EBUILD pyicu-1.3.ebuild 1111 RMD160 70cfc51e47bfc8957e1fc6941111127b5cd08735 SHA1 a5e212690a9f1cee15bb62699d0c98dbba05f293 SHA256 ce312c4432929ea8ee6a36461d0096a3967c2bf21c4da4b7d6afd621837c13fd
-MISC ChangeLog 1485 RMD160 b8268db1330e4b002c2b74ee8eaf4877385c9f73 SHA1 815ebe35fad34bafe988fe6cedf60220b9b229f4 SHA256 8631eac8cfad100a9c4044d74b9063473b32414727a12f51933ad5bdd0c0863d
+EBUILD pyicu-1.3.ebuild 1583 RMD160 81cf711bf832b17b847ecad82301f8f6f1727adb SHA1 4d2c4bf9a97387367f5b64a14748704ff69d7889 SHA256 2c9331d9fa4a095af2e66466e1e29d44efca6237bdd0aa5fc184285f0ba9445d
+MISC ChangeLog 1600 RMD160 075e4be6ac5b3094ffa9a50a84ce48b9023911e5 SHA1 7298f87b2b56ff976769c211af5e5cd355f01aa4 SHA256 adaefdaab5a903fa240e15ea1ff15d95e585b8d968707cefa546e376ecf48240
 MISC metadata.xml 499 RMD160 af4f88a565517083006955a9b06ccdb2ebc82c3c SHA1 b21eb17caffeabee4fa966b2205562680615eee5 SHA256 fc8bc8371e734428b86d929279626a1b8445625299a2a477dd54806ab7ac5f6b

diff --git a/dev-python/pyicu/pyicu-1.3.ebuild b/dev-python/pyicu/pyicu-1.3.ebuild
index f0ea063c2504daae9e5df365ea1245b95807888a..fc957d6370404bca99314207af35f87b76c734a7 100644 (file)
--- a/dev-python/pyicu/pyicu-1.3.ebuild
+++ b/dev-python/pyicu/pyicu-1.3.ebuild
@@ -5,8 +5,9 @@
 EAPI=3
 
 SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+RESTRICT_PYTHON_ABIS="*-jython"
 DISTUTILS_SRC_TEST=setup.py
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1 # setup.py applies 2to3 to tests
 
 inherit base distutils
 
@@ -37,11 +38,24 @@ src_prepare() {
        distutils_src_prepare
 }
 
-distutils_src_compile_post_hook() {
+src_compile() {
+       distutils_src_compile
        if use doc; then
-               echo " * Making documentation"
+               local doc_abi abi
+               for abi in ${PYTHON_ABIS}; do
+                       # Find latest 2.* ABI, fall back to latest ABI if there is no 2.*
+                       if [[ ${abi} == 2* ]] || [[ ${doc_abi} != 2* ]]; then
+                               doc_abi=${abi}
+                       fi
+               done
+               local epydoc=epydoc-${doc_abi}
+               [[ -x ${EROOT}/usr/bin/${epydoc} ]] || epydoc=epydoc
+               echo " * Making documentation from ${doc_abi} build using ${epydoc}"
+               cd "${S}-${doc_abi}"
+               PYTHON_ABI=${doc_abi}
                PYTHONPATH=$(_distutils_get_PYTHONPATH) \
-                       epydoc --html --verbose --url="${HOMEPAGE}" --name="${MY_P}" \
+                       ${epydoc} --html --verbose \
+                       --url="${HOMEPAGE}" --name="${MY_P}" \
                        icu.py || die "Making the docs failed!"
        fi
 }
@@ -49,6 +63,6 @@ distutils_src_compile_post_hook() {
 src_install() {
        distutils_src_install
        if use doc; then
-               dohtml -r html/* || die "Installing the docs failed!"
+               dohtml -r ../*/html/* || die "Installing the docs failed!"
        fi
 }