gentoo resync : 28.04.2019

6 files changed, 179 insertions, 18 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index ce388964eefd..46ad620ae16b 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/lugaru/Manifest b/games-action/lugaru/Manifest
index d60597f52587..346657469378 100644
--- a/games-action/lugaru/Manifest
+++ b/games-action/lugaru/Manifest
@@ -1,4 +1,5 @@
 AUX lugaru-20151204-dir.patch 317 BLAKE2B 47b73dad97c8a853eb14d6718db18e0541607770419da6b95eb56791f5629a0ebcb1600506934aea30d3cb216c91d38fa8cf45735b0049435693a39a229c48aa SHA512 c0830385ca57dfda082596f65e7166ba71148fcb2b99e416a4a6ef8882c280a823e6308fce9fcfab62127667a10f0ed0ef49df60f1f39627615ff21c9ffd62e2
+AUX lugaru-20151204-jpeg-9c.patch 362 BLAKE2B 5d3da9005dc4f9b957c36e5bb9e9b4453fd4794b5adb611f6ddd1b2f810765dd069747bc98a9df79d4a670baf919fc350902ea72bf6129f97528462173e3335c SHA512 12fea82021782563efab139a9a7e1b0d9aed9ee708e833552ec15ddcaad91a3c8fce37859d174eb86c0861717e594750d704c712cbaa9772c82c66bb13bc3e83
 DIST lugaru-20151204.tar.bz2 88950866 BLAKE2B d1d42f8d06d20d8f06fbe52d95c925fefc0453cc577dc5a023189eb77508361737ab01298f2035c3071ac7f8a239ee47c13bb8bafa852dd3b5cdecc971e9b4ed SHA512 8e448b782847376ac10585996a91a571fd005ac51e0e510765a35bf44bfcbb09e566d9a9c3d87277e69511b0f8d74c04edcc4b59f467bed640d8ba7c74045e30
-EBUILD lugaru-20151204-r1.ebuild 1160 BLAKE2B 60510918c45226e8a4ce041b3d5ffd09eb8f0d482784e600fa33ab9f6c5a70473dc6e65a6631c31b1fafa54416756ec916063ee43570b940d6855337a9f71d64 SHA512 70613abf475f75eb59a52d3605f1e8f0cb751590ff2bcdaea7a5030d134ba54531ff70a7fe3a9a725d2a4da1377a44a722590b93a23ed74a806b6ebe7a169e79
+EBUILD lugaru-20151204-r1.ebuild 1148 BLAKE2B 8abca7c07b4586b6e701d1ea6231dbae2cf0385b59ef666f4f17208a901552d31163e6a52300111db7df1ae1d349414061902e75bcfe8ceb2bc5b87100b76b99 SHA512 0d75e8bd85fb51d33b25d9febbd7a74692e05f79d7e8faa59fd834682689693cfb222af3245da69597ba1be240f75ca6146039eb96fdc66c3c3df8cd358a747c
 MISC metadata.xml 337 BLAKE2B 5fa6d71103f9aad7af7d0766be33b63f5dcdcbba20c043a2d1183b18a23f4910d49d411defb7f1c604ef085437956af72a55fa366734be5827a3d736bc71f72f SHA512 10af1cda47d8d683fc8245f23c05243fb5809636399d75779081a3da09209829da31a8d5fa070687656e9c235e78c75f1571b5b4f1a686359a11d1232a543b5e
diff --git a/games-action/lugaru/files/lugaru-20151204-jpeg-9c.patch b/games-action/lugaru/files/lugaru-20151204-jpeg-9c.patch
new file mode 100644
index 000000000000..ac0ee48f62d6
--- /dev/null
+++ b/games-action/lugaru/files/lugaru-20151204-jpeg-9c.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/652930
+
+--- a/Source/OpenGL_Windows.cpp
++++ b/Source/OpenGL_Windows.cpp
+@@ -839,7 +839,7 @@
+     (void) jpeg_read_header(&cinfo, TRUE);
+ 
+     cinfo.out_color_space = JCS_RGB;
+-    cinfo.quantize_colors = 0;
++    cinfo.quantize_colors = FALSE;
+     (void) jpeg_calc_output_dimensions(&cinfo);
+     (void) jpeg_start_decompress(&cinfo);
+ 
diff --git a/games-action/lugaru/lugaru-20151204-r1.ebuild b/games-action/lugaru/lugaru-20151204-r1.ebuild
index 16843cc472c0..c2abf83066a1 100644
--- a/games-action/lugaru/lugaru-20151204-r1.ebuild
+++ b/games-action/lugaru/lugaru-20151204-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils desktop
 
@@ -15,11 +15,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	media-libs/libpng:0
-	media-libs/libsdl[opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	sys-libs/zlib
+	media-libs/libpng:0=
+	media-libs/libsdl:=[opengl,video]
+	media-libs/libvorbis:=
+	media-libs/openal:=
+	sys-libs/zlib:=
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl"
@@ -27,7 +27,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-dir.patch"
+	"${FILESDIR}"/${P}-dir.patch
+	"${FILESDIR}"/${P}-jpeg-9c.patch
 )
 
 src_prepare() {
@@ -39,21 +40,17 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
-		"-DLUGARU_FORCE_INTERNAL_OPENGL=False"
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+		-DLUGARU_FORCE_INTERNAL_OPENGL=False
 	)
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
-	dobin "${WORKDIR}/${P}_build/lugaru"
+	dobin "${BUILD_DIR}"/lugaru
 	insinto /usr/share/${PN}
-	doins -r Data/
+	doins -r Data
 	newicon Source/win-res/Lugaru.png ${PN}.png
 	make_desktop_entry ${PN} Lugaru ${PN}
 }
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 3883e7c3ff1b..077ea5b58bc4 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -3,7 +3,9 @@ AUX minetestserver.initd 558 BLAKE2B 70557c32b4aaff21ea8e8101b90bb2f1278dfbaa684
 DIST minetest-0.4.16.tar.gz 7753044 BLAKE2B a35a0bcab00393fc72e5d932a86ebacdd1b3aa5a850e36f7b788599086c65f549341fa05fcbc0c6a09540df79d840611ec352d79e673ba63575a9f51fd5e22af SHA512 c124a997d9eb242885551e5c68948158cbd172ccd44fb1feb4d7aea487f876a2421bc990528dbfb6baf2033bfd4759d17138ed95b077e0ba80785a6e7ff521a2
 DIST minetest-0.4.17.1.tar.gz 7758675 BLAKE2B 93f5f1ce32b98bb78a6ae5bc2ab9110902e118480b37b8c9cf87f1c6aa986f379e1191e82d4a764fb2aa0a0747c113e80cd014e6a06e0a485a59e516c4644fc6 SHA512 9f84ae45ebe181cb1cd2dff6b71b558eb276472efdfcd73bd02a111b2761793d49681bdfbbeaccc28f4a2f49e15b80d04b78db2f2f728c852c188b0c96aae618
 DIST minetest-0.4.17.tar.gz 7757149 BLAKE2B 9ee908990224da800e7f0f4fc5e28d5bde03f4486d43ad58225d8ec056f8209fde94597798c977e1d3f3f8cbeadeb0bcdae6eb2aac2b8572fcbcfa28bbd62eba SHA512 3015f5a03be37c5395b55b6dc9f883f9270b19f709a47250f36bc7b1ce6d04a0e89e4366d86da33bbebbfb64f04ff008aec66c96930d7314991a21160265bafe
+DIST minetest-5.0.1.tar.gz 8761122 BLAKE2B 888e29b956d66543dd506b8e7eadd2e9d37324aebd4f84989745090fe927e97355c2baa7d615f5e0f8e2a074724b89bdf5f807c297cce1bc8483e500b0248e22 SHA512 00f0c77c19eb9619387285e5dad690c8aa9969ff11c4de0bdae99ee6e9a4508a8c2f977837fc2e01aebc5d4c1a5191d4f56acb131182d73c8f50da1458695607
 EBUILD minetest-0.4.16-r1.ebuild 3226 BLAKE2B 917e9af650a0e760804a2247b516565864390686141c67293aa38fd3ef52a0f6a68dd8713f9b6d48fb38b006c3dbcc4c2251373daf9e92bc53758a3a4dcc769d SHA512 0e5bbfc042b0951b7bd1fa589b91a280372bceaec7703046a0e124eb0c81d4572b821a72733c2ad30eed56dc7d2ff42f6d41d8e4670f1fa8551391acec3ce414
 EBUILD minetest-0.4.17-r1.ebuild 3296 BLAKE2B e659a638177d0f1435352476393e71c6aef503fb8ce83b0bef7144c6d8c29b55955fa9e73e01f3e4954fb6eec0eaba0bcc351dce27dbe8879d8184d4ea9be206 SHA512 6024a9de7ce3ee7372f7ced01a40b0b060a351fce506d506a9fd1f225ba8cf858ca031851aeb11da351d3dac75624bcce1da924f239d83b12f79e85604ddf9ca
 EBUILD minetest-0.4.17.1.ebuild 3296 BLAKE2B e659a638177d0f1435352476393e71c6aef503fb8ce83b0bef7144c6d8c29b55955fa9e73e01f3e4954fb6eec0eaba0bcc351dce27dbe8879d8184d4ea9be206 SHA512 6024a9de7ce3ee7372f7ced01a40b0b060a351fce506d506a9fd1f225ba8cf858ca031851aeb11da351d3dac75624bcce1da924f239d83b12f79e85604ddf9ca
+EBUILD minetest-5.0.1-r1.ebuild 3518 BLAKE2B 5fe7cdd41d77c57043a028ab548d6d2ff6baa466971330d11f603fee5071cd0d448da1c577920e335c0948cf7e4457b289b8d443ec898c52a1f012304910c616 SHA512 412facd744106ea1496c1b471056479e6ce38953efa9ad2bf0b7ed7cc2d451bdf673de9e6c83ff258ff8a46392ba21c53a07607d6684ee82992ff08db4fd51b2
 MISC metadata.xml 2216 BLAKE2B 3872d007ded87d46e806b334e3808096f7a07c64e6ae1a99a5b79db81d7396131df7ea42d7d74753efd42844e7fe01de5e02be37c8f78198de953d9e8381602d SHA512 4c2a2a007239ca5a313e31caa19483fc877e241e5ede1ea509b12931d0feef1aa72cb086266d61f3d38c11fc303f646f328b17c5f184d8bb45d0019e6a31c9a7
diff --git a/games-action/minetest/minetest-5.0.1-r1.ebuild b/games-action/minetest/minetest-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..8147fcf53adb
--- /dev/null
+++ b/games-action/minetest/minetest-5.0.1-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils user xdg
+
+DESCRIPTION="An InfiniMiner/Minecraft inspired game"
+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="+curl dedicated doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/gmp:0=
+	dev-libs/jsoncpp:=
+	sys-libs/zlib
+	curl? ( net-misc/curl )
+	!dedicated? (
+		app-arch/bzip2
+		dev-games/irrlicht
+		media-libs/libpng:0=
+		virtual/jpeg:0
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXxf86vm
+		sound? (
+			media-libs/libogg:=
+			media-libs/libvorbis:=
+			media-libs/openal:=
+		)
+		truetype? ( media-libs/freetype:2 )
+	)
+	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 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if use server || use dedicated ; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# set paths
+	sed \
+		-e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
+		-e "s#@GROUP@#${PN}#g" \
+		"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
+
+	# remove bundled gmp/jsoncpp
+	rm -rf lib/{gmp,jsoncpp} || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex !dedicated)
+		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
+		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
+		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_CURSES=$(usex ncurses)
+		-DENABLE_FREETYPE=$(usex truetype)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GLES=0
+		-DENABLE_LEVELDB=$(usex leveldb)
+		-DENABLE_LUAJIT=$(usex luajit)
+		-DENABLE_POSTGRESQL=$(usex postgres)
+		-DENABLE_REDIS=$(usex redis)
+		-DENABLE_SPATIAL=$(usex spatial)
+		-DENABLE_SOUND=$(usex sound)
+		-DENABLE_SYSTEM_JSONCPP=1
+		-DRUN_IN_PLACE=0
+	)
+
+	use dedicated && mycmakeargs+=(
+		-DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc ; then
+		cmake-utils_src_compile doc
+		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server || use dedicated ; then
+		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+		newconfd "${T}"/minetestserver.confd minetest-server
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use dedicated ; then
+		elog
+		elog "optional dependencies:"
+		elog "	games-action/minetest_game (official mod)"
+		elog
+	fi
+
+	if use server || use dedicated ; 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
+
+	elog
+	elog "The version 5.x series is not compatible to the version 0.4 series."
+	elog "This applies to clients and servers, other content such as mods,"
+	elog "texture packs and worlds is unaffected and backwards-compatible"
+	elog "as usual."
+	elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}