Consolidate DEPEND.

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

4 files changed, 20 insertions, 18 deletions

diff --git a/dev-python/scrapy/ChangeLog b/dev-python/scrapy/ChangeLog
index bcb30e61b26e..528d6c727b43 100644
--- a/dev-python/scrapy/ChangeLog
+++ b/dev-python/scrapy/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2012/04/20 18:44:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/ChangeLog,v 1.9 2012/04/20 18:48:09 floppym Exp $
+
+  20 Apr 2012; Mike Gilbert <floppym@gentoo.org> scrapy-0.14.2.ebuild,
+  scrapy-0.14.3.ebuild:
+  Consolidate DEPEND.
 
 *scrapy-0.14.3 (20 Apr 2012)
 
diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index 3f05a9f26b01..2122996c614e 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -6,14 +6,14 @@ DIST Scrapy-0.14.1.tar.gz 719187 RMD160 015baca21f34c65e900d839d5ab464325503e8ed
 DIST Scrapy-0.14.2.tar.gz 719256 RMD160 1324497be82b7dc09c6e5b54944c5359e09e626e SHA1 ce8fde29ff066dacf2cc9e6ec8c0e7c986fd7e69 SHA256 66fe66681421446f63703bcae680ea10d745d320ce262d3128cbae3b474b1eed
 DIST Scrapy-0.14.3.tar.gz 716257 RMD160 7eb62710cd32249ed7c0af3b0a7e789c71c6ac6a SHA1 c948f2290d52f51d74732ffacd6a6afab1aca3ed SHA256 fd42e2a9e93f1741f24032d3a1a45c5660ce942a1e829c4d481d8ff9f287518a
 EBUILD scrapy-0.14.1.ebuild 1423 RMD160 e4104c04b493ff369ecc118a91841630bd59cef5 SHA1 ba1992f958f1ca65b499f541a05745b3db3ab594 SHA256 7bc1281b6210c58844047c406f4284001a556f7e36ad4914716d03328ce25d24
-EBUILD scrapy-0.14.2.ebuild 1671 RMD160 4ca4d46e3204b74071547b2e0593ab7449d5f1b3 SHA1 3a6b372dcd51066250ebc04bc253ca86a7edd595 SHA256 bd5c1c771e0c140bcb8dc9b5a653c4a7eac219772ceb1cf1573356cf637dd634
-EBUILD scrapy-0.14.3.ebuild 1800 RMD160 76387fabff93df9f1e157780a813e774fec8212d SHA1 929adf807fd795119f5cafb441612a1a7f99f244 SHA256 7ad0d1978bea68f64fe76cbe5bf306526271996e9b11538216ab762948c12f4c
-MISC ChangeLog 1605 RMD160 22e86cf2e4faa61619c373614531d1a7c8effaa3 SHA1 372f5a294f44274e7797448a2d0896ff16093db1 SHA256 912314a3d2e4e176b91087c1c263504f84dbe2b3fa80e29ae367640db8ec24ac
+EBUILD scrapy-0.14.2.ebuild 1661 RMD160 f87fcfef605cc7d41367e562feda89d255adceb7 SHA1 8d7dc53101c28c609ba2f37312f936da15c7606c SHA256 a2d4e9266191a514d3a445998e532f94d7e9276bccc683eabe6d416b27bd5432
+EBUILD scrapy-0.14.3.ebuild 1788 RMD160 59f16f28f2a6cf2dc63af8c145a24d76bc6b1863 SHA1 3bdac2dcd7fff0d5f716a238a49b858ed77115ad SHA256 fce3d74b306de204de3bc6a846016b105aa80481a9222ddc53872de332496b8f
+MISC ChangeLog 1723 RMD160 b41aec21fce0dd8104672f54d910df209aa3545e SHA1 6ff0bcf57e6b83b9fea1388f0a67b2e867a19336 SHA256 f7d953b3200a3009a7872038b0948335e1eb76dc4ce96c93985f1b05450177e9
 MISC metadata.xml 415 RMD160 d9fc2ff3e8e2b3fd6acb978eae6623e38fe5b99d SHA1 44b7e1f1040f9b4ccb813bcb4f6a77d61deedaed SHA256 6cbf7bc902a788f3aca1fc94cb2451399e088a2f696f1d1a724c296505b54655
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+RrpQACgkQC77qH+pIQ6ROAgEAjRhFTaNnbLlCwMxGnFbpXpo9
-5SrZAf1pKFN1mzqFrrUA/RdGJGij1mmjoHHezO7lIa/Ch4tWJneoOHZHs6t4wrVX
-=Zq+v
+iF4EAREIAAYFAk+Rr28ACgkQC77qH+pIQ6R4qgD8Cbv9WwuVEkHV4/ACIyTwiAWY
+O3ZQPfBGQjAMtCnJwsMA/RhqBrGjqDbpI3+R9es32YsxJpvzkDhj1WX5wNjONJgD
+=0lJh
 -----END PGP SIGNATURE-----
diff --git a/dev-python/scrapy/scrapy-0.14.2.ebuild b/dev-python/scrapy/scrapy-0.14.2.ebuild
index c11a65c5fbfc..893a317c1532 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.4 2012/04/20 18:44:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.14.2.ebuild,v 1.5 2012/04/20 18:48:09 floppym Exp $
 
 EAPI="4"
 
@@ -26,7 +26,8 @@ IUSE="boto doc examples ibl test ssl"
 RESTRICT="test"
 
 DEPEND="dev-python/setuptools
-	doc? ( dev-python/sphinx )"
+	doc? ( dev-python/sphinx )
+	test? ( dev-python/django )"
 RDEPEND="dev-libs/libxml2[python]
 	boto? ( dev-python/boto )
 	dev-python/imaging
@@ -40,7 +41,6 @@ RDEPEND="dev-libs/libxml2[python]
 	dev-python/twisted-mail
 	dev-python/twisted-web
 	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
index 4bb74fb37c91..3ec9843b30b2 100644
--- a/dev-python/scrapy/scrapy-0.14.3.ebuild
+++ b/dev-python/scrapy/scrapy-0.14.3.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.3.ebuild,v 1.1 2012/04/20 18:44:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.14.3.ebuild,v 1.2 2012/04/20 18:48:09 floppym Exp $
 
 EAPI="4"
 
@@ -24,7 +24,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="boto doc examples ibl test ssl"
 
 DEPEND="dev-python/setuptools
-	doc? ( dev-python/sphinx )"
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-python/django
+		net-ftp/vsftpd
+	)"
 RDEPEND="dev-libs/libxml2[python]
 	boto? ( dev-python/boto )
 	dev-python/imaging
@@ -38,12 +42,6 @@ RDEPEND="dev-libs/libxml2[python]
 	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}"