Fix tests (bug #326635).

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

diff --git a/dev-python/pycairo/ChangeLog b/dev-python/pycairo/ChangeLog
index d31f878c2538a8dc89cde7440becf9c7575f71bc..bfdd768e1bcc0ce9141558fd19a37b4fe898e520 100644 (file)
--- a/dev-python/pycairo/ChangeLog
+++ b/dev-python/pycairo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pycairo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.85 2010/06/18 17:53:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.86 2010/07/02 23:49:24 arfrever Exp $
+
+  02 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pycairo-1.8.10.ebuild:
+  Fix tests (bug #326635).
 
 *pycairo-1.8.10 (18 Jun 2010)
 

diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index bdada27b5318360ee16a0d51864504eaf8fc27e1..e4201670d8ddaf2a75af810fe53c196afa6f6aed 100644 (file)
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -3,7 +3,7 @@ AUX pycairo-1.8.8-pkgconfig_dir.patch 456 RMD160 c7fea264be6026a03098d75d90e3ffc
 AUX pycairo-1.8.8-svg_check.patch 3009 RMD160 5335b1dd097022bae1fcb1eb1c3bc3e0706a3186 SHA1 a40017c41e7a984ccf0dc308076ff1827a7e0587 SHA256 eff2f24f5bf93ca45b18d57287ced0a1241391ece20dd57d21842f2ca820fd72
 DIST py2cairo-1.8.10.tar.gz 588459 RMD160 932e19f2f582bdf5735bdc92720b76edfb0a0c8e SHA1 6bb0b3e0249bce9fc0480aadad0c602d32f26ec1 SHA256 b15f71019e42e06d86f7e8fe5587f07c3de5a59a6c3a071b25fe100796dbcd56
 DIST pycairo-1.8.8.tar.gz 475651 RMD160 d7e40be061140992e05f714b45182c498ae19311 SHA1 b127ed59bd876ca0fe5d0cf0f69735835c599e9b SHA256 2f52599943ca03c8ff336a0e84b1c8b74f30e2a3de9cb6a9a42a93a848832860
-EBUILD pycairo-1.8.10.ebuild 1842 RMD160 3fdbf5c0c35bb0254e4a24d0f15c7f1f5a02a078 SHA1 509a33a3d4517349380bbb71165b7ce4540b24f3 SHA256 e1b42d161b6d9f6c49e63f0b033196bb01b3ccd5fb1a6798c89a6bea5f8be160
+EBUILD pycairo-1.8.10.ebuild 2473 RMD160 1addae1f2104f58532ab9ff76a726f482e077aec SHA1 be08d9d5a31943aecbc64710e730f9306f133ce0 SHA256 86be2ba77879e52bc2a67d5ca35478a8045d459f02ede7aff3f51f80c39b760b
 EBUILD pycairo-1.8.8.ebuild 2589 RMD160 13042bfa00265e332eedf5215204d2632cbb48ad SHA1 025b907fc81abb4bfcc80003e65e9bca1165a0d2 SHA256 8c64cbef69323a3d4fcb7e5ce14a7b0e740646c4f962de8cbae4d84b5c3aad04
-MISC ChangeLog 11129 RMD160 9ffa98466a85a223488d010ed0ed19b9bbbcc868 SHA1 a154f7b6a0642ff671167f5ba2755097bbca694f SHA256 b5d15b528b980f829b93e152496b38e8d348931804662d4fb1da6ee95c39b36a
+MISC ChangeLog 11255 RMD160 887e8c20aa856a1b14213b66a48e173770e30251 SHA1 588352b04e2058a094b1cf90d64ef0edb82f9d79 SHA256 df2b7abd37187672624aae79cfec5685bd1e7278aa194f6ddfd24abf6957931b
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a

diff --git a/dev-python/pycairo/pycairo-1.8.10.ebuild b/dev-python/pycairo/pycairo-1.8.10.ebuild
index 5b5615e488948cc6d2f4a8ec80ac88cb22a5e72b..1ebedf1068f96556fd0aa5ea6bc7d49099b2559a 100644 (file)
--- a/dev-python/pycairo/pycairo-1.8.10.ebuild
+++ b/dev-python/pycairo/pycairo-1.8.10.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/pycairo/pycairo-1.8.10.ebuild,v 1.1 2010/06/18 17:53:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.8.10.ebuild,v 1.2 2010/07/02 23:49:24 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -34,24 +34,37 @@ src_prepare() {
 }
 
 src_configure() {
-       if use doc; then
-               econf
-       fi
-
        if ! use svg; then
                export PYCAIRO_DISABLE_SVG="1"
        fi
 }
 
+distutils_src_compile_post_hook() {
+       cp src/__init__.py "$(ls -d build-${PYTHON_ABI}/lib.*/cairo)" || die "Copying of src/__init__.py failed"
+}
+
 src_compile() {
        append-flags -fno-strict-aliasing
        distutils_src_compile
 
        if use doc; then
-               emake html || die "emake html failed"
+               einfo "Generation of documentation"
+               pushd doc > /dev/null
+               sphinx-build -b html -d .build/doctrees . .build/html || die "Generation of documentation failed"
+               popd > /dev/null
        fi
 }
 
+src_test() {
+       # python_execute_py.test -P '$(ls -d build-${PYTHON_ABI}/lib.*):../../$(ls -d build-${PYTHON_ABI}/lib.*)'
+
+       testing() {
+               echo PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*):../../$(ls -d build-${PYTHON_ABI}/lib.*)" py.test
+               PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*):../../$(ls -d build-${PYTHON_ABI}/lib.*)" py.test
+       }
+       python_execute_function testing
+}
+
 src_install() {
        PKGCONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" distutils_src_install