Bump to 0.14.1, bugs #398641 and #405027

(Portage version: 2.1.10.48/cvs/Linux x86_64)

3 files changed, 13 insertions, 67 deletions

diff --git a/dev-python/scrapy/ChangeLog b/dev-python/scrapy/ChangeLog
index 47fdf57b1df4..7eb545e18b91 100644
--- a/dev-python/scrapy/ChangeLog
+++ b/dev-python/scrapy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/scrapy
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/ChangeLog,v 1.4 2011/12/19 13:46:17 maksbotan Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/ChangeLog,v 1.5 2012/02/21 13:01:03 maksbotan Exp $
+
+*scrapy-0.14.1 (21 Feb 2012)
+
+  21 Feb 2012; Maxim Koltsov <maksbotan@gentoo.org> +scrapy-0.14.1.ebuild,
+  -scrapy-0.12.0.2548.ebuild, -scrapy-0.14.0.2841.ebuild:
+  Bump to 0.14.1, bugs #398641 and #405027
 
 *scrapy-0.14.0.2841 (19 Dec 2011)
 
diff --git a/dev-python/scrapy/scrapy-0.12.0.2548.ebuild b/dev-python/scrapy/scrapy-0.12.0.2548.ebuild
deleted file mode 100644
index 8fbfe5258156..000000000000
--- a/dev-python/scrapy/scrapy-0.12.0.2548.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.12.0.2548.ebuild,v 1.1 2011/10/30 16:50:17 maksbotan Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="sqlite"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils python
-
-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="~x86"
-IUSE="boto doc examples ibl 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"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		cd docs
-		emake html || die "emake html failed"
-		cd "${S}"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r "${S}"/docs/build/html/ || die "dohtml failed"
-	fi
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins -r "${S}"/examples/* || die "doins failed"
-	fi
-}
diff --git a/dev-python/scrapy/scrapy-0.14.0.2841.ebuild b/dev-python/scrapy/scrapy-0.14.1.ebuild
index e464fe827361..edd97e987bc6 100644
--- a/dev-python/scrapy/scrapy-0.14.0.2841.ebuild
+++ b/dev-python/scrapy/scrapy-0.14.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.0.2841.ebuild,v 1.1 2011/12/19 13:46:17 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.14.1.ebuild,v 1.1 2012/02/21 13:01:03 maksbotan Exp $
 
 EAPI="3"
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/S/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="boto doc examples ibl ssl"
 
 DEPEND="dev-python/setuptools
@@ -36,7 +36,8 @@ RDEPEND="dev-libs/libxml2[python]
 	dev-python/twisted
 	dev-python/twisted-conch
 	dev-python/twisted-mail
-	dev-python/twisted-web"
+	dev-python/twisted-web
+	dev-python/w3lib"
 
 S="${WORKDIR}/${MY_P}"