[patch] revised patch

scrapy.patch (text/plain), 1.82 KB, created by Ian Delaney (RETIRED) on 2012-04-18 08:45:03 UTC

diff -ur scrapy.orig/scrapy-0.14.2.ebuild scrapy/scrapy-0.14.2.ebuild
--- scrapy.orig/scrapy-0.14.2.ebuild	2012-04-17 17:40:52.618156023 +0800
+++ scrapy/scrapy-0.14.2.ebuild	2012-04-18 16:35:01.156307177 +0800
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.14.2.ebuild,v 1.1 2012/02/21 13:01:03 maksbotan Exp $
 
-EAPI="3"
+EAPI="4"
 
 PYTHON_DEPEND="2:2.5"
 PYTHON_USE_WITH="sqlite"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils python
+RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
+DISTUTILS_SRC_TEST="setup.py"
+inherit distutils
 
 MY_PN="Scrapy"
 MY_P="${MY_PN}-${PV}"
@@ -22,6 +22,8 @@
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="boto doc examples ibl ssl"
+# New found test script has failures
+RESTRICT="test"
 
 DEPEND="dev-python/setuptools
 	doc? ( dev-python/sphinx )"
@@ -37,26 +39,38 @@
 	dev-python/twisted-conch
 	dev-python/twisted-mail
 	dev-python/twisted-web
-	dev-python/w3lib"
+	dev-python/w3lib
+	test? ( dev-python/django )"
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	sed -e s':decs = "1000.12":decs = 1000.12:' \
+		-i scrapy/tests/test_utils_serialize.py || die
+}
+
 src_compile() {
 	distutils_src_compile
+
 	if use doc; then
-		cd docs
-		emake html || die "emake html failed"
-		cd "${S}"
+		emake -C docs html || die "emake html failed"
 	fi
 }
 
+src_test() {
+	testing() {
+		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)"  bin/runtests.sh || die
+	}
+	python_execute_function testing
+}
+
 src_install() {
 	distutils_src_install
 	if use doc; then
-		dohtml -r "${S}"/docs/build/html/ || die "dohtml failed"
+		dohtml -r "${S}"/docs/build/html/
 	fi
 	if use examples; then
 		insinto /usr/share/doc/"${PF}"/examples
-		doins -r "${S}"/examples/* || die "doins failed"
+		doins -r "${S}"/examples/*
 	fi
 }