gentoo christmass resync : 25.12.2020

3 files changed, 79 insertions, 1 deletions

diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest
index 6ad26d8d499b..6d9fbb4874be 100644
--- a/games-strategy/wargus/Manifest
+++ b/games-strategy/wargus/Manifest
@@ -1,5 +1,7 @@
 DIST wargus-2.4.1.tar.gz 45981981 BLAKE2B 8d80e5d781a1be1edf602f13d77b84e85fe2592fb0a784f1b25b5c9656eaf10a11c3241dfa71388c9a01a9e8fad15b1805a67ddb3157c2a0e86d967f3852869a SHA512 d468d9ad08907fbbfd02af0bca069d6a95d5303cd4f3d838c12bbfe6af0d48f695f9f49d446dbddeae2a91deb1eaa17875954eefdfbe5e25cd840c4454dc6ea0
 DIST wargus-2.4.3.tar.gz 46635465 BLAKE2B be559e6efdba7542e9ed65f4ece5419b781b61d7d6d43b40418ca8dffc446fa7478f608d7f24696281c7acbda4dc5bf8d808feeb3376ae3e8a04b3372d18ace1 SHA512 0c9eca898146c44e211e0da7061cb605eb04ab113fd9ad0c51f9b92df8724a5b28aea9b7cf9bfadd44f0183f8b5c519d7da0050b260624f4f7da4b9f8aee458c
+DIST wargus-3.0.0.tar.gz 4890178 BLAKE2B 7ab4a4b5e8171b2297e17f0338a5fd674cff7beb3457e33c7938c12f9a262d81b9faf2db6ae00fdbbef440624880c37bfe61c2b9957e943cf13d364544f58a65 SHA512 70bf6a5a3d489c9d88bf28e65eea85936ac42850b9c8f27c5cb4a7ba8ff28c609274235c735abb4de92e5c63113d4850adc1da313ff39cbdee797de6b9e1cc43
 EBUILD wargus-2.4.1.ebuild 1015 BLAKE2B 2ec460a15d26df522ead61b9863618d24057da3b48e73eedb8888017369b94458e87e4792f05d6eb965412c3fee8b21a8fbaf8868065d46948e1e8acfdc0f793 SHA512 4b5b967cfbd52156e3fbe32eb75829ef627ef69534fb5994ad3d0a76ad4280cb89026eed1a5eef643c198865781a32eccb3d9308b356b3b00ae936fe736fd9f8
 EBUILD wargus-2.4.3.ebuild 1933 BLAKE2B 1570688d37ca291df56f903b130957f8e898b8b3c618863743bdf24f3c8a4ea2ce6d3850bd3d746947efcef7f0bead9849a23f72124b87d12e323ecd4bad0e7c SHA512 eda886eae8fdd69c877d3b2f9c175eedb899a2d79b0d67c3006b69f15800679297c0397a861a86749187cd62f4423f4cffa1969ff7c10ae4583ca7ad2a800a1c
-MISC metadata.xml 439 BLAKE2B eebdbfe89e7dde448e4828a3d6d9aab70fa1269da5069cf14560edb1dab234cd90f510251af7cbed27440c7712b6ec17273ec2f22a1c8082bd70a8ef13e32094 SHA512 047eacf4d2169f8446f04312c14ea7f9693d631da3eef54c2c5ec696d6b721905dbcf88b196942b796e373ae125b7b2a62301766927a82c18385cac8d1b93ff7
+EBUILD wargus-3.0.0-r1.ebuild 1939 BLAKE2B b8272a50ba893a4c39ab03374af5ab4e7b3da5cfa5643be31e7c6f38ed85baec5d96b4e6bdeb313481711fd2f355240ad2c5e2044df4b903cbf2ea960ff16673 SHA512 c3cd057699fd4b42111eef93e6143f554c695ead5ceaf4801b6420fc581004b61f0f6b9dae3603ed4245dba14d94075d6fd38ae9a975007883eb15611560c640
+MISC metadata.xml 535 BLAKE2B 1c618d85c92a9daa24009d320dbc05c83d78ffb58a343e88e5df9cbf0a8097051ebb10021200ebe7f2ba5679274d316a98d7cc0171224f371dffe35cee29fa85 SHA512 d369b2201b6461b4709d54817f0b99982260362e3c54e99e93aaeec614843aa14d1fb0d4c24c7c5b5825e05c2e2bd52971f7a6395995aee3f33d9872f9ad2215
diff --git a/games-strategy/wargus/metadata.xml b/games-strategy/wargus/metadata.xml
index 4dbdbbfd0323..e87f6c4d810f 100644
--- a/games-strategy/wargus/metadata.xml
+++ b/games-strategy/wargus/metadata.xml
@@ -9,6 +9,10 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<use>
+		<flag name="bne">Support extracting data from the Battle.net
+			Edition</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">Wargus/wargus</remote-id>
 	</upstream>
diff --git a/games-strategy/wargus/wargus-3.0.0-r1.ebuild b/games-strategy/wargus/wargus-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..a15e86163b5b
--- /dev/null
+++ b/games-strategy/wargus/wargus-3.0.0-r1.ebuild
@@ -0,0 +1,72 @@
+# 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
+}