Fix build with new subversion. Bug #387379

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

4 files changed, 25 insertions, 9 deletions

diff --git a/games-simulation/flightgear/ChangeLog b/games-simulation/flightgear/ChangeLog
index 4427256768e3..e4089e2e681e 100644
--- a/games-simulation/flightgear/ChangeLog
+++ b/games-simulation/flightgear/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/flightgear
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.50 2011/10/16 02:31:24 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.51 2011/10/19 06:36:06 tupone Exp $
+
+  19 Oct 2011; Tupone Alfredo <tupone@gentoo.org> flightgear-2.4.0.ebuild,
+  +files/flightgear-2.4.0-svn.patch:
+  Fix build with new subversion. Bug #387379 by Juergen Rose
 
 *flightgear-2.4.0 (16 Oct 2011)
 
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 87302e4f209a..ae7b8cbc03e5 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -5,6 +5,7 @@ AUX flightgear-1.9.1-gcc44.patch 268 RMD160 35785208026c9efb432ad03bee5cf2113a96
 AUX flightgear-1.9.1-parallel.patch 390 RMD160 166605f0e28479c4f40bd9ec042c12031903b6c2 SHA1 0d4a70faa9b80a620b6c49295d288ad861b48cfe SHA256 f37ee6216f36a247207ca48ebd99e96e0065eff6ff14ad00afea6eef2908287f
 AUX flightgear-1.9.1-sdl.patch 388 RMD160 6d76ab59d7db019af897bcf702d75b2c631872d1 SHA1 7ba2f6a027474cebfa208c1bb777f0fa609e6499 SHA256 30b75c4cd89bb443ff6c6f8415dea096ba32245840772a8e0f2c554845815b50
 AUX flightgear-2.0.0-sdl.patch 388 RMD160 6d76ab59d7db019af897bcf702d75b2c631872d1 SHA1 7ba2f6a027474cebfa208c1bb777f0fa609e6499 SHA256 30b75c4cd89bb443ff6c6f8415dea096ba32245840772a8e0f2c554845815b50
+AUX flightgear-2.4.0-svn.patch 328 RMD160 3536c61afdac1e47c722a91bd80e34aecb5c7877 SHA1 c5976e1c81f3cb9f2b68d1e6ffa79b2d6b425698 SHA256 317fa1ba9dd98f124880db56a660c5b83ec655743b59ae2dd7cf1fadd467c6dd
 DIST FlightGear-1.9.1.tar.gz 2246411 RMD160 7bac6d9a4291d3df3827ea7c990a7bb765a0b7a4 SHA1 db1a6478164eabaab7c5ecf05bb011b573bb8659 SHA256 81162a349137bcc98934a9606b50dad9b293d561a089423814af4d178f0b3d01
 DIST FlightGear-2.0.0.tar.gz 2425099 RMD160 0b7cd19c5f4413c82bc9e7e17cd423f823e03607 SHA1 666d7a165e121feaabd2235959f5ed853ee88126 SHA256 8f874534b4f62de6ebac8a513f51cbc5b408aa57424c3715036df65292b6079e
 DIST FlightGear-data-1.9.0.tar.bz2 239976097 RMD160 4c41b3e8aaf928cfe0a5b31b0a3dc4c938d07cb7 SHA1 1cac1339960595f08e09b38e28703c976ee0adeb SHA256 19600130d862108678d415e71b2fe3d8c9cd4168e123704b0121dd7fd6adc3c0
@@ -13,13 +14,13 @@ DIST FlightGear-data-2.4.0.tar.bz2 431295521 RMD160 b3bb025b4c726cee0bb156664ddf
 DIST flightgear-2.4.0.tar.bz2 1909473 RMD160 fa4962bb8e4229ddf8f1c2ebbef76d90f39f6edf SHA1 779d89433e2ffb11ebd4743855bce7376d388731 SHA256 3f2fdad171b86746b0dfa67510aabfb0c24731951a6d5646c6f0a4f98f01dbe1
 EBUILD flightgear-1.9.1.ebuild 1257 RMD160 8632bb18b056007f99d3cd29275721439792c162 SHA1 48d5e7c39681cf3a20f497ba8d6e73f1132b96b8 SHA256 b492cb4d517ec0eef6b0377efb48769194d04654b3a3ace882c620212b831854
 EBUILD flightgear-2.0.0.ebuild 1230 RMD160 cae991e5e36447cd7d34d4afb89b2379f6f6f49c SHA1 5f07531c084b20a2665ede7ca80684a90c695135 SHA256 643e21cb3a7c7899ff865b2426631885bd2720e54fb2174e29a2764badb3d400
-EBUILD flightgear-2.4.0.ebuild 1452 RMD160 324c5b5ccf4db1cb5ce8d8ad4e59c5d2ca5b868e SHA1 d9ec1b7c28ea9e6b7785cc29417f6e42b9caf84e SHA256 3676989375f7ceea1f076d4125683d710dedb0a34ef2ab0789b20da88d70c356
-MISC ChangeLog 8811 RMD160 1b340f9f9cc9217f570f0bb130cc9e973b82fb13 SHA1 ffc90010d573b6872e284d70f4f9ffcfa57f4631 SHA256 ffbf352d4b43025976e068948db9952482e3bc4332992be68b8d01bc96ce77e8
+EBUILD flightgear-2.4.0.ebuild 1483 RMD160 8db67a5513a5f3942bfb84c169247c8b7a42e0b3 SHA1 d59c9484d7bdd552d1beef33fae1a1ac72420ae4 SHA256 c5eca7116db9888fbc3049c8c340344f56889a3c3798aac65bb77f1f47cd0674
+MISC ChangeLog 8983 RMD160 4927d5794ea58122fdd635240897d72d4184bddb SHA1 07e7950cb70b12a007560087b7bc2129ef13fcaa SHA256 9a97561ee83608d567fb1fd083666722a7786b1b0e81cf2cee8768a451a7f4db
 MISC metadata.xml 252 RMD160 ff740b48a8231442102a6d8a05de35fa90034978 SHA1 acec02c8c581a36d1750a910a6db41766a0e3c98 SHA256 2dc38e2edb5ef0ce76845cfb7ab60e702c61eaff8e5ae142025b1793ed81084c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6aQgAACgkQFuHa/bHpVdsByQCfSl2X0tuol4+zF4HFu4/bFbLQ
-G5oAoJpOMM73YVpu2qbBSakjmuRFN9eH
-=03yM
+iEYEARECAAYFAk6ecCgACgkQIY77eQFFFC1jyQCgqUPs8flLWcyGAJMUKB8MWorg
+61sAnRKbTtPVNuNKE1iyMowMwGL450e1
+=LfPy
 -----END PGP SIGNATURE-----
diff --git a/games-simulation/flightgear/files/flightgear-2.4.0-svn.patch b/games-simulation/flightgear/files/flightgear-2.4.0-svn.patch
new file mode 100644
index 000000000000..a62bb2310fc0
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2.4.0-svn.patch
@@ -0,0 +1,10 @@
+--- utils/TerraSync/terrasync.cxx.old	2011-10-18 20:31:14.893605854 +0200
++++ utils/TerraSync/terrasync.cxx	2011-10-18 20:32:58.580593547 +0200
+@@ -61,6 +61,7 @@
+ #    include <svn_client.h>
+ #    include <svn_cmdline.h>
+ #    include <svn_pools.h>
++#    include <svn_version.h>
+ #  else
+ #    undef HAVE_SVN_CLIENT_H
+ #  endif
diff --git a/games-simulation/flightgear/flightgear-2.4.0.ebuild b/games-simulation/flightgear/flightgear-2.4.0.ebuild
index 8266f25c0b95..aa60999fa65d 100644
--- a/games-simulation/flightgear/flightgear-2.4.0.ebuild
+++ b/games-simulation/flightgear/flightgear-2.4.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-simulation/flightgear/flightgear-2.4.0.ebuild,v 1.1 2011/10/16 02:31:24 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-2.4.0.ebuild,v 1.2 2011/10/19 06:36:06 tupone Exp $
 
 EAPI=3
 
@@ -35,7 +35,8 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.0-sdl.patch
+	epatch "${FILESDIR}"/${PN}-2.0.0-sdl.patch \
+		"${FILESDIR}"/${P}-svn.patch
 	eautoreconf
 }