gentoo (leap year) resync : 29.02.2020

3 files changed, 5 insertions, 38 deletions

diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 4ab9e0ea6a53..216c10688afc 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,6 +1,5 @@
-AUX 5.1.0-FindJson.patch 1231 BLAKE2B 49f9da4ef48d23b013e49c5f6e19d6ddae5a73b968223efb722e243a97af9bb38cdbf75424d518dcea5a575f28b740d8412e8d4592cfebe57e9508d68945872d SHA512 7d6648d3cd5d10e3572636066b3da737dfdc0e27d2b574f5aefae1696f874f2486ecf246274cdd28440ceac63e7f2434377286ad579fe6eccff830d3f0216854
 AUX minetestserver.confd 313 BLAKE2B 51af7c8d6c23461028774e459d3ff24a867102ac56c239da056e31ba800ec0904d4ad2daa26a9fd5069ecffc2fded37a8409d966403456c239e78d2a7c369345 SHA512 75442376afb031ad65880fd2b9cad034c520c7bed489543d5e1cee65fc998d0ae082d5736528dcdfaca41681b01ee895d7e0471f8581e8f0cba1a8cbbe20b3bc
 AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1
-DIST minetest-5.1.0.tar.gz 8939376 BLAKE2B 5c56bd74a573632636937c5e5a45eb864ec627962b73573a763be7326c2a3fa95ad87683d655725b29d29d91270812beef33c21b3eb100627f21befeb2dbfac5 SHA512 f2cad4720c1003536cc3c619c18234a95cae1dee8fb54b46a2ef5fd24108a4c945efcb0a461926ef3ede7b8bec41ed6620806212fe11f4142bbf31fe4f0f659e
-EBUILD minetest-5.1.0-r1.ebuild 3274 BLAKE2B 5e1038adfdeb1e0e6eedbe07bdac00cd0481c825ac47fa8fc2ff8acbbc78bc64646f7d3b5ab2a6deacf99f88de2049b064ca17abdfd79ba4bc761a042b3cb14b SHA512 b9244cc8b25e2d5166be1cb71593f84625eb307de9533c407e9104b68867fc8c258b836076867b246d03929299027ae0ac4a56691d1f18e5a8a60e20e5a83bf0
+DIST minetest-5.1.1.tar.gz 9002025 BLAKE2B 8258850a0f45125a09e0a4cf5eda7a8860be4f0a5e564767952e27fc8509593bf0615c1457a0ee168f6eeedcf1065e288b787d74e1d0a2180870bc1bae818bfc SHA512 4a36a86a3e5f8f5246ff3410e9ab182631f38292bea077e7dbc25fdc1520e5a479ffbd5ec447000fb4999ab252a59bf976299e6fecda1f8cd47f40549885766b
+EBUILD minetest-5.1.1.ebuild 3260 BLAKE2B ab0cc56e29f123224315d220f7dc1a4484cbb71fee250ece1d170abe3cc4bf6e49e8fa4374bb57108c17148e29d8c0c8fd8953c1cdc639d0ff40de562f7eb4af SHA512 dedd9e37aabdc91697c4193309da03822de866181d78f8b3511e358696fa0d154382841d6c116e12b6c4f3bfaa11e1d2aed3bcbf8dbb259334bc682411823fb5
 MISC metadata.xml 2238 BLAKE2B 71d17709848d892d3eb5e99165bc21f41b3d3c4ff51f4b9923f078156eb48c743308cb74c5f84ecc147aa9284332e0968b6e47a34c0c412e32abde9685c1bb1f SHA512 33d80f695f354f623e7dd927881865e074c430b4b562f2ac2bcc716a6be0d9ef89bcd2eb773d9207d3887a00b8ff7b9017b8d613cd603499cb6b0226ed3ffce4
diff --git a/games-action/minetest/files/5.1.0-FindJson.patch b/games-action/minetest/files/5.1.0-FindJson.patch
deleted file mode 100644
index 3d48b0a0924c..000000000000
--- a/games-action/minetest/files/5.1.0-FindJson.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 706b6aad06a112f55105f08b6acd130b276a06ca Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Sat, 16 Nov 2019 13:14:24 -0500
-Subject: [PATCH] Fix find_path for newer jsoncpp installations
-
-The upstream JsonCpp project has renamed the `json/features.h` file to
-`json/json_features.h`. This patch fixes the JsonCpp installation search
-by looking for `json/allocator.h` which has not been renamed on newer
-versions of JsonCpp.
-
-Fixes: https://github.com/minetest/minetest/issues/9119
----
- cmake/Modules/FindJson.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake
-index 26339a29..53ddf459 100644
---- a/cmake/Modules/FindJson.cmake
-+++ b/cmake/Modules/FindJson.cmake
-@@ -8,7 +8,7 @@ option(ENABLE_SYSTEM_JSONCPP "Enable using a system-wide JSONCPP.  May cause seg
- 
- if(ENABLE_SYSTEM_JSONCPP)
- 	find_library(JSON_LIBRARY NAMES jsoncpp)
--	find_path(JSON_INCLUDE_DIR json/features.h PATH_SUFFIXES jsoncpp)
-+	find_path(JSON_INCLUDE_DIR json/allocator.h PATH_SUFFIXES jsoncpp)
- 
- 	include(FindPackageHandleStandardArgs)
- 	find_package_handle_standard_args(JSONCPP DEFAULT_MSG JSON_LIBRARY JSON_INCLUDE_DIR)
--- 
-2.24.0
-
diff --git a/games-action/minetest/minetest-5.1.0-r1.ebuild b/games-action/minetest/minetest-5.1.1.ebuild
index 018526a2e715..66f7329bb98e 100644
--- a/games-action/minetest/minetest-5.1.0-r1.ebuild
+++ b/games-action/minetest/minetest-5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,13 +17,13 @@ REQUIRED_USE="|| ( client server )"
 
 RDEPEND="
 	dev-db/sqlite:3
-	dev-games/irrlicht
 	dev-lang/luajit:2
 	dev-libs/gmp:0=
 	dev-libs/jsoncpp:=
 	sys-libs/zlib
 	client? (
 		app-arch/bzip2
+		dev-games/irrlicht
 		media-libs/libpng:0=
 		virtual/jpeg:0
 		virtual/opengl
@@ -45,6 +45,7 @@ RDEPEND="
 	server? (
 		acct-group/minetest
 		acct-user/minetest
+		dev-games/irrlicht-headers
 	)
 	spatial? ( sci-libs/libspatialindex:= )"
 DEPEND="${RDEPEND}"
@@ -55,8 +56,6 @@ BDEPEND="
 	)
 	nls? ( sys-devel/gettext )"
 
-PATCHES="${FILESDIR}/${PV}-FindJson.patch"
-
 src_prepare() {
 	cmake_src_prepare
 	# set paths