gentoo resync : 17.08.2021

5 files changed, 4 insertions, 6 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 781d5930bbc0..889df0b0fb9f 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index c06f1fb7cf74..075d35002067 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,6 +1,6 @@
 AUX odamex-0.9.0-Unbundle-miniupnpc.patch 2765 BLAKE2B f1a7307c82d6ab9ee17524d0384ec7b54ee51a1ee611a89cad9cdd3e8a98b448327a85242f71f0432ec266cbb8b24b893a0ca86dd62b994bc1320ef4157dc9f6 SHA512 a310ede1fc3340e6ee28ea0925da828dae517d7f9f83d015b744e0b3185ed82fa737f0a1d6c73ab000edf87a4467910ab14aa3a6bb34dc7c157535bd8270173c
-DIST odamex-0.9.2.tar.bz2 6657974 BLAKE2B 60bf542806fe9d66711b45211f646607875621b014175fa3c4b9948c1c02d45af36d4a324349f22f4a7a4e11c13f48f2b96c731a9bb5f18c9d43111c56676f18 SHA512 69fb2ecc1d642c9c90da7503712aba628c753534ee56003945e4d267dc38bca0136d155a75695e483b0b4ec739aa331fca8c7493263b39a2521e8abcb378b5e4
 DIST odamex-0.9.3.tar.bz2 6658459 BLAKE2B 1afe34400d2875ac196d5c189a35eb402fce0de90ded496aafcc98d2847ac7cdb10f07261c977a69e2442876897c0931813ddaf1954de2a871af6ca9d9317895 SHA512 114afe22f5651c87cedd7677055286ef9d222de790d9578669fdb5a20b471b273bd427c0dd103a64bcf7c285477776b6fa608b4086f78b4cd8271c33c87afcc3
-EBUILD odamex-0.9.2.ebuild 1784 BLAKE2B b839525adfa4f0d0e2b29dd0b5d76f80568fb79d5c5ea2b9f6d2ba4a0a30d922db86b732ff92e345afe1f27f111aac92e0b8a6946440805901234b22bed8bf54 SHA512 5948ffd6eadc5ac78902a8e674c85727ac937b42309dff653fa9f4eea84a76fdf820e473983c4ca9af759add321acf71cb85e950684a82ebc0a8d6310d900ca6
+DIST odamex-0.9.4.tar.bz2 6659835 BLAKE2B df6602c05e911a979e9de168bc08be13ac154106ac6d11f3dbf1c50ce6ccdc10f099ff6caf024e45136e5f6be53eb7db7a7cda89d5b37c0507f37fdae033f2bd SHA512 5488c4245aaf02a6e82714cd137fb6b26da0de808c137506b2575d9bad8025f46ba4d2e063de93a78e86806bbf7950651ec19697dee9b41b11c3aa2963b44e50
 EBUILD odamex-0.9.3.ebuild 1779 BLAKE2B 51a20fbcb38a36737b4cb0ad84ab30240da396e597d3c7bc6339c86df6ccbf3e2cabbd9b1155d366b064a5745e29a232eace583d0c0c2b3264d28305b78e409f SHA512 0b366a7024835787d546caa4f3855466205b2e7c47f5d13aad5c1f518d7a09b7e9f7e55cb77f0dd9280e96d1a71f273078cef6e763cd795ec7630ae17a25cfee
+EBUILD odamex-0.9.4.ebuild 1779 BLAKE2B 51a20fbcb38a36737b4cb0ad84ab30240da396e597d3c7bc6339c86df6ccbf3e2cabbd9b1155d366b064a5745e29a232eace583d0c0c2b3264d28305b78e409f SHA512 0b366a7024835787d546caa4f3855466205b2e7c47f5d13aad5c1f518d7a09b7e9f7e55cb77f0dd9280e96d1a71f273078cef6e763cd795ec7630ae17a25cfee
 MISC metadata.xml 1560 BLAKE2B 9005fa7ad7cf0c111c7f1843320a325ab2859e125a7fe173585a41efa0c255b7cb547af627bb574e4276052ccc4797d0de214cacf8aa39b9e14576f326f8ba30 SHA512 da4fc9f0f98577b4e221649b6dca286cc00037cd2579d4adafc98bc00b0761ac5f553018394ea8509784754c4adf86963c1098db555aca0b01d62c1bc9efb843
diff --git a/games-engines/odamex/odamex-0.9.2.ebuild b/games-engines/odamex/odamex-0.9.4.ebuild
index 34a596cc2ee8..2a6cc608b6d8 100644
--- a/games-engines/odamex/odamex-0.9.2.ebuild
+++ b/games-engines/odamex/odamex-0.9.4.ebuild
@@ -21,12 +21,12 @@ RDEPEND="
 		media-libs/libpng:0=
 		media-libs/libsdl2[joystick,sound,video]
 		media-libs/sdl2-mixer
+		net-misc/curl
 		odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
 		portmidi? ( media-libs/portmidi )
 		X? ( x11-libs/libX11 )
 	)
 	server? (
-		dev-libs/jsoncpp:=
 		upnp? ( net-libs/miniupnpc:= )
 	)"
 DEPEND="${RDEPEND}"
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 3ee02e430af4..ee20e311b82e 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -9,5 +9,5 @@ AUX openmw-0.47.0-mygui-license.patch 728 BLAKE2B 036156d52e609fcbce3b219174e9de
 DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B 060b529fd4cd01f0fc723bb5a00a256b9c1ae4413c7b22581467cce75416e01041c3af22f0215ad9b1c475965a988065e0860c01c1e71d97454b022eec4779ea SHA512 0e165417e9ae047231fdc27b62251b33867f3782c1753f81705c886d6d3a433c8bbc3b4653a2555bc644bad11db9769d4bc2abcc84ca3ab23fabb6b80347bc32
 DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B 8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c SHA512 da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486
 EBUILD openmw-0.46.0-r2.ebuild 4282 BLAKE2B 78ebe705fe5e2365b3a2e0684d7e8bffd4ea6c94e0890d4e67377d5b6b03dd6c86c13861106c660cc65c39691d4c4df1f09d016fcf5f5eafa65c0d1412b14d61 SHA512 0c77d328ff9398cb7fe361c5ce19653905adf41030e7f041be9a9948b4c88c1a3e84b0283e32afb960c8f30cd55d2019b128c2fb1ab9887ad678b072865dc969
-EBUILD openmw-9999.ebuild 4201 BLAKE2B e5a1ccac389d31001ab5d26714a144f1439627f61687c4bfbad2a1a54ffce76af5684db2c1689dff7f854b6a30a9dda8d90a8ad0d31a7387a7388bc7a68c7c97 SHA512 1940f39350c3d2a9fe9097620e4716bb7f351d80e4992094244b92daa87ecd888bf54d943dfa44a52fadb4d72739228c29b40df8fddac47830dd8262e620f6d1
+EBUILD openmw-9999.ebuild 4138 BLAKE2B d902890b0c1b2f49c826350068c6be2ef379caf41828b2844dc164320dd231b1647a28d8f6baf19b639874b122ef09ab0e49b0331f3eec89ff25e4cfde2b09b2 SHA512 f61fde6985d36127d6857905ffbcf94d320a483d04704ebf6b59bd5ff15da4a1fc330d88a4da23e67e99f5d8431f95e414a50aa9f900333463d5a10901294bb4
 MISC metadata.xml 1453 BLAKE2B b8731f5073cc74dbe2b17b776227e19c226a9bc3087996263d689771f8bcb8ceed06ef81b3a28dc693532f36e57a028fae2adc18b32dcf22bb6115f686643e63 SHA512 ead1390d762da49cb57fc978a59cde9ba1c77fb4a539c69250c98adf2ea836e1b231a939a4e0b1a88b7cbe804ebc7973a91e85f14cb701a97c983728b4bf8b0a
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index 8692f3d2d3eb..d5893e7f0370 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -81,8 +81,6 @@ src_configure() {
 	use devtools && ! use qt5 && \
 		elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed"
 
-	append-cppflags "-I${ESYSROOT}/usr/include/recastnavigation"
-
 	local mycmakeargs=(
 		-DBUILD_BSATOOL=$(usex devtools)
 		-DBUILD_DOCS=$(usex doc)