Fix compilation against curl-7.21.7 (bug #376089)

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

7 files changed, 64 insertions, 34 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index fd163c90b232..6ae94b4d7e9a 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.105 2011/07/12 20:52:00 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.106 2011/07/25 10:13:48 angelos Exp $
+
+  25 Jul 2011; Christoph Mende <angelos@gentoo.org> octave-3.2.4-r1.ebuild,
+  octave-3.2.4-r3.ebuild, +files/octave-3.2.4-curl-headers.patch,
+  octave-3.4.0-r2.ebuild, +files/octave-3.4.0-curl-headers.patch:
+  Fix compilation against curl-7.21.7 (bug #376089)
 
 *octave-3.4.0-r2 (12 Jul 2011)
 
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index b9fd60ac7959..458c438d9274 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX octave-3.2.0_as_needed.patch 485 RMD160 6476d8af9ada03c4b169e87e65d674a3b4bb810b SHA1 f0af5b1435ae2ca9eee08e37de5f3dda0e662b26 SHA256 cd4e0d0299b487959396313a42fdc94b2f069dd99c3127789496cfa40da71e9e
 AUX octave-3.2.0_parallel_make.patch 374 RMD160 0e597204583c44c6c67aa5c5360a73f0f6bae298 SHA1 85170197541aa797ff41f7c46e1e3594dbf32fe4 SHA256 d2864f9b0dbea021120be04d16f57759d881bff11bf2b90e34c7b68c770adb23
 AUX octave-3.2.4-addpath.patch 645 RMD160 41e419f8cac00277107d96a38f865720d435f197 SHA1 292051d3463b51fbb48b62f81f55b00783993ef7 SHA256 1f6a3fd6abf44f0058b08276b74ea10649e3412c74a70dd424f4918165b983ff
+AUX octave-3.2.4-curl-headers.patch 389 RMD160 b1292f6dccf1f1742235af044d6df8912c4e6849 SHA1 6e5101f5d04e1089f03d026a52bb453502c0c7f3 SHA256 aaf8b2a56299254f129035830f1f85ea63122d5cbfcd94b4c03fb0a9e2ddfcf9
 AUX octave-3.2.4-dlmread-speedup.patch 6100 RMD160 6e760e5cbf246c83667d2ecff7a8369dc9a4629c SHA1 30a72e1c810a9f532a35c35562ad001b55bdec27 SHA256 f54249a78a2250096d360a5c1fdd2187226388c29bd3f19db0c03f4592066474
 AUX octave-3.2.4-filter-empty-vector.patch 409 RMD160 163664d0b6d855f6f3a8ec448c4d163f61e56ee9 SHA1 288b67e74cce3fdf80ab0a0d444ffa98b0c404ff SHA256 d82f6cb5255fa556155c6c44cbf84a9fcb14d4cc484b2d322ab62de4df96c99c
 AUX octave-3.2.4-fltk-1.3.patch 819 RMD160 039712388cc2c4c95a01e3d34b06e2c1328a27af SHA1 56b52ab991a4c8be5974c93693f7604a126b5b7b SHA256 339472c36749382b7227d6fa20e936250ce307e8fdd5ec03c360e30a6931e9f1
@@ -14,6 +15,7 @@ AUX octave-3.2.4-interp2.patch 5747 RMD160 8583bfd070cf1ef746bc954dadf54e1b48401
 AUX octave-3.2.4-ldflags.patch 365 RMD160 65e753b086871b91e43995ce56491a2e057a020d SHA1 c70ae715234f737d6218b955748ecf65c56cf0be SHA256 55a3bd8cba99c9bc70cd2d7f40544beda9752df18ed681cf7fd44c4e4d937b80
 AUX octave-3.2.4-no-helvetica.patch 636 RMD160 fa10278332658633e89b0b44e75a82687a28194f SHA1 b0ef546e8505f13e97e57df918ecb5ec11a6ce13 SHA256 c448c5ac2af1dbd4dc93b08ac76276bbf530d83cc6b918cfdd7cc8b25b53d6df
 AUX octave-3.2.4-normal-marker-size.patch 776 RMD160 f9c88f1e4eaa57dc4e344cfaa39b0db089c6d0bc SHA1 a4199e042a35609d7bf885f175da1ab6f4b8162f SHA256 4cec4c75303657b53caecba8a6f3ec8d9a806f6b21647c6c69dff81f6cd2c31b
+AUX octave-3.4.0-curl-headers.patch 365 RMD160 9025652e87dbd7ba76df6e42518981d61f992347 SHA1 6040e5c3f904aea2c26ee636c172ad07e5de31f1 SHA256 7e8e9e149368e3898fbb0335b078895caab4d805670489556e493f8e174a266d
 AUX octave-3.4.0-fftshift.patch 572 RMD160 15fd2814d5f8c835174a46a2f2f0834fdaa6d2dc SHA1 fd86e57a768823ea417667800700b069b0e35466 SHA256 baaac52c4ea78d2ddc4ab1ff2f2a34b85d2e9ee18b8de40fc3f9fa39d26129e8
 AUX octave-3.4.0-fltk.patch 1181 RMD160 47d6fe5ba0e69887a7a76107dcfc7de67e701c74 SHA1 753cb977b0203aad64516e52c831232bbcf85ffb SHA256 7a36f8fcde9fa293f59649fc2affbfcb79306f019db2fc1a7d8507c27e32e018
 AUX octave-3.4.0-gcc46.patch 849 RMD160 c0a17a61646b77aea98f29fb41db0bad9e525c9b SHA1 791c905a80510783e5f9c556c12f02400887fbec SHA256 9ef417691a5f48a179ecd6d260873a150a4cba85cd1b2e18d667bbc85eeffe1d
@@ -21,19 +23,15 @@ AUX octave-3.4.0-help.patch 605 RMD160 fa6a63ebb50a452386dc0c10f6b54afe806bd2cc
 AUX octave-3.4.0-pkgbuilddir.patch 1429 RMD160 00765a8faf96f19e3a725da030986867995f6e8e SHA1 ce76db87fb480a3492ed89a906774b49273297e7 SHA256 b6a73e80041ae0847c0eb89e8cdc9f2135622567d18378c429f9ed3e498aed65
 DIST octave-3.2.4.tar.bz2 12080959 RMD160 6dcdea7ef2431b8427da5e6b9d2113e0e5736f43 SHA1 7de078564027108f3436f3ba7bf5993a6b411a67 SHA256 48471d05c7ed9c0a5a4d5fa4ae8a857447ac3da1197f86cfe79b9d8f4fdfd147
 DIST octave-3.4.0.tar.bz2 14619487 RMD160 8448fc8277e19dab8dbc5c0121e673e9198c74ec SHA1 936a8fc962abd96e7568fb5909ec2a4d7997a1a8 SHA256 0fb4f78f43320eec82477c1bbde42877e0e490a9f4903966b1682a9600ffcc2b
-EBUILD octave-3.2.4-r1.ebuild 2910 RMD160 2f7dd59cee88eeb8256da03a2df0c9e29e7b2ee1 SHA1 4263df9bacc15a66ae21a7d4e9616869d0f17676 SHA256 10de640975d178838ec17c38b83ba238bab5380c8e119f3c9c529d3b339d928f
-EBUILD octave-3.2.4-r3.ebuild 3322 RMD160 68d2d9b43d71051f45de0b848179547889c23dcf SHA1 be87f0f9d4c20929500b28c1234ce91047b09091 SHA256 b6ee1a5a9e2a3314e0dfc950a7c3f8fe53a1fb6454e178e2f5fa44a563e3bd14
-EBUILD octave-3.4.0-r2.ebuild 2179 RMD160 69f53bee75b2e54da6e1bba43ad353d0898085fc SHA1 872af4f39fc92ead9ffd17bfbc238f067a39f627 SHA256 1ad85e78823ce59c0da0ec48fed2c9f1b9cfb188d5cfc81a528d60a7b39dca5e
-MISC ChangeLog 26294 RMD160 c5034c95b0fd81f8db3fc64f46b14c648e8971b0 SHA1 658939377a2f09aff86b9a43d4726f598b32957f SHA256 8005bf704b491755cbd4fbc2ce6884a1313aa5d10e40136a05beea3b81a1b3ee
+EBUILD octave-3.2.4-r1.ebuild 2939 RMD160 10a5e73760c0cbe5ef0280cc95e2d9916098ffe1 SHA1 4819ba44c4b59d1fc9bb90ad57d5b7cd66b98d21 SHA256 b8c0040fca8dd7e9b816da72e14335c444ea7bd9c75e6e95f11dd0a6c3483b35
+EBUILD octave-3.2.4-r3.ebuild 3323 RMD160 5f6067a918bbf89c5f5faeb97e39cf0a276b4b23 SHA1 f5796f2f36e7a2bbed959433d2dae85a794056f8 SHA256 b1451c3dac71d7162b43939ca0d2706f0f4c6014cf427b328af9ba1cf4d04ad1
+EBUILD octave-3.4.0-r2.ebuild 2215 RMD160 a780113ce1f92a68e1fbc1f389fe68bfa23efd63 SHA1 b22d100a5f0479b91e4f63e4614bac476a7fe1e0 SHA256 674266f1dc68ae4c0e0087416559c5f39b57690391223244ca9f9e6a963d2371
+MISC ChangeLog 26549 RMD160 b18ffe485fdabffc2cf839ac183e8efe94125884 SHA1 ca9b317a9d20a887f54dd10bca3dcfa41a2cebaa SHA256 98d59491f98a52a5403c6fa5d7a277a3f4432cdeef0768eaf3576798d4879617
 MISC metadata.xml 260 RMD160 27a4292b758e1199d0092b731cba79033f1b4167 SHA1 9997a99a4d6115f3b901208ba711d735ce9be36e SHA256 5fda55fd44bfec5755e1c3ac828887c37f0eebed6b3b972454e123ac2472d3ff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOHLP6AAoJEMmH5mwCk1Nvr6YH/icd+uwuPHvtyoxYWbnhWU9l
-qwNNmS4sPJOMAGL6THsb2pKUq47C0GBVrIWWTiBohvyDNxAfY8S7O2XEckmxUtBT
-YrFO9HjYKWWjSYjDHABnsSzVCrxknwjNTM0FdaFBJ85hVafcpPhJQiJuOomfacp5
-EytVFUcF0ytmYcnaI4UVXy7C0c2UiuB5kHAWJvhpQhK+KnwK190gGJ9RAsfxyPPR
-+2VJ+1LenUvHJxwrVaYclQxdZ8fPZVby24UK3bnLsrt9azlU0VXFLdu9wQgZ1Wtp
-9KdTbVkV63T7pLE31KbvN79OigctxcfWWZukxNhQnELfp34tE4lnIcGxk55eBP0=
-=mMn9
+iF4EAREIAAYFAk4tQdYACgkQmWq1bYTyC0PKjQD9Gr4gXxkzN+mxkc/EzLMZghWh
+Bbwit5ajoagF96UMg5gBAK2FvS2YWh7MGKVnf+I1SbPb1zgmgiOyKoicX9EY4Hm8
+=NtTB
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/files/octave-3.2.4-curl-headers.patch b/sci-mathematics/octave/files/octave-3.2.4-curl-headers.patch
new file mode 100644
index 000000000000..aa4ca54537ca
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.2.4-curl-headers.patch
@@ -0,0 +1,12 @@
+diff --git a/src/DLD-FUNCTIONS/urlwrite.cc b/src/DLD-FUNCTIONS/urlwrite.cc
+index 4f9aeac..d8a63da 100644
+--- a/src/DLD-FUNCTIONS/urlwrite.cc
++++ b/src/DLD-FUNCTIONS/urlwrite.cc
+@@ -46,7 +46,6 @@ along with Octave; see the file COPYING.  If not, see
+ #if defined (HAVE_CURL)
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ // Write callback function for curl.
diff --git a/sci-mathematics/octave/files/octave-3.4.0-curl-headers.patch b/sci-mathematics/octave/files/octave-3.4.0-curl-headers.patch
new file mode 100644
index 000000000000..b9e0ae6b51b7
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.4.0-curl-headers.patch
@@ -0,0 +1,12 @@
+diff --git a/src/DLD-FUNCTIONS/urlwrite.cc b/src/DLD-FUNCTIONS/urlwrite.cc
+index 83927b1..8c41d38 100644
+--- a/src/DLD-FUNCTIONS/urlwrite.cc
++++ b/src/DLD-FUNCTIONS/urlwrite.cc
+@@ -52,7 +52,6 @@ along with Octave; see the file COPYING.  If not, see
+ 
+ #include <curl/curl.h>
+ #include <curl/curlver.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ static int
diff --git a/sci-mathematics/octave/octave-3.2.4-r1.ebuild b/sci-mathematics/octave/octave-3.2.4-r1.ebuild
index 642b2136379c..0ec6fcd2ca7d 100644
--- a/sci-mathematics/octave/octave-3.2.4-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.2.4-r1.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/sci-mathematics/octave/octave-3.2.4-r1.ebuild,v 1.10 2011/03/20 20:01:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.2.4-r1.ebuild,v 1.11 2011/07/25 10:13:48 angelos Exp $
 
 EAPI="2"
 inherit flag-o-matic xemacs-elisp-common autotools
@@ -47,11 +47,12 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.0_parallel_make.patch
-	epatch "${FILESDIR}"/${PN}-3.2.0_as_needed.patch
-	epatch "${FILESDIR}"/${PN}-3.2.4-imread.patch
-	epatch "${FILESDIR}"/${PN}-3.2.4-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-3.2.4-fltk-magic.patch
+	epatch "${FILESDIR}"/${PN}-3.2.0_parallel_make.patch \
+		"${FILESDIR}"/${PN}-3.2.0_as_needed.patch \
+		"${FILESDIR}"/${PN}-3.2.4-imread.patch \
+		"${FILESDIR}"/${PN}-3.2.4-ldflags.patch \
+		"${FILESDIR}"/${PN}-3.2.4-fltk-magic.patch \
+		"${FILESDIR}"/${P}-curl-headers.patch
 	eautoreconf
 }
 
diff --git a/sci-mathematics/octave/octave-3.2.4-r3.ebuild b/sci-mathematics/octave/octave-3.2.4-r3.ebuild
index 3fcdd0b8a554..fb929b388b49 100644
--- a/sci-mathematics/octave/octave-3.2.4-r3.ebuild
+++ b/sci-mathematics/octave/octave-3.2.4-r3.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/sci-mathematics/octave/octave-3.2.4-r3.ebuild,v 1.4 2011/03/20 20:01:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.2.4-r3.ebuild,v 1.5 2011/07/25 10:13:48 angelos Exp $
 
 EAPI="2"
 inherit flag-o-matic xemacs-elisp-common autotools
@@ -48,18 +48,19 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.0_parallel_make.patch
-	epatch "${FILESDIR}"/${PN}-3.2.0_as_needed.patch
-	epatch "${FILESDIR}"/${PN}-3.2.4-imread.patch
-	epatch "${FILESDIR}"/${PN}-3.2.4-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-3.2.4-fltk-magic.patch
-	epatch "${FILESDIR}"/${PN}-3.2.4-dlmread-speedup.patch
-	epatch "${FILESDIR}"/${PN}-3.2.4-addpath.patch
-	epatch "${FILESDIR}"/${PN}-3.2.4-filter-empty-vector.patch
-	epatch "${FILESDIR}"/${PN}-3.2.4-imshow.patch
-	epatch "${FILESDIR}"/${PN}-3.2.4-interp2.patch
-	epatch "${FILESDIR}"/${PN}-3.2.4-no-helvetica.patch
-	epatch "${FILESDIR}"/${PN}-3.2.4-normal-marker-size.patch
+	epatch "${FILESDIR}"/${PN}-3.2.0_parallel_make.patch \
+		"${FILESDIR}"/${PN}-3.2.0_as_needed.patch \
+		"${FILESDIR}"/${PN}-3.2.4-imread.patch \
+		"${FILESDIR}"/${PN}-3.2.4-ldflags.patch \
+		"${FILESDIR}"/${PN}-3.2.4-fltk-magic.patch \
+		"${FILESDIR}"/${PN}-3.2.4-dlmread-speedup.patch \
+		"${FILESDIR}"/${PN}-3.2.4-addpath.patch \
+		"${FILESDIR}"/${PN}-3.2.4-filter-empty-vector.patch \
+		"${FILESDIR}"/${PN}-3.2.4-imshow.patch \
+		"${FILESDIR}"/${PN}-3.2.4-interp2.patch \
+		"${FILESDIR}"/${PN}-3.2.4-no-helvetica.patch \
+		"${FILESDIR}"/${PN}-3.2.4-normal-marker-size.patch \
+		"${FILESDIR}"/${P}-curl-headers.patch
 	has_version ">=x11-libs/fltk-1.3_rc1" && \
 		epatch "${FILESDIR}"/${PN}-3.2.4-fltk-1.3.patch
 	eautoreconf
diff --git a/sci-mathematics/octave/octave-3.4.0-r2.ebuild b/sci-mathematics/octave/octave-3.4.0-r2.ebuild
index 686a22da1240..17f5caaab66a 100644
--- a/sci-mathematics/octave/octave-3.4.0-r2.ebuild
+++ b/sci-mathematics/octave/octave-3.4.0-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/sci-mathematics/octave/octave-3.4.0-r2.ebuild,v 1.1 2011/07/12 20:52:00 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.4.0-r2.ebuild,v 1.2 2011/07/25 10:13:48 angelos Exp $
 
 EAPI=4
 inherit eutils base autotools
@@ -47,7 +47,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{gcc46,pkgbuilddir,fltk,help,fftshift}.patch
+	epatch "${FILESDIR}"/${P}-{gcc46,pkgbuilddir,fltk,help,fftshift}.patch \
+		"${FILESDIR}"/${P}-curl-headers.patch
 	eautoreconf
 }