Disable tests again on 7.36.0

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 24 insertions, 26 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 2c2908b430a0..9536aa89b80b 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.344 2014/04/02 15:29:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.345 2014/04/02 15:38:28 blueness Exp $
+
+  02 Apr 2014; Anthony G. Basile <blueness@gentoo.org> curl-7.36.0.ebuild:
+  Disable tests again on 7.36.0
 
 *curl-7.35.0-r1 (02 Apr 2014)
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index dfb8e9f86a25..21ca4b55465d 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -11,23 +11,23 @@ DIST curl-7.35.0.tar.bz2 2781470 SHA256 d774d1701454f1b7d331c2075fc4f6dd972bddc2
 DIST curl-7.36.0.tar.bz2 2809266 SHA256 1fbe82b89bcd6b7ccda8cb0ff076edc60e911595030e27689f4abd5ef7f3cfcd SHA512 ae471d382c9c8f321a987e7a5a302abe7cb2cae4204ea65234b02c73303abef7c995c50ce8219bd90d762fa63006d50293e4350e78aee2c2086b6f7aec09b01a WHIRLPOOL 0b9f5d8a2d41126e0ff735d3f863a943e9182ec5a2abdb8caac890232432df66fe422f4dcdbfcba1fbc925880435f3733c01b747185aaa5cd1cc96571025663f
 EBUILD curl-7.35.0-r1.ebuild 6721 SHA256 5dfffde4aa8add29fb79671a4024f964539da77b97587c0cdb44703376b4d461 SHA512 9b0778f77b50d77e649869aba3a6590da52704354019532a31dc2159db8a179416db1c06b2fc94c18cf023ffbaf4f947fd041df6a777f6806fe3fea123456753 WHIRLPOOL 4b4a6b763d3ff122bf6371c8ccb7f6432ce5639e5be94d3a1a96766711eeed7669e1c7d475dae4b2d8c9d5029aec843005a3c3ae2d30eb5480743fe48ed1970d
 EBUILD curl-7.35.0.ebuild 6431 SHA256 8c26e410ce9eccd07d7db100ca682cc826cf86ac435937a8568211866a3a9fd9 SHA512 cc371b055b79a677e2f4c0c435fb0c21fd4a56881a8e2292d19a32aa84243484045e6109f4abb2c2723115a328319f80296a11cab914e174bd0f4562ddf55bf2 WHIRLPOOL 417f0cf68a165a96573a0497c77660168bba8ef25ad958b749b1a9f01890fd3d0ebc8228e9c0188a85c7e9a774e4b4980bbb99839002bfe97ae9c5e5590d8bab
-EBUILD curl-7.36.0.ebuild 6469 SHA256 8433801bef1f9cbec95eabb14218e31ae4b85efc79313da4202be321bf3feefb SHA512 cd8fc34cfca9586faec8431663e0fcc666319617bb30eb3806677a0c853a208a34ae66ed78c88abd1ad08c674d3e2d5c8e7d44eb7a723f1beafcbacd28486493 WHIRLPOOL 8bb5f9abe2923c616ae3668c520cca55d667cd7a8385cb9206b034e4a9ea0abbfad08ae9bf7655616eeb478ae018daed34cdb62d31f3f82236ecf5b64a391e5d
-MISC ChangeLog 52146 SHA256 68bf031b426abf877cb4f3bd18e37c39cb1d8c99409327e5702cf8647bec726f SHA512 20b7df3d41b5608704ac5805ab3b17fe621d82500877a6164fc000c1b0e48a7b3a1c06bd1e7aa8b9a3a05ee45bb7b8c3c911925d111a81f9670abd2927c6234b WHIRLPOOL 3fb55d05da311a098a1a24e89ec803f1bb3014ee8fd233d6d3431777e1cfb949947a1c8448a8dd7378fde82662188a5eed26cea84a78a72e1a85e19057eab66d
+EBUILD curl-7.36.0.ebuild 6396 SHA256 054eb94a8e531fca6eae6c43c2db2ce19fc9d37e4fd5753100e822c5114c0145 SHA512 8d0ab5d5b17ff6d108b8cbd6856a13e4c3cbae7d150f19a09f7cfa5fabcd1eb2c9d0a9af161a1874b95ba816f919dc251a2d81c478f6c03fde08a343a2f7513a WHIRLPOOL 80094f2262a83dc26790533489890eb660987f9f9b1049e92bfdd2f6f15e710b5d327cdd0a893a829c80d6a7ca7c02fab10957b4dd95fec00703a4c2522ccda6
+MISC ChangeLog 52254 SHA256 b9896f9f4a2ca3bc6cc0100cf35b3c99f330454e1e88b4c041088aa02d0a3752 SHA512 1aff69612c2282773b3ca70a0bb7073b8c6900f31c7e1ce3c3e79c3fe17e1ff026a27b6d6958c99cf5e17f113717280d3f297ad33233d8a312a59095ec44a4f6 WHIRLPOOL 2e6dced862e9ab739d07dc8b5cfb2bc6b4c7a93c93e65e8f0c6fb32639608637470ff264fd53f48c5acf6d0a177ed6ec4c00507368f1f656dd7277796c42f12e
 MISC metadata.xml 872 SHA256 3d775fddf0eb8858a113590d1306caabc04eb35939f47815a6989940b6a1128f SHA512 32bb23547ee5f5c5cd0a15f2066f149c9c98be96fe8dcbc57b99ca02b3f3f449978d36b23050154dc1b48970b105bfc8f3961727769d51f3f6693b80d8d78f59 WHIRLPOOL bfba7704a7c456fad6e156e07617aa004201942dbfbce09673341af070b545346a20972491812a3d0b171361393c5aa33f5c24acd4314c71a11679ef9f7a38b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTPC0fAAoJEJOE+m71LUu6YeQP/2dKsj7H/PcpwXUwF9Y6B7u5
-bBOinTud83JevGSaAPGhG3tt+nMJjckAbHJM9r49I7Ui25urnKFtp70/R2aAf/NV
-kTmOePB4SD6N0Bfq73C58GErwblgeS6nw6Ep7G2Ecsy2KJYYjtI8ZnS920oRjGQ2
-7no+Am0wM0TOGY+rM0vdCFCYHr0xSLTTjsnpCzY74NN8mF+vKJydgeduCgbeB5p2
-8sl+EoUvRWN9DUT3VlhLgUiLtQF+7OX3inIlsPZ1NpjJtL38YkXDbGykywj716tl
-pFzN3bV9lao2RYwHNrpKYkx2p1TIfSuISphH2IaKCjAxqmF4Xu9ySXiHcySM8BlU
-yIjYCukIxL0fMDSbG1FjVAmpdGhZGzSqGLTc/GUprutNZXxEafUA03aNNJaA37vK
-rcXed/ExkJLw8q0PtOTfrYzjASzL/jHdLha83Dv2FGtoMc8z7cF3kWi6hQUCBp+o
-L6rlSoRt+RAOkuvDooVQI3Z4mv5vdvIKvPUy4RLbgeu2AeRVKK3vo5XaNhB1otUg
-88l6d+WmOsmLfc+4SbSUa1N0bNKR2iySMR2HoPTAdSdTr2yXZn3zHPmPMdwrsvYE
-v8xpVdo+kv9BTYw/FwKe7X2Zha2ulsYl5yRyodUmod/eSzZ5BV9ZG/H3MvqVf4sQ
-dN2/38sjZ1rRzcMIpNLc
-=8YL2
+iQIcBAEBCAAGBQJTPC8/AAoJEJOE+m71LUu6fjEP/3GAanYaD3IZs4No3ks/T/QZ
+kK7N/xW3RsSuZNuILVD6TtZuEenqazzuBwYnDYEDDKaXNm9cc7tSlITL4puHKxHW
+MhT8OcUT18iLXJbPGGKvNK9fFAabR+YPXQtJQpHyZ118dSefjuEpygrh6kJWGFcK
+ixiEiTAKAjf65vMtKZaueFlxYE/nS1QMYU46NqWTs2x6xUXMfzccKXlAlLda/Mej
+tQ/jmOjD5Lyav9zGsXvYA7a7n/QB5TtVWKMbIho99DyLZ1ZgBVMI0hprvjtNCE8S
+xv4j2rVzw0gLqbKSaUN4NVKlR+/jzJKMpkuMdGWKx/VkpWgbMnL1sbfXk9yUarNP
+cq6pGsX+ZVzONPNM5WaoI/VD/a0NYdN2yuNlYV7ocwTpYgTotgkYEUvvsaJlZw34
+MwlAylbYU7PsIqe+qUP6o+Mdzkoq4O5lgJKdluTTNQU46wNYReUV//ZVHg9cYCGg
+t1YU6BtU/lfkVQuIEwXST6TNEXNVKPu5QKZ40oJDO4+FlHfn0Pp6eHP2i6GPrU7G
+wXiWdgPfhbgh9gDzrSI7h6lZp0lhJEdYcivT9dupgVOi9FJCtUnV5faoHJorS2Lf
+2rFvPavh55402xQRIPvA780MHjbT/58dRqf0RBVrD4SXfO5cucrECYKQJhqB2djL
+fbPFH4diMgx7jNi6U8M5
+=igI3
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.36.0.ebuild b/net-misc/curl/curl-7.36.0.ebuild
index a6bb727eb801..375cd7fad25f 100644
--- a/net-misc/curl/curl-7.36.0.ebuild
+++ b/net-misc/curl/curl-7.36.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v 1.2 2014/03/31 13:42:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v 1.3 2014/04/02 15:38:28 blueness Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_6 python2_7 )
-inherit autotools eutils prefix python-any-r1
+inherit autotools eutils prefix
 
 DESCRIPTION="A Client that groks URLs"
 HOMEPAGE="http://curl.haxx.se/"
@@ -17,6 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
 IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl"
 
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
 RDEPEND="ldap? ( net-nds/openldap )
 	ssl? (
 		curl_ssl_axtls?  ( net-libs/axtls  app-misc/ca-certificates )
@@ -56,7 +58,6 @@ RDEPEND="ldap? ( net-nds/openldap )
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? (
-		${PYTHON_DEPS}
 		sys-apps/diffutils
 		dev-lang/perl
 	)"
@@ -79,12 +80,6 @@ REQUIRED_USE="
 DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
 	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
 
-pkg_setup() {
-	if use test ; then
-		python-any-r1_pkg_setup
-	fi
-}
-
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-7.30.0-prefix.patch \