Fix compilation against (bug #376009)

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

diff --git a/media-libs/libofa/ChangeLog b/media-libs/libofa/ChangeLog
index 2b10e0034c8d1ef80375b9745a1005b8d32afcc8..24918a90186afce4e6eec01b8625a9b381074ad7 100644 (file)
--- a/media-libs/libofa/ChangeLog
+++ b/media-libs/libofa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libofa
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/ChangeLog,v 1.21 2011/03/06 12:10:37 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/ChangeLog,v 1.22 2011/07/22 17:23:48 angelos Exp $
+
+  22 Jul 2011; Christoph Mende <angelos@gentoo.org> libofa-0.9.3.ebuild,
+  +files/libofa-0.9.3-curl-7.21.patch:
+  Fix compilation against (bug #376009)
 
   06 Mar 2011; Tobias Klausmann <klausman@gentoo.org> libofa-0.9.3.ebuild:
   Stable on alpha, bug #354061

diff --git a/media-libs/libofa/Manifest b/media-libs/libofa/Manifest
index 60f933d566095b35f8f545f685e82f4c7231e7e5..a394616b88f6f6e853a67058ac2caf762199be57 100644 (file)
--- a/media-libs/libofa/Manifest
+++ b/media-libs/libofa/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX libofa-0.9.3-curl-7.21.patch 394 RMD160 09eb2b67586b2c8eb2b8065bb96d716aa0819de6 SHA1 6a8c841ebe2cc4e3800f9ef5ec9373563ed84992 SHA256 2fa49ced7b47cf05641d1413965244693ffd514ec9d409a784b92751ae4d1c90
 AUX libofa-0.9.3-gcc-4.3.patch 1254 RMD160 a435c893b3594d3c622588f87bac5a2a6cfbf69d SHA1 cae08bdc12de923d5e032696702a0530ae6eafc1 SHA256 99fb50907d98640b21a42d00fccee1fa33a02dfabf94a40374766fcc823f5dd3
 AUX libofa-0.9.3-gcc-4.4.patch 281 RMD160 eb0637ea02892ae9faa165114048f8ebe4d6672a SHA1 5f5d8fe172a2f3aaece09aa486a3bd787b916db3 SHA256 f8c5f3ab8e5a62cc5524a527555be7108e27e020193c70e47df5330a9164631a
 AUX libofa-0.9.3-gcc-4.patch 819 RMD160 438764c9c9ab5a1a9ede64c505c140cc53aabf9b SHA1 cb19377d0634c03d2a49cfc61915cec918c341f7 SHA256 29955fe97cdb3cc2eb72b7b05f1ae38cc5c98b1740a0db96d61f51a13d380cd8
 DIST libofa-0.9.3.tar.gz 384043 RMD160 77f393570bb5356026c4b9c7195236bd96cb9143 SHA1 3dec8e1dcea937f74b4165e9ffd4d4f355e4594a SHA256 0216466153e92058c5202dea03390ddc7601d916b983f71ce4f4d034405590a0
-EBUILD libofa-0.9.3.ebuild 931 RMD160 7f981efc951646554b7c466c8dbee1ffb053c783 SHA1 0bb5d255d8c6f6e3f22276673630b37c44ad0793 SHA256 ce622e402776c6e4bf601719955b9bb61cc9477b95a00cbbe2a0c23a91b8a4df
-MISC ChangeLog 2702 RMD160 ce515278f1ebe399f819cbb521000460a8a30e72 SHA1 07a3aab569dd03bfd6353e39cf0ee7bc6d103c1e SHA256 e60f65a153d7409c3305f36f632f812456751f5ad69ca8e4df4b4034e8b0c300
+EBUILD libofa-0.9.3.ebuild 966 RMD160 9ce8d34a44ab80c91eb5af409b5b9b629be41820 SHA1 916f3b5935e0971391f57411398ad1fcfdf29acd SHA256 b7f2aded73b85b5370aa079bfa886c6751b0ef4d31c5f1a83ae6ea5e8cecffe2
+MISC ChangeLog 2854 RMD160 83e01806a15baca0948c33c75ea6a3b1198f395a SHA1 6770eaeba2ccb98456fd8c7e2c5d82d62e194fe2 SHA256 3b41ce56dec8c68d0be4b02d0e6f7d523876b86f5423e1b992cbdc99aa1cc19e
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk4psh8ACgkQmWq1bYTyC0O1FwD+OGCD72CYzihEAJnPdt3r4wMx
+conRQFOxLx6tfb/p8AQA/j31FcNF+U3B2S3JBuikPD1pXqucFQWFhQgogPi75TrH
+=Nsw5
+-----END PGP SIGNATURE-----

diff --git a/media-libs/libofa/files/libofa-0.9.3-curl-7.21.patch b/media-libs/libofa/files/libofa-0.9.3-curl-7.21.patch
new file mode 100644 (file)
index 0000000..d233518
--- /dev/null
+++ b/media-libs/libofa/files/libofa-0.9.3-curl-7.21.patch
@@ -0,0 +1,11 @@
+diff -ru libofa-0.9.3.orig//examples/protocol.cpp libofa-0.9.3//examples/protocol.cpp
+--- libofa-0.9.3.orig//examples/protocol.cpp   2006-05-10 20:05:42.000000000 +0200
++++ libofa-0.9.3//examples/protocol.cpp        2011-07-22 19:02:30.687109297 +0200
+@@ -12,7 +12,6 @@
+ #include <map>
+ #include <expat.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ using namespace std;

diff --git a/media-libs/libofa/libofa-0.9.3.ebuild b/media-libs/libofa/libofa-0.9.3.ebuild
index fc38a5f572aec686f28adfa93c7d74f6d062e9a9..f83b1da6f65e17cc598d24fa99ca373967a03864 100644 (file)
--- a/media-libs/libofa/libofa-0.9.3.ebuild
+++ b/media-libs/libofa/libofa-0.9.3.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/media-libs/libofa/libofa-0.9.3.ebuild,v 1.22 2011/03/06 12:10:37 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/libofa-0.9.3.ebuild,v 1.23 2011/07/22 17:23:48 angelos Exp $
 
 EAPI=2
 
@@ -25,6 +25,7 @@ PATCHES=(
        "${FILESDIR}"/${P}-gcc-4.patch
        "${FILESDIR}"/${P}-gcc-4.3.patch
        "${FILESDIR}"/${P}-gcc-4.4.patch
+       "${FILESDIR}"/${P}-curl-7.21.patch
 )
 
 pkg_setup() {