gentoo resync : 25.05.2018

8 files changed, 178 insertions, 65 deletions

diff --git a/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild b/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
new file mode 100644
index 000000000000..9b33e87f7945
--- /dev/null
+++ b/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="0ad-${PV/_/-}"
+DESCRIPTION="Data files for 0ad"
+HOMEPAGE="https://play0ad.com/"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	rm binaries/data/tools/fontbuilder/fonts/*.txt
+}
+
+src_install() {
+	insinto /usr/share/0ad
+	doins -r binaries/data/*
+}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index 706814012c95..64e4b07e2854 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1,3 +1,5 @@
 DIST 0ad-0.0.22-alpha-unix-data.tar.xz 632555792 BLAKE2B 2b3fd05919e344136114903706d5ec452d432e1fb839e9324b23a627bd740e1994dd10db0d4345447950807908d0f299c745c7f0b6c3cb3215f5a23147ab3e51 SHA512 ff9928a59b461d4a6082227dce11b7a497e9e518b6cd3a58723963bed9241f7afc2b228e7728a3d03bd2a8c3708f756639b87abd6520d09dab01309c8444ff1d
+DIST 0ad-0.0.23-alpha-unix-data.tar.xz 691973492 BLAKE2B 7dcd36d21ea2c12f314f5a185a0fce57cec33754fbd26ad34c376fb9c7725fe5487e79a3da54249981fe58bf03c39350a871198a4cfb98c3a40eb878c6cc39b6 SHA512 9eae8bbdf83f609a0775261d691435c2924b505499fdf36ac0922b5f0c1d605dae49f257a872153c718d8bad018f6635320ec376418761c0d650bf165765e062
 EBUILD 0ad-data-0.0.22_alpha.ebuild 532 BLAKE2B ff7e7ac49fd99928ea0f0c67046db9b480a75af2dff228a6db4da328b5862260fb5372bf242b2dbc8d46969c46b3a917b57b1c80f37b444683810c159bad04f0 SHA512 6ab42ff53c6c0f97bc137c7f453a5a341839c02aef5bcd5ae30b31110e318ee3b8cd6731a2686ecb9e4ba08f4eb9083b3166bea4f17691e1ee55a50f0fa7e040
+EBUILD 0ad-data-0.0.23_alpha.ebuild 534 BLAKE2B 3517c0dc476b363aab702a25ef2bc4d19c2fd162b0c6c9ea41995b190215c8ff859d630700db8760cd80514d4197a4d4583cacf991d0b98118b755da1dc55e30 SHA512 d6d9d5de0fa84a76ca80d701de2e0d8340ac8990c83bd6238e66a180a02820112a3c1e20c2c75fa1e03b4fe4671cdde716092841bbe76c71db060b7ceb3452a3
 MISC metadata.xml 330 BLAKE2B 9f9fa8d997d33a71d11d118396fd718f8109e3e44410d5c8c2aeb54cc48b4c979e88922be7e5e9b0009e330b67ce85696fd747c52b2a23b51dc3e8d475c24254 SHA512 55b1c876bea472fc72321364ac95e97c950c675c68e9a32862eb6135b96f7bf7da5c0b787ddd28685b322a33c60dd51dafe1d382eb46e066a5cf8bd15fb5347f
diff --git a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
new file mode 100644
index 000000000000..0e44c4e36fb1
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/icu:=
+	dev-libs/libsodium
+	dev-libs/libxml2
+	dev-libs/nspr
+	~games-strategy/0ad-data-${PV}
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( >=net-libs/gloox-1.0.20 )
+	nvtt? ( media-gfx/nvidia-texture-tools )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use editor && setup-wxwidgets
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
+)
+
+src_configure() {
+	local myconf=(
+		--with-system-nvtt
+		--with-system-miniupnpc
+		--minimal-flags
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--collada
+		--bindir="/usr/bin"
+		--libdir="/usr/$(get_libdir)"/${PN}
+		--datadir="/usr/share/${PN}"
+		)
+
+	# stock premake4 does not work, use the shipped one
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# regenerate scripts.c so our patch applies
+	cd "${S}"/build/premake/premake4 || die
+	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+	# rebuild premake again... this is the most stupid build system
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# run premake to create build scripts
+	cd "${S}"/build/premake || die
+	"${S}"/build/premake/premake4/bin/release/premake4 \
+		--file="premake4.lua" \
+		--outpath="../workspaces/gcc/" \
+		--platform=$(usex amd64 "x64" "x32") \
+		--os=linux \
+		"${myconf[@]}" \
+		gmake || die "Premake failed"
+}
+
+src_compile() {
+	tc-export AR
+
+	# build bundled and patched spidermonkey
+	cd libraries/source/spidermonkey || die
+	JOBS="${MAKEOPTS}" ./build.sh || die
+	cd "${S}" || die
+
+	# build 3rd party fcollada
+	emake -C libraries/source/fcollada/src
+
+	# build 0ad
+	emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+	newbin binaries/system/pyrogenesis 0ad
+	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	insinto /usr/share/${PN}
+	doins -r binaries/data/l10n
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe binaries/system/libCollada.so
+	doexe libraries/source/spidermonkey/lib/*.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 5d730a297308..0ec270713ead 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,4 +1,6 @@
 AUX 0ad-0.0.21_alpha-gentoo.patch 3905 BLAKE2B 265020af1e1df234d0932c6294e0cda9c0f48bc1b311d6770c8347431c17e5e99c68f4c52cf6e1277ffb2e57431a6c237d2dc4f452e563eb343b06f62ab1eede SHA512 592e9fdff6ef6d88efc9c4a5c856e41240845187cc4a4b3d9d6b5c616eb1f664fdf702b7b0a30cdfeedd6d87ac0fab913df477567b84d42e13d2cf2761cfdec8
 DIST 0ad-0.0.22-alpha-unix-build.tar.xz 29199308 BLAKE2B a9204949e4dd669228b2a0e2c2dc5d2ccd4f18767e32c4f772714c61314ca0fb283d41201cb9f0547588a6dbdc20fd9d7d14ff153bc3087003c27f4ec2f6fef9 SHA512 3f917e77c6cc1d3fb585c98950db6eab3f5895ba3db41a8737f8172c769b5582689b436cab31eeafecce0e9639ee456afc7b78ebb03435b06512eb9fe7393771
+DIST 0ad-0.0.23-alpha-unix-build.tar.xz 31907988 BLAKE2B 567b9e1b5cd653206194e042f4f0859cd4f9afe75d52d3f480a328b76fdcdd746254502fbf284f790b4932c912ff31453bbc8c986c879ad76baa3d2a5db802c9 SHA512 4a1c86b19e0d8ec7d9b8bf75428df0255f95e7f991f419734f9b6ddc288a537405a34c5d7081f1a97475155c49013af85dee5c0265c35c7dbc003b46637a03d7
 EBUILD 0ad-0.0.22_alpha.ebuild 3388 BLAKE2B 527f19ac8a3dd38ee3f2d6005223ea45b76a01739640bae7456427c6687518a7a5fe60dd7cc77a13861c0bfd381e59fad8d81084a6245b84566dffa459035e2f SHA512 c7d221e6ee1c8e68686e82c245ba90878acb9a7fe64b1916fefdbba381e479f98419bbe06b0f4f7d3c8308d515ab0f88c97f5d29a299eadbd0d734511e6c1b34
+EBUILD 0ad-0.0.23_alpha.ebuild 3408 BLAKE2B bb6fbd77a2e9a0b27f086b33bb347ac5c5a8c76277b967359dfd8b4c7b6ea4b3f296aa150bacc3b3dd9a1460e5ebda436ad1429c5c1eaefe826a64403417ac1c SHA512 99db5ad39c1e0fe4ec9762df7c27e5ae12a1234007cd5d6e229110471affa705373015bb6e42e23b1f8ace93c5a3bae4afc204d966c5940f810415cd255186bc
 MISC metadata.xml 668 BLAKE2B 9bfa86da2d6e1631217082f88905d8d8be7a2c91248839b9a0f5da9d0c214552b11f4af861eb04072e4645b47505d83d0b93c1313f7a3857b1006f94a699b3b2 SHA512 7aab21c31587f1cce5b4635ace0fbbb5bcdc2a6d811df68494ac1fb251fbfc75911cfa3a9e1a60c28f684f64a919164c6e3504fd3fbba3b0ec05afe8278ae343
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 6bfd222f5ac4..22ab44d500b9 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest
index 87e041ab6bf4..32b874b17bde 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,6 +1,4 @@
 DIST 7kaa-2.14.7.tar.xz 31342092 BLAKE2B 1e2456ff8e40eace3185f842aad1d436e7e336eb4489a1a23022c89e7695ef1fc6f632d884d5d992c63f8b67f8b045fbda37e2fa3a07e9be13b9801d959b1e93 SHA512 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1
-DIST 7kaa-source-2.14.4.tar.bz2 27366752 BLAKE2B d80c5dcf0982cc2dddf29559c4f096392d88b916701e1fa21d2885aba254c8214920dd1be45a7ea6931e8f025647946d19b4158a22b824aa18e75c18ace8fe99 SHA512 7ee39aba89993d9f0041ab991e053069e0c3ab4298f74c0ec95e3f30f49a71731ef37d8870b1ab9afd97b1c4618a879492976006b8a513bfc4bc44dfac591bf0
 DIST 7kaa.png 559 BLAKE2B 0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113 SHA512 0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6
-EBUILD seven-kingdoms-2.14.4.ebuild 1415 BLAKE2B 737f051f651e20eb55317ba3201d57fbd1f4a38f798e5da4274ed3f291930050a3bbb6b21b9f4a492190bb2f7e5493b4d667ae51fd53d4d2b644a81475153ead SHA512 c5d8ed264a9e8e200fae0160f55f560e38e9b9f4118b1fb14a09dfa5c618f60b450568bf5d507c41542a6b4d9ad9123f14f961df19b0b300de573a19ef9caea0
 EBUILD seven-kingdoms-2.14.7.ebuild 783 BLAKE2B 88eb5caf7fad23b0924878a177f4dc4c7da78e928752ff6082350bc44635ab8b2e0c5286d14d5e36562eb23c6bff40e6e52d2b3d6b7bcbb298cf3df578f1ccf7 SHA512 f360b0580feefb5e53f0639e56aa206af62ac20932c0e624bff9865e449c31fe72d735cc7b204eb073252c6509872f2ce487a5ff00164ce4a79910d3bf3fefcc
-MISC metadata.xml 433 BLAKE2B a88d674bc0b6dc9e2c905743f5c3c1dd02bb8e5d885108da63d68895540a1df0c224ed9365f7ada6550e1c33643f1918d84904ee6bbe338dc7574e61cd179267 SHA512 5f83ff52f28bcd4ea5e54556ab408ef1a635ce20cec2b56a1424697309d97f4a6402f6c8d5c5b194017487c00ec2eeeb215a3e1e538914afb9a3ae94e390140b
+MISC metadata.xml 323 BLAKE2B d6893eaaa3f0dd7c230028000f15ed2964a7e7f4b2e5c710c61e2735aa27dafd4c2cff4deaec887854a68e7102f6df772fa8c1ae9c1286df68f115704e608049 SHA512 09f1b34120c01f3dd5f367a2b4ba99b7b89ef06362843e18bc320c7ce7eaea02cbc6c8a0d33541630758d77c6482bc88138d7cdfa1c4fa6dac7ca559d0feeff8
diff --git a/games-strategy/seven-kingdoms/metadata.xml b/games-strategy/seven-kingdoms/metadata.xml
index 2010db746631..4a1da05f9526 100644
--- a/games-strategy/seven-kingdoms/metadata.xml
+++ b/games-strategy/seven-kingdoms/metadata.xml
@@ -5,9 +5,6 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-	<use>
-		<flag name="network">Enable support for multiplayer via <pkg>media-libs/sdl-net</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">skfans</remote-id>
 	</upstream>
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild
deleted file mode 100644
index b82832b94681..000000000000
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils games
-
-MY_PN="7kaa"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Seven Kingdoms: Ancient Adversaries"
-HOMEPAGE="http://7kfans.com/"
-SRC_URI="mirror://sourceforge/skfans/${MY_PN}-source-${PV}.tar.bz2
-	https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="network"
-
-DEPEND="media-libs/libsdl[X,video]
-	media-libs/openal
-	network? ( media-libs/sdl-net )
-	!games-strategy/seven-kingdoms-data"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( README )
-
-src_prepare() {
-	sed -i -e '/#include <player_desc.h>/a\#include <string.h>' src/multiplayer/common/player_desc.cpp || die 'sed failed'
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# In current state debugging works only on Windows :-/
-	egamesconf \
-		$(use_enable network) \
-		--disable-debug \
-		--without-directx \
-		--without-wine \
-		--datadir="${GAMES_DATADIR}/${MY_PN}"
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	newgamesbin "src/client/${MY_PN}" "${MY_PN}.bin"
-	doicon "${DISTDIR}/${MY_PN}.png"
-	games_make_wrapper "${MY_PN}" "${GAMES_BINDIR}/${MY_PN}.bin" "${GAMES_DATADIR}/${MY_PN}"
-	make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" "${MY_PN}" "Game;StrategyGame"
-
-	prepgamesdirs
-}