version bump wrt #525130

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

5 files changed, 275 insertions, 17 deletions

diff --git a/games-strategy/0ad/0ad-0.0.17_alpha.ebuild b/games-strategy/0ad/0ad-0.0.17_alpha.ebuild
new file mode 100644
index 000000000000..2f8280048f2e
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.17_alpha.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/0ad/0ad-0.0.17_alpha.ebuild,v 1.1 2014/10/12 22:40:10 hasufell Exp $
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils games
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="http://play0ad.com/"
+SRC_URI="mirror://sourceforge/zero-ad/${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 sound test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-lang/spidermonkey:24[-icu]
+	dev-libs/boost
+	dev-libs/icu:=
+	dev-libs/libxml2
+	~games-strategy/0ad-data-${PV}
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	net-libs/enet:1.3
+	net-libs/miniupnpc
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( net-libs/gloox )
+	nvtt? ( media-gfx/nvidia-texture-tools )
+	sound? ( media-libs/libvorbis
+		media-libs/openal )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_configure() {
+	local myconf=(
+		--with-system-nvtt
+		--with-system-miniupnpc
+		--with-system-mozjs24
+		--minimal-flags
+		--sdl2
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex sound "" "--without-audio")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--collada
+		--bindir="${GAMES_BINDIR}"
+		--libdir="$(games_get_libdir)"/${PN}
+		--datadir="${GAMES_DATADIR}"/${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() {
+	# 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() {
+	dogamesbin binaries/system/pyrogenesis
+	use editor && dogamesbin binaries/system/ActorEditor
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r binaries/data/l10n
+
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe binaries/system/libCollada.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
+	use editor &&
+		games_make_wrapper ${PN}-ActorEditor "${GAMES_BINDIR}/ActorEditor"
+	make_desktop_entry ${PN}
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	einfo
+	elog "It is advised to compile dev-lang/spidermonkey with the"
+	elog "jit USE flag enabled! Otherwise you might experience slowdowns."
+	einfo
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/0ad/ChangeLog b/games-strategy/0ad/ChangeLog
index c8dca74da437..ab22e3194715 100644
--- a/games-strategy/0ad/ChangeLog
+++ b/games-strategy/0ad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/0ad
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/0ad/ChangeLog,v 1.4 2014/09/12 20:54:31 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/0ad/ChangeLog,v 1.5 2014/10/12 22:40:10 hasufell Exp $
+
+*0ad-0.0.17_alpha (12 Oct 2014)
+
+  12 Oct 2014; Julian Ospald <hasufell@gentoo.org> +0ad-0.0.17_alpha.ebuild,
+  +files/0ad-0.0.17_alpha-gentoo.patch, metadata.xml:
+  version bump wrt #525130
 
   12 Sep 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   0ad-0.0.16_alpha-r2.ebuild:
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 253a01848506..4a48d5985f64 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -3,24 +3,29 @@ Hash: SHA256
 
 AUX 0ad-0.0.16_alpha-gcc-4.9.patch 1092 SHA256 1b48326bfb60beb032968693fafd3c465b05c8e9eb76390bf5e65a816ca21ee3 SHA512 1083d9c90e0249b2dbc0382a73f4328b98af91f934e98f7dd5af7d10819e0bd345585371ad1b6baeb16a5e28ea703e761903b3f447f965a9ba6c21d90255c718 WHIRLPOOL ad9c610690b1da865e0d42728880d55e318e3ef9ad72fd6c04f6a757eaabe0ca3709ed61fbb75d3be70a593bdab5ea30c4d62a97884e2f2ae3500a8f05200a17
 AUX 0ad-0.0.16_alpha-gentoo.patch 3176 SHA256 0631ab138fc937380b3c565a8aabe00c7b339ed6d1eef74a3e661aa277f7cd9b SHA512 8f1e5798257f814a4140f818fe30278ee2301c0130a79a46dbc3360b5cfe91db0a32dc62ed4fcb1db18962cb3a8a2b061553aaa2d70efb18806a76d32d745306 WHIRLPOOL 452351a0b43286e77cdd2b6f82730795a57f141fc56ea2fcc00f76e87d8a8a8af5288cdaf7d1149f74d74a4d15787f67cf5d88cd9f3631c815502718d3fa1e71
+AUX 0ad-0.0.17_alpha-gentoo.patch 3417 SHA256 557710a7f7af1e4cf2f01e55c60d75e7686e88c037bad9e001cb57a9a36dc1a2 SHA512 c2c3e90877b686e5c0df82a818b5019fc7a28cfbf06568e2ef3a85b2f26af008326bddee87c6b172403433730b9b9f3c5f0ce4ceb27da6ed2687664d92a56e07 WHIRLPOOL 60dd00a8112785d35db71132ea5ff8fd3dace1a401312f530b8de1dd532222e8c5684b2f6d5a6967346027610b190fe9366423d4a0de5ceac63f07375ab30892
 DIST 0ad-0.0.16-alpha-unix-build.tar.xz 20019680 SHA256 cb965ef7e292bc3a2f1f598a9695e16ff4d786398f384a1ec7d5f9bfe2626de5 SHA512 9fe3440233d9827895b91ade1873afe977d62386a5dd6042d8169b153d576b462381bfc97e637f0b183aff034236380ca6d552ea2755cf08398143ad67121031 WHIRLPOOL 0e2f1ac9799a4b4d4588c2370a78195f2cc415fb2043be815ed2a2f9f179ccd856c405e7c0323f2033d3a6a4d63c08d8d5c8a05b50769ae3b9219717218edef6
+DIST 0ad-0.0.17-alpha-unix-build.tar.xz 19327284 SHA256 ef144d44fe8a8abd29a4642999a58a596b8f0d0e1f310065f5ce1dfbe29c3aeb SHA512 21133b7f255df73909e0ba72d455ed8d687cdca4a6d28fb04fb2a786ee941d7f4e207b5c245f9bfff1f3e5e10e2ccc932f49587e227982885eef64b4114d02c6 WHIRLPOOL 662e177293ca7add73ca160b67a526aeda6a7a32e26a68fb577376d25db00df9844fe763a2dfcef70f66fc0edd6d2297158251a517deeaa7d7e8292850a8b444
 EBUILD 0ad-0.0.16_alpha-r2.ebuild 3461 SHA256 c465d16d0abb996fcda595a4f630b2f5bd31e1ce042f55ea21682987dcd9112e SHA512 176af2dd76dc114d68b79f776c804bec58f9fcab384e76ade013b659c52c744cc6a0d51f1af87044513fb21c1cf075a538b21a0925e34544cc63911947f28e7c WHIRLPOOL 9ca4eb5f326c385779571bc005a48156ea3c018548f6a9051453e710232c4e844fea60d4d7c836e8d5834f5ae675ab154131426d4ad2e9749262fa15ff8421c9
-MISC ChangeLog 1046 SHA256 e00529f6ef45f36f8d921727cb4fc16519c87c88846562fd3e4491f72493a075 SHA512 a0c0ca31e4546b82a41af56aa7537d56b0e299e45d13a5ec556fb68c2d5cffdd0737c8a96fdb0b57086da3a1ff6164853ba9e29c8b34729d446360e2880a56b7 WHIRLPOOL 8c92bb63baf4cc64e1ea9a1dd555096594b36c7dc521bff05e3abd20d1191350316497f4bafe70455b7dbedaf9785411afcc3a246a7e2b10069648261bf061db
-MISC metadata.xml 438 SHA256 8e370d849a6baeb52fc2d92273d54a2ebf9b5a131f6c46a9fcfeffeb681dae89 SHA512 50774792abb5a400d3ba88b38bcc45b0d22eddeab791acb2f73dbb4d91f1d0be1913adf6c49cc56083f2adfeb0f17a60e573f3e8b3cec961bc8cfc18866c1c83 WHIRLPOOL 65d5b7f8f4caa4956ed60c4849db12d9b0a1b8ac2924020cfaa368533ba0e4cae591e8ab4e513cfad034ecce8552917231745df8177dbbd5deed27e4604b7e6f
+EBUILD 0ad-0.0.17_alpha.ebuild 3590 SHA256 027f1190006ae19af59759a36daa1efddb9d361acecdb8ab3625b9069f7ae080 SHA512 7215fdded8230058692524f79dba007e63dcd6856c63a0be1da0851d885ead40bfe1bf7bd77bef73c650c52cc2d6ecaa95e7e6ca3e77b026d95e452340c90fc1 WHIRLPOOL a619fa656305f73afdbca2d72496ff5b46cfd84d1e183477d37a83977152f48adcb06f251d703b1677d7537c52a7c8be920daed48f1bc69c8dab33a02580366c
+MISC ChangeLog 1237 SHA256 2b82c4707befa63cd067c788de7d7c4fbd7a25127f7bf5c26154333fcde75608 SHA512 fc8cc3ff7f823948018b740b1af8371bf43ec036158db3cea5ed1fbbb40385e85e65dc0df771e3f601c22d45525d1c4f1c75ce0bea029e179a0db7db2886b83a WHIRLPOOL d62c1334b70579ad31da0ee2c94f9737d66eb73403d0484dfee87b20d27b221a0c1e27c58de5a1497591a24b91b28b512da27fdc3c28da26f8a6c1e1357f3752
+MISC metadata.xml 592 SHA256 bb8b2eeec6efa9a63c57a93b67eb021ea81eb0b3115017ae5a9f439bd57765fd SHA512 6946826c579b4c47087a6c4987e8a56278b8f4e18f311e40bf7073062a80792868000f15eb3e19e196307f290be89f47a4f3915a98adca98115628b967e0b716 WHIRLPOOL e72dd1cbaa8938d29404650e02155e1158f911937bc4a6d6aec82f4f54d3cf4b17bb73626c29cb5d3371ff4c48762c713e1a3981b2d54590139156fbfcd6e75c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUE12OAAoJEJS/30SErRQvS6kP/iBcyInCQAmIbIL+qPYaWdep
-dXrueTqUqbOplE5vYkIoaP5r6whuw59EXwCyoc1qfu1IKCS18sGxT8+zVK83YyXY
-2H7ZpV5CdJpHN+i4lJ/crf+7EgGCp/2i0PXPKEEtW9Sbgy3QhR/5RL1DaX4o8uRM
-kYfGWUNXKImE+AXi+dDwh7Tt6yVVvatW7fvWBFivNReXPF1ME0OFZvswTfBqYOdE
-Wb81wPDnQD9WhTXESEAFiegbKZON5vA4patjHsW3PS9j+BWDqR0u9/UooipwSOQe
-to/G89chRD+WvSKOw2+qHaGja2t9HsZ5SSZJ4vR1Ew6hGvRTtGlNoc1XZ59tNLVW
-7Znx5xdGa+Z3ee182qghfJXkHHTraKfe0VE0R4S4Fwaush54GiMNg7knTywUhbHU
-swleNcxBFOBptbmGyW6VOHRnip6tI11KbXG36mrsWYSwhAoP714MAiikqwns5nm8
-DOdI93aHZ5e99HrdXW1ta3iB7bA2MzQa5bukCgl+5vWQ7wCw7+a84Cj7i7qRi3R9
-bP1mlw7n7Yi0LX/6lzdLCjK/FF036vm5lEes2oy2tq4HIBLPXlCvWYGz/j+s4/Th
-KS9qgz6yqkGKBZHvC5lyD/pwVFS4vHuHIO9G5tuEPTu48LbSE/2heG2Qpu4pmeGn
-UhLxNg4g2iBiZGhYkupl
-=SFiv
+iQJ8BAEBCABmBQJUOwNKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgFWEP/iklR4gZclibkz8JWQr5oTb3
+XsS5Akf9ArbQrrLeF86tNYnyub9iTLqr9yg8yiYTIaoZE0CpODemK+BbuAxQ82Q3
+Or+ssnaix/nZ40ns1zp9yz1iozq5tiQdNtDLF2KH4xJpzLOlNVdmwYyFCISb0KfG
+s+yZ+SjyA0GuvMAFbYrKxwJzeqM66T0y+byS/nRH8aeRigsOehmcqUAb72n0N8am
+ssNTYF5rohCow9jPzEs5ab8N8i8eMdhGBh4PMrv7G2lr5ELw21T64PP6k8p9OZ/k
+ONngQxcU17DO5u7CRXRfo57EUkjtea4Lpwn8eN7oitug74EbmM9voiMSUoOjO0Zo
+2mpqBBzaWJKbY6oVieZX60TkWg4Ivs/T9jYevy88kOvapBmfUT83dsKdE0ZaIFlI
+hjp9ZmDpN9RhK+84YOAoDwl4lOhEz5V7AaqRqY4WwCroNUiCP39a544KrigXWlKh
+w6Vdiw7fvVQzk0sXuY4a4oqmi6YDk87wBNxN6EpHnaXq7uxrJcAHBvtb2dVV0sxj
+PV1+Ew4sSyL5VyeNinuT+QEu5fs7MhNcwfezSZy7VnB4IJqHoh+U/8fgA278/bCm
+IHIzLPpCbsjNrlPc38tVwf+B+ANrask6/cRFmOZJAr6R5KpbnDbBM6Ktt30WN/6/
+vCaEjguVLiXgYCnlWPrp
+=SJeJ
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/0ad/files/0ad-0.0.17_alpha-gentoo.patch b/games-strategy/0ad/files/0ad-0.0.17_alpha-gentoo.patch
new file mode 100644
index 000000000000..45233ab16066
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.17_alpha-gentoo.patch
@@ -0,0 +1,100 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Jun 24 18:32:38 UTC 2012
+Subject: build system
+
+respect flags
+let stripping be handled by the system
+
+fix minimal-flags option:
+	leave -fvisibility=hidden active
+	leave conditional -fpc-preprocess active
+
+--- build/premake/premake4.lua
++++ build/premake/premake4.lua
+@@ -177,7 +177,7 @@
+ 
+ function project_set_build_flags()
+ 
+-	flags { "Symbols", "NoEditAndContinue" }
++	flags { "NoEditAndContinue" }
+ 	if cc ~= "icc" and (os.is("windows") or not _OPTIONS["minimal-flags"]) then
+ 		-- adds the -Wall compiler flag
+ 		flags { "ExtraWarnings" } -- this causes far too many warnings/remarks on ICC
+@@ -366,13 +366,11 @@
+ 			end
+ 		end
+ 
+-		if not _OPTIONS["minimal-flags"] then
+-			buildoptions {
+-				-- Hide symbols in dynamic shared objects by default, for efficiency and for equivalence with
+-				-- Windows - they should be exported explicitly with __attribute__ ((visibility ("default")))
+-				"-fvisibility=hidden"
+-			}
+-		end
++		buildoptions {
++			-- Hide symbols in dynamic shared objects by default, for efficiency and for equivalence with
++			-- Windows - they should be exported explicitly with __attribute__ ((visibility ("default")))
++			"-fvisibility=hidden"
++		}
+ 
+ 		if _OPTIONS["bindir"] then
+ 			defines { "INSTALLED_BINDIR=" .. _OPTIONS["bindir"] }
+--- libraries/source/fcollada/src/Makefile
++++ libraries/source/fcollada/src/Makefile
+@@ -9,9 +9,9 @@
+ 
+ CXX ?= g++
+ CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
+-CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
+-CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL
+-CXXFLAGS_TEST := -O0 -g -D_DEBUG
++CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
++CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
++CXXFLAGS_TEST := -D_DEBUG
+ LIBS += `pkg-config libxml-2.0 --libs`
+ INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
+ INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)
+--- build/premake/premake4/src/tools/gcc.lua
++++ build/premake/premake4/src/tools/gcc.lua
+@@ -136,8 +136,6 @@
+ 		if not cfg.flags.Symbols then
+ 			if cfg.system == "macosx" then
+ 				table.insert(result, "-Wl,-x")
+-			else
+-				table.insert(result, "-s")
+ 			end
+ 		end
+ 	
+--- build/premake/premake4/build/gmake.unix/Premake4.make
++++ build/premake/premake4/build/gmake.unix/Premake4.make
+@@ -26,9 +26,9 @@
+   DEFINES   += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+   INCLUDES  += -I../../src/host/lua-5.1.4/src
+   CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
+-  CFLAGS    += $(CPPFLAGS) -Wall -Os
+-  CXXFLAGS  += $(CPPFLAGS) -Wall -Os
+-  LDFLAGS   += -s -rdynamic
++  CFLAGS    += $(CPPFLAGS) -Wall
++  CXXFLAGS  += $(CPPFLAGS) -Wall
++  LDFLAGS   += -rdynamic
+   LIBS      += -lm -ldl 
+   RESFLAGS  += $(DEFINES) $(INCLUDES) 
+   LDDEPS    += 
+@@ -48,8 +48,8 @@
+   DEFINES   += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+   INCLUDES  += -I../../src/host/lua-5.1.4/src
+   CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
+-  CFLAGS    += $(CPPFLAGS) -Wall -g
+-  CXXFLAGS  += $(CPPFLAGS) -Wall -g
++  CFLAGS    += $(CPPFLAGS) -Wall
++  CXXFLAGS  += $(CPPFLAGS) -Wall
+   LDFLAGS   += -rdynamic
+   LIBS      += -lm -ldl 
+   RESFLAGS  += $(DEFINES) $(INCLUDES) 
+@@ -302,4 +302,4 @@
+ 	$(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<"

+ 

+ -include $(OBJECTS:%.o=%.d)

+--include $(GCH:%.h.gch=%.h.d)
+\ No newline at end of file
++-include $(GCH:%.h.gch=%.h.d)
diff --git a/games-strategy/0ad/metadata.xml b/games-strategy/0ad/metadata.xml
index 8c007dca14af..57a9e35a794f 100644
--- a/games-strategy/0ad/metadata.xml
+++ b/games-strategy/0ad/metadata.xml
@@ -10,5 +10,8 @@
 		<flag name="editor">Include Atlas scenario editor projects</flag>
 		<flag name="lobby">Enable the use of <pkg>net-libs/gloox</pkg>
 			and the multiplayer lobby</flag>
+		<flag name="nvtt">Support for some uncompressed data formats
+			via <pkg>media-gfx/nvidia-texture-tools</pkg>
+			(might be needed for some mods)</flag>
 	</use>
 </pkgmetadata>