Build with newer net-misc/curl. Bug #383217

Package-Manager: portage-2.1.10.24/cvs/Linux i686

diff --git a/games-server/crossfire-server/ChangeLog b/games-server/crossfire-server/ChangeLog
index 5f4bccb7be927e72ec3dbfd1c928c499e9471e54..425d1d814295306bc02584a86f95d69fb0e7945d 100644 (file)
--- a/games-server/crossfire-server/ChangeLog
+++ b/games-server/crossfire-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-server/crossfire-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.18 2011/02/21 14:17:21 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.19 2011/10/10 14:40:21 tupone Exp $
+
+  10 Oct 2011; Tupone Alfredo <tupone@gentoo.org>
+  crossfire-server-1.11.0.ebuild, +files/crossfire-server-1.11.0-curl.patch:
+  Build with newer net-misc/curl. Bug #383217 by Diego Elio Pettenò
 
   21 Feb 2011; Tupone Alfredo <tupone@gentoo.org>
   crossfire-server-1.11.0.ebuild,

diff --git a/games-server/crossfire-server/Manifest b/games-server/crossfire-server/Manifest
index d18215bad1092c3bccb612e1d19ac8e5e5e4995b..80de611f345aeb8c16c189531a2d7ae17ad54f9b 100644 (file)
--- a/games-server/crossfire-server/Manifest
+++ b/games-server/crossfire-server/Manifest
@@ -1,6 +1,7 @@
+AUX crossfire-server-1.11.0-curl.patch 252 RMD160 184c50319bd04377a35d8020892b382ea955e559 SHA1 b0cc1ce7e8c0cbdfa232dd744525f316b4e0a9e2 SHA256 1ae1f299f30a29d98a11d3328c989e39ab2255f55cd2b17ce07af404277ca964
 AUX crossfire-server-1.11.0-libpng15.patch 386 RMD160 1e3beabb9fc24d21ecaf453fa74e622a4eabaca7 SHA1 a9544fc1a991e25adc44f8d0c7b1f916c2b2d6ee SHA256 7f5c391d0323e9abe9ae2d8ad7ffc381408af75d9ef59f6262f882aed7b8bfc0
 DIST crossfire-1.11.0.maps.tar.gz 24675542 RMD160 4defb41bed63c87d92840c9cc130041450dce078 SHA1 bd72ebe276a3c2f589c4505543ca4123b7caf575 SHA256 848dc10e292f0e4812f9ec4cd802375da8e18df7648d090942e484bbde94b08b
 DIST crossfire-1.11.0.tar.gz 6302656 RMD160 c71c429896ccfecc98b5f52559377bb01b33c1c0 SHA1 5ba3f6e8ac39f7d02cf2d133ed6069c789502c25 SHA256 ad259903d37ddecbfc69507f01e5bfcf5c3f847fd22e711b1cc7df2d47ad222c
-EBUILD crossfire-server-1.11.0.ebuild 1366 RMD160 01bc5be2f6d52d9d6fc34e1deccfc364e4cd202e SHA1 a73d978e76b6406486b859e7f7278eab789874e0 SHA256 f8e6c3639c101d16c5937491ee86d5bfd12d532022fd79668a918dd1a0098c0a
-MISC ChangeLog 2694 RMD160 1242ecd8ec11735a3c65eac64e4b62f640a14084 SHA1 2efb2ca3dc6252718f2ff73db80a1852922f5868 SHA256 c737a452c0706a9f9f3cdc6b74f089b8e18ae5741793e8ed1b8962251b619169
+EBUILD crossfire-server-1.11.0.ebuild 1412 RMD160 93768fda02e1ae1b82ab5ae2406aca93e69ec4f3 SHA1 09966be98823f60309c28c0aca417b203197249b SHA256 480eac8d5dbe8429595578777c1a2e8f5d9d8e1f6710797c87aa2f042148d985
+MISC ChangeLog 2891 RMD160 0830969f838ea1e6cfe8ce8d1dab7693d27ccb63 SHA1 0bd23a564d8841866bb141ab5cc39581744ba3cc SHA256 854bcdd53c314ba5d7ba50c2affb178b52d0d15575720db82e2f5e0143e2acd8
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-server/crossfire-server/crossfire-server-1.11.0.ebuild b/games-server/crossfire-server/crossfire-server-1.11.0.ebuild
index e0b4fdd7fe029d97df9d170496ba09785db5d6fd..d7956cc0f62d4aa305aecafb74c4c4e4176a66df 100644 (file)
--- a/games-server/crossfire-server/crossfire-server-1.11.0.ebuild
+++ b/games-server/crossfire-server/crossfire-server-1.11.0.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/games-server/crossfire-server/crossfire-server-1.11.0.ebuild,v 1.7 2011/04/28 07:46:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.11.0.ebuild,v 1.8 2011/10/10 14:40:21 tupone Exp $
 
 EAPI=2
 inherit eutils autotools games
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ppc x86"
 IUSE="X"
 
 DEPEND="
+       net-misc/curl
        X? (
                x11-libs/libXaw
                media-libs/libpng )"
@@ -24,7 +25,8 @@ DEPEND="
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-       epatch "${FILESDIR}"/${P}-libpng15.patch
+       epatch "${FILESDIR}"/${P}-libpng15.patch \
+               "${FILESDIR}"/${P}-curl.patch
        sed -i \
                -e 's/make /$(MAKE) /' \
                $(find . -name Makefile.am) \

diff --git a/games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch b/games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch
new file mode 100644 (file)
index 0000000..86365d2
--- /dev/null
+++ b/games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch
@@ -0,0 +1,10 @@
+--- socket/metaserver.c.old    2011-10-10 16:23:40.513409319 +0200
++++ socket/metaserver.c        2011-10-10 16:23:46.617408594 +0200
+@@ -48,7 +48,6 @@
+ 
+ #ifdef HAVE_CURL_CURL_H
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #endif
+