gentoo auto-resync : 01:08:2022 - 15:15:48

6 files changed, 18 insertions, 307 deletions

diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest
index 61f0ac45db2e..bc25aac8cd0e 100644
--- a/games-strategy/wargus/Manifest
+++ b/games-strategy/wargus/Manifest
@@ -1,15 +1,7 @@
-DIST wargus-2.4.3.tar.gz 46635465 BLAKE2B be559e6efdba7542e9ed65f4ece5419b781b61d7d6d43b40418ca8dffc446fa7478f608d7f24696281c7acbda4dc5bf8d808feeb3376ae3e8a04b3372d18ace1 SHA512 0c9eca898146c44e211e0da7061cb605eb04ab113fd9ad0c51f9b92df8724a5b28aea9b7cf9bfadd44f0183f8b5c519d7da0050b260624f4f7da4b9f8aee458c
-DIST wargus-3.0.0.tar.gz 4890178 BLAKE2B 7ab4a4b5e8171b2297e17f0338a5fd674cff7beb3457e33c7938c12f9a262d81b9faf2db6ae00fdbbef440624880c37bfe61c2b9957e943cf13d364544f58a65 SHA512 70bf6a5a3d489c9d88bf28e65eea85936ac42850b9c8f27c5cb4a7ba8ff28c609274235c735abb4de92e5c63113d4850adc1da313ff39cbdee797de6b9e1cc43
-DIST wargus-3.1.0.tar.gz 4977868 BLAKE2B 063d47f53b58360c3ccc1aea301f4731a0108a52867b529a1f3935e500e569c11775074241ed8acd58ee7b33064831abebee693a9720927a1432c3f4ed9b17dc SHA512 9e4c3ed955cbf0ff38fd8a847a9590fb3588923b88065a8eb3d2e82fa20b10cd00d507b74c5440486237eb20b71435f72c219efdf288eb67fca594050622f169
-DIST wargus-3.1.1.tar.gz 4982124 BLAKE2B 1dd583c46f841c03d0e859e3c79da72da5866c5f6c67d1e23bf186935f2ae8d539e6dec36bb7c41b6f74af3a4f93c308489c802890c982a13aa68ba2cfbc4626 SHA512 8ec6a3dd11db9cb5984c9d61882beac0851f744203f9d90f23783b8a6b7f2728a180d7354c2e85d7ec8105c731a3e6996f5a688ce6bf5fa9437040c09cea6a59
-DIST wargus-3.1.2.tar.gz 4981468 BLAKE2B 76e925a6cd469a583adffe67f53a407f919b93c6700aeaa182db05b07691d64e6040d6f9f80461b14b81b412882bb58b976253b382d9e4aced7d1429c28832d2 SHA512 6925eab28b63222c4957b40c7b9a57ca231a18a7b36509c90f72d563a43a2ac4bd82bda3ca02e68099045fcddf10dd36c5a93c6f114f7bdcfb67afa7c7471b1e
 DIST wargus-3.2.0.tar.gz 5062175 BLAKE2B e742c2dae21aa5a8a05ef8a4cefc7d1245707d401aa9e14dfc633aeac0e4e4e54459c0ce07cbd32aed842c3dcf57ea8df39fcfc34a9316211146a61ce71464dc SHA512 bc85304c0994abf778cf157d1013d9dea18e1d761a3b432018641211824bcdb2e424c938842848d8c7a670d8660289b5860342a99be7af259cf8eaf883af1285
 DIST wargus-3.3.0.tar.gz 5094634 BLAKE2B aa0b02d62dc8620ba9517e5c7d1e8193f2c4c0e20b9b96b91cd5aa57fefdfda7354c82d67507aea67704adc7c77d90b858f0f3fb78d2a1bf430b5c4c5251f432 SHA512 3a2bd04aed0ced18a11ab925ca3d4da98f8848b45a0716fe5164ee5e0f9c76a63d7783d9ba94f3de022622e841f0257cb59d507ea772b2cc42419cef01ea8cbc
-EBUILD wargus-2.4.3.ebuild 1933 BLAKE2B 1570688d37ca291df56f903b130957f8e898b8b3c618863743bdf24f3c8a4ea2ce6d3850bd3d746947efcef7f0bead9849a23f72124b87d12e323ecd4bad0e7c SHA512 eda886eae8fdd69c877d3b2f9c175eedb899a2d79b0d67c3006b69f15800679297c0397a861a86749187cd62f4423f4cffa1969ff7c10ae4583ca7ad2a800a1c
-EBUILD wargus-3.0.0-r1.ebuild 1939 BLAKE2B b8272a50ba893a4c39ab03374af5ab4e7b3da5cfa5643be31e7c6f38ed85baec5d96b4e6bdeb313481711fd2f355240ad2c5e2044df4b903cbf2ea960ff16673 SHA512 c3cd057699fd4b42111eef93e6143f554c695ead5ceaf4801b6420fc581004b61f0f6b9dae3603ed4245dba14d94075d6fd38ae9a975007883eb15611560c640
-EBUILD wargus-3.1.0.ebuild 1938 BLAKE2B dd8622e5021dcb08c3d52838023871eb1cae2f66198d336bbd8e40cb9cb780642b71655211acff480da59e65d25eb594ec9a137fd26471824e8158c3141133b6 SHA512 0a46d7635c3b3a59a18f952df7427b8e8e454bd7c5ac56e232338c88387b050eddefc028f9a1415ec1db76ac3b8c4e86d7c31ce1bc3d697aadd50bf3e14fdcc9
-EBUILD wargus-3.1.1.ebuild 1938 BLAKE2B dd8622e5021dcb08c3d52838023871eb1cae2f66198d336bbd8e40cb9cb780642b71655211acff480da59e65d25eb594ec9a137fd26471824e8158c3141133b6 SHA512 0a46d7635c3b3a59a18f952df7427b8e8e454bd7c5ac56e232338c88387b050eddefc028f9a1415ec1db76ac3b8c4e86d7c31ce1bc3d697aadd50bf3e14fdcc9
-EBUILD wargus-3.1.2.ebuild 1938 BLAKE2B dd8622e5021dcb08c3d52838023871eb1cae2f66198d336bbd8e40cb9cb780642b71655211acff480da59e65d25eb594ec9a137fd26471824e8158c3141133b6 SHA512 0a46d7635c3b3a59a18f952df7427b8e8e454bd7c5ac56e232338c88387b050eddefc028f9a1415ec1db76ac3b8c4e86d7c31ce1bc3d697aadd50bf3e14fdcc9
+DIST wargus-3.3.1.tar.gz 5094251 BLAKE2B b5f3674db93a8973f166e6dd0dcd9adeee330aa3932b97218b10e3540f5bc6123c977f45463d77c1cf6cc8d5dcadf39d799551311e9a891ec91200e668febcd8 SHA512 33a642d87a9a0d407fd8591fbb19d5357b5d7ae2fa3319512776feb0b6dbdc4d403e82de907235a9614302b5b0af466da37af21f7f4093715d39fe7e7da30468
 EBUILD wargus-3.2.0.ebuild 1938 BLAKE2B dd8622e5021dcb08c3d52838023871eb1cae2f66198d336bbd8e40cb9cb780642b71655211acff480da59e65d25eb594ec9a137fd26471824e8158c3141133b6 SHA512 0a46d7635c3b3a59a18f952df7427b8e8e454bd7c5ac56e232338c88387b050eddefc028f9a1415ec1db76ac3b8c4e86d7c31ce1bc3d697aadd50bf3e14fdcc9
 EBUILD wargus-3.3.0.ebuild 1949 BLAKE2B c9f02b4a29a00843e327fccc84aa2ce9ace4eb2611d4925dae763ec9cfda9cf5759e9e4ee71837445c3580ca9de2573f064e2b837260f5e978c1dc8cf48cdb87 SHA512 80e5ae52de4cae8499b9d904a7f73f35ea7ea13e53c9cb6a2a9576d57afe507fa6c67036e9858949b41056ec006ad17ee5610b82f3e9dd06841a14aa77086f6f
+EBUILD wargus-3.3.1.ebuild 1949 BLAKE2B c9f02b4a29a00843e327fccc84aa2ce9ace4eb2611d4925dae763ec9cfda9cf5759e9e4ee71837445c3580ca9de2573f064e2b837260f5e978c1dc8cf48cdb87 SHA512 80e5ae52de4cae8499b9d904a7f73f35ea7ea13e53c9cb6a2a9576d57afe507fa6c67036e9858949b41056ec006ad17ee5610b82f3e9dd06841a14aa77086f6f
 MISC metadata.xml 536 BLAKE2B 4d7b4b47f8ac2fd71541d4f013b9e9e68a1be97426acdf768bbc2bb75cd16ec583a6542eab31a0cf11f16e3ebfbfcce6bf4b968a7dde059d388d1b8bf18a6048 SHA512 6cb843f123a8e5c5f81e92db2088a64601f00dffbebec293a59f34a6bff16aa763aaecc49d3e7429831bfebc77c72c70d9ae0958ecaf51ae73ea2ff746c4adab
diff --git a/games-strategy/wargus/wargus-2.4.3.ebuild b/games-strategy/wargus/wargus-2.4.3.ebuild
deleted file mode 100644
index 23954b3347a3..000000000000
--- a/games-strategy/wargus/wargus-2.4.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Warcraft II for the Stratagus game engine"
-HOMEPAGE="https://wargus.github.io/
-	https://github.com/Wargus/wargus"
-SRC_URI="https://github.com/Wargus/wargus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	=games-engines/stratagus-${PV}*[theora]
-	media-libs/libpng:0=
-	sys-libs/zlib:=
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	!games-strategy/wargus-data"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if has_version games-strategy/wargus-data; then
-		ewarn "The system-wide install of game data via games-strategy/wargus-data"
-		ewarn "no longer works.  The old data will be uninstalled after merging"
-		ewarn "this version of Wargus.  If you would like to preserve it, please"
-		ewarn "abort the process and back /usr/share/stratagus/wargus up."
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGAMEDIR="${EPREFIX}/usr/bin"
-		-DBINDIR="${EPREFIX}/usr/bin"
-		-DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
-		-DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
-		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	elog "Wargus requires the data from the original game to run.  The game"
-	elog "will ask you for the location of the game data and extract/convert"
-	elog "it automatically on the first run.  Only the DOS version is supported"
-	elog "at the moment."
-
-	if ! has_version media-video/ffmpeg ||
-		! has_version media-sound/cdparanoia
-	then
-		elog
-		elog "If you did not convert the game data yet, you may want to install"
-		elog "the following optional dependencies:"
-		elog
-		elog "media-video/ffmpeg -- to convert game videos"
-		elog "media-sound/cdparanoia -- to rip game music from the CD"
-	fi
-
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-strategy/wargus/wargus-3.0.0-r1.ebuild b/games-strategy/wargus/wargus-3.0.0-r1.ebuild
deleted file mode 100644
index a15e86163b5b..000000000000
--- a/games-strategy/wargus/wargus-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Warcraft II for the Stratagus game engine"
-HOMEPAGE="https://wargus.github.io/
-	https://github.com/Wargus/wargus"
-SRC_URI="https://github.com/Wargus/wargus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bne"
-
-RDEPEND="
-	=games-engines/stratagus-${PV}*[theora]
-	media-libs/libpng:0=
-	sys-libs/zlib:=
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	bne? ( app-arch/stormlib:= )
-	!games-strategy/wargus-data"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if has_version games-strategy/wargus-data; then
-		ewarn "The system-wide install of game data via games-strategy/wargus-data"
-		ewarn "no longer works.  The old data will be uninstalled after merging"
-		ewarn "this version of Wargus.  If you would like to preserve it, please"
-		ewarn "abort the process and back /usr/share/stratagus/wargus up."
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGAMEDIR="${EPREFIX}/usr/bin"
-		-DBINDIR="${EPREFIX}/usr/bin"
-		-DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
-		-DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
-		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
-		-DWITH_STORMLIB=$(usex bne)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	elog "Wargus requires the data from the original game to run.  The game"
-	elog "will ask you for the location of the game data and extract/convert"
-	elog "it automatically on the first run."
-
-	if ! has_version media-video/ffmpeg ||
-		! has_version media-sound/cdparanoia
-	then
-		elog
-		elog "If you did not convert the game data yet, you may want to install"
-		elog "the following optional dependencies:"
-		elog
-		elog "media-video/ffmpeg -- to convert game videos"
-		elog "media-sound/cdparanoia -- to rip game music from the CD"
-	fi
-
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-strategy/wargus/wargus-3.1.0.ebuild b/games-strategy/wargus/wargus-3.1.0.ebuild
deleted file mode 100644
index 05c144af13dd..000000000000
--- a/games-strategy/wargus/wargus-3.1.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Warcraft II for the Stratagus game engine"
-HOMEPAGE="
-	https://stratagus.com/
-	https://github.com/Wargus/wargus"
-SRC_URI="https://github.com/Wargus/wargus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bne"
-
-RDEPEND="
-	=games-engines/stratagus-${PV}*[theora]
-	media-libs/libpng:0=
-	sys-libs/zlib:=
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	bne? ( app-arch/stormlib:= )
-	!games-strategy/wargus-data"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if has_version games-strategy/wargus-data; then
-		ewarn "The system-wide install of game data via games-strategy/wargus-data"
-		ewarn "no longer works.  The old data will be uninstalled after merging"
-		ewarn "this version of Wargus.  If you would like to preserve it, please"
-		ewarn "abort the process and back /usr/share/stratagus/wargus up."
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGAMEDIR="${EPREFIX}/usr/bin"
-		-DBINDIR="${EPREFIX}/usr/bin"
-		-DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
-		-DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
-		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
-		-DWITH_STORMLIB=$(usex bne)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	elog "Wargus requires the data from the original game to run.  The game"
-	elog "will ask you for the location of the game data and extract/convert"
-	elog "it automatically on the first run."
-
-	if ! has_version media-video/ffmpeg ||
-		! has_version media-sound/cdparanoia
-	then
-		elog
-		elog "If you did not convert the game data yet, you may want to install"
-		elog "the following optional dependencies:"
-		elog
-		elog "media-video/ffmpeg -- to convert game videos"
-		elog "media-sound/cdparanoia -- to rip game music from the CD"
-	fi
-
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-strategy/wargus/wargus-3.1.1.ebuild b/games-strategy/wargus/wargus-3.1.1.ebuild
deleted file mode 100644
index 05c144af13dd..000000000000
--- a/games-strategy/wargus/wargus-3.1.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Warcraft II for the Stratagus game engine"
-HOMEPAGE="
-	https://stratagus.com/
-	https://github.com/Wargus/wargus"
-SRC_URI="https://github.com/Wargus/wargus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bne"
-
-RDEPEND="
-	=games-engines/stratagus-${PV}*[theora]
-	media-libs/libpng:0=
-	sys-libs/zlib:=
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	bne? ( app-arch/stormlib:= )
-	!games-strategy/wargus-data"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if has_version games-strategy/wargus-data; then
-		ewarn "The system-wide install of game data via games-strategy/wargus-data"
-		ewarn "no longer works.  The old data will be uninstalled after merging"
-		ewarn "this version of Wargus.  If you would like to preserve it, please"
-		ewarn "abort the process and back /usr/share/stratagus/wargus up."
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGAMEDIR="${EPREFIX}/usr/bin"
-		-DBINDIR="${EPREFIX}/usr/bin"
-		-DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
-		-DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
-		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
-		-DWITH_STORMLIB=$(usex bne)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	elog "Wargus requires the data from the original game to run.  The game"
-	elog "will ask you for the location of the game data and extract/convert"
-	elog "it automatically on the first run."
-
-	if ! has_version media-video/ffmpeg ||
-		! has_version media-sound/cdparanoia
-	then
-		elog
-		elog "If you did not convert the game data yet, you may want to install"
-		elog "the following optional dependencies:"
-		elog
-		elog "media-video/ffmpeg -- to convert game videos"
-		elog "media-sound/cdparanoia -- to rip game music from the CD"
-	fi
-
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-strategy/wargus/wargus-3.1.2.ebuild b/games-strategy/wargus/wargus-3.3.1.ebuild
index 05c144af13dd..fff6023fa177 100644
--- a/games-strategy/wargus/wargus-3.1.2.ebuild
+++ b/games-strategy/wargus/wargus-3.3.1.ebuild
@@ -1,32 +1,40 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg-utils
 
 DESCRIPTION="Warcraft II for the Stratagus game engine"
 HOMEPAGE="
 	https://stratagus.com/
-	https://github.com/Wargus/wargus"
-SRC_URI="https://github.com/Wargus/wargus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	https://github.com/Wargus/wargus/
+"
+SRC_URI="
+	https://github.com/Wargus/wargus/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+bne"
 
-RDEPEND="
+DEPEND="
 	=games-engines/stratagus-${PV}*[theora]
 	media-libs/libpng:0=
 	sys-libs/zlib:=
 	x11-libs/gtk+:2
 	x11-libs/libX11
 	bne? ( app-arch/stormlib:= )
-	!games-strategy/wargus-data"
-DEPEND="${RDEPEND}"
+	!games-strategy/wargus-data
+"
+RDEPEND="
+	${DEPEND}
+"
 BDEPEND="
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 pkg_pretend() {
 	if has_version games-strategy/wargus-data; then