Use system pyftpdlib.

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 23 insertions, 13 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index c08b7522a97c..6cd99546527b 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.351 2011/05/07 11:54:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.352 2011/05/07 13:45:22 phajdan.jr Exp $
+
+  07 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-12.0.742.21.ebuild, chromium-9999-r1.ebuild:
+  Use system pyftpdlib.
 
 *chromium-11.0.696.65 (07 May 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 10acba558462..85b4fec622ce 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -16,14 +16,14 @@ DIST chromium-12.0.742.21.tar.bz2 150264103 RMD160 7df6bd5ebccfe19af8ca0a8f81b6e
 EBUILD chromium-11.0.696.57.ebuild 10569 RMD160 1915cfa1a6cc719bc89690882695709df4ef1cd2 SHA1 69d8f9e36ad637115a3fc576225aaba8ff05b7c2 SHA256 0da808f90649507468c4c75dfd8be1aa9ede89142cc932245a902b2a74969fcc
 EBUILD chromium-11.0.696.65.ebuild 10576 RMD160 995f1f5e04936993001f220c60171662fcdffd1f SHA1 36fd63c66055682ec51ef7bee3ae0d94bf2a6abd SHA256 6542b6e39ed8dc7a7a55ddb0be5501e1ceadfdc62e7e023cc966578527ad8fcb
 EBUILD chromium-12.0.742.16.ebuild 11576 RMD160 6ca1a3079908b74ba87cd3e44d765321c5b95184 SHA1 3ba3df62187ff992185684f663e93f33ab15f76d SHA256 a172775846fb2edaa0abecb065c06846e12390884469ff5dadfcb580358f85a3
-EBUILD chromium-12.0.742.21.ebuild 11576 RMD160 0c0b013da5823fa3207390b636aed2e7faae420f SHA1 6a13901e7380ff63d44f8e90368d33bf44940461 SHA256 4d28a8b26a54307f572a2d077f8f5aa2bdefa15d96d61fb0023f9579b032b42d
-EBUILD chromium-9999-r1.ebuild 14267 RMD160 b8dd2d1818b07649dd2680df4e28d8d524c40f2f SHA1 a5cb5019f27b32d7764537831cb81c7bd71fef04 SHA256 c309cff98f72bda298d1ec6b227168928c504b3f17441faa84d9efb95ad32a55
-MISC ChangeLog 78741 RMD160 0c510c1af80a78eaf7835a5106d3b0e3ffeb4dea SHA1 274f8f135e5914a6c9d65160c203589abb61eec1 SHA256 edba8d70c6aa4826220fd0ba067eff7b82b6d66d0e7c9dae96b53fee6cb40c8e
+EBUILD chromium-12.0.742.21.ebuild 11565 RMD160 d169a2086062817bdd738e0e445a37017273e210 SHA1 5bc1c3d6b6de2295cfee5270db84dcf4dc5d573c SHA256 1ef8d4579043f568f585d5286cff7aabfdd1ef28f107369d6f1b0da722666591
+EBUILD chromium-9999-r1.ebuild 14256 RMD160 895f58ef3c890a267775394073d1ef8ec31704f7 SHA1 c822f7f3906da7d4b9ee45a5b03c38d129200a3b SHA256 201e5a95e26f685b70f3c52652bf8433c542ae1192f420c8e0131ff767edb50f
+MISC ChangeLog 78877 RMD160 f8a2db4056d4d940af60443e03b82a3325240d57 SHA1 41796dc93169f33219be2c430e6944fb22e890db SHA256 8a46937efed9a755bdb3c27034ed87528d7250b394b7c6baf46f78ea11a07b72
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3FMuQACgkQuUQtlDBCeQILpQCgh5eWbfybuAZ2ok+82sSiyL9w
-oCcAoIYZASg2uNxD6t2koD73Zb+0eSyC
-=rFJq
+iEYEARECAAYFAk3FTQMACgkQuUQtlDBCeQIl/ACfTYXHbYOxBEMiCrYi4NdXTMt+
++3kAn1HZpFoLwKGwvHExvvJY0BFBvCL0
+=/5jA
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-12.0.742.21.ebuild b/www-client/chromium/chromium-12.0.742.21.ebuild
index c8eb4eeae96b..93bd24389360 100644
--- a/www-client/chromium/chromium-12.0.742.21.ebuild
+++ b/www-client/chromium/chromium-12.0.742.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-12.0.742.21.ebuild,v 1.1 2011/05/06 08:56:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-12.0.742.21.ebuild,v 1.2 2011/05/07 13:45:22 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -47,7 +47,11 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	>=sys-devel/make-3.81-r2
 	x11-libs/libXinerama
-	test? ( dev-python/simplejson virtual/krb5 )"
+	test? (
+		dev-python/pyftpdlib
+		dev-python/simplejson
+		virtual/krb5
+	)"
 RDEPEND+="
 	kerberos? ( virtual/krb5 )
 	xinerama? ( x11-libs/libXinerama )
@@ -142,7 +146,6 @@ src_prepare() {
 		\! -path 'third_party/openmax/*' \
 		\! -path 'third_party/ots/*' \
 		\! -path 'third_party/protobuf/*' \
-		\! -path 'third_party/pyftpdlib/*' \
 		\! -path 'third_party/skia/*' \
 		\! -path 'third_party/speex/speex.h' \
 		\! -path 'third_party/sqlite/*' \
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 2bc6d25b08fe..28b98fdd4ac1 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.22 2011/04/28 06:27:12 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.23 2011/05/07 13:45:22 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -49,7 +49,11 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	>=sys-devel/make-3.81-r2
 	x11-libs/libXinerama
-	test? ( dev-python/simplejson virtual/krb5 )"
+	test? (
+		dev-python/pyftpdlib
+		dev-python/simplejson
+		virtual/krb5
+	)"
 RDEPEND+="
 	!=www-client/chromium-9999
 	kerberos? ( virtual/krb5 )
@@ -183,7 +187,6 @@ src_prepare() {
 		\! -path 'third_party/openmax/*' \
 		\! -path 'third_party/ots/*' \
 		\! -path 'third_party/protobuf/*' \
-		\! -path 'third_party/pyftpdlib/*' \
 		\! -path 'third_party/skia/*' \
 		\! -path 'third_party/speex/speex.h' \
 		\! -path 'third_party/sqlite/*' \