gentoo resync : 18.11.2019

6 files changed, 60 insertions, 27 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 7a7a9222630e..4cccc0605d37 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 18feb2f1419d..20bf09a56e25 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,5 +1,6 @@
-AUX minetestserver.confd 313 BLAKE2B 67e0b20c320d93323affd63b58085c7e0371f2ac68a541cd59a5327811bb420a42951b12396fe9c73e83be38c1a9affa25f5257e9e8488cdf9074498c1664d60 SHA512 96fe764d78b383f294bce81e8631861057f309fd9d13f9397ca0c715396f3793f201f313a3507c0b190f41891441eb4fe418b5888cb73ffdea0d27969d0172c3
-AUX minetestserver.initd 558 BLAKE2B 70557c32b4aaff21ea8e8101b90bb2f1278dfbaa684152024130603a1c69ac93790983777eed666069bfe8898a4b3d20fca4f8dba6a93018e238bc6274ca1c41 SHA512 0be59fb3b42632d3a6badd01362bf62519da9cf4a1a726f304167c7ecd52c7643c04cc410bbfd3096ebd6413242cb28e3d149b06858b25344fd5a2412b6f0907
-DIST minetest-5.0.1.tar.gz 8761122 BLAKE2B 888e29b956d66543dd506b8e7eadd2e9d37324aebd4f84989745090fe927e97355c2baa7d615f5e0f8e2a074724b89bdf5f807c297cce1bc8483e500b0248e22 SHA512 00f0c77c19eb9619387285e5dad690c8aa9969ff11c4de0bdae99ee6e9a4508a8c2f977837fc2e01aebc5d4c1a5191d4f56acb131182d73c8f50da1458695607
-EBUILD minetest-5.0.1-r3.ebuild 3357 BLAKE2B 53b2a48ebeee0bbad0b40a8965980b84bc4e2d47e6e8647931ce2e46b11824106000ee2bad85420d7483737a410cd310d9b788bf3c8c266eca4d9d02a725e1b4 SHA512 b3605a1d6fb7b87ef90e69f899f87dd951fe9375bcdcc4701c3a29dc9277ffd2ceaf7eaf90193dbcec4fc1ab81a7e433e694ad456d9d6b2bb3c2cc7746d61102
+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 3310 BLAKE2B 9537833f8988aeff9d866da6302386552170ca150570e97f7e76e6f24c26adb512127fa8b3296c99ce9120c878367883f753c6765d7d1c2d677d4111cbe0867a SHA512 dfcea08a294506047580ab6a11d6e9fad9405fa6765e34b5a77fe8a0fd8ce6d4f5071d03a67f4603cfe650c21d247b4db58425549c334854fabc00bc0b936f4c
 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
new file mode 100644
index 000000000000..3d48b0a0924c
--- /dev/null
+++ b/games-action/minetest/files/5.1.0-FindJson.patch
@@ -0,0 +1,31 @@
+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/files/minetestserver.confd b/games-action/minetest/files/minetestserver.confd
index ec3d0138cb73..7a6f9b12ff01 100644
--- a/games-action/minetest/files/minetestserver.confd
+++ b/games-action/minetest/files/minetestserver.confd
@@ -13,4 +13,4 @@ PIDFILE="/var/run/minetest.pid"
 MINETESTBIN="@BINDIR@/minetestserver"
 
 # additional arguments for the server
-ARGS="--logfile /var/lib/minetest/minetest-server.log"
+ARGS="--logfile /var/log/minetest/minetest-server.log"
diff --git a/games-action/minetest/files/minetestserver.initd b/games-action/minetest/files/minetestserver.initd
index 1e56ff646517..ffca2e55995f 100644
--- a/games-action/minetest/files/minetestserver.initd
+++ b/games-action/minetest/files/minetestserver.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="Minetest dedicated server"
diff --git a/games-action/minetest/minetest-5.0.1-r3.ebuild b/games-action/minetest/minetest-5.1.0-r1.ebuild
index 0f424e11d7db..30beb3bfeb10 100644
--- a/games-action/minetest/minetest-5.0.1-r3.ebuild
+++ b/games-action/minetest/minetest-5.1.0-r1.ebuild
@@ -3,21 +3,22 @@
 
 EAPI=7
 
-inherit cmake-utils user xdg
+inherit cmake-utils xdg
 
-DESCRIPTION="An InfiniMiner/Minecraft inspired game"
+DESCRIPTION="A free open-source voxel game engine with easy modding and game creation"
 HOMEPAGE="https://www.minetest.net"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+client +curl doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
+IUSE="+client +curl doc +leveldb ncurses nls postgres redis +server +sound spatial +truetype"
 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
@@ -29,20 +30,23 @@ RDEPEND="
 		x11-libs/libX11
 		x11-libs/libXxf86vm
 		sound? (
-			media-libs/libogg:=
-			media-libs/libvorbis:=
-			media-libs/openal:=
+			media-libs/libogg
+			media-libs/libvorbis
+			media-libs/openal
 		)
 		truetype? ( media-libs/freetype:2 )
 	)
 	curl? ( net-misc/curl )
 	leveldb? ( dev-libs/leveldb:= )
-	luajit? ( dev-lang/luajit:2 )
 	ncurses? ( sys-libs/ncurses:0= )
 	nls? ( virtual/libintl )
 	postgres? ( >=dev-db/postgresql-9.5:= )
-	redis? ( dev-libs/hiredis )
-	spatial? ( sci-libs/libspatialindex )"
+	redis? ( dev-libs/hiredis:= )
+	server? (
+		acct-group/minetest
+		acct-user/minetest
+	)
+	spatial? ( sci-libs/libspatialindex:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? (
@@ -51,12 +55,7 @@ BDEPEND="
 	)
 	nls? ( sys-devel/gettext )"
 
-pkg_setup() {
-	if use server ; then
-		enewgroup ${PN}
-		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	fi
-}
+PATCHES="${FILESDIR}/${PV}-FindJson.patch"
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -66,8 +65,8 @@ src_prepare() {
 		-e "s#@GROUP@#${PN}#g" \
 		"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
 
-	# remove bundled gmp/jsoncpp
-	rm -rf lib/{gmp,jsoncpp} || die
+	# remove bundled libraries
+	rm -rf lib || die
 }
 
 src_configure() {
@@ -85,11 +84,12 @@ src_configure() {
 		-DENABLE_GETTEXT=$(usex nls)
 		-DENABLE_GLES=0
 		-DENABLE_LEVELDB=$(usex leveldb)
-		-DENABLE_LUAJIT=$(usex luajit)
+		-DENABLE_LUAJIT=1
 		-DENABLE_POSTGRESQL=$(usex postgres)
 		-DENABLE_REDIS=$(usex redis)
 		-DENABLE_SPATIAL=$(usex spatial)
 		-DENABLE_SOUND=$(usex sound)
+		-DENABLE_SYSTEM_GMP=1
 		-DENABLE_SYSTEM_JSONCPP=1
 		-DRUN_IN_PLACE=0
 	)
@@ -114,8 +114,11 @@ src_install() {
 	cmake-utils_src_install
 
 	if use server ; then
-		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+		keepdir /var/log/minetest
+		fowners minetest:minetest /var/log/minetest
+
 		newconfd "${T}"/minetestserver.confd minetest-server
+		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
 	fi
 }
 
@@ -125,8 +128,6 @@ pkg_postinst() {
 	if use server ; then
 		elog
 		elog "Configure your server via /etc/conf.d/minetest-server"
-		elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
-		elog "Default logfile is ~/minetest-server.log"
 		elog
 	fi