gentoo resync : 16.09.2021

4 files changed, 4 insertions, 120 deletions

diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 800ed0ccf31c..044bd6e03163 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,7 +1,5 @@
 AUX warzone2100-4.1.3-no-compress-manpages.patch 2317 BLAKE2B 00d67b7df0898b1a6343b38ffb7e1655d3f16a94bffe94894f3cff5e25f1e7f426046beda9983eea963bac5fb2a7e49aca473b8b78d141ac00baa250710093c1 SHA512 48b8c3f651bf7d504da88a6351799cc9cd19bf84191f52e9ca5b0c5c60b52a81587c8a03fde5e3d8d19e7770dc7b17dd60b59d8441b47221a7cda5a8008f9558
-DIST warzone2100-4.1.2.tar.xz 337480924 BLAKE2B 2042aedd43a3515bf6ccfc210dd02502bc20d487ff96ce763f573f0dd92ef08577ee21fd54237b4cf4f99c31ed33197febc70edd25d0e0a515e286167d815f9d SHA512 7218f98757e421d8ccf6c36de5e310060b52506d4e10c3cba6e32d1917da30b9deb52b8081026d8efc84ef44842a7db8604d4a86157409281a30bbcc52b556f6
 DIST warzone2100-4.1.3.tar.xz 337479212 BLAKE2B 07d1788fc2f8e5073a15231d5bf0c8c50dc0413522ea1589b064190144906fb58008faab66a295cec7759a1036f4d007ef8a42cffd9ef588fde1116b6cd7a38b SHA512 64126a1a5aab8b766cdfc70b8d96465ad451bd6a31e33be963eb89664b062dfe58e195ac3cbc087a9c008519c0e13003d9750bcb428b0e0ff12c82bf9940be3f
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
-EBUILD warzone2100-4.1.2-r3.ebuild 2402 BLAKE2B 30851896517d6df07fa994ba6125af0e4d8ead4e0179158bbcb280b084f629675128117ab29927dc48fb22740921566d2dddb966a94ab649da7991907708ce25 SHA512 94ffadb25e4048d8c8a9b12e4f50cfea5884201d233033861b5a1c31029fe43222e36a0724bcd4b7bad3356a3555d86d59b76d7e2c3eef11573e1e43bb26a2d7
-EBUILD warzone2100-4.1.3-r4.ebuild 2686 BLAKE2B c66c3402d285cccfd2d33780605a22acf294564671e52ad6630d892d67e2d7d42f1b2ab7b3f84f735340892e78c38263186a0b9034f48fc44911b175b1255347 SHA512 5a2146eb1f1f201d830a40cc843df461cf16ac489d2b792d9977478db6a1d60a37af42d618c16be58fe0f556548986a8a8535b07808af2284165db5c40f06bd7
-MISC metadata.xml 811 BLAKE2B 3b34613b3eeec7f6f428f9e2c48561df6fecc03566d7b9b10618aba37fd53e2f1bd1d09e46804f2c87f2504e4d91d1a289a2a22afea8c7eac01820b779a77cf3 SHA512 af44da84a5578f11e6f01e0310a7aefedf29582c90d257eaa51e64a59fd85a5e60c2f56ca401c58fb40c079c556abc400586aa74dc49d1b5b9073bf750ce1845
+EBUILD warzone2100-4.1.3-r4.ebuild 2678 BLAKE2B 4c3db36d5f39189d1e43fbedeb894546bc133fc9d772f6fed8bb5bb7d1b39d84db2d6f66ac337a2c80cd24eef2d7fbd8cb230f1d2f6814d8f26ca658b13fa0ef SHA512 9459049e8aff4cb3a481699fbc1ebc2ba92d780cfe4984e9ddfdda8f03de5a465fb91d1da5b1a4d84d957a2fba23decdb4c7ab917e52b1f8e8367a97f46393d7
+MISC metadata.xml 812 BLAKE2B b2b9ab08275974118342f645f9c6fee90fb2f8904a3c6708666d71d57ec71ab86e9f905669cc3fe9424cec8329d434c979e9ae87324f0b47ed313b28c66d6070 SHA512 0af92d46baaf497a9f5aa57e45f0860e94c36f008386c1f483a49d8df50719ef11532a8473b4068a5cc63286d7af72b71e4de2e883b178c278b7aecf27f8389d
diff --git a/games-strategy/warzone2100/metadata.xml b/games-strategy/warzone2100/metadata.xml
index d095ae1493b5..c43918c4e4e2 100644
--- a/games-strategy/warzone2100/metadata.xml
+++ b/games-strategy/warzone2100/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
diff --git a/games-strategy/warzone2100/warzone2100-4.1.2-r3.ebuild b/games-strategy/warzone2100/warzone2100-4.1.2-r3.ebuild
deleted file mode 100644
index db26399fb3a0..000000000000
--- a/games-strategy/warzone2100/warzone2100-4.1.2-r3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop 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"
-SLOT="0"
-#[[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~amd64 ~x86"
-# upstream requested debug support
-IUSE="debug discord nls videos vulkan"
-
-CDEPEND="
-	>=dev-games/physfs-2[zip]
-	>=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:=
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXrandr
-	nls? ( virtual/libintl )
-	vulkan? ( media-libs/libsdl2:=[vulkan] )
-"
-DEPEND="
-	${CDEPEND}
-	app-text/asciidoc
-	dev-libs/fribidi
-	media-libs/fontconfig
-"
-RDEPEND="
-	${CDEPEND}
-	media-fonts/dejavu
-"
-BDEPEND="
-	app-arch/zip
-	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 )
-
-src_unpack() {
-	unpack ${P}.tar.xz
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
-
-	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() {
-	default
-
-	insinto /usr/bin
-	dobin "${BUILD_DIR}"/src/${PN}
-
-	insinto /usr/share/${PN}
-	doins "${BUILD_DIR}"/data/base.wz
-	doins "${BUILD_DIR}"/data/mp.wz
-
-	if use videos ; then
-		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
-	fi
-
-	insinto /usr/share/${PN}
-	doins -r data/music
-
-	doman "${BUILD_DIR}"/doc/warzone2100.6
-
-	doicon -s 128 icons/warzone2100.png
-	domenu icons/warzone2100.desktop
-}
diff --git a/games-strategy/warzone2100/warzone2100-4.1.3-r4.ebuild b/games-strategy/warzone2100/warzone2100-4.1.3-r4.ebuild
index 1259fe012c7e..929af63b820a 100644
--- a/games-strategy/warzone2100/warzone2100-4.1.3-r4.ebuild
+++ b/games-strategy/warzone2100/warzone2100-4.1.3-r4.ebuild
@@ -4,7 +4,7 @@
 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 desktop plocale xdg
+inherit cmake plocale xdg
 
 MY_PV=$(ver_cut 1-2)
 VIDEOS_PV=2.2