gentoo resync : 03.03.2021

6 files changed, 76 insertions, 146 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 62ae7dfe721c..b5f8728c1356 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/bzflag/Manifest b/games-action/bzflag/Manifest
index 29aa7d9e28c2..d61a7be2e2ec 100644
--- a/games-action/bzflag/Manifest
+++ b/games-action/bzflag/Manifest
@@ -6,9 +6,11 @@ DIST bzflag-2.4.14.tar.bz2 14066129 BLAKE2B 7ec44bc9b7ccb644b98dac0b99770471b488
 DIST bzflag-2.4.16.tar.bz2 14010330 BLAKE2B fc19e068c43c18bd38445b48ca0ca38669f956da1540e3255420cb7f36a42349aa3aa881dfeed2b2a1a7e163ee832a510fde658edd38b6ac038b62229baf8306 SHA512 809adc39088f3fc8ca0d2ead9c7172cfbe582789bc80b3ac55fabe078a0868f0cf7cfa8027ac696718e9983a19386933fd370684a0bd33e63c3106f2ce8a9d63
 DIST bzflag-2.4.18.tar.bz2 14011236 BLAKE2B 103495622afb45b2bf87576d92c5cdd37a04386fa82583929ab64087a875acd3be49045cf81d0099fccd0ebc5e7471883756edb85894f9f519d7b6fea8ac3534 SHA512 8e3183f2d78b686c92f3b9911b3cad2fa0df5693401537dc674c75e192fd59451167b7ddc546aa8a090b38d7864b8f22459ba9a4702451987f9c1dfa87fdb246
 DIST bzflag-2.4.20.tar.bz2 14032356 BLAKE2B 278b0f0d970f103a7b00953e60bda6962706dea27a8695bae8e902bdbb1364158ace03dafc778871e89444fe44f16e7d2fceec36b67982ad7f18fc916484260d SHA512 6140123d37065bead3021ef9c36db1210ad2c71a4a7deb6894bb3f856a571197a7eac37d16b8e3b587549dc201c4ac8d7bbe03d1a05d067dc452861924005169
+DIST bzflag-2.4.22.tar.bz2 14169079 BLAKE2B e3020d161326215b721e142198295314fce60212322d787389ee47519a8f20a64065ec2744799b8dc282fb343af1b2c5ae54bdab93827a5716ad5ac2363f8978 SHA512 c78ad0e9e861d0c922ef73dd1e040d998836efaab3a48d5a3cd8392835ce37392b1b9438aed7483ea48c6bce672bb937aeba40553553dce0c0fd3cce38bf10cf
 EBUILD bzflag-2.4.12.ebuild 1230 BLAKE2B 7d423cbadd4cd97d1cf8802d3cb27e92b96adaeedfddbab68b04b0fa184dd601facfde0359817826fff49ab5bb8f881c02474c1740e334cb684c56072b308530 SHA512 6d4701f797524170ba701d576d3e754374d9b161d56715f9ad677b65153e11030ff56186259d93424c62a5f96eda2329585c895ae179cfd28eeec33b940b7bfd
 EBUILD bzflag-2.4.14.ebuild 1374 BLAKE2B 2d3489f7d979a9450361c2f326866b5991078441accd95a43b35193a117231bd6939071369415360fedc559fb202d7d97676015a77a9622137dc31b44e02c478 SHA512 77b2b00b66c71cb779c059a8adf81e74454c87d0d51f48831dc51c9ee2ec715e89f378a782c242dd8cac237210ad6aa0fbfac4edbfd216e058ac22f05d44550e
 EBUILD bzflag-2.4.16.ebuild 1389 BLAKE2B e5f2aaaa41c6b7e95333c1e62fda97fd689a79a158eadb896a0db02470ce23600be8b99c48dab389b2b8a06f3c8fd102d8daa82db14ee68979ccc1b9aec146b0 SHA512 a69233216af2ac803dbdf03d981ffc82473e970aa8492e3e58550631a1bd849df8e5c2257811a284eb70df44f322c9201bed2c7974bf859dd60582b49e3c536e
 EBUILD bzflag-2.4.18.ebuild 1386 BLAKE2B 18aef6ee817ed31e0c6b7c7285e4d984c17580f604533c4d41a1155d86a13ec5bc41d16f61f5d28a9e901e12876761b797a8c9a687e367f82d45a1dcb5cbabad SHA512 d2150674093674e79942db3f72d21ede06b94ad55893e840c179deae170021596bacc1f27632c92dcd10efee893b2c9e09aa89e5a09bdc8c489606c2ce191286
 EBUILD bzflag-2.4.20.ebuild 1386 BLAKE2B c15fb4988a79136d39500cc583319eb4796c21b349d5c81a0956aa949b1e550b569aff90b673b07a0347490dc5fcf72954d98625c8ee499c299c5da1079b31bb SHA512 e787f961330320853f2eb09fc7a6310906d0de9b5571910942c32e933421c9ff94eeec384956ef90c64028aa1d095c4ba70f1013a9306d025d0ebbb9bbfce279
+EBUILD bzflag-2.4.22.ebuild 1386 BLAKE2B 96e6ea1a257a17a73778dad362e34672d6b165c2d94d80e828790f7a00b20e1b186f6daa41c02279a9270474ff417d8bd87743e89d8977cc9c9823bf2b6f5530 SHA512 fe9449b241fb127cbbccd9e5f89c3ccdf7728f0493d97e871a7c5a7abab7e02c97114cc2c02d530d4c11ddb8fa7230003a08365d6b95b0fd1dc50c3d4266e818
 MISC metadata.xml 329 BLAKE2B 045c2426f059b10e768ba5764ec7c26ad95f98ca1754358df18faa4ec58d3b26c02d905222c877c6d508eeb47f3ae3f22dd319b1d719f169e91ab31d824ab30d SHA512 4f9e157aef5067fb6a97fd7d7e68f758a280a37b8093c7291b45ada10169ca8c79ee0e7770fdbcc4d2de517b7bf05f1e3585585c72c1fdf7692d4e568f5d8301
diff --git a/games-action/bzflag/bzflag-2.4.22.ebuild b/games-action/bzflag/bzflag-2.4.22.ebuild
new file mode 100644
index 000000000000..fd77e44f349c
--- /dev/null
+++ b/games-action/bzflag/bzflag-2.4.22.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop flag-o-matic
+
+DESCRIPTION="3D tank combat simulator game"
+HOMEPAGE="https://www.bzflag.org/"
+SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated upnp"
+
+RDEPEND="
+	net-dns/c-ares
+	>=net-misc/curl-7.15.0
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2[joystick,sound,video]
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl )
+	upnp? ( net-libs/miniupnpc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.12-configure.patch
+	"${FILESDIR}"/${PN}-2.4.12-tinfo.patch
+	"${FILESDIR}"/${PN}-2.4.12-sdl2-cppflags.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable upnp UPnP)
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
+	)
+
+	if use dedicated ; then
+		ewarn
+		ewarn "You are building a server-only copy of BZFlag"
+		ewarn
+		myconf+=( --disable-client --without-SDL )
+	else
+		myconf=( --with-SDL=2 )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog DEVINFO PORTING README README.Linux" \
+		default
+
+	if ! use dedicated ; then
+		newicon data/bzflag-48x48.png ${PN}.png
+		make_desktop_entry ${PN} "BZFlag"
+	fi
+
+	find "${D}"/ -name \*.la -delete
+}
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 9b8cd65822e1..2db6bd6cb7ec 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,7 +1,6 @@
 AUX minetestserver.confd 313 BLAKE2B 51af7c8d6c23461028774e459d3ff24a867102ac56c239da056e31ba800ec0904d4ad2daa26a9fd5069ecffc2fded37a8409d966403456c239e78d2a7c369345 SHA512 75442376afb031ad65880fd2b9cad034c520c7bed489543d5e1cee65fc998d0ae082d5736528dcdfaca41681b01ee895d7e0471f8581e8f0cba1a8cbbe20b3bc
 AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1
 AUX minetestserver.logrotate 85 BLAKE2B 72ca62554a0146305cbafd9050378252bc4214c23a71d1f43041bd78ad332f25e834de3ae382f383ef8aef40fccb4849343fe23223ad2032efd16a12c10022f8 SHA512 19fe1e9264f195ea178cade577cea5cd93f7de1ceaab14ee00cafc051e1ec8f2e2ceac89557a00a3dd7838002e30da622f90a313776de2ad35aab10c68b6ec14
-DIST minetest-5.3.0.tar.gz 10828893 BLAKE2B 0847c040d2874962be79af6fce89b19354f6763cb37dd61d7e5e91bcacb9a76a115e295976056ae761db257612277ceef0d7e8bfc55790b1bc59a9c4961af41b SHA512 7bb34a80107861539a9ac2417812625ef11d145bf9401afdb8e0a1b9f619adcce24e2becf5bf361b805f4610097cf9d44c76d497ab08d489a43655852ce44777
-EBUILD minetest-5.3.0-r100.ebuild 3467 BLAKE2B dacd79ca8822a134ced28dabff64603310181794a0e2a1169caac46b3f02edb3e6bc8ba533ae2d98e86aa0c8f6a6a586401d62d34b034c27865cb5dd85fb9cd1 SHA512 c3b6773467185fe478869ea14160cd65cf9079e053ad706958f06e5702751e9d2597f0469c1af832e881ada37cc0c10e578dd736e1e42eeacab5c27ce3e493b5
-EBUILD minetest-5.3.0.ebuild 3416 BLAKE2B 2eb08d10b89b9c10c559b7ed8995c1c1775c920b49707151bd2a38d0b75c9ac68485c4e919789a7462408332751b113c05f0b34af4d18f372e58b43e4bf9eb72 SHA512 0da88b6f8f648b6e36dc6a33d1813c771dcf09f17b0eb4e413feab879206cb887abf8a50c9681cbb084a2ff68709d8e9b5d155597a771f649d0a6b9aba1db1f8
+DIST minetest-5.4.0.tar.gz 11205196 BLAKE2B 4fd03cf75c6ace4a8e3b1fc81826a43df4a6ea68c7dbdc33cda948e5c81fb49440341f148943c7300036d4063fafb0104fc42a8a29a0495df65d4c66f0d4eb46 SHA512 4cb43678c56ee2ccf9d5dd9c1fc0007119d598a4a56df43fc2a1b827efe08feba0008a30bdb1a1fcd4efe0ada88484b7be0c9e46f108d5424451adb0999b0bcb
+EBUILD minetest-5.4.0.ebuild 3467 BLAKE2B 3350c84716902ea9b4d9eb33ebd635e43ca3c42024add64ebce0a9830ae0535e664d5ea781cecff0a0452dc8da1e0397d01796208a6cf9798c78ac24a88b1995 SHA512 09022c7bd83aa3be1ce09a7e8e59eff8b3a02257dd5eed5855f7cea480f70299b4c03532f27c01a57649e35686742a72d56b4fb5b442b5c5b1220bba6c06034d
 MISC metadata.xml 2304 BLAKE2B 174aa3ecba34e78284cc6b58a622f2aaa3312950b9c52428ea999fea12df4817348b8f0ac85259566d3c131d735be305f86e3bdb27993fb92bdc98bd4d6a6495 SHA512 b84fa111e428ab16114081b56469259f1bc3b4dae74ce530d9fc0512db7bfa500c6920e4913accabade89dcf25fb4463b116a79be969cc91e5d45e3e67aaa4d0
diff --git a/games-action/minetest/minetest-5.3.0.ebuild b/games-action/minetest/minetest-5.3.0.ebuild
deleted file mode 100644
index b954c7f0fa33..000000000000
--- a/games-action/minetest/minetest-5.3.0.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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 ~x86"
-IUSE="+client +curl doc +leveldb ncurses nls postgres prometheus redis +server +sound spatial test +truetype"
-REQUIRED_USE="|| ( client server )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	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
-		x11-libs/libX11
-		x11-libs/libXxf86vm
-		sound? (
-			media-libs/libogg
-			media-libs/libvorbis
-			media-libs/openal
-		)
-		truetype? ( media-libs/freetype:2 )
-	)
-	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
-		dev-games/irrlicht-headers
-	)
-	spatial? ( sci-libs/libspatialindex:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	cmake_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 libraries
-	rm -rf lib || die
-}
-
-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_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=1
-		-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 /var/log/minetest
-		fowners minetest:minetest /var/log/minetest
-
-		newconfd "${T}"/minetestserver.confd minetest-server
-		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/minetestserver.logrotate minetest-server
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use server ; then
-		elog
-		elog "Configure your server via /etc/conf.d/minetest-server"
-		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
-}
diff --git a/games-action/minetest/minetest-5.3.0-r100.ebuild b/games-action/minetest/minetest-5.4.0.ebuild
index de4641d9e6a5..6cd3d801b35b 100644
--- a/games-action/minetest/minetest-5.3.0-r100.ebuild
+++ b/games-action/minetest/minetest-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7