gentoo resync : 27.01.2018

5 files changed, 96 insertions, 0 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 82edd5e3ee4d..3257ddf02eee 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/wargus-data/Manifest b/games-strategy/wargus-data/Manifest
index cfcc0da92b37..b8fac46763ef 100644
--- a/games-strategy/wargus-data/Manifest
+++ b/games-strategy/wargus-data/Manifest
@@ -1,2 +1,3 @@
+EBUILD wargus-data-0-r1.ebuild 951 BLAKE2B e03d8ca96a4dc70886269ef8ae36c33e73924cb45c80fdf49f62bb51847645d557f0d2ed1df298f70371d8a7b9351b25bf9e28114e5f1744a383b1315b734fc3 SHA512 dc3e4e3e44073d25236761b605ac892e513681d4088f8f202a02dede6559a59a68ab1e207f23b17d7bef01c1f44b54cd5108399e32e3503ecfcf672704801268
 EBUILD wargus-data-0.ebuild 987 BLAKE2B 9655d9c60b952a470638b35df1527f7f8baf7f1f5045c21fb3383a74bd019dac7c5bafbcda4b1c2bc085af636b29081a41eef6ff2767386e93b5d6cac7036dd4 SHA512 8e82be7c2e65e9223c43cbdde33f74707c4132d94d4305354a29550cb87d2db896895a4ccffc0e5f9194517368b5937867a748a237e9dc82c1916813ddc2940f
 MISC metadata.xml 329 BLAKE2B aad962070eacf1667ce2bed4939e290802eadb53bbb1e8ffe8ca13f9c006c45818f9dda522e6ba0d92d1404c8691a7d76a2636caee3657cd6ac3d947f0df2449 SHA512 fedeb73a5c2116db0073c51166b5c3fcf1c5667f5bb0db1b21f7643a6a8f247624738c883af3e457d6a6a7c2b5d39da6c26ffb2cecc847e64501bd659f1f119e
diff --git a/games-strategy/wargus-data/wargus-data-0-r1.ebuild b/games-strategy/wargus-data/wargus-data-0-r1.ebuild
new file mode 100644
index 000000000000..9636a8e03f33
--- /dev/null
+++ b/games-strategy/wargus-data/wargus-data-0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cdrom
+
+DESCRIPTION="Warcraft II data for wargus (needs DOS CD)"
+HOMEPAGE="http://wargus.sourceforge.net/"
+SRC_URI=""
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# wargus is needed for wartool (bug #578340)
+DEPEND="
+	games-strategy/wargus
+	media-sound/cdparanoia
+	media-sound/timidity++
+	media-video/ffmpeg2theora"
+# wrt bug #419331
+RESTRICT="userpriv"
+
+S=${WORKDIR}
+
+src_configure() {
+	export CDROM_NAME="WARCRAFT2"
+	cdrom_get_cds data/rezdat.war
+}
+
+src_compile() {
+	# cdparanoia needs write acces to the cdrom device
+	# this fixes sandbox violation wrt #418051
+	local save_sandbox_write=${SANDBOX_WRITE}
+	addwrite /dev
+	"${EPREFIX}"/usr/bin/wartool -v -r "${CDROM_ROOT}"/data "${S}"/ || die
+	SANDBOX_WRITE=${save_sandbox_write}
+}
+
+src_install() {
+	insinto /usr/share/stratagus/wargus
+	doins -r .
+}
diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest
index e5e2362cb4a7..e34efe01e034 100644
--- a/games-strategy/wargus/Manifest
+++ b/games-strategy/wargus/Manifest
@@ -1,3 +1,5 @@
+DIST wargus-2.4.1.tar.gz 45981981 BLAKE2B 8d80e5d781a1be1edf602f13d77b84e85fe2592fb0a784f1b25b5c9656eaf10a11c3241dfa71388c9a01a9e8fad15b1805a67ddb3157c2a0e86d967f3852869a SHA512 d468d9ad08907fbbfd02af0bca069d6a95d5303cd4f3d838c12bbfe6af0d48f695f9f49d446dbddeae2a91deb1eaa17875954eefdfbe5e25cd840c4454dc6ea0
 DIST wargus_2.3.0.orig.tar.gz 45006918 BLAKE2B b952d4b93a6aed22c201ce6caa2398a8d2ac60366882dd091c861733bf9f6baca409fcb4f0fd59a1c8673744c80b154cd6053ab81a89afef6e95737766c41e88 SHA512 79dbef5f86fafe7357c2911a16655c29bccef71dad39bfe6e02866c1734ee1598bb29a9005c8fa7c73d6f64e13fb7cdd3962214921b0b18c3868cb5abb2a0a87
 EBUILD wargus-2.3.0.ebuild 1189 BLAKE2B 03c7cd0de8e239f74f3397cdd50d03583166ceba3344bf07648be8283fbc8f81cbe583e3662a7df25c8edac53f01ef211cfb6d41257c64fc75c1cf1321b109d7 SHA512 2f792f0179cda44947ac9e8091d01384fbbaafc0e9f3f896232e641a29d185e0b8f4d36089d41f21bfefeecfb7600cf7d5435ae9dd048536d41060e42ce12169
+EBUILD wargus-2.4.1.ebuild 1015 BLAKE2B 2ec460a15d26df522ead61b9863618d24057da3b48e73eedb8888017369b94458e87e4792f05d6eb965412c3fee8b21a8fbaf8868065d46948e1e8acfdc0f793 SHA512 4b5b967cfbd52156e3fbe32eb75829ef627ef69534fb5994ad3d0a76ad4280cb89026eed1a5eef643c198865781a32eccb3d9308b356b3b00ae936fe736fd9f8
 MISC metadata.xml 378 BLAKE2B ea732d1cff85972c33a4fef5281b71f5e3bcf7663e864b00891802ee353fab9b33bd93fc6e76ff8123ba4dd8e77dc4889f3a8d044d7c664782c07629b2f942e6 SHA512 ccc5c5ce04783ccd03e482797fd8941fae5c1ba32936641b762595a03606996157637f5155a80eb7284fa2f290b8883b12a1b9b9ba83cf2693876f3cd269617f
diff --git a/games-strategy/wargus/wargus-2.4.1.ebuild b/games-strategy/wargus/wargus-2.4.1.ebuild
new file mode 100644
index 000000000000..e88a97f6bba3
--- /dev/null
+++ b/games-strategy/wargus/wargus-2.4.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Warcraft II for the Stratagus game engine"
+HOMEPAGE="http://wargus.sourceforge.net/"
+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"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="games-strategy/wargus-data"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DBINDIR="${EPREFIX}/usr/bin"
+		-DSTRATAGUS="${EPREFIX}/usr/bin"/stratagus
+		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	elog "Enabling OpenGL in-game seems to cause segfaults/crashes."
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}