Fix test suite (bug #376025)

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

5 files changed, 138 insertions, 11 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 8be4c6378328..8fe78fd7e769 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.189 2011/07/21 21:11:24 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.190 2011/07/23 11:43:48 angelos Exp $
+
+  23 Jul 2011; Christoph Mende <angelos@gentoo.org> curl-7.21.7.ebuild,
+  curl-7.21.7-r2.ebuild, +files/curl-7.21.7-examples-fix-headers.patch:
+  Fix test suite (bug #376025)
 
 *curl-7.21.7-r2 (21 Jul 2011)
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index fa69ef419a30..ad2a72b34749 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,6 +5,7 @@ AUX config.h.ed 501 RMD160 54a470cde54020ac4820d1189b90d9e742a6c309 SHA1 ea72841
 AUX curl-7.18.2-prefix.patch 662 RMD160 a5cf90f3b93acd610adf116d00383ec8f792105e SHA1 5424f70aaf0ed9843bb84bc5e3e9e3654aca66a9 SHA256 ba5530d4ce9175eb54944716768ce33278e5de236cbeeb2a80caefff709ff0f8
 AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2a1cc6c477 SHA1 63739ae2625d1d858676fc7638322d3c677be2b8 SHA256 e06c33750b5337b2700445a073b96d0ab817584fffbf24ac386668cd5e98d450
 AUX curl-7.20.0-strip-ldflags.patch 419 RMD160 9373e95129812c9da74e1dafed33adcfeea84d3d SHA1 11f5466959fe0b93e2e2e47121a44093ac79c0b2 SHA256 eabd5d5ed0c154b834376a76334581c5ef0ef6a51ea7229c79e4cfc02bd446c6
+AUX curl-7.21.7-examples-fix-headers.patch 3128 RMD160 a6e52e484b642eeb738fca0b4f35734b9d13962d SHA1 81fb6b957b5c454014f5b5515d5c9b3269ab44df SHA256 8d720b98dc318008f3365139f2925de289f04ee75d61157d6d014766e1f90b0a
 AUX curl-respect-cflags-2.patch 1174 RMD160 8d613e222baae7dee7207931025f5389c529eec1 SHA1 0bcdaf3c5081e7b3196fae9dbd123ed5e09b8439 SHA256 a580b492e40bc01dcdf5527f7b69b06ef3a06a329314f48991de0ab9871e5cfe
 AUX curl-respect-cflags.patch 8180 RMD160 027b43d8fe11b5635af8473a4236cd483f6dadee SHA1 72d4829a2eac9b7f33343140ae0104fa3c796496 SHA256 fc9ac005a904efe408901cf2ee29359056bb1e49fe51a771377bedbae19bc665
 AUX curlbuild.h.ed 219 RMD160 745d3b5cb3613eab1b828fa5fcbee00b27856b86 SHA1 c8f9534498e265651494270d34fb349068d126c3 SHA256 eb97ca2aa14dfe905902a9a126f5fd2b01473087c642bc48a61fcdaa0f437833
@@ -13,14 +14,14 @@ DIST curl-7.21.6.tar.bz2 2311355 RMD160 25741abc0ec79d6f0da249aa50d310397bb92d17
 DIST curl-7.21.7.tar.bz2 2319682 RMD160 c4c8afe66fb30be9eec8233c22db6d5beed00e39 SHA1 88aab0188ac86c3d13118bb5b6ee49a83e53b0ce SHA256 1a50dd17400c042090203eef347e946f29c342c32b6c4843c740c80975e8215a
 EBUILD curl-7.21.4.ebuild 3500 RMD160 da59518fe336b44075f2b93524fa48e57db94401 SHA1 3d318ddd125f1c6f723a9f96af895e74202808ce SHA256 a3c54ce1f7690fa7396236be7d2b247d4cd0ec9fe3b0ee8dc7b9c52261080de6
 EBUILD curl-7.21.6.ebuild 3491 RMD160 ff149e8b7243622e68984589b289914cce039ee3 SHA1 37e45a232c442d363460d6bcf06a50734a6f645e SHA256 2fe3323f68bd5e3a37bb06ab8d0a650ce467556e06233a776712a3e115f17c6d
-EBUILD curl-7.21.7-r2.ebuild 3648 RMD160 24fedea9d04e8189b6d29eedaf81e8876d0c3380 SHA1 2bf50b6e4da2fa179bcf4ebfadbdc81e5ec90d37 SHA256 a7c944e7667dc2ede674c68efb52e033efc5ac2571fcd06c66fde9b42d99334b
-EBUILD curl-7.21.7.ebuild 3490 RMD160 33a79793ab4e6914436c6f2a9065a990d0a5df5f SHA1 2fa9a7b7947e2172de1c66317c7bf91b1b7be2d1 SHA256 56afd17002cfca04e27e71e8f63af0b7dda955d8f4a522c5c03584ead76daff6
-MISC ChangeLog 31692 RMD160 01ac421895ac5a99113752d892b349ae2dbeb6d1 SHA1 c888d5b9e7ab97ae7bef334912a6847df0c02771 SHA256 e5ab6ba7c999b616a4bb3069b45a2c2767cbf2a723736dc10d3896876a349d4b
+EBUILD curl-7.21.7-r2.ebuild 3698 RMD160 d1166775f31221e7e78fb8e66623268c687c95d3 SHA1 b5a73df3c17f70259a6c211bea37b608af9d902c SHA256 6ae736ff6dd8ffe80bd9e7280cce79bcc3b05ecaa0f8852c8ec0b7588889fc24
+EBUILD curl-7.21.7.ebuild 3537 RMD160 d18c4326bd7b53625019add90b6e68cb03871442 SHA1 9d95054e41000a5d042e3df2dd7018367e696d09 SHA256 2fce4d8718548f70f1c7328cf922d31e038bfa7e68a3cec3cbc7046d6db10603
+MISC ChangeLog 31868 RMD160 de9497a6083f5b75953472e20d98b62f79ebc0d0 SHA1 cf012fc626e0bb2e6901906665fc3e2b1c8678a9 SHA256 8438bc1eec3cede50c819d8f7b7b47906f3e2e845db20ec9803e7f88561d220d
 MISC metadata.xml 661 RMD160 01583b468ecdaef206cc2ed15da0a481e2f3b9c8 SHA1 2a3b2ebdc360ba87a1926b18f1ff3be5257565db SHA256 17dc3be94df3140e158ce615047e02a8604286c74bf33f62fe1aabd33c4a1890
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4olfgACgkQmWq1bYTyC0MHbAD/a1cBFpIx8Vfm1gphrsWBFR71
-TZlbWbDPWVPQHYI2b7oA/Aoi4wEPxvpL5i+8iVQQuIo0Oj69Vp6g+uk1ooUmH8Eb
-=+bVK
+iF4EAREIAAYFAk4qs/AACgkQmWq1bYTyC0P7lAD/boHCvS3EoCL6UpgSX9pL/msC
+DEbR9w/IFtb1WsdmCz4A+QH6zwg3Ce0hlWLE2UHNYXxDdrvDXoA3kUrbESDeH4fb
+=iHWY
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.21.7-r2.ebuild b/net-misc/curl/curl-7.21.7-r2.ebuild
index 16f575d3ff9f..801ab70fc06c 100644
--- a/net-misc/curl/curl-7.21.7-r2.ebuild
+++ b/net-misc/curl/curl-7.21.7-r2.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/net-misc/curl/curl-7.21.7-r2.ebuild,v 1.1 2011/07/21 21:11:24 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7-r2.ebuild,v 1.2 2011/07/23 11:43:48 angelos Exp $
 
 EAPI=4
 
@@ -48,7 +48,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
 		"${FILESDIR}"/${PN}-7.19.7-test241.patch \
 		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags-2.patch
+		"${FILESDIR}"/${PN}-respect-cflags-2.patch \
+		"${FILESDIR}"/${P}-examples-fix-headers.patch
 
 	eprefixify curl-config.in
 	eautoreconf
diff --git a/net-misc/curl/curl-7.21.7.ebuild b/net-misc/curl/curl-7.21.7.ebuild
index 8217fdeb1dba..5b7ce1fe0881 100644
--- a/net-misc/curl/curl-7.21.7.ebuild
+++ b/net-misc/curl/curl-7.21.7.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/net-misc/curl/curl-7.21.7.ebuild,v 1.3 2011/07/21 16:27:15 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7.ebuild,v 1.4 2011/07/23 11:43:48 angelos Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -49,7 +49,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
 		"${FILESDIR}"/${PN}-7.19.7-test241.patch \
 		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags-2.patch
+		"${FILESDIR}"/${PN}-respect-cflags-2.patch \
+		"${FILESDIR}"/${P}-examples-fix-headers.patch
 
 	eprefixify curl-config.in
 	eautoreconf
diff --git a/net-misc/curl/files/curl-7.21.7-examples-fix-headers.patch b/net-misc/curl/files/curl-7.21.7-examples-fix-headers.patch
new file mode 100644
index 000000000000..d761a370a247
--- /dev/null
+++ b/net-misc/curl/files/curl-7.21.7-examples-fix-headers.patch
@@ -0,0 +1,120 @@
+diff --git a/docs/examples/certinfo.c b/docs/examples/certinfo.c
+index 02558d9..e1463ec 100644
+--- a/docs/examples/certinfo.c
++++ b/docs/examples/certinfo.c
+@@ -22,7 +22,6 @@
+ #include <stdio.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ static size_t wrfu(void *ptr,  size_t  size,  size_t  nmemb,  void *stream)
+diff --git a/docs/examples/chkspeed.c b/docs/examples/chkspeed.c
+index fbcb1f7..efcf472 100644
+--- a/docs/examples/chkspeed.c
++++ b/docs/examples/chkspeed.c
+@@ -35,7 +35,6 @@
+ #include <time.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #define URL_BASE "http://speedtest.your.domain/"
+diff --git a/docs/examples/curlgtk.c b/docs/examples/curlgtk.c
+index 2c44280..59dcd3f 100644
+--- a/docs/examples/curlgtk.c
++++ b/docs/examples/curlgtk.c
+@@ -13,7 +13,6 @@
+ #include <gtk/gtk.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h> /* new for v7 */
+ #include <curl/easy.h> /* new for v7 */
+ 
+ GtkWidget *Bar;
+diff --git a/docs/examples/ftpget.c b/docs/examples/ftpget.c
+index 7b5e0d7..3ec17b9 100644
+--- a/docs/examples/ftpget.c
++++ b/docs/examples/ftpget.c
+@@ -22,7 +22,6 @@
+ #include <stdio.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ /*
+diff --git a/docs/examples/ftpgetinfo.c b/docs/examples/ftpgetinfo.c
+index 52f87d6..9bf39c3 100644
+--- a/docs/examples/ftpgetinfo.c
++++ b/docs/examples/ftpgetinfo.c
+@@ -23,7 +23,6 @@
+ #include <string.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ /*
+diff --git a/docs/examples/ftpgetresp.c b/docs/examples/ftpgetresp.c
+index ea882a0..49b2137 100644
+--- a/docs/examples/ftpgetresp.c
++++ b/docs/examples/ftpgetresp.c
+@@ -22,7 +22,6 @@
+ #include <stdio.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ /*
+diff --git a/docs/examples/postit2.c b/docs/examples/postit2.c
+index bb7fd48..470fd8b 100644
+--- a/docs/examples/postit2.c
++++ b/docs/examples/postit2.c
+@@ -37,7 +37,6 @@
+ #include <string.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ int main(int argc, char *argv[])
+diff --git a/docs/examples/sepheaders.c b/docs/examples/sepheaders.c
+index dac2878..973e465 100644
+--- a/docs/examples/sepheaders.c
++++ b/docs/examples/sepheaders.c
+@@ -24,7 +24,6 @@
+ #include <unistd.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ static size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream)
+diff --git a/docs/examples/simplessl.c b/docs/examples/simplessl.c
+index aeaadce..217622a 100644
+--- a/docs/examples/simplessl.c
++++ b/docs/examples/simplessl.c
+@@ -22,7 +22,6 @@
+ #include <stdio.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ 
+diff --git a/docs/examples/smooth-gtk-thread.c b/docs/examples/smooth-gtk-thread.c
+index 8cf106c..b679a27 100644
+--- a/docs/examples/smooth-gtk-thread.c
++++ b/docs/examples/smooth-gtk-thread.c
+@@ -37,7 +37,6 @@
+ #include <pthread.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h> /* new for v7 */
+ #include <curl/easy.h> /* new for v7 */
+ 
+ #define NUMT 4