restrict broken tests wrt #511006, add lobby USE flag, rm obsolete fam USE flag, install ActorEditor binary for +editor

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

4 files changed, 35 insertions, 21 deletions

diff --git a/games-strategy/0ad/0ad-0.0.16_alpha.ebuild b/games-strategy/0ad/0ad-0.0.16_alpha-r1.ebuild
index 36d2b5c68baf..76043c9de79d 100644
--- a/games-strategy/0ad/0ad-0.0.16_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.16_alpha-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.16_alpha.ebuild,v 1.1 2014/05/21 18:09:13 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/0ad/0ad-0.0.16_alpha-r1.ebuild,v 1.1 2014/05/22 12:06:23 hasufell Exp $
 
 EAPI=5
 
@@ -16,7 +16,8 @@ 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 fam pch sound test"
+IUSE="editor +lobby pch sound test"
+RESTRICT="test"
 
 RDEPEND="
 	dev-lang/spidermonkey:24
@@ -29,7 +30,6 @@ RDEPEND="
 	media-libs/libsdl[X,opengl,video]
 	net-libs/enet:1.3
 	net-libs/miniupnpc
-	net-libs/gloox
 	net-misc/curl
 	sys-libs/zlib
 	virtual/jpeg
@@ -37,6 +37,7 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXcursor
 	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( net-libs/gloox )
 	sound? ( media-libs/libogg
 		media-libs/libvorbis
 		media-libs/openal )"
@@ -61,6 +62,7 @@ src_configure() {
 		$(usex test "" "--without-tests")
 		$(usex sound "" "--without-audio")
 		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
 		--collada
 		--bindir="${GAMES_BINDIR}"
 		--libdir="$(games_get_libdir)"/${PN}
@@ -104,6 +106,7 @@ src_test() {
 
 src_install() {
 	dogamesbin binaries/system/pyrogenesis
+	use editor && dogamesbin binaries/system/ActorEditor
 
 	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r binaries/data/l10n
@@ -115,6 +118,8 @@ src_install() {
 	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
diff --git a/games-strategy/0ad/ChangeLog b/games-strategy/0ad/ChangeLog
index a7e9f120e004..cfaa91c56b18 100644
--- a/games-strategy/0ad/ChangeLog
+++ b/games-strategy/0ad/ChangeLog
@@ -1,6 +1,13 @@
 # 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.1 2014/05/21 18:09:13 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/0ad/ChangeLog,v 1.2 2014/05/22 12:06:23 hasufell Exp $
+
+*0ad-0.0.16_alpha-r1 (22 May 2014)
+
+  22 May 2014; Julian Ospald <hasufell@gentoo.org> -0ad-0.0.16_alpha.ebuild,
+  +0ad-0.0.16_alpha-r1.ebuild, metadata.xml:
+  restrict broken tests wrt #511006, add lobby USE flag, rm obsolete fam USE
+  flag, install ActorEditor binary for +editor
 
 *0ad-0.0.16_alpha (21 May 2014)
 
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 8e3fa2715fc5..260c9d58f990 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -3,25 +3,25 @@ Hash: SHA256
 
 AUX 0ad-0.0.16_alpha-gentoo.patch 3176 SHA256 0631ab138fc937380b3c565a8aabe00c7b339ed6d1eef74a3e661aa277f7cd9b SHA512 8f1e5798257f814a4140f818fe30278ee2301c0130a79a46dbc3360b5cfe91db0a32dc62ed4fcb1db18962cb3a8a2b061553aaa2d70efb18806a76d32d745306 WHIRLPOOL 452351a0b43286e77cdd2b6f82730795a57f141fc56ea2fcc00f76e87d8a8a8af5288cdaf7d1149f74d74a4d15787f67cf5d88cd9f3631c815502718d3fa1e71
 DIST 0ad-0.0.16-alpha-unix-build.tar.xz 20019680 SHA256 cb965ef7e292bc3a2f1f598a9695e16ff4d786398f384a1ec7d5f9bfe2626de5 SHA512 9fe3440233d9827895b91ade1873afe977d62386a5dd6042d8169b153d576b462381bfc97e637f0b183aff034236380ca6d552ea2755cf08398143ad67121031 WHIRLPOOL 0e2f1ac9799a4b4d4588c2370a78195f2cc415fb2043be815ed2a2f9f179ccd856c405e7c0323f2033d3a6a4d63c08d8d5c8a05b50769ae3b9219717218edef6
-EBUILD 0ad-0.0.16_alpha.ebuild 3223 SHA256 6c6a18d323a90e4af59269997e9ab572f64866954c8d545d177a80813dec9393 SHA512 078966014d8fcd3d453bbbe52b152a0c073c2c3a26efeda4e1aa36dc210a64968bd447cd9b91359072c1c23438ad19b855d26fe14a4e01f8021aa92d869ab15c WHIRLPOOL 4e52f7fd86d1119ab30e49ac359bf6e5491a97377deaf2d03b8ef4e897fc51ee92042a0427909f3ea9e8b28d1c1d6a8ea98706f6fd43448945e24e2ca019c1fb
-MISC ChangeLog 406 SHA256 d5ce749f1f60b1761b0d74e5b798260ba134b923f780f93e3ec24a1ea535f87c SHA512 3aa7b5153fa6f0ab88e6fab80596c783f5135afbda0ab5004b9ad14c2b6c38ea1a405e9cf064219f02512b629c8dd6e2ddbba8478fc773fcdeb7a3c05fdf7642 WHIRLPOOL 19e972956d403464ed149ab2be16a7e0daee373577f238a8b7caae4f027d473f4d5b739dc8b80652782faeb32d565236f789725cbfaa13cc5e87d50fc3e63b63
-MISC metadata.xml 337 SHA256 843518014b94cce560bb06b3aade8251427bd47f1d6ac724cc4185e8b0cb06f5 SHA512 1293447cda760f098035b1bb9509d0f8e79fcfd7ddc9fe49d680393fdffef147615442f71848cfe9bef8f06313a996fec10ba39fbb4314ff701b874583be94ed WHIRLPOOL 6fc73b10515f0817c9f3f2570c76f77e117d6a2b0d74dfc29000858183bea82ae6f56a79efb30c5237cfec0967af83217b1f5c3c311bba75197084aa4670986c
+EBUILD 0ad-0.0.16_alpha-r1.ebuild 3431 SHA256 7403976e2ae5c60a2c10cbe0c4a30814e5e3710d5bf50b2c4bb35c12af4b7b9f SHA512 9d8aa7e8180e2c48260125ac7c404e8ad65be923884d06e94d60594f4ef57e6c5b7661ea2f260b3bc8dfcfa94f62bd8b67f365a18a739a8d01c6df891bc705ba WHIRLPOOL 90f6248860e2131ca6dfe61c807cbdead1131be99f79768f7c854b71c4f46fad4b733221ba4ca9afdf6479dcbfcbfb4221a51e326d92652be645fcc059be899e
+MISC ChangeLog 689 SHA256 33bd26b4389703c94cb4751505ae3c188d4a81db029887d819533147cde7a75d SHA512 0a20b7c4f3cb18a67452d317279f1e7d3479744257250c87b4a9a3d1b7fdf70e56f0eb2f3a37ae8872f844cfd8c4fd498965de2f84ee7f2e2f48dad391be344e WHIRLPOOL 82903369d92253a6749561e8dbd930f4a4c8a051d4d5c0c3048456442faab20278c071afe04d39a32f723be12e96025e799afab0b499241ea7588cbc47c42774
+MISC metadata.xml 438 SHA256 8e370d849a6baeb52fc2d92273d54a2ebf9b5a131f6c46a9fcfeffeb681dae89 SHA512 50774792abb5a400d3ba88b38bcc45b0d22eddeab791acb2f73dbb4d91f1d0be1913adf6c49cc56083f2adfeb0f17a60e573f3e8b3cec961bc8cfc18866c1c83 WHIRLPOOL 65d5b7f8f4caa4956ed60c4849db12d9b0a1b8ac2924020cfaa368533ba0e4cae591e8ab4e513cfad034ecce8552917231745df8177dbbd5deed27e4604b7e6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTfOvIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTfehCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg69IP/2YKVb34deo9sWWu4LH5k5GU
-MCLtRIHWWQO/Ek5ZWryfKqTtPnB0slhuzXJFqcWEI+3eyFg2I493lGCC9vyf+v/2
-KJhx3f/AzrvmGIkEzxFNxBbXc/hlAViCoI3Wj4TLw+mL7L6+JPd6HCLbruYjK2xk
-VtWlb+oPceVHy39Xc9KmBdHsbzfhSCD17xlcrdEnFyaW+3n6U0tAc4EfVWeJPCjD
-lkL7zaXepoMvLECpN2aGX8QzqgXdEV3y3PCY8X4JM+0x1CETAC9YUv170WJr5jAB
-i0OqhCLm9666tSe/da9QKcCx/xqnR2zaZfgmGgWj1ukNgULOAat4wvqfWr0eawAz
-UfMI5fUZbPzgCnE5I0SJdm2g9PJIuIshnAOFq2AZX0VwxcN+7oDsg8JYK26aOSv2
-VxKTBFg5GuN4QtEw1+3e0OHwYzfZRf4hRMwsu9cS3KdLOrNDI1F+E/W8e/jFZkiL
-svMsbYyeZ1uRf+HKgQqPSA7H5DCxX32FdKJ7/HeTOnOEskZXAJ1STLv7N7pSLiax
-wW6VbF/TWb6GXa2CWnNvZTtBszYOHvj2fG6ZiUQTgKBmfbyu0nOBOXPbR0FMC9Hr
-i1PxPtnbalaXyZeH4idMgkoKt2VdKaZOZUR6rM4LdHNq5oKpynfzQzVxrLAAwCJQ
-jNh1Kl+CjCmFiP3tzbGg
-=Naoq
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgmQ0QAJdGRebPRp7QKZsFnsScFOmf
+SdZ47+qXzIVbVa8EVFwr51CD6CvAUEo6pIFhcetbxIalROSXOzbEbQ+JM3+tGU8B
+qHs3cxtE6d8e8IzeSDBmCFK4HyB63Ne9Ja8tPjR5ErT+VIuQ0K2QBAOtlWADTQ9Y
+2hBJ1sKlu+j6ZVceK6oHT8YvM6e+FrpJiqP/FOuciI9nL5G7IW9ZSLi2v9pg4/fs
+uaTLk3ORSvfadHp/XgccSVc+nZ3EG+lh+GoGdCnxeOLQWcY25lh5XoThTN+BYEVq
+MKNbJdpnYyZo/Ix6Jy2QBuIp3gsuksY7zwwiFNP5kwmvUd3ndv99NXOdyIFe0216
+8S/lr7xcPe4tewG3BsPa/LYabxGuSv0J46gzNR0W9aYoKc8vvGXYbnh/u3Rsjct0
+JVC2JXs9BSpQv6XDAZ+lLEvvVzQ3BtjMz53Q5EP1OAA8Q7oS1CNexi5HEPHOtiJf
+yyhQjlT3yW2D30WUuzEJwAMmayChm3Fq6T2qklubgkSJGPrk4AGccVonZY73v3z4
+6Zr6ZbAyLFxvZ6LquaMXUs5vjfocExdYckxyFVu1R/1PycMLvRvVN5hpGpKdW+a2
+2z0eHEle1xy41b+6OHY2l2308RuiGDDGQ9KGlZfw3eBRwum1XfOioAiawmHEWkEu
+LlXda90hM4+YhXlColZk
+=HZQ4
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/0ad/metadata.xml b/games-strategy/0ad/metadata.xml
index 14504b9a6f39..8c007dca14af 100644
--- a/games-strategy/0ad/metadata.xml
+++ b/games-strategy/0ad/metadata.xml
@@ -8,5 +8,7 @@
 	</maintainer>
 	<use>
 		<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>
 	</use>
 </pkgmetadata>