Use system tlslite instead of the bundled one.

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

4 files changed, 22 insertions, 13 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index c2626f9f32eb..21f4731b0bb4 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.570 2012/03/03 06:47:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.571 2012/03/03 09:28:16 phajdan.jr Exp $
+
+  03 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-19.0.1055.1.ebuild, chromium-9999-r1.ebuild:
+  Use system tlslite instead of the bundled one.
 
   03 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   +files/chromium-glib-r0.patch:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 991f7cd40551..60f793951a7c 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -28,15 +28,16 @@ EBUILD chromium-17.0.963.56.ebuild 17906 RMD160 90d4f1008405ff14822ea59a89938e8b
 EBUILD chromium-18.0.1025.39.ebuild 17850 RMD160 4b3072b2ec7f7aebdc62fb26b72c38f3ad534936 SHA1 810a8a10485a5db173ef4be2de4e01505da3a24c SHA256 b1428094aaa745af9971b6868965ab63914019e778ced22d6b08f5094f686daf
 EBUILD chromium-18.0.1025.45.ebuild 18042 RMD160 ce9a1717959b4c0ff1eb44c46fc6737b614682b1 SHA1 c2ee3d37f7b2d6d451f22d85937214fcd41d81bb SHA256 1e2f6911cc4bfdcf997ca3ef4beac97758b04e6eb9658bcfc7db8017f7f82f34
 EBUILD chromium-19.0.1049.3.ebuild 17673 RMD160 36bf6f1c493c7e313e7b44f3180f2681377f6d16 SHA1 ba056cdf8a0c0e447cd8923bca2c3f883e3fa1d4 SHA256 9643d31654ab9f53176fb3ea175a1746cfea11421d804edd43528a2c0a3f87db
-EBUILD chromium-19.0.1055.1.ebuild 17673 RMD160 3629bc0066b4b249270eae2d96fd301a329f8763 SHA1 9c181934a46d3753aea7179549be1fa7bf08e8cc SHA256 9d0a9d6488cc7fff52382a0985fe0439d956de8be027a5060b5560e30e7d9c64
-EBUILD chromium-9999-r1.ebuild 19839 RMD160 c2d5a3e2b48ce40de20d0a43258c387f87604215 SHA1 9d02aff405dd9502f5ca85ea2188bf37cf7d59f1 SHA256 0e06bdb8b84a3629e08a17903466bc4ba900f714faef34bd6c29468ab8c7ba3f
-MISC ChangeLog 8646 RMD160 baeb5c5868f89cf3f6a02dc69f31a522c147272a SHA1 2776f6b2a948c8ca00c7e0742a80107aa7ce7dbe SHA256 a2231c310edfd6ad14c541dc87293f8260186df20f8bca85c4fc31377cedd03a
+EBUILD chromium-19.0.1055.1.ebuild 17668 RMD160 b58af792f31224a8a5c4616958303ac2aeaf7037 SHA1 c491aefd85a92f9575adbb07fb439428336a9966 SHA256 35d4114f1f20f35b6f075a539ad661011986f8b7bff12ad2d721c467a48e7b9b
+EBUILD chromium-9999-r1.ebuild 19834 RMD160 9cb32db6ba1975982a98662c57635a9dfcc407b4 SHA1 0002bac9431012f02210203cd07627d49590ee6a SHA256 39f80e2b3af682c3a48c2002deda3e57b72d6d00ac053480bd80d0c5713764a8
+MISC ChangeLog 8807 RMD160 a931c8cbe59d56b69e2dc9f22a84889ecdf077f5 SHA1 c5bae508a9ed951b4185e5c16958a94b80a10c51 SHA256 3394e867a51e63effacb8593ba99c9ef88eb7c279979f035d75603a9b16fda39
 MISC ChangeLog-2011 114031 RMD160 819d2187b876e03ba1a5f23369eca56e554bcfe6 SHA1 c449259648a4f2633b8812e7761e8cdeaea7f948 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54
+MISC chromium-9999-r1.ebuild.orig 19839 RMD160 c2d5a3e2b48ce40de20d0a43258c387f87604215 SHA1 9d02aff405dd9502f5ca85ea2188bf37cf7d59f1 SHA256 0e06bdb8b84a3629e08a17903466bc4ba900f714faef34bd6c29468ab8c7ba3f
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk9Rvm0ACgkQuUQtlDBCeQJzpwCfSK05ooH/iGaPYrJiwxWTZJnP
-+oEAn1tri1U1VBvoalSZls1Jx5t1TuLT
-=uLtD
+iEYEAREKAAYFAk9R5EAACgkQuUQtlDBCeQLMCgCeOj4osKyNOE/1VzigP37dJES3
+qwMAn2QsKwCGBHhyzBBPA6gb3oz3KiPs
+=RLZn
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-19.0.1055.1.ebuild b/www-client/chromium/chromium-19.0.1055.1.ebuild
index ac4e33dcfc76..12fd2a4de7df 100644
--- a/www-client/chromium/chromium-19.0.1055.1.ebuild
+++ b/www-client/chromium/chromium-19.0.1055.1.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/www-client/chromium/chromium-19.0.1055.1.ebuild,v 1.1 2012/02/29 11:06:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-19.0.1055.1.ebuild,v 1.2 2012/03/03 09:28:16 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -64,7 +64,10 @@ DEPEND="${RDEPEND}
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
 	>=sys-devel/make-3.81-r2
-	test? ( dev-python/pyftpdlib )"
+	test? (
+		dev-python/pyftpdlib
+		>=dev-python/tlslite-0.4.0
+	)"
 RDEPEND+="
 	!=www-client/chromium-9999
 	x11-misc/xdg-utils
@@ -227,7 +230,6 @@ src_prepare() {
 		\! -path 'third_party/speex/speex.h' \
 		\! -path 'third_party/sqlite/*' \
 		\! -path 'third_party/tcmalloc/*' \
-		\! -path 'third_party/tlslite/*' \
 		\! -path 'third_party/undoview/*' \
 		\! -path 'third_party/v8-i18n/*' \
 		\! -path 'third_party/webdriver/*' \
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 4cc53544ce8f..029cfb951be9 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.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/www-client/chromium/chromium-9999-r1.ebuild,v 1.95 2012/02/24 17:30:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.96 2012/03/03 09:28:16 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -64,7 +64,10 @@ DEPEND="${RDEPEND}
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
 	>=sys-devel/make-3.81-r2
-	test? ( dev-python/pyftpdlib )"
+	test? (
+		dev-python/pyftpdlib
+		>=dev-python/tlslite-0.4.0
+	)"
 RDEPEND+="
 	!=www-client/chromium-9999
 	x11-misc/xdg-utils
@@ -283,7 +286,6 @@ src_prepare() {
 		\! -path 'third_party/speex/speex.h' \
 		\! -path 'third_party/sqlite/*' \
 		\! -path 'third_party/tcmalloc/*' \
-		\! -path 'third_party/tlslite/*' \
 		\! -path 'third_party/undoview/*' \
 		\! -path 'third_party/v8-i18n/*' \
 		\! -path 'third_party/webdriver/*' \