Fix compilation against curl-7.21.7 (bug #376143)

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

8 files changed, 57 insertions, 32 deletions

diff --git a/media-plugins/vdr-rssreader/Manifest b/media-plugins/vdr-rssreader/Manifest
index 94747d4d4983..7a6ec2bb8452 100644
--- a/media-plugins/vdr-rssreader/Manifest
+++ b/media-plugins/vdr-rssreader/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX vdr-rssreader-1.0.3-gentoo-rss.diff 854 RMD160 adc795fa57c4190c2b1f6163ae594d566d8c7948 SHA1 329ce124ded4186d5ad1ee92056be8e145ddea9c SHA256 4711a73409fbff90e8770258c75c11c0eaf8aa38bf1a9fb910120aae7bc4ea3c
 AUX vdr-rssreader-1.0.3-gentoo.diff 1247 RMD160 e2e2a6e091958bd87c3ed7b7b225c4154d37ddf6 SHA1 953fb2b6ea9f83d97aedb2c6aa232177f1aad08c SHA256 aebe4c9f25a87c043b75f3ee1dca0fff26c64346655f7705078464f023bc15b5
@@ -7,22 +7,22 @@ AUX vdr-rssreader-1.1.4-gentoo-rss.diff 1065 RMD160 290d57222cd1be85d97357f127d5
 AUX vdr-rssreader-1.1.4-gentoo.diff 1504 RMD160 2f282877677c1ea849ce8969014022d68347b7d6 SHA1 2a3a585c361875880f24eb7440c172b37d9003ce SHA256 374d441ae2c6afd01eb607c3c1c31ca422d72827d7628cd917d79488636c15b7
 AUX vdr-rssreader-1.6.0-gentoo-rss.diff 1065 RMD160 290d57222cd1be85d97357f127d5315bd49052ca SHA1 409039d8691c787e5b05d0bdfeb689bc9f0016d2 SHA256 6ac687fb3ec7b53600253a2a576f0995e35f227ccb7d553035f9a9d10dcfe731
 AUX vdr-rssreader-1.6.0-gentoo.diff 1504 RMD160 2f282877677c1ea849ce8969014022d68347b7d6 SHA1 2a3a585c361875880f24eb7440c172b37d9003ce SHA256 374d441ae2c6afd01eb607c3c1c31ca422d72827d7628cd917d79488636c15b7
+AUX vdr-rssreader-1.6.4-curl-headers.patch 248 RMD160 f4d11d5e01e3e33d3f2db47823882942e7cf0680 SHA1 642c477609f3fdca3e2d131ab1f5b64677dcb119 SHA256 932001f64a6a7fe32188303cf26aa6843a0b4a68a07181ca32ce4132852b8604
 AUX vdr-rssreader-1.6.4-gentoo-rss.diff 722 RMD160 de594bec4e55dbb52115a41781b5c61d1e304bfa SHA1 d13e9bd38db4e7e4a1993c8e32ad0d2e07585498 SHA256 1b906a6aff35460a1cb72a23d5fce9b9b84f42035abdaabbb19701774b51b80f
 DIST vdr-rssreader-1.0.3.tgz 20502 RMD160 7f0c2ae2a0ebc21ff18de23c5a5299e5ec766514 SHA1 d8d312e97496b1f73a1a5302394122676b3a591d SHA256 25fe55592163ae5b0eb01eadd9027c8e641368cf3fb29750843b3dfb80b9879e
 DIST vdr-rssreader-1.1.4.tgz 21412 RMD160 de39c64733043f2a1190fca182e80d45a1e664f5 SHA1 4bd86e96d08685092eb98982aea5467124cbdef4 SHA256 b9f46ec6e8620e36b9d51a662b3f49b66b8bb1e9e4001b1287a009d06d2b5ade
 DIST vdr-rssreader-1.6.0.tgz 21679 RMD160 a1046c8a97281926d912adc7f6c45c05492e3c08 SHA1 6d62ab1ab529daa06b7c3456668034fe63335e5f SHA256 5ac71d3b5f43faa00fafa0df65ad69d1956693d7a72f8e8c1f821a208c85f09d
 DIST vdr-rssreader-1.6.4.tgz 23533 RMD160 0a8f9d2698f156e7c211dd4023d3a0992d6d71d3 SHA1 6f1feebe7b15120e0449cd7736ff79dcbd5bf63d SHA256 2a3516c82367ad77a66cf95baf758191b82cbd0a4d26cfb1ab733c0d88bc5af6
-EBUILD vdr-rssreader-1.0.3.ebuild 796 RMD160 a9cba6b60ad9e7f6687940b1489e599f72ad4cac SHA1 e686b9f1dcce1c5f4ac3d99fa203ff47b8c38aed SHA256 ddd17d4b2f83a3c75682089bd8edd68c936be3f7981846d24828c8f24a3d6cf9
-EBUILD vdr-rssreader-1.1.4.ebuild 794 RMD160 43375158048fd5072da7c66c9796951e12fd7fca SHA1 01a50d69ed6a886b204760c00c33b533d70d700d SHA256 f201c7cb520bff974f59a9eb8031efe616559737223311c33249adf2260e8626
-EBUILD vdr-rssreader-1.6.0.ebuild 798 RMD160 4676dcf0601115c02152c4f7cdde10b4f4a9acc5 SHA1 f83153b64cf99037ce3e190702f241c803918864 SHA256 55f0109d1226be988afc11bbc9842f354a0b30b079af7c9789cd839ff0758d3b
-EBUILD vdr-rssreader-1.6.4.ebuild 788 RMD160 6fde2d256f6e7fb2578e479fc574f6c7683a017b SHA1 27f6df4906a9806b6028515f9e68ec061375eaae SHA256 f738678c48b7975bb78eee4e2bc76236624191c1865dd2e53a3204e75561aa36
-MISC ChangeLog 2154 RMD160 08fff440d921f742129cde8e3f73ca4b86ff8631 SHA1 a715938ee572795e69051c4a98555975e409bb5d SHA256 c01c62ce15f1e1f7dcdeddaa55c73620de94ae55d242c6c29b214114afc8aad7
+EBUILD vdr-rssreader-1.0.3.ebuild 845 RMD160 26fb5800ebd71f5d7390b93a3c8ce16f4951089e SHA1 4f3c3dce7bc5a763557fbc832a8fc844581f2018 SHA256 4f6d37cdeb2b9f4f5edd96cdc5d5972937808356189a4895fe0fa04b5bea17a2
+EBUILD vdr-rssreader-1.1.4.ebuild 843 RMD160 ff52af2e414a9b1ff5517070dc768a8c4f4970ab SHA1 8e37de4f03ff54b30f91617539ec5ae1366b66cf SHA256 6ed54211265ea6783d07f34c19e00580a767252519febb9f67ba5da7c9fcd1ab
+EBUILD vdr-rssreader-1.6.0.ebuild 842 RMD160 88b4a3fce783e29201d80253f893367c7f40f44b SHA1 1491360b0083f082271611021e8b51eee4f7e122 SHA256 8bdda93c8474f8ebdd916f29e68980c01890be18e4a7bfa612b1a5d6b9596e49
+EBUILD vdr-rssreader-1.6.4.ebuild 827 RMD160 88a5ab8f477aa8ed20cdedf63f3b25bbbdb5dfab SHA1 8b756caa4d7f962284f630043e4f743f956bcb08 SHA256 919a4bdcf7e9830df5b86e153254b660873063c61ae768cc446751c2f20f5a98
+MISC ChangeLog 2420 RMD160 b11aa28282a8f7247d2d0a03a0bc4902650679dd SHA1 e2878e9b146fada495028972f5cbfff326bf5e72 SHA256 1364c3e5ef8b21e18249d9ecf6583e8d9dd45ca865f4afe46ec06ea62119310a
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFMm/Dbdn07HTTCgIoRAt0UAJ9qaUBvaTqkWb5DW6Pe+6kk7nMXEgCfYRNR
-GoWF4Bsehom4qBb0z3dBaw4=
-=eyJx
+iF4EAREIAAYFAk4tSVUACgkQmWq1bYTyC0P7swD/QsdZ2nmNygU+pLcwXEkK+bSn
+dJ73OQ4dBXI8umCjaeEA/RaglzBez0nVM+mtModIYAqrjsCT1qRkj0xQntd3Pef8
+=v4PG
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-tvtv/ChangeLog b/media-plugins/vdr-tvtv/ChangeLog
index 93420ee50499..3c42096db106 100644
--- a/media-plugins/vdr-tvtv/ChangeLog
+++ b/media-plugins/vdr-tvtv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-tvtv
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvtv/ChangeLog,v 1.9 2008/04/28 09:03:26 zzam Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvtv/ChangeLog,v 1.10 2011/07/25 10:42:37 angelos Exp $
+
+  25 Jul 2011; Christoph Mende <angelos@gentoo.org> vdr-tvtv-0.2.12.ebuild,
+  vdr-tvtv-0.3.2.ebuild, vdr-tvtv-0.3.3.ebuild, vdr-tvtv-0.3.3-r1.ebuild,
+  +files/vdr-tvtv-0.3.3-curl-headers.patch:
+  Fix compilation against curl-7.21.7 (bug #376143)
 
   28 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
   vdr-tvtv-0.3.3-r1.ebuild:
diff --git a/media-plugins/vdr-tvtv/Manifest b/media-plugins/vdr-tvtv/Manifest
index 8194c38c0c6f..9245966e63c8 100644
--- a/media-plugins/vdr-tvtv/Manifest
+++ b/media-plugins/vdr-tvtv/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX vdr-tvtv-0.3.3-curl-headers.patch 225 RMD160 df43f6b46b9c1dd7473f992c31d2c9633a96c32d SHA1 bff585ad11744537130e816ccda075aef714032b SHA256 18390d726cdf704e2475769b72f45355494431b46da3d158c9acf4bf58a3639a
 AUX vdr-tvtv-0.3.3-vdr-1.6.0.diff 508 RMD160 a7ce8279695ecbc4f45d8f54fc68399e7e404125 SHA1 752aaebf0bcda4bf51431c94bbc10be41fd15265 SHA256 c5e72b199a7db530bff3ca7578f67495f300b6856e0569213f1568d7b24743d2
 DIST vdr-tvtv-0.2.12.tgz 24037 RMD160 685eccb04f24e817a19b79e16fde1c7689c9f961 SHA1 7a25d853d59c95709916b7557181a39418ae2956 SHA256 4e3562c8284505ba5982495ffd0095ea8eb121cf3f526103d3cc5fab6a35ec59
 DIST vdr-tvtv-0.3.2.tgz 30964 RMD160 a2447b61c5e47568254a5f37b0343dd36c1eb87c SHA1 b71812d107ded67ecad8eb2e404f15b664f93e37 SHA256 ee7c2ee17c2398963847fc2c6f2ce730c758dcc39610b7b9d5eac53fe038a74f
 DIST vdr-tvtv-0.3.3.tgz 31983 RMD160 4a16baf3c163996166da61907ac69d7edfb82350 SHA1 9884a612d429313cd25f0573faa33099db7f76e9 SHA256 e72a79d6f36e8b850f3d842213244da8341ad6608815dfce892eec51d271a288
-EBUILD vdr-tvtv-0.2.12.ebuild 523 RMD160 cd79786747d82faba2a12a55ada68a6b52df95d3 SHA1 199c46c1fe50f2f7e15ec7e4ad879fde51f54086 SHA256 040c2b3c8c27287deebb62f915df171bcdcc32f024b0b03e3aa6ec0819d19f3b
-EBUILD vdr-tvtv-0.3.2.ebuild 526 RMD160 9185eabb9f02f3c18df696731ca145a4b0f184a6 SHA1 290ea1f9a29030c6f62df638308c2cedb6bec498 SHA256 5ecca303ffbb8fc8cf0b575837904ef0f47c5e30b520748154730d8ceb82ce07
-EBUILD vdr-tvtv-0.3.3-r1.ebuild 570 RMD160 0ad85ac439815f7908f13ff28d1ebb53b5b00c23 SHA1 7cd1f10fc6d39e1db8e24fa688185a1f05303b27 SHA256 18ce160032593bf8a01c8fb025cd3683e25bc2571fccd919319197135ece321e
-EBUILD vdr-tvtv-0.3.3.ebuild 526 RMD160 a9cf4d5af68f9201469f0e27ba1358b13e769449 SHA1 94567f15e1c5cf4411fc561fb7b3bc806729bd86 SHA256 ccdcf54673e15175ceaffe624b318281c80723eb2a7dfc1815cd61e22c39f510
-MISC ChangeLog 1359 RMD160 e133d88657694b83db9f1698174506724c8a63ba SHA1 ece2d4ee72339c715b92ec726840c1bb89185d08 SHA256 b070b67440f2ced92a5508e8d5d61cfa622f9a1a0b80ee8f4852a73b664821b8
+EBUILD vdr-tvtv-0.2.12.ebuild 579 RMD160 e980b921168dce2c056c345bb6ac452b730947d1 SHA1 7238465ac5502545181993bb88345f8bc8b52733 SHA256 c25f9ab57ce84bfe0f531d15c62800da9d7d252592831a0c95bd0560b8df2543
+EBUILD vdr-tvtv-0.3.2.ebuild 582 RMD160 5cf649492af274759e48ff3f071716b4afc99217 SHA1 21227b621c4fcfe2f94e6deb03a992f34bdd02a3 SHA256 ccb5a85795b11e796f3bc08f540c4e43a8a5068e623d2c2ae408ecf21d4da13d
+EBUILD vdr-tvtv-0.3.3-r1.ebuild 621 RMD160 c584a10a799603781726c64626cdc22be5b6ffbd SHA1 180eaa7b1c9c3197434f19e58546a202eff7d5de SHA256 d1141ac386f6d7e7c3a7dc668db310920a9fd819bb35b055b2ec67ace6b8a75f
+EBUILD vdr-tvtv-0.3.3.ebuild 582 RMD160 3a8baefee1b7e77130d5ef20dd6b29e449aba69c SHA1 407bf30c82572edf51537ecbd9cf51e008e49e6f SHA256 fc7c2248699b5d0f059b7a65abced551b5e18fb60a1aad12cd58c8e451b297f8
+MISC ChangeLog 1610 RMD160 d94b2c0bcfaadf5e70283305f8fd776ca724b66c SHA1 b6790198221adee55f2562e9debbf4450898bb6a SHA256 fea95eb48bb0b8104e27f8e105c54613e42eced8bb22cbe913ad01a45f4b0f8e
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkgVkuQACgkQt2vP6XvVdOce0wCg22cAXgHPeVDzCTZvu4hIxC2G
-+p0An1KhnMtJfklMk1tD7cmvt+9QKXsd
-=hTVg
+iF4EAREIAAYFAk4tSJcACgkQmWq1bYTyC0NZCQD+ObIzEVPC1T7aG8tOv9ewmQvt
+lzPB3cDPkg560AJsUaUBAMqOr07XL1Nbelu20K1EcFXdtBqRp+Q3/bH4ivnr2mzm
+=EX0W
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-tvtv/files/vdr-tvtv-0.3.3-curl-headers.patch b/media-plugins/vdr-tvtv/files/vdr-tvtv-0.3.3-curl-headers.patch
new file mode 100644
index 000000000000..f6c25b66c3de
--- /dev/null
+++ b/media-plugins/vdr-tvtv/files/vdr-tvtv-0.3.3-curl-headers.patch
@@ -0,0 +1,12 @@
+diff --git a/update.h b/update.h
+index 561fb9e..c2d0b4c 100644
+--- a/update.h
++++ b/update.h
+@@ -9,7 +9,6 @@
+ #define __UPDATE_H
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <string>
diff --git a/media-plugins/vdr-tvtv/vdr-tvtv-0.2.12.ebuild b/media-plugins/vdr-tvtv/vdr-tvtv-0.2.12.ebuild
index cb88d3fd9f9e..853e31a3f9d6 100644
--- a/media-plugins/vdr-tvtv/vdr-tvtv-0.2.12.ebuild
+++ b/media-plugins/vdr-tvtv/vdr-tvtv-0.2.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvtv/vdr-tvtv-0.2.12.ebuild,v 1.3 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvtv/vdr-tvtv-0.2.12.ebuild,v 1.4 2011/07/25 10:42:37 angelos Exp $
 
 inherit vdr-plugin
 
@@ -15,3 +15,5 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.2.6
 	net-misc/curl"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.3.3-curl-headers.patch )
diff --git a/media-plugins/vdr-tvtv/vdr-tvtv-0.3.2.ebuild b/media-plugins/vdr-tvtv/vdr-tvtv-0.3.2.ebuild
index 1e11ecb7c33f..cd1415d0419e 100644
--- a/media-plugins/vdr-tvtv/vdr-tvtv-0.3.2.ebuild
+++ b/media-plugins/vdr-tvtv/vdr-tvtv-0.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvtv/vdr-tvtv-0.3.2.ebuild,v 1.3 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvtv/vdr-tvtv-0.3.2.ebuild,v 1.4 2011/07/25 10:42:37 angelos Exp $
 
 inherit vdr-plugin
 
@@ -15,3 +15,5 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.2.6
 	net-misc/curl"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.3.3-curl-headers.patch )
diff --git a/media-plugins/vdr-tvtv/vdr-tvtv-0.3.3-r1.ebuild b/media-plugins/vdr-tvtv/vdr-tvtv-0.3.3-r1.ebuild
index 9ea6d9fa8a3c..7165cdc65351 100644
--- a/media-plugins/vdr-tvtv/vdr-tvtv-0.3.3-r1.ebuild
+++ b/media-plugins/vdr-tvtv/vdr-tvtv-0.3.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvtv/vdr-tvtv-0.3.3-r1.ebuild,v 1.3 2008/04/28 09:03:26 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvtv/vdr-tvtv-0.3.3-r1.ebuild,v 1.4 2011/07/25 10:42:37 angelos Exp $
 
 inherit vdr-plugin
 
@@ -16,4 +16,5 @@ IUSE=""
 DEPEND=">=media-video/vdr-1.2.6
 	net-misc/curl"
 
-PATCHES=("${FILESDIR}/${P}-vdr-1.6.0.diff")
+PATCHES=( "${FILESDIR}/${P}-vdr-1.6.0.diff"
+	"${FILESDIR}"/${PN}-0.3.3-curl-headers.patch )
diff --git a/media-plugins/vdr-tvtv/vdr-tvtv-0.3.3.ebuild b/media-plugins/vdr-tvtv/vdr-tvtv-0.3.3.ebuild
index c9a6bb1e0165..d499fffe048d 100644
--- a/media-plugins/vdr-tvtv/vdr-tvtv-0.3.3.ebuild
+++ b/media-plugins/vdr-tvtv/vdr-tvtv-0.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvtv/vdr-tvtv-0.3.3.ebuild,v 1.3 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvtv/vdr-tvtv-0.3.3.ebuild,v 1.4 2011/07/25 10:42:37 angelos Exp $
 
 inherit vdr-plugin
 
@@ -15,3 +15,5 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.2.6
 	net-misc/curl"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.3.3-curl-headers.patch )