Version bump. Unrestrict tests.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

4 files changed, 106 insertions, 4 deletions

diff --git a/dev-python/scrapy/ChangeLog b/dev-python/scrapy/ChangeLog
index b173ed046791..bcb30e61b26e 100644
--- a/dev-python/scrapy/ChangeLog
+++ b/dev-python/scrapy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/scrapy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/ChangeLog,v 1.7 2012/04/20 03:48:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/ChangeLog,v 1.8 2012/04/20 18:44:30 floppym Exp $
+
+*scrapy-0.14.3 (20 Apr 2012)
+
+  20 Apr 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/scrapy-0.14.3-runtests.patch, +scrapy-0.14.3.ebuild,
+  scrapy-0.14.2.ebuild:
+  Version bump. Unrestrict tests.
 
   20 Apr 2012; Mike Gilbert <floppym@gentoo.org> scrapy-0.14.2.ebuild:
   Remove pointless src_prepare function. Cleanup src_test.
diff --git a/dev-python/scrapy/files/scrapy-0.14.3-runtests.patch b/dev-python/scrapy/files/scrapy-0.14.3-runtests.patch
new file mode 100644
index 000000000000..f33cea58e76b
--- /dev/null
+++ b/dev-python/scrapy/files/scrapy-0.14.3-runtests.patch
@@ -0,0 +1,13 @@
+--- bin/runtests.sh
++++ bin/runtests.sh
+@@ -42,7 +42,10 @@
+     $trial "$@"
+ fi
+ 
++exit_status=$?
++
+ # cleanup vsftpd stuff
+ [ -n "$vsftpd_pid" ] && kill $vsftpd_pid
+ [ -n "$ftproot" ] && rm -rf $ftproot $vsftpd_conf
+ 
++exit $exit_status
diff --git a/dev-python/scrapy/scrapy-0.14.2.ebuild b/dev-python/scrapy/scrapy-0.14.2.ebuild
index 1d392347f08d..c11a65c5fbfc 100644
--- a/dev-python/scrapy/scrapy-0.14.2.ebuild
+++ b/dev-python/scrapy/scrapy-0.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # 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.3 2012/04/20 03:48:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.14.2.ebuild,v 1.4 2012/04/20 18:44:30 floppym Exp $
 
 EAPI="4"
 
@@ -39,8 +39,8 @@ RDEPEND="dev-libs/libxml2[python]
 	dev-python/twisted-conch
 	dev-python/twisted-mail
 	dev-python/twisted-web
-	dev-python/w3lib
-	test? ( dev-python/django )"
+	dev-python/w3lib"
+DEPEND+=" test? ( dev-python/django )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/scrapy/scrapy-0.14.3.ebuild b/dev-python/scrapy/scrapy-0.14.3.ebuild
new file mode 100644
index 000000000000..4bb74fb37c91
--- /dev/null
+++ b/dev-python/scrapy/scrapy-0.14.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.14.3.ebuild,v 1.1 2012/04/20 18:44:30 floppym Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="sqlite"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
+
+inherit distutils eutils
+
+MY_PN="Scrapy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A high-level Python Screen Scraping framework"
+HOMEPAGE="http://scrapy.org http://pypi.python.org/pypi/Scrapy/"
+SRC_URI="mirror://pypi/S/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boto doc examples ibl test ssl"
+
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )"
+RDEPEND="dev-libs/libxml2[python]
+	boto? ( dev-python/boto )
+	dev-python/imaging
+	dev-python/lxml
+	ibl? ( dev-python/numpy )
+	ssl? ( dev-python/pyopenssl )
+	dev-python/setuptools
+	dev-python/simplejson
+	dev-python/twisted
+	dev-python/twisted-conch
+	dev-python/twisted-mail
+	dev-python/twisted-web
+	>=dev-python/w3lib-1.1"
+DEPEND+="
+	test? (
+		dev-python/django
+		net-ftp/vsftpd
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-runtests.patch"
+	distutils_src_prepare
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		emake -C docs html || die "emake html failed"
+	fi
+}
+
+src_test() {
+	testing() {
+		# PYTHOPATH should probably be build-$PYTHON_ABI/lib, but causes a test
+		# fail. Should probably investigate this further.
+		echo PYTHONPATH="${PWD}" bin/runtests.sh
+		PYTHONPATH="${PWD}" bin/runtests.sh
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	if use doc; then
+		dohtml -r "${S}"/docs/build/html/
+	fi
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r "${S}"/examples/*
+	fi
+}