diff options
author | Christian Schmitt <chris@ilovelinux.de> | 2010-11-21 16:10:01 +0100 |
---|---|---|
committer | Christian Schmitt <chris@ilovelinux.de> | 2010-11-21 16:10:49 +0100 |
commit | 0764b82fc7a740f63dfcc878825854cdd0de43fa (patch) | |
tree | 3085ca188a0b11da0c2a293afe435da79c32c847 /games-simulation/flightgear | |
parent | games-strategy/widelands: Moved to gx86. (diff) | |
download | gamerlay-0764b82fc7a740f63dfcc878825854cdd0de43fa.tar.gz gamerlay-0764b82fc7a740f63dfcc878825854cdd0de43fa.tar.bz2 gamerlay-0764b82fc7a740f63dfcc878825854cdd0de43fa.zip |
[games-simulation/flightgear] remove svn patch which is now upstream
Diffstat (limited to 'games-simulation/flightgear')
-rw-r--r-- | games-simulation/flightgear/Manifest | 3 | ||||
-rw-r--r-- | games-simulation/flightgear/files/flightgear-configure-svn.patch | 49 | ||||
-rw-r--r-- | games-simulation/flightgear/flightgear-9999.ebuild | 1 |
3 files changed, 1 insertions, 52 deletions
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest index 1806593..d51ff13 100644 --- a/games-simulation/flightgear/Manifest +++ b/games-simulation/flightgear/Manifest @@ -1,3 +1,2 @@ -AUX flightgear-configure-svn.patch 1689 RMD160 616e24436d9d237f946969e02f91b831d0708fbd SHA1 ee60aaf0cc88709eede3105a8950f609ee77d26d SHA256 581d899e8093a50944a6ba0c5e8f15b493cd67445dbce80968d8dd6baafff43f -EBUILD flightgear-9999.ebuild 1474 RMD160 f7054651ada62ef352b9e476a5bce27ac73b9d5b SHA1 bfc5f5ef3a31f9c85e21b118cae8be5fc3b805d4 SHA256 337fa3b57f96be0471bb17ccc780bea92dc5c3af5dd6d2be020255ffeda82006 +EBUILD flightgear-9999.ebuild 1426 RMD160 c829be6656d9af3ac1c058234dc0eeb6926c5031 SHA1 84b45da91a8b160da4d8453f8178f110b735a171 SHA256 ab04c2a28aeca30186eb347d207a4dc3af48a7ee8aea059f16d584d6aa967e49 MISC metadata.xml 353 RMD160 068d76460adbcf17bc9ec9c50469e026df6f6e65 SHA1 0c038b1fdd2f2a082b0d4f229a6f20f36d443d4a SHA256 527e7864e63fce5b6258b1e902ea65b3d084794a20bfce04e14ee298a40c8ed0 diff --git a/games-simulation/flightgear/files/flightgear-configure-svn.patch b/games-simulation/flightgear/files/flightgear-configure-svn.patch deleted file mode 100644 index 8fa05cf..0000000 --- a/games-simulation/flightgear/files/flightgear-configure-svn.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 8285ffc..5f367d5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -745,23 +745,31 @@ if test "x$ac_cv_header_zlib_h" != "xyes"; then - fi - - dnl Check for Subversion library support -+# libsvn support defaults to yes - save_LIBS=$LIBS - save_CPPFLAGS=$CPPFLAGS --LIBS="`apr-1-config --link-ld`" --CPPFLAGS="-I/usr/include/subversion-1 `apr-1-config --includes`" --AC_CHECK_HEADERS([svn_client.h]) --if test "x$ac_cv_header_svn_client_h" != "xyes"; then -- echo "TerraSync will shell out for command line subversion" -+AC_ARG_WITH(libsvn, [ --without-libsvn Do not use libsvn for terrasync [default=no]], [], [with_libsvn=yes]) -+if test "x$with_libsvn" = "xyes"; then -+ LIBS="`apr-1-config --link-ld`" -+ CPPFLAGS="-I/usr/include/subversion-1 `apr-1-config --includes`" -+ AC_CHECK_HEADERS([svn_client.h]) -+ if test "x$ac_cv_header_svn_client_h" = "xyes"; then -+ echo "TerraSync will use libsvn" -+ AC_SEARCH_LIBS(svn_client_checkout, svn_client-1) -+ AC_SEARCH_LIBS(svn_cmdline_init, svn_subr-1) -+ svn_LIBS=$LIBS -+ svn_CPPFLAGS=$CPPFLAGS -+ AC_SUBST(svn_LIBS) -+ AC_SUBST(svn_CPPFLAGS) -+ else -+ echo "Libsvn not found. TerraSync will use command line subversion" -+ svn_LIBS="" -+ svn_CPPFLAGS="" -+ fi -+else -+echo "Libsvn explicitly disabled. TerraSync will use command line subversion" - svn_LIBS="" - svn_CPPFLAGS="" --else -- echo "TerraSync will use integrated subversion library" -- AC_SEARCH_LIBS(svn_client_checkout, svn_client-1) -- AC_SEARCH_LIBS(svn_cmdline_init, svn_subr-1) -- svn_LIBS=$LIBS -- svn_CPPFLAGS=$CPPFLAGS -- AC_SUBST(svn_LIBS) -- AC_SUBST(svn_CPPFLAGS) - fi - LIBS=$save_LIBS - CPPFLAGS=$save_CPPFLAGS diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild index e7ae5b3..6c13103 100644 --- a/games-simulation/flightgear/flightgear-9999.ebuild +++ b/games-simulation/flightgear/flightgear-9999.ebuild @@ -26,7 +26,6 @@ RDEPEND=">=dev-games/openscenegraph-2.9[png] DEPEND="${RDEPEND}" src_prepare() { - epatch ${FILESDIR}/"${PN}"-configure-svn.patch eautoreconf } |