Fix compilation against curl-7.21.7 (bug #376833)

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

5 files changed, 47 insertions, 16 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 9b2cac75f500..524a4ad7e1ef 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.163 2011/07/20 13:37:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.164 2011/07/29 06:40:00 angelos Exp $
+
+  29 Jul 2011; Christoph Mende <angelos@gentoo.org> conky-1.8.0-r1.ebuild,
+  conky-1.8.1-r2.ebuild, +files/conky-1.8.1-curl-headers.patch:
+  Fix compilation against curl-7.21.7 (bug #376833)
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #34534
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 4c9a3cb0829b..28a7de0fbb2c 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX conky-1.8.0-audacious-2.3.patch 595 RMD160 5ce471fc07a8f8dfe85e0b74f5ffc18a71ebef25 SHA1 d44055c6b4878b189cd5555747611d444cca3b25 SHA256 41ba5c1934992116b792e399064e1d517b7715b5338b8f9d782a0c7dfd96ea52
 AUX conky-1.8.0-ncurses.patch 4359 RMD160 deb00ff8338881bf97a8ed26aeb6cdb3d53c0a07 SHA1 13dd57185c5ab8118cf2ca9c7e86222b9dc4e166 SHA256 9ac58ffcebe10447ac0255a5e7c569d1f22ddb3f6b1a1b8b0854e55d781c6f59
 AUX conky-1.8.1-acpitemp.patch 2415 RMD160 dcef233f8ba2ca192bfac3b16f0c671e1381fffe SHA1 d5000bfdddb134c4cd61e90e8bcc3bce5866c33c SHA256 57815044cd972139171b76e75267792821c783e03537eb6cf7ba8105c46cdf8d
+AUX conky-1.8.1-curl-headers.patch 494 RMD160 26c0e9060991a9ece1e38a552da828109566daa3 SHA1 0cb58b354bbd91a44af183e4ac7022246843552d SHA256 53ff30aa933163a1feb646720ea21b4727d515e33521ac53e77b8bd9d0473eba
 AUX conky-1.8.1-nvidia-x.patch 883 RMD160 f6e85e117ba5b895ba23db0d6e4160a0c0141c21 SHA1 1e3dc3f2a8e44d62e25ab2ab22726e0e91ecf666 SHA256 290ffdf4094167715bf11b86ee2cf73574a3af32ffb50fa09517d89c56bc0853
 AUX conky-1.8.1-secunia-SA43225.patch 1620 RMD160 3206a288819bc33048d9eee2444308b04b25fc1b SHA1 7c88144711911a6b38465311c7cf8cf6b0e6d45f SHA256 61c2d204796f51d0d51cd62e9a37a9f4f318e8fe8f955278ef86b64d5b2ff99f
 AUX conky-1.8.1-xmms2.patch 1190 RMD160 6ec093e08f55c198b5b2321acc7f3d1d7f74e267 SHA1 0e05fe363521145bde14eca99d3aebc28e258833 SHA256 1b64047f04239dbf24b3171fcd8d5c950e9f8aa6af5e94cd4836cd14c70e2bdc
 DIST conky-1.8.0.tar.bz2 610545 RMD160 5ea6accf73e1d41ebe8390722a53ae50e0c23df8 SHA1 eef214c2917ea5666d24f03128b12d00fa313b58 SHA256 badb3824a9655eee90281939df8bdb3ca95cf8bab03269b3b3775bfea2ed0a51
 DIST conky-1.8.1.tar.bz2 612481 RMD160 f3203131e2d8f3756eb29f5c5a9034b9c269fdc6 SHA1 9581419b1a53a8a7e37b0291cd4e55ab166d221a SHA256 f85a278f2869596b1fd68b6d26d58c93af8dcc39d5186bbcfd587d4c545e5e43
-EBUILD conky-1.8.0-r1.ebuild 3967 RMD160 2a7a6f187bf0c20b2d0f83796f3578ffea90714f SHA1 b4f01faaeb3b3046ed950997788b49c4fa51c5b0 SHA256 4bf134d29f37079b3b44c132856546c3ad74ae79f9d161b2a890253f9a8cc9e8
-EBUILD conky-1.8.1-r2.ebuild 3986 RMD160 cc57150be4f565ffb75aaa3fc2b15b33484fbc09 SHA1 dacf7b5d67e80cbe0757fc9d3c4c5695b136d6c8 SHA256 4c8bd95098648f5b4d5da4d02311e7365963eb148edc534b411f7ed507738855
-MISC ChangeLog 24708 RMD160 de759eeaf826f50166914c4126c8471ff30e778b SHA1 bf089e3eca1c2c7d910dc5fa4e97b7beb8143770 SHA256 111c859422bd2f81b03294b3d286d2279c331a718f6c34296e0cf9572bec0428
+EBUILD conky-1.8.0-r1.ebuild 4010 RMD160 93077b67329c48907ad9cd366a6c80c62588f4bf SHA1 4adeb54854518d7d43bd9e184e47db3a04841e87 SHA256 280ac43b204f0edf7ac2e8996e96fc415e5f09468ed2d707e9c5c89a85c3b96d
+EBUILD conky-1.8.1-r2.ebuild 4015 RMD160 093ab0a8765481fc88ef7ddf7aaba3359be9fe5b SHA1 10d1b38fb09d0bcce7813444d244d74cfe69dcf1 SHA256 f015d931a085dd2e7b1ee08af161a8d3b57ddc42828e1dcd0dca7b8bf1f8d450
+MISC ChangeLog 24902 RMD160 7354f53fd863e4fd0a5052b12b0721ef4cb09a0f SHA1 01929f1c5581bcd4ff77042ea24158871c770b44 SHA256 306fc0bdb83c4dfd7786f6daa0e1547bed7e6bc75027bbca1d92227a99710a98
 MISC metadata.xml 2057 RMD160 811d4a824c4e8b85e5817aff1d533425f85ffbab SHA1 be48ada89f6cbf83923cb6b7933a45884dfe1920 SHA256 9aac2a13ac4dcc06f0842a7177a3ea41d00ab452f9492064cd6620c3c6b8477e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4m2hcACgkQCaWpQKGI+9QFrQCdEb2UKeD1qYNAvM8OjBhRkVcD
-nOoAn3l5zjgf55g7SJpBbNIfYkx8DzYz
-=Xrbo
+iF4EAREIAAYFAk4yVbIACgkQmWq1bYTyC0OniQEAyBP++t5RNEcqXZRIhEyfYpa5
+CiW9phpa4zoug7rx03wBAKc4SadF5WERLsrdnNLkq2ZhoJgTM5kgBwXEdnil3R54
+=O0gB
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.8.0-r1.ebuild b/app-admin/conky/conky-1.8.0-r1.ebuild
index 427624c74533..dbcb144452f1 100644
--- a/app-admin/conky/conky-1.8.0-r1.ebuild
+++ b/app-admin/conky/conky-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r1.ebuild,v 1.8 2010/11/06 01:42:29 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r1.ebuild,v 1.9 2011/07/29 06:40:00 angelos Exp $
 
 EAPI="2"
 
@@ -53,7 +53,8 @@ DEPEND="
 
 src_prepare() {
 	epatch "${FILESDIR}/conky-1.8.0-ncurses.patch" \
-		"${FILESDIR}/conky-1.8.0-audacious-2.3.patch"
+		"${FILESDIR}/conky-1.8.0-audacious-2.3.patch" \
+		"${FILESDIR}/${PN}-1.8.1-curl-headers.patch"
 	eautoreconf
 }
 
diff --git a/app-admin/conky/conky-1.8.1-r2.ebuild b/app-admin/conky/conky-1.8.1-r2.ebuild
index cc08c8f35c9b..4e31a8cce1ff 100644
--- a/app-admin/conky/conky-1.8.1-r2.ebuild
+++ b/app-admin/conky/conky-1.8.1-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/app-admin/conky/conky-1.8.1-r2.ebuild,v 1.6 2011/03/06 12:11:08 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r2.ebuild,v 1.7 2011/07/29 06:40:00 angelos Exp $
 
 EAPI=2
 
@@ -53,10 +53,11 @@ DEPEND="
 	"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-nvidia-x.patch"
-	epatch "${FILESDIR}/${P}-xmms2.patch"
-	epatch "${FILESDIR}/${P}-secunia-SA43225.patch"
-	epatch "${FILESDIR}/${P}-acpitemp.patch"
+	epatch "${FILESDIR}/${P}-nvidia-x.patch" \
+		"${FILESDIR}/${P}-xmms2.patch" \
+		"${FILESDIR}/${P}-secunia-SA43225.patch" \
+		"${FILESDIR}/${P}-acpitemp.patch" \
+		"${FILESDIR}/${P}-curl-headers.patch"
 }
 
 src_configure() {
diff --git a/app-admin/conky/files/conky-1.8.1-curl-headers.patch b/app-admin/conky/files/conky-1.8.1-curl-headers.patch
new file mode 100644
index 000000000000..5de2de14e6fd
--- /dev/null
+++ b/app-admin/conky/files/conky-1.8.1-curl-headers.patch
@@ -0,0 +1,24 @@
+diff --git a/src/ccurl_thread.c b/src/ccurl_thread.c
+index 10e73a6..9bea299 100644
+--- a/src/ccurl_thread.c
++++ b/src/ccurl_thread.c
+@@ -33,7 +33,6 @@
+ #endif /* DEBUG */
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ /*
+diff --git a/src/eve.c b/src/eve.c
+index dc07264..f62a5f6 100644
+--- a/src/eve.c
++++ b/src/eve.c
+@@ -37,7 +37,6 @@
+ #include <libxml/xmlwriter.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <time.h>