3 files changed, 15 insertions, 126 deletions
diff --git a/dev-games/recastnavigation/Manifest b/dev-games/recastnavigation/Manifest
index 4cfcc2d49e7f..eff22c2d918e 100644
--- a/dev-games/recastnavigation/Manifest
+++ b/dev-games/recastnavigation/Manifest
@@ -1,4 +1,3 @@
-AUX recastnavigation-1.5.1_p20200511-install.patch 4029 BLAKE2B 7167a92f5763887f073110f04e0965745ff2114579d8a35c5c7c2480f3787aec3929f83b443e585852d268891fa279a91577a73b3bdebee0aee9c10a66afdd7f SHA512 da2c1bf75328729ef9679e2ac6cd9446b7b950ece6b6f343c0e015cc872c1e69e9fd27c9a6781a62cf6f8c845b82133d4df4ccefde8cbc3983258896d346ffc4
-DIST recastnavigation-1.5.1_p20200511.tar.gz 1541540 BLAKE2B 3878294247e26421c33019c05a8d70f9ae04ce046d1e503b2df8297e5c390c592e0222c445c9a7798c2e3eb7090b6c32d18b94015dce0a248ab17198d3054dda SHA512 bc48d9195c1ce4422359d850ad422e53c2599ff575b8c7a0ce6b7dc42720d7edd99781a1efa7bee49a00cd4ce6734f34ce9d434421471cb0cbf8e5207bbebebc
-EBUILD recastnavigation-1.5.1_p20200511.ebuild 811 BLAKE2B a5ba8c158dadc09cc59c53504d425696a2665fe5e529c05d833499c56f3f6abc78d1fa8cec56e5cad475934c676ff53510d771defd2d955878a8f2898dfca03b SHA512 0c9d9be8c118a5ee78b1d2429c52a2dcaf4249877518f714fe350d3b375ab37a622dd9723fdcdc989f0a13d9e244528b15bb2948508552886cbea82730ac38a0
+DIST recastnavigation-1.5.1_p20210305.tar.gz 1542880 BLAKE2B f1066a48c7269fe67deba17768187522db9c0ece11293a3ff54311a6400cd38f32340985729bb38109bc1262099b44b7bf92974dfeb80c47953e58e6eeab73ea SHA512 7c3a8ce3e38de81eeb31332584896af9f234826c7f7f831eccb36972746c8b528ffde7ae4ee0d25baf814ece030a4b029101e07ea89aacc33c6d44f1ae2cf265
+EBUILD recastnavigation-1.5.1_p20210305.ebuild 876 BLAKE2B c5cce1acf8ba88d6beb6387ac130926afb43533bcad517df3fa65c97cd1f68d6d960c97f24db86157bdfc2406209890d2d1fffd28a79dfef3f3d649d5da0ac7b SHA512 82b6e94e6fe052c7bf2a7882b60373485c16784533f38c5619338be56e1459c1d81d74345a635bc783c9e4225e07f93aba86fcae5d4e03f967fc06d6728570da
 MISC metadata.xml 517 BLAKE2B 68c09b23758cc20e24ca0789c5590ea6cad2089b2a7ddbc1d13193491cec83e45e986633bd0e20496a24354496a4414d0172c59aa2e7ee6d4786277f70f83401 SHA512 1a694f110c0e94aaef94b4cdeb9223707f10d51e9f171b95cc69d85ba22643c0046e945c0c4b1841f5425d352c6f49fc2bf45ecdbcbcad8ba99ecb1d8c214fe3
diff --git a/dev-games/recastnavigation/files/recastnavigation-1.5.1_p20200511-install.patch b/dev-games/recastnavigation/files/recastnavigation-1.5.1_p20200511-install.patch
deleted file mode 100644
index 8017517b448a..000000000000
--- a/dev-games/recastnavigation/files/recastnavigation-1.5.1_p20200511-install.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-https://github.com/recastnavigation/recastnavigation/pull/437
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d23859d..54a38d8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,6 +11,8 @@ option(RECASTNAVIGATION_TESTS "Build tests" ON)
- option(RECASTNAVIGATION_EXAMPLES "Build examples" ON)
- option(RECASTNAVIGATION_STATIC "Build static libraries" ON)
- 
-+include(GNUInstallDirs)
-+
- add_subdirectory(DebugUtils)
- add_subdirectory(Detour)
- add_subdirectory(DetourCrowd)
-diff --git a/DebugUtils/CMakeLists.txt b/DebugUtils/CMakeLists.txt
-index 8b6a3fc..86cfe76 100644
---- a/DebugUtils/CMakeLists.txt
-+++ b/DebugUtils/CMakeLists.txt
-@@ -26,10 +26,10 @@ set_target_properties(DebugUtils PROPERTIES
-         )
- 
- install(TARGETS DebugUtils
--        ARCHIVE DESTINATION lib
--        LIBRARY DESTINATION lib
-+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT library
-         )
- 
- file(GLOB INCLUDES Include/*.h)
--install(FILES ${INCLUDES} DESTINATION include)
-+install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
-diff --git a/Detour/CMakeLists.txt b/Detour/CMakeLists.txt
-index de88111..b4c457a 100644
---- a/Detour/CMakeLists.txt
-+++ b/Detour/CMakeLists.txt
-@@ -20,10 +20,10 @@ set_target_properties(Detour PROPERTIES
-         )
- 
- install(TARGETS Detour
--        ARCHIVE DESTINATION lib
--        LIBRARY DESTINATION lib
-+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT library
-         )
- 
- file(GLOB INCLUDES Include/*.h)
--install(FILES ${INCLUDES} DESTINATION include)
-+install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
-diff --git a/DetourCrowd/CMakeLists.txt b/DetourCrowd/CMakeLists.txt
-index 73cdf7c..7d1ace3 100644
---- a/DetourCrowd/CMakeLists.txt
-+++ b/DetourCrowd/CMakeLists.txt
-@@ -24,10 +24,10 @@ set_target_properties(DetourCrowd PROPERTIES
-         )
- 
- install(TARGETS DetourCrowd
--        ARCHIVE DESTINATION lib
--        LIBRARY DESTINATION lib
-+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT library
-         )
- 
- file(GLOB INCLUDES Include/*.h)
--install(FILES ${INCLUDES} DESTINATION include)
-+install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
-diff --git a/DetourTileCache/CMakeLists.txt b/DetourTileCache/CMakeLists.txt
-index 121b8ed..141a680 100644
---- a/DetourTileCache/CMakeLists.txt
-+++ b/DetourTileCache/CMakeLists.txt
-@@ -25,10 +25,10 @@ set_target_properties(DetourTileCache PROPERTIES
- 
- 
- install(TARGETS DetourTileCache
--        ARCHIVE DESTINATION lib
--        LIBRARY DESTINATION lib
-+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT library
-         )
- 
- file(GLOB INCLUDES Include/*.h)
--install(FILES ${INCLUDES} DESTINATION include)
-+install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
-diff --git a/Recast/CMakeLists.txt b/Recast/CMakeLists.txt
-index 5e84376..3b04742 100644
---- a/Recast/CMakeLists.txt
-+++ b/Recast/CMakeLists.txt
-@@ -20,10 +20,10 @@ set_target_properties(Recast PROPERTIES
-         )
- 
- install(TARGETS Recast
--        ARCHIVE DESTINATION lib
--        LIBRARY DESTINATION lib
-+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT library
-         )
- 
- file(GLOB INCLUDES Include/*.h)
--install(FILES ${INCLUDES} DESTINATION include)
-+install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
-diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
-index 7c17469..a98ccbf 100644
---- a/Tests/CMakeLists.txt
-+++ b/Tests/CMakeLists.txt
-@@ -8,5 +8,3 @@ add_executable(Tests ${TESTS_SOURCES})
- add_dependencies(Tests Recast Detour)
- target_link_libraries(Tests Recast Detour)
- add_test(Tests Tests)
--
--install(TARGETS Tests RUNTIME DESTINATION bin)
diff --git a/dev-games/recastnavigation/recastnavigation-1.5.1_p20200511.ebuild b/dev-games/recastnavigation/recastnavigation-1.5.1_p20210305.ebuild
index ca12783c1d9f..879d46837a6b 100644
--- a/dev-games/recastnavigation/recastnavigation-1.5.1_p20200511.ebuild
+++ b/dev-games/recastnavigation/recastnavigation-1.5.1_p20210305.ebuild
@@ -1,31 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="Navigation mesh construction toolset for games"
 HOMEPAGE="https://github.com/recastnavigation/recastnavigation"
-MY_COMMIT="df27e4eb1a4ade9912f8b7d75c25769a3193dbd0"
+MY_COMMIT="c5cbd53024c8a9d8d097a4371215e3342d2fdc87"
 SRC_URI="https://github.com/recastnavigation/recastnavigation/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="ZLIB"
-SLOT="0"
+SLOT="0/1.5.1"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-PATCHES=(
-	"${FILESDIR}/recastnavigation-1.5.1_p20200511-install.patch"
-)
+DEPEND="test? ( dev-cpp/catch )"
+
+src_prepare() {
+	rm Tests/catch.hpp || die
+
+	cmake_src_prepare
+}
 
 src_configure() {
+	append-cppflags "-I${ESYSROOT}/usr/include/catch2"
+
 	local mycmakeargs=(
 		-DRECASTNAVIGATION_DEMO=OFF
 		-DRECASTNAVIGATION_EXAMPLES=OFF
-		-DRECASTNAVIGATION_STATIC=OFF
 		-DRECASTNAVIGATION_TESTS=$(usex test)
 	)