gentoo resync : 02.02.2022

3 files changed, 162 insertions, 0 deletions

diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index a15c5b553595..dae7dfff21ef 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,10 +1,13 @@
 AUX minetest-5.4.1-gcc11.patch 605 BLAKE2B d067b6bf6250fa9928c01220fb0da2c8ffc093c949840767db6cf2b84fbe889fd9ed2546c953048d02116f015a279622c1ada29ce1df6e3b254b0d0e9e56083d SHA512 f42b8c3c38b40a9f22eca7947360ae4d786ff0775f46b4184c3fe014b64958c89828bae314acd8bfe99246a452c818527b5d3c5c1c0b813ed0a82c43b915125b
 AUX minetest-5.4.1-system_puc_lua.patch 1285 BLAKE2B 773466b132d1e7fdcd2108c7cae9d7538d02319140c91c87b5533c4225fe64077a4400cdddbfa0d96b256fad54ef7b92a5239036789b2af3a57365ac0a305808 SHA512 acb1ddb7e156324b3e4aea2807ba7b708b563bcf70208bad672a1777eb116dd7c812fcd420cdfb3a08b9b3fe4adf8a56b51ee2827439a058a78e8ffc4cb07ea4
+AUX minetest-5.5.0-bundled_luabitop.patch 740 BLAKE2B 91f86c47f17572d1bf27be5012cff147eea6625683d4cb5f285f2da72a541a0f5cf3128f0cf4b9514bf0b4f9a27673f5c989dfb4757d4142b8f24ccb29df6918 SHA512 6bdfdb6a1e022a66c67aa1e2314ed1f4e6791f4901a811e63606116c7e4058e801d1fb772a1f75378c8404e8085cc072b6987b867b45bb0c10b5bed01e6779ff
 AUX minetestserver.confd 310 BLAKE2B b5af3f5e87622fc3e1739f3972b32a3f83fa720476d7398ce55657b2e4d2dc8693748720aa422724b40a1309f79158b37ba9628061db31db3e5757a73c122205 SHA512 4905fb8446d82bdd7ccffcd6f0c2f85de9843107f10d21d73814f54587aab5f6c7716a78bc32cd82c8b7d8443f0492a3a7b5e47d10f2900349047b6ba7ceb2f3
 AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1
 AUX minetestserver.logrotate 71 BLAKE2B 9189610adc6e78be5249163e3daa02ebcb73822bed9939df3a807ec47e753e9952b3ac7932327164ae5dcf1ef149f55fdb898b1818412b994572f8ef6b4615e4 SHA512 82de44aa5670113d6a244c7cc662e6f4001510c6766490375f226d2abd4d7749310e8a21d282408a711478bf8449ab15036d9a914657e2ca4699395d32d8b21b
 AUX minetestserver_default.service 371 BLAKE2B a52989d01e7df20facac1796079e38d2145e72eb43868f19ba7ea573cf025d4aea346f7ddfc5e7001d70c6d43609d877be5af95956cc344df2b5c7e318bf07f1 SHA512 dbca1a2cc4b615310ff179f4fb803e05d856e04d8316c9d30807d12788b41e8f1ef87f510ff2db0114237a8d0640c3af3d31cc77a2bd23395e247d86710606e9
 AUX minetestserver_template.service 353 BLAKE2B 8f4231481a23c1ef29523533955e373b50669d6a61a818fe5c36b29be54ec21669f6c0e17ea6675795eb2630be08dcb053ae1843789d615dddb1664ec96f6c55 SHA512 ff9584b709df5f8f6a8544954da7a6ef593ac0b8bad2352a459c6eb97c684104f47708952882bf6b7216b7636328a1ff533b97bbc08cd300f1a47d2af71ac895
 DIST minetest-5.4.1.tar.gz 11209289 BLAKE2B a8517309ee98c3991e7ce2d67bb8d14a5697a299b480835c79b1e3c7161ebc94f6245f36c09d88903c052fca1de52fe0253f055059c3d72745c724d117d9753a SHA512 8f9985c6a658c868ed8971f112eae3c71c2b1535fd433689920be6d42ac2c7eb8453d58ec2825573764ee2f56b651c5e27895b7fd58fada61fbaf4758fc69471
+DIST minetest-5.5.0.tar.gz 9558895 BLAKE2B 13db90556a4faaac31cca7427fb85439cab144d73f25b79ae9f8367883b0fafa39c39fe0e40f3734d7e3f48cef4942a37a302cf58993707a14024905d8ed9b61 SHA512 9c744eac2704457d6896485997666d614dd156214dae26c2cb413771fd3eab54d80731a5220bcc4a18ddc737db64971893a3c89a56a46020adf8d00aad299817
 EBUILD minetest-5.4.1-r1.ebuild 3478 BLAKE2B cb5f11ed5e8b8c0339570af29fd126f75b4f084f0910cd692870c797ecb3ae0349bc26db743cbd911d4d2fd01aedb5ccce4fa6c043ac07d421a7054a20522232 SHA512 3eb3ace3d2f20f457b2460c7a2a28720534a69454337db9ea3089e1b56bee74b267a1745fc1e13ea4e6cba6403de2aebdcccfdb9138443f49462377b76111cc7
+EBUILD minetest-5.5.0.ebuild 3463 BLAKE2B a91b8486891ee45266e45978615d89238aeec189eaac91708acc12b18a5c8a88cb293d26f06409224bbb8dbd4b664f20b582e0b650fad507adc9b9dec9ae2693 SHA512 c24c159b44f82a19a8bedbae2493868d28769aaca8214ef4421f1be6ad89c51e520726fde4d0b6b12065ea447f143b5dd80903da30d44453e05f8844310e5c8c
 MISC metadata.xml 2174 BLAKE2B ad72184bd3f52d94304fb316d325478b03a5751d564174deac0eec4d05dce67f55dabc0e7c0788f9221318ac453802be552a711e35c60cce7f8396afb5fc7a9c SHA512 e3d99fa37f56133a051d8369ee5c8bc60a8e7159683cf11fba95470ff2e00acd2c3987b3d261641e2508a9f8f409e2f7249167a4226f490152ac35e58b476b1b
diff --git a/games-action/minetest/files/minetest-5.5.0-bundled_luabitop.patch b/games-action/minetest/files/minetest-5.5.0-bundled_luabitop.patch
new file mode 100644
index 000000000000..5006ddd499b6
--- /dev/null
+++ b/games-action/minetest/files/minetest-5.5.0-bundled_luabitop.patch
@@ -0,0 +1,17 @@
+When built against PUC Lua, minetest binaries get linked against
+a customised version of LuaBitOp which then gets installed
+as /usr/$(get_libdir)/libbitop.so. This violates the policies of both
+Gentoo (unversioned shared library) and Lua itself (compiled extensions
+should be installed into implementation-specific directories rather than
+top-level libdir, and I'm pretty sure linking against such extensions
+is a no-no). Switching to system dev-lua/LuaBitOp will require work
+so just make the customised version static for now.
+
+--- a/lib/bitop/CMakeLists.txt
++++ b/lib/bitop/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_library(bitop bit.c)
++add_library(bitop STATIC bit.c)
+ target_link_libraries(bitop)
+ 
+ include_directories(${LUA_INCLUDE_DIR})
diff --git a/games-action/minetest/minetest-5.5.0.ebuild b/games-action/minetest/minetest-5.5.0.ebuild
new file mode 100644
index 000000000000..0b2a456abd27
--- /dev/null
+++ b/games-action/minetest/minetest-5.5.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit cmake flag-o-matic lua-single systemd xdg
+
+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 ~riscv"
+IUSE="+client +curl doc leveldb ncurses nls postgres prometheus redis +server +sound spatial test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	|| ( client server )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_impl_dep 'deprecated' lua5-1)
+	app-arch/zstd
+	dev-db/sqlite:3
+	>=dev-games/irrlicht-mt-1.9.0.4
+	dev-libs/gmp:0=
+	dev-libs/jsoncpp:=
+	sys-libs/zlib
+	client? (
+		media-libs/freetype:2
+		media-libs/libpng:0=
+		virtual/jpeg:0
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXxf86vm
+		sound? (
+			media-libs/libvorbis
+			media-libs/openal
+		)
+	)
+	curl? ( net-misc/curl )
+	leveldb? ( dev-libs/leveldb:= )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	postgres? ( >=dev-db/postgresql-9.5:= )
+	prometheus? ( dev-cpp/prometheus-cpp )
+	redis? ( dev-libs/hiredis:= )
+	server? (
+		acct-group/minetest
+		acct-user/minetest
+	)
+	spatial? ( sci-libs/libspatialindex:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-system_puc_lua.patch
+	"${FILESDIR}"/${PN}-5.5.0-bundled_luabitop.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled libraries other than bitop
+	rm -rf lib/{gmp,jsoncpp,lua} || die
+
+	# To avoid TEXTRELs on riscv
+	append-flags -fPIC
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_UNITTESTS=$(usex test)
+		-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_MANDIR="${EPREFIX}/usr/share/man"
+		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_CURSES=$(usex ncurses)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GLES=no
+		-DENABLE_LEVELDB=$(usex leveldb)
+		-DENABLE_LUAJIT=$(usex lua_single_target_luajit)
+		-DENABLE_POSTGRESQL=$(usex postgres)
+		-DENABLE_PROMETHEUS=$(usex prometheus)
+		-DENABLE_REDIS=$(usex redis)
+		-DENABLE_SPATIAL=$(usex spatial)
+		-DENABLE_SOUND=$(usex sound)
+		-DENABLE_SYSTEM_GMP=1
+		-DENABLE_SYSTEM_JSONCPP=1
+		-DRUN_IN_PLACE=0
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cmake_src_compile doc
+		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		keepdir /etc/minetest
+		fowners root:minetest /etc/minetest
+		fperms 2750 /etc/minetest
+
+		keepdir /var/log/minetest
+		fowners minetest:minetest /var/log/minetest
+
+		newconfd "${FILESDIR}"/minetestserver.confd minetest-server
+		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+
+		systemd_newunit "${FILESDIR}"/minetestserver_default.service minetest-server.service
+		systemd_newunit "${FILESDIR}"/minetestserver_template.service minetest-server@.service
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/minetestserver.logrotate minetest-server
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}