summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2011-05-07 13:45:22 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2011-05-07 13:45:22 +0000
commit87435290daabd78900a1d184331bee646aa2b596 (patch)
tree3d8d800222385fa1c0dbb50966951a04dfa20561 /www-client
parentVersion bump, drop old (diff)
downloadgentoo-2-87435290daabd78900a1d184331bee646aa2b596.tar.gz
gentoo-2-87435290daabd78900a1d184331bee646aa2b596.tar.bz2
gentoo-2-87435290daabd78900a1d184331bee646aa2b596.zip
Use system pyftpdlib.
(Portage version: 2.1.9.42/cvs/Linux i686)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog6
-rw-r--r--www-client/chromium/chromium-12.0.742.21.ebuild9
-rw-r--r--www-client/chromium/chromium-9999-r1.ebuild9
3 files changed, 17 insertions, 7 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/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/*' \