gentoo resync : 27.10.2021

5 files changed, 224 insertions, 0 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 18f1f04dcb81..51e7dae32fe3 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 044bd6e03163..2d6bc9ad88a1 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,5 +1,7 @@
 AUX warzone2100-4.1.3-no-compress-manpages.patch 2317 BLAKE2B 00d67b7df0898b1a6343b38ffb7e1655d3f16a94bffe94894f3cff5e25f1e7f426046beda9983eea963bac5fb2a7e49aca473b8b78d141ac00baa250710093c1 SHA512 48b8c3f651bf7d504da88a6351799cc9cd19bf84191f52e9ca5b0c5c60b52a81587c8a03fde5e3d8d19e7770dc7b17dd60b59d8441b47221a7cda5a8008f9558
 DIST warzone2100-4.1.3.tar.xz 337479212 BLAKE2B 07d1788fc2f8e5073a15231d5bf0c8c50dc0413522ea1589b064190144906fb58008faab66a295cec7759a1036f4d007ef8a42cffd9ef588fde1116b6cd7a38b SHA512 64126a1a5aab8b766cdfc70b8d96465ad451bd6a31e33be963eb89664b062dfe58e195ac3cbc087a9c008519c0e13003d9750bcb428b0e0ff12c82bf9940be3f
+DIST warzone2100-4.2.0.tar.xz 338587136 BLAKE2B e29147ce573c7a07e0ab856b1c74000bfc866437784e314393335d21e735fb78fcdbe71aa19f9c806f280f0ca2d33aff15815a09971c9e5ab85cf8b31e9a7864 SHA512 d2dfb8f2710493cbdacb01ca26cf69b476ad906f4851bc384a7a506a37bc296c2bd2e8c464f1a7a86e50924c66839459413d00c73031f9fe024afef8173c820c
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
 EBUILD warzone2100-4.1.3-r4.ebuild 2678 BLAKE2B 4c3db36d5f39189d1e43fbedeb894546bc133fc9d772f6fed8bb5bb7d1b39d84db2d6f66ac337a2c80cd24eef2d7fbd8cb230f1d2f6814d8f26ca658b13fa0ef SHA512 9459049e8aff4cb3a481699fbc1ebc2ba92d780cfe4984e9ddfdda8f03de5a465fb91d1da5b1a4d84d957a2fba23decdb4c7ab917e52b1f8e8367a97f46393d7
+EBUILD warzone2100-4.2.0.ebuild 2678 BLAKE2B 4c3db36d5f39189d1e43fbedeb894546bc133fc9d772f6fed8bb5bb7d1b39d84db2d6f66ac337a2c80cd24eef2d7fbd8cb230f1d2f6814d8f26ca658b13fa0ef SHA512 9459049e8aff4cb3a481699fbc1ebc2ba92d780cfe4984e9ddfdda8f03de5a465fb91d1da5b1a4d84d957a2fba23decdb4c7ab917e52b1f8e8367a97f46393d7
 MISC metadata.xml 812 BLAKE2B b2b9ab08275974118342f645f9c6fee90fb2f8904a3c6708666d71d57ec71ab86e9f905669cc3fe9424cec8329d434c979e9ae87324f0b47ed313b28c66d6070 SHA512 0af92d46baaf497a9f5aa57e45f0860e94c36f008386c1f483a49d8df50719ef11532a8473b4068a5cc63286d7af72b71e4de2e883b178c278b7aecf27f8389d
diff --git a/games-strategy/warzone2100/warzone2100-4.2.0.ebuild b/games-strategy/warzone2100/warzone2100-4.2.0.ebuild
new file mode 100644
index 000000000000..929af63b820a
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-4.2.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="af_ZA bg_BG ca_ES cs da de el en_GB eo es et_EE fa_IR fi fr fy ga he_IL hr hu id_ID id it ko la lt nb nl pl pt_BR pt ro ru sk sl tr tt_RU uk_UA zh_CN zh_TW"
+inherit cmake plocale xdg
+
+MY_PV=$(ver_cut 1-2)
+VIDEOS_PV=2.2
+VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
+DESCRIPTION="3D real-time strategy game"
+HOMEPAGE="https://wz2100.net/"
+SRC_URI="mirror://sourceforge/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz
+	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Upstream requested debug support
+IUSE="debug discord nls videos vulkan"
+
+CDEPEND="
+	>=dev-games/physfs-2[zip]
+	dev-db/sqlite:3
+	>=dev-libs/libsodium-1.0.14:=
+	media-libs/freetype:2
+	media-libs/harfbuzz:=
+	media-libs/libogg
+	media-libs/libpng:=
+	media-libs/libsdl2[opengl,video,X]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	nls? ( virtual/libintl )
+	vulkan? ( media-libs/libsdl2:=[vulkan] )
+"
+DEPEND="
+	${CDEPEND}
+	dev-libs/fribidi
+	media-libs/fontconfig
+"
+RDEPEND="
+	${CDEPEND}
+	media-fonts/dejavu
+"
+BDEPEND="
+	app-arch/zip
+	app-text/asciidoc
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm )
+DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.3-no-compress-manpages.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.xz
+}
+
+src_prepare() {
+	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
+
+	# Delete translations we're not using
+	cleanup_po() {
+		local locale=${1}
+		einfo "Cleaning up disabled locale: ${locale}"
+		rm po/${locale}.po || die
+	}
+
+	plocale_for_each_disabled_locale cleanup_po
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWZ_DISTRIBUTOR="Gentoo Linux"
+		-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF
+		-DWZ_ENABLE_BACKEND_VULKAN=$(usex vulkan)
+		-DBUILD_SHARED_LIBS=OFF
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_DISCORD=$(usex discord)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	asciidoc -b html5 doc/quickstartguide.asciidoc || die
+}
+
+src_install() {
+	cmake_src_install
+
+	rm "${ED}"/usr/bin/.portable || die
+
+	# We cover licencing within the ebuild itself
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* \
+		"${ED}"/usr/share/doc/${PF}/copyright || die
+
+	if use videos ; then
+		insinto /usr/share/${PN}
+		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
+	fi
+}
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 541967bb06be..e566ec3d84a3 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -2,6 +2,8 @@ AUX wesnoth-1.14.14-ar.patch 576 BLAKE2B 5cc3995992f9e92f1179e502d8cb3981191953d
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024 SHA512 3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
 DIST wesnoth-1.15.15.tar.gz 512968280 BLAKE2B 2b5c979244fb168e674d120a5eeef3905560992a7ca50735ef30918144ad7b21a9d57bef8cf19d564e02226955fb1c6922b27151fef36825a9b06cbe3d9e40ee SHA512 7f59ac11223e6ca93f926ca978638828e366ea2fd75530b317656e5edd8b0f042f86beb57fd17b8cc9b2d3d093d60580cd3449e1c3bf53b8ee37f656df7198a2
+DIST wesnoth-1.16.0.tar.gz 515780018 BLAKE2B 1a9d6aa9b294b9919d3b51528928f43d786f30fda739f0af2e62ebbb210b8f071945fe6130c00e2055d3726ae7eabf63b57fd2f1d5d8981a4cd0feedbfbffbfb SHA512 6d999a99e140916ef2070c524898ef69c7b45b3240f208aa380e81a1d1822a02c05a7fc9c5049a05a230e5126d8ff8723e16b6a62ba532b81c031f78ad8c85fe
 EBUILD wesnoth-1.14.14-r1.ebuild 2524 BLAKE2B e53ddf2cac6ffd8d95edd0708e00c595e2ab9f015ff98fb314e85683d1f2a42b76ceff356095ae70d010694baa6343dc8c99341c38ea260c624a20f7b847e321 SHA512 dc3e7c29bb2273d175b899b82c95499dfb44e9f167bf1e1990fc5da4fe8c27b4e409534efbb3217267c581c9453ecacc9a3fee8e1c1ee704a550136a9a2a0f27
 EBUILD wesnoth-1.15.15.ebuild 2454 BLAKE2B 063e06beb12e8b609dd355655c55d7771b6df994c6f89892fdd5ec5e1308997e3c4cbae69259c8a4e8110b3cfff43040e4748a7a231f3854b9e4c1c8e62b6ffe SHA512 8a1ac9bc1f80882d56a94ac76d1abc0c47cacc6fa870b74cb979e41094ea54cbe494ba7f623735f5526b591a892139f0b259a822854dc89306c711e7710c0ec6
+EBUILD wesnoth-1.16.0-r1.ebuild 2361 BLAKE2B 544e8395aff4b66cff7ae0eafdac30fc26ad9fcd6408dd8b57d55f722eaee190aafd1ab3dbefd4e1753cbe1fd77c3d6b8da7129e7eaf93055f0d0ce0f03b2e83 SHA512 2659d205ec460b6b6c75965cd8f8c8c5c5fa8c279ab12a3f6a403ad2c0878894faca8772fbf5ab2d273c752b5367cfaa637a745b1baadada20b9e47574fff8d1
 MISC metadata.xml 486 BLAKE2B a9dc64cc59fd1a47f9e6e13f6ebb9ba05845437efb6ec4e4fa68b5f1a1018d12fa7d1371fb4fb9ac0f83a3e2dbcc9eaade90a15ddd2213891dd8dff37280cb1d SHA512 10477ca40a5c3ba502f85841bed2ae73e8125b94c6c504288d8c9fc5742c0084f17c7b0901a298772a28e5c813c9d5034058b68d32ee4ec37513fadaf49442d1
diff --git a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
new file mode 100644
index 000000000000..0d53e174d56e
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+	https://github.com/wesnoth/wesnoth"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+	acct-group/wesnoth
+	acct-user/wesnoth
+	dev-libs/boost:=[bzip2,context,icu,nls,threads(+)]
+	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+	!dedicated? (
+		dev-libs/glib:2
+		dev-libs/openssl:0=
+		>=media-libs/fontconfig-2.4.1
+		>=media-libs/sdl2-image-2.0.0[jpeg,png]
+		>=media-libs/sdl2-mixer-2.0.0[vorbis]
+		media-libs/libvorbis
+		>=x11-libs/pango-1.22.0
+		>=x11-libs/cairo-1.10.0
+		sys-libs/readline:0=
+		dbus? ( sys-apps/dbus )
+	)"
+DEPEND="${RDEPEND}
+	x11-libs/libX11
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	if ! use doc ; then
+		sed -i \
+			-e '/manual/d' \
+			doc/CMakeLists.txt || die
+	fi
+
+	# respect LINGUAS (bug #483316)
+	if [[ ${LINGUAS+set} ]] ; then
+		local lang langs=()
+		for lang in $(cat po/LINGUAS) ; do
+			has ${lang} ${LINGUAS} && langs+=( ${lang} )
+		done
+		echo "${langs[@]}" > po/LINGUAS || die
+	fi
+}
+
+src_configure() {
+	filter-flags -ftracer -fomit-frame-pointer
+	if [[ $(gcc-major-version) -eq 3 ]] ; then
+		filter-flags -fstack-protector
+		append-flags -fno-stack-protector
+	fi
+
+	if use dedicated || use server ; then
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="ON"
+			-DENABLE_SERVER="ON"
+			-DSERVER_UID="${PN}"
+			-DSERVER_GID="${PN}"
+			-DFIFO_DIR="/run/wesnothd"
+			)
+	else
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="OFF"
+			-DENABLE_SERVER="OFF"
+			)
+	fi
+	mycmakeargs+=(
+		-Wno-dev
+		-DENABLE_GAME="$(usex !dedicated)"
+		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_NOTIFICATIONS="$(usex dbus)"
+		-DENABLE_STRICT_COMPILATION="OFF"
+		)
+	cmake_src_configure
+}
+
+src_install() {
+	local DOCS=( README.md changelog.md )
+	cmake_src_install
+	if use dedicated || use server; then
+		rmdir "${ED}"/run{/wesnothd,} || die
+		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
+	fi
+}