Fix support for Jython. Don't install C sources. Patch by Arfrever.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

3 files changed, 40 insertions, 13 deletions

diff --git a/dev-python/storm/ChangeLog b/dev-python/storm/ChangeLog
index ec1af5f5d0d5..18f7b68d5e95 100644
--- a/dev-python/storm/ChangeLog
+++ b/dev-python/storm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/storm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/ChangeLog,v 1.11 2011/11/03 17:00:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/ChangeLog,v 1.12 2011/11/05 19:33:08 hwoarang Exp $
+
+  05 Nov 2011; Markos Chandras <hwoarang@gentoo.org> storm-0.19.ebuild:
+  Fix support for Jython. Don't install C sources. Patch by Arfrever.
 
 *storm-0.19 (03 Nov 2011)
 
diff --git a/dev-python/storm/Manifest b/dev-python/storm/Manifest
index a0a3b11eaf53..bdcb8b8e7d4e 100644
--- a/dev-python/storm/Manifest
+++ b/dev-python/storm/Manifest
@@ -4,17 +4,23 @@ Hash: SHA512
 DIST storm-0.18.tar.bz2 186569 RMD160 e667aa474a68582b71064204fcabb7d44adf059c SHA1 425b00c754f5c9a85d385a1c3e62388c660b76f3 SHA256 e7c0aaabe63efb1107081e01a8fcf5d51840ff726101df9cbb08c6e88d1dee06
 DIST storm-0.19.tar.bz2 198190 RMD160 a461062ebc598cebb4b750d29cef6d24c9aee987 SHA1 d54477aa871091fba49fd960cd8742104f34c135 SHA256 4cfba23256d143e23f7646d30ca83d9e56f228036634824b12854a7dfd8ce429
 EBUILD storm-0.18.ebuild 1849 RMD160 8a97321a409ea0ca21f80525708c492d128839c4 SHA1 038f8be29f1215b31cfbaf7569511ae097906ada SHA256 c45ca66e62c8aa8b111e0f5735227b4386339d10a09a3b2459721e072941ba58
-EBUILD storm-0.19.ebuild 1850 RMD160 63d1aa962e1e5fb35b9ad3ce2cfad4a4e9bc69ff SHA1 fb292ddf298931a2fbc99398941064a85a42c05e SHA256 5c67004ce51d94597aaabaae7f48ab22257e2c79ad04c58028685d002b546c8a
-MISC ChangeLog 1770 RMD160 8618f1d2f9b827500ad6684602a86c92f0317788 SHA1 258536679a43d52be0ddc5d9b8efc6de3ed9d63d SHA256 93340129cc081a615db7cca8da46015bcc85357b9328f02092c6899d8ab515b1
+EBUILD storm-0.19.ebuild 2252 RMD160 093b06d9a9ecbe6b7c0b1ac309d8a0bd17fdb303 SHA1 91246fb22b19a360c0db2be9698e627739d1ab5c SHA256 9a2f0a0dbbda0686273784a9a174d40fb9d3cc247c920ac5d59294048b2ea2d5
+MISC ChangeLog 1912 RMD160 387f6f771bd85c40cb1d69ab4315ea1669b0ecf4 SHA1 653fef4079d951dfa63967161750de241df0090f SHA256 d04ed4e3da9359c928816e47e640ee52a43e48a1db3ee6701e0e448f848ba02a
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOssihAAoJEEqz6FtPBkyj2KwH/0a617GaJSMgSRtqrZR2R+rX
-cLip699CGEn61YbvtaVArCDfSU+kAwoE11csCRDbCzLk2LNj8O8aMzeopnk4w6i9
-W2yctHXKFWEvRDnya/0Mjz2/7V1XBdvn4NxZR6RmFfQnxtW4fsEjfcnJZUgeYp6n
-fraJTdZyfrwLbfdef0FBFdhzXFnCVd+cMiYN4ZTHkWAOB03O+sJp61MBvrjRLhYk
-GrcVZmBSgb8hYCj628an9tLLV44MCaChwQ31OjKTsFqO6hz3VWmn2xzF5dXLg6TL
-gYZfgiMOgV70wAGgWBzB0oSG4XyViXguMw2lGWzQEP1HWYLfxoA4p6zDFP/0jGY=
-=6LN1
+iQIcBAEBCgAGBQJOtY8kAAoJEPqDWhW0r/LCOnYQAJ7KnW8Ee0P1N65dC4ZqwuFc
+dxqLiZFTurgPqXF2w2d5IVAFGezNARXq46mIU2T2Miymhfm73qFkz0AacrtfatX6
+C8J9gQ0QRyIVTof56lLh7tFsyovdBH2IjJWPYBJiAOeRNB5KPs8hmEYvVwGtpzgO
+Qi1qgCo3+dTTEcdeEHox8iffkniir/FvLky7cpYoNbB+rTEfMe1fX5wnxTnbIHcx
+l7lS+iAFKdic/VHhhIUCdXtdMNjDYdPno8IAhKBPk72PHDg+BTXjZond/+Bv03zy
+qeItNAvx+3r4Y/FNosH6mP+eio293fLVBL//BRTS1Q/BIQ8/vFlR4kcLvBM6Hb+G
+iFoQN5Ss9UPQG4n5j0qQxHTPLpLTtkuUdMmEjZkBwDqWBYdxeVWgSJ/sSjVMxcoD
+yk1N5RwT6GPz5wfgNpWnPQvc44tMoBQrn8URPTXEQMO4Yl1QgSn9FNd1pYj1K3HC
+p9xaig0gl7u8Xga5liT6PnEf2mpfq+LcDLifSYXF6u81KByZTQ+YQv1BjdaHe0ch
+Kqhsce8yhGY7xh0ut8bKKCbqNVvOzoBFeTPMx0l5WwZLFtlHcOj0mks/f6UoFM6v
+0M8wRhAUPURauev0XJknQJ0CmRhqoF73Y53zJXDb3EeH4mKlmcbEChyTopMMukI0
+AaVl+cXIhvagu5VvMD9j
+=oDUA
 -----END PGP SIGNATURE-----
diff --git a/dev-python/storm/storm-0.19.ebuild b/dev-python/storm/storm-0.19.ebuild
index 96ac63eeb4ed..a4fb05b90069 100644
--- a/dev-python/storm/storm-0.19.ebuild
+++ b/dev-python/storm/storm-0.19.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/storm/storm-0.19.ebuild,v 1.1 2011/11/03 17:00:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/storm-0.19.ebuild,v 1.2 2011/11/05 19:33:08 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython"
 
 inherit distutils
 
@@ -26,8 +27,20 @@ DEPEND="dev-python/setuptools
 
 PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
 DOCS="tests/tutorial.txt"
 
+src_prepare() {
+	distutils_src_prepare
+
+	preparation() {
+		if [[ "$(python_get_implementation)" == "Jython" ]]; then
+			sed -e "s/BUILD_CEXTENSIONS = True/BUILD_CEXTENSIONS = False/" -i setup.py
+		fi
+	}
+	python_execute_function -s preparation
+}
+
 src_test() {
 	if use mysql; then
 		elog "To run the MySQL-tests, you need:"
@@ -45,7 +58,12 @@ src_test() {
 	fi
 
 	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" test --verbose
+		PYTHONPATH="$(ls -d build/lib*)" "$(PYTHON)" test --verbose
 	}
-	python_execute_function testing
+	python_execute_function -s testing
+}
+
+src_install() {
+	distutils_src_install
+	python_clean_installation_image
 }