Fix build as per Bug #481678

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

4 files changed, 40 insertions, 21 deletions

diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog
index 5be5f415a3ae..365a95036ef3 100644
--- a/games-strategy/ufo-ai/ChangeLog
+++ b/games-strategy/ufo-ai/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/ufo-ai
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.43 2014/09/09 11:50:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.44 2014/10/22 06:45:48 tupone Exp $
+
+  22 Oct 2014; Alfredo Tupone <tupone@gentoo.org> ufo-ai-2.4.ebuild,
+  +files/ufo-ai-2.4-anon.patch:
+  Fix build as per Bug #481678 by Torsten Kaiser
 
   09 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
   files/ufo-ai-2.4-mathlib.patch:
diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest
index bc69b641cf60..b1ee2856e2ae 100644
--- a/games-strategy/ufo-ai/Manifest
+++ b/games-strategy/ufo-ai/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ufo-ai-2.4-anon.patch 731 SHA256 45564b6d8b6638d230ee92e2f971b43ee2d276decb0950946f8b7d650dd1d568 SHA512 252d3cfe1ad2dc947433e316505b5cbdacd663d3465aa5ffaaeb1ba2a641b2a8a01ef91f503fa335c2642f0fc0342abf159fbc13640802d02d7aabdbbb40883c WHIRLPOOL 0cf699a23058ea5fcf27f6ebcea55b74ff4631c81d59d92131b611536af1b9e23070829c91986f6fbf9eb4111fc8f271ecc6e19ce4721cbbc38489e95f1ed433
 AUX ufo-ai-2.4-locale.patch 744 SHA256 edf333eea46aaea2a43529d4d323d2b317a9376c39e5952a2b92d7bf25fe110b SHA512 94ae4710bfed572abe7dd4b6238ddb4e240c55250e608d63fc1c8ccf67567927721a0f09234ae7a018fe38e4f5a0bc47745b483e5073d5a4da3816d99853746d WHIRLPOOL 13b655d127c34353c1cd73e5b4e62dc9267892f0288b39aef4c28b1c0d8bbe163b60a1d232c4a1912fe8e52404799d47cb1f1a9dd82d95754140db31583129da
 AUX ufo-ai-2.4-mathlib.patch 1852 SHA256 4de46ec51a00b3e68a270dc18a67605663b0de372164f9e08fc182e87f8f45e3 SHA512 3b086458e94ea9a7f1efd4ecb7d96a5b44e326f0d59916476595bf328c1e66250241124a74921302a9e139eeb61fd7b2a860fd972bbbc5664157bf60a2196b02 WHIRLPOOL 1821dff2538794997a22109258a949d8a7ca1589ee52c1efdefa8581f1582a64d938a37154f454496bfc9a1f86c684031b78ff61678f5d8c0885e647fc401dd9
 DIST 1maps.pk3 242016 SHA256 8cdb8c231c0ba98900d97012b62c5cef72ab5710fe3f087e534496a66f7b0e4e SHA512 9615b365e590dceb82362e7cd683980e15401a3b5a2b359a33c7ed2a4c51e5328efb352618cc48f46971a2ced1717276b5270ca6bf6d2bc7fc2b2238030eb3ae WHIRLPOOL 8e798ffeaa83609114fd239ea8f379ee54fa6038735a09bd3abe3076073e92b44e7fa867c893d597577da462b4e583fb0a2bba7cd2014a9f4b4bb8ef04b377e6
 DIST ufoai-2.4-data.tar 937062400 SHA256 6bb322fc0362781d07439799de32c677884cef7c96fcf17dd87c62cc108030b7 SHA512 471eab2f62cad144fe9966317d48c408fba19de0c33cf7414918b502c723b722af38a025f808848698d9a06ffc10fb0faac145dd01dcd3d321547c87da1c6246 WHIRLPOOL 139251bdbd76f86cb38175eb9c14149ea0cab6bbcb04e2dba7351cdb5b0e21bdfd231e350c0af4f52379d0c5bee91f0512422a7eb9f6339eb6a07170d64fec0c
 DIST ufoai-2.4-source.tar.bz2 16875353 SHA256 254a61b770f141374d57e5c2589048be9298d0a920e914c6e72c2b98255bb94f SHA512 3f9d0df7392f50c201464c81e42435f860df97d5d7a2ef53bb9a05d2b2fc645a1130baaf16fc34818b88bb07b8cf83283f7479d685cbd3caf80ea7522e13c56f WHIRLPOOL 0e68149ab2b3eeffb7134e65cc29de9cecf60dc89c965958a0d669c2d22462d05b89b0a81a3225ebbd7e47015fc63697cbad365136706f4853f9c1e690b0667d
-EBUILD ufo-ai-2.4.ebuild 2883 SHA256 3cf34d552e9a4e007c897da4517f4ef56c7ad5c73d69beaf5e6c4ebba0bf2275 SHA512 c3193c0cf2fd17e3c7885be278c709955ba4bc5682404c7022cd8df12129198a3285c0cb2252e8747564bdcb1f0ce58a2fe9c3c5b37d82648ef2f049b60f82b7 WHIRLPOOL 1a4cd5b16ab1215cbfb39a5c81dd55096bb28af166dc71ae4a75eb61873fcd38663405bfd4f391f7cd9dbbc853adb61e53db1d19460248fa732975a761ae22cd
-MISC ChangeLog 6313 SHA256 8e993c130a3f3317fa04321dcba1ac06b4f9b8719d9dcbdc32a26d93337a45d8 SHA512 1e0c238cd503a7b0f1d88119756c421a5246f2971be147e5fffcb4724cbd327df8d259ed8a6c07345a88024ea654af569809d762d1ec7c2baee47d90199c83b6 WHIRLPOOL 6040c0a73f2d0cd2ca7ab531230b21beece5f8870a79a4ffa4e7b860d6a08965b8a124774e2858e3b93f846bcca9052fe6016eab040710927f3cc04fb9f088ca
+EBUILD ufo-ai-2.4.ebuild 2851 SHA256 11f60f23a047e39ae23caff4e7b81300699291299674bb0eafd7d422f2189768 SHA512 fd3a2abdf697055028df1babd9b93193566e4786e8b6d86c9961c2a7fd8a9776a6837952904413cb1804a07c12ee3f59733f5408564004ac716565130a1e5959 WHIRLPOOL d2ea772d535232e94ed5f74262fe1d0385adbc771d18abeb181c2b01064104fea2635a846ccd8aa2ee7f0ee46a580e988740f3ff849db306f7d7221ef136d895
+MISC ChangeLog 6461 SHA256 97174dbc4b120660ecfcd6e747e346c624568b6c5c216ccc546e5f435c21a45c SHA512 f8f8b273871e6273a53e7b8f182b2dd54d5a571a922a7d8256082383202131d438fdb4a1eec5e27ca594032fda5d65755a0e441b2e86850912b7582632f61577 WHIRLPOOL 51e41f20fe73ed2a59ef1a660f1b6b684d133785d45f1722f7520546c8163c67f38e2b46a97885a3fd24d3863344cc146fbda6f26ddf12df8f8e019fa9cad062
 MISC metadata.xml 219 SHA256 266385ce0470b911b2b3ca5fe6b237ad5dfc2d480533be5453537328a08cb2eb SHA512 367f0880f9a5e9db1df03545ad02d88b38b0c72ede5315f0dce19d9c4aa5fe93cc50b1870ee441f662a4b7d899c52d44910c8eefa24b81b6fa49d1dcc3c66d1c WHIRLPOOL 730328333f19c2e720cf4c1cd9f5ed7ffca92602cf91fff0105f9eb3a5ed1bfcf0b0cea6b3a09b24a84e1c0ccb814b77009b7f4d23026ce58babbc1195ff552e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUDuikAAoJEEdUh39IaPFN13gH/iO1F2ZCAjC2MmMbfgKfp0Oe
-OifOiAyRN/u9V0zh0HBMk3utA+rmauhvb065NZCSKjCBAS3462dJgLv2Jt6dHTVW
-Xek4hz12SzkF+PkYSMlmyHOedQNREgDm4U0RNrWi4eZ2RTDH6HJf7mBjYae7fAv6
-DB04HfTSUTntzrhWWzC3wXJLXqWKEmejwNAcC+9YCkuwgurIP7vbR9jF8+SFVj4r
-E8ZWLBvxOWZEuRKuKgmJUSG4NTv92WBJDSmH1bo+jHP2ofgw9jHR/axZJjkB4jMv
-XhBssObydc4JFbU48L9s47e2yFinOUf31ydBplbgAk+e7N5mxXP9Qtw5pqVKajA=
-=scoi
+iEYEAREIAAYFAlRHUqEACgkQIY77eQFFFC1p1QCg2YUYf2mn3nWBDST8R74RJExm
+Zv4An04V9zRhoVsVcGKosj9Qp3VgBmv8
+=ZxlS
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch b/games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch
new file mode 100644
index 000000000000..53f07261bb7e
--- /dev/null
+++ b/games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch
@@ -0,0 +1,17 @@
+--- src/tools/radiant/radiant/camera/CameraSettings.h.old	2014-10-22 08:30:35.690248415 +0200
++++ src/tools/radiant/radiant/camera/CameraSettings.h	2014-10-22 08:31:12.329900302 +0200
+@@ -16,13 +16,13 @@
+ const std::string RKEY_ENABLE_FARCLIP = "user/ui/camera/enableCubicClipping";
+ const std::string RKEY_DRAWMODE = "user/ui/camera/drawMode";
+ const std::string RKEY_SOLID_SELECTION_BOXES = "user/ui/xyview/solidSelectionBoxes";
++}
+ 
+ enum CameraDrawMode
+ {
+ 	drawWire, drawSolid, drawTexture
+ };
+ 
+-}
+ /* greebo: This is the home of all the camera settings. As this class derives
+  * from a RegistryKeyObserver, it can be connected to the according registry keys
+  * and gets notified if any of the observed keys are changed.*/
diff --git a/games-strategy/ufo-ai/ufo-ai-2.4.ebuild b/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
index 12ba09fb526f..f2e38d26177e 100644
--- a/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
+++ b/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.4.ebuild,v 1.5 2014/05/10 05:40:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.4.ebuild,v 1.6 2014/10/22 06:45:48 tupone Exp $
 
-EAPI=3
+EAPI=5
 inherit eutils flag-o-matic games
 
 MY_P=${P/o-a/oa}
@@ -56,6 +56,7 @@ src_prepare() {
 
 	epatch \
 		"${FILESDIR}"/${P}-mathlib.patch \
+		"${FILESDIR}"/${P}-anon.patch \
 		"${FILESDIR}"/${P}-locale.patch
 
 	cp "${DISTDIR}"/1maps.pk3 "${WORKDIR}"/base/ || die
@@ -81,35 +82,35 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die
-	emake lang || die
+	emake
+	emake lang
 
 	if use editor; then
-		emake uforadiant || die
+		emake uforadiant
 	fi
 }
 
 src_install() {
-	newicon src/ports/linux/ufo.png ${PN}.png || die
-	dobin ufoded || die
+	newicon src/ports/linux/ufo.png ${PN}.png
+	dobin ufoded
 	make_desktop_entry ufoded "UFO: Alien Invasion Server" ${PN}
 	if ! use dedicated; then
-		dobin ufo || die
+		dobin ufo
 		make_desktop_entry ufo "UFO: Alien Invasion" ${PN}
 	fi
 
 	if use editor; then
-		dobin ufo2map ufomodel || die
+		dobin ufo2map ufomodel
 	fi
 
 	# install data
 	insinto "${GAMES_DATADIR}"/${PN/-}
-	doins -r base || die
+	doins -r base
 	rm -rf "${ED}/${GAMES_DATADIR}/${PN/-}/base/game.so"
 	dogameslib base/game.so
 
 	# move translations where they belong
-	dodir "${GAMES_DATADIR_BASE}/locale" || die
+	dodir "${GAMES_DATADIR_BASE}/locale"
 	mv "${ED}/${GAMES_DATADIR}/${PN/-}/base/i18n/"* \
 		"${ED}/${GAMES_DATADIR_BASE}/locale/" || die
 	rm -rf "${ED}/${GAMES_DATADIR}/${PN/-}/base/i18n/" || die