respect CC/CXX, make build log verbose, fix dedicated useflag wrt #477658

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 57 insertions, 15 deletions

diff --git a/games-action/teeworlds/ChangeLog b/games-action/teeworlds/ChangeLog
index fd5acf371eb5..859a9b48aa71 100644
--- a/games-action/teeworlds/ChangeLog
+++ b/games-action/teeworlds/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-action/teeworlds
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/ChangeLog,v 1.11 2013/09/05 18:37:31 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/ChangeLog,v 1.12 2013/09/08 12:32:29 hasufell Exp $
+
+*teeworlds-0.6.2-r1 (08 Sep 2013)
+
+  08 Sep 2013; Julian Ospald <hasufell@gentoo.org>
+  +files/0.6.2/04-dedicated.patch, +files/0.6.2/05-cc-cflags.patch,
+  -teeworlds-0.6.2.ebuild, +teeworlds-0.6.2-r1.ebuild:
+  respect CC/CXX, make build log verbose, fix dedicated useflag wrt #477658
 
 *teeworlds-0.6.2 (05 Sep 2013)
 
diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
index 8c434a46a1ac..adac8b2a57a1 100644
--- a/games-action/teeworlds/Manifest
+++ b/games-action/teeworlds/Manifest
@@ -7,23 +7,25 @@ AUX 0.6.1/03-use-system-pnglite.patch 3935 SHA256 e035cb3074de6c8bc95c7e8486baa5
 AUX 0.6.2/01-use-system-wavpack.patch 3182 SHA256 266ebb1e36bbcb9ef3008a53bc9fb1e726fd4c53d00107022759789ff70b0b76 SHA512 2210a018c3917b78109e31b3fa51a292c5c3714371880d2b9ce10de4cde999f014ff44555fa657fed78d961dbada2511601b3aa8e9356eb34de187f24b16dbad WHIRLPOOL 85faa33f93e8994cf5c0321ac0d9376b994f865a781b25bd98f08b9bb53d6789cb4d1da1ade1b1dfb4f5136f40113a1ca4ce8a76bb65d3b8127f253c176bcabb
 AUX 0.6.2/02-fixed-wavpack-sound-loading.patch 2916 SHA256 5f75a6dd06bd69d90bc53e69ff714d1a469ae50a566e64dbbf926493b603692b SHA512 9cada7356b588a220dba4a0c104a28738969c7755c80f9e9f10c4bf1f57ae1b6ea64c084aa012410de135fed0267e0e7ab8375137f2f16aba2d81c0441de2e8a WHIRLPOOL a7e13d2b8aec541bd3f8677edd31b0c2bde5c91bc7722a87285403efd01c4d1fff0757770c607b401ef9107980b2891e0783a95905987a8bf8bea04d684db22a
 AUX 0.6.2/03-use-system-pnglite.patch 5703 SHA256 3fb1df74e020704d0a4cd1849f2955ce753be9d2ac614a4a325b986529a95e85 SHA512 c069fc15de002b9e3f01bf9a36e40396aa62158bec1bb70a2dae6fbbace07299c298854319f80141d26e34b49dd270b9478383c55eb4b7e8873aedd323eb412b WHIRLPOOL 6cf80cef92040a0c952bac59ae3e4673693d4ab1c5d1ec82137cab0a79dac88c8fbf0f38825062984b9f3ba99ac295a1bc2bf4acce6e80c39865afc0596eec9d
+AUX 0.6.2/04-dedicated.patch 491 SHA256 2dcf3a886a5e22c308b041463d3e40ac1e6047f93c5022028ba915b0598e45ed SHA512 c292b638e58e69fcf6b273617fc43cc4c8d96ffe4c75ad7911c1b319a129de6c01255f988569a0532b8e6c29f775ececc679274f7f85c6a9933bf713620ab8fb WHIRLPOOL cd224d0f8897749c3bbca245ef93b5ddb2ba42cd743fbe3e4ce6a745ea08e25da7bd0419780a0fd153b76bd3654240ffe6ca69446607ce6ccd3d980a3677856e
+AUX 0.6.2/05-cc-cflags.patch 482 SHA256 ab634107cb694cf1030e3311c3c0bbc1c4bdc723a8840bb3656b56532479bb69 SHA512 92b74845413c20cf4626cb89b8b825bc5cb2f25e9af1d61d2ecabbda3acf024ee0c5e03abf8de2b57d6a8c739a8cf343fcb109a3a72d4baa016711e53368d0f8 WHIRLPOOL f38b40006b8978b82731cf2d422f9af98206057a493c49698138a7b75255306cf13a325803d6c40f4e551385a7a7d1a0a206e260ff623ecf0416ae6697da297e
 AUX teeworlds-init.d 999 SHA256 8f60b3b2f68d9cfdb279ffbaefd2a6c611d74ce87fc306faaa438dc61732ca3b SHA512 a61b52a649764fc908c14cabfec3525393c9aba699475ec2f27a1d16265fc6e627f3f3adbe9bdf9303a28791c6e42be48f74083ed69435f742849ec24a82d27e WHIRLPOOL 883d2ef2d42fb499cd68ccf3f795b8630a66ace7a0eec0ab81e571989981adef44a0bed57e8cc610bc4d5cb6867474d9f8539205ca8227ba516a4ae5e5238eeb
 AUX teeworlds.xpm 2785 SHA256 0b31cc3e65ca26676324a7b66de29cb91df90221e28f9e4b5adfec0e37729284 SHA512 f8a8a1c3a5675f12b13ddaf9b68bc2757698725d406356c871d58e62f735413b5f4f0bcb3dbf783e0aa6b3ecb0ec7f9eddbcef044506a6a07a374fe46d2616c0 WHIRLPOOL f7f70bf612b4d69bacc68b29c9ffd2fa194755285b389523df30ff53e190df821595dbc9381049c6a9443950b30fa3caa946445d336e86113d05ec195f8eff22
 AUX teeworlds_srv.cfg 193 SHA256 9c00eca2c72d02893c288282793b81abb472ee0a7302847e472e964179339687 SHA512 d9a55f749f6974caddf96438eb38e490e0e507fbe07ebdac070fe91ab46eed93afb5dd6300a5b7a86b6282c6b97fdd178a00720483c3e71490be816b8c6a73b5 WHIRLPOOL 93726bef063d4d280f9058d3698c4f76492e2705d1f0c5506400c391fdb3c0feeb99374fbe814c0b3735e41f6d4a77f80b90baa206f1bac7dad6c740e115b6a2
 DIST teeworlds-0.6.1-source.tar.gz 8599538 SHA256 6328d48fb98d451af8e1dba0999190496e851842c84e4594d413b79aca67b908 SHA512 861df9b148571960d99140196d1bd5175a5d28c0c96cf44371aab79d1c4febfc0a79fe2b3791958b54b07d8e8d0cde051eed21d47ee53fb7446a99511f16bc08 WHIRLPOOL 189b86adbeaae0323b0f9e9ec23a130a1ec612869f23f95492d4733d2529b4bf587f0b44cc37ee639b11fcb40145187473be197080a4423749d17fc2b9a38295
 DIST teeworlds-0.6.2-source.tar.gz 9179568 SHA256 00061b30377597a61810eda3dc5de0caad439ca851cb8eebbe4152e4f861e2af SHA512 e08db7a8eabe2f04c543ecf1abc2f51b513a06812581cf8c396fc8bd7e038ce09c46f73bfea80e295affded96c511ef74d47a14dd03fd0aac05487a46f380839 WHIRLPOOL 4656378b51d3b06b268f228370d0ef8db03920a476652ebab6af37839636c91380c40c7ffc721fcdb2519b14b76ee848e40add01fb016cdd399bcd50d9e6bbf4
 EBUILD teeworlds-0.6.1.ebuild 2530 SHA256 50d0d61d24087828e3b1636067477602c910e591f8d158b211587b6e64d3aa75 SHA512 0b06dd7c3b209f4289ce92685f229348ff16a286c778a43492b1142064887e960b2273de682eed14076268046d469ed2c6e69f2dba2b2dea9902f85d4a6b34cc WHIRLPOOL 5a8859bcc48da87f1b6fdd2b10dd11cab77ebf70d1fd213e0a5331ebbbdcafdace0a5857ef13f27f942ec57b2f70e88f9d72026469c0cc4505415090a335696b
-EBUILD teeworlds-0.6.2.ebuild 2526 SHA256 ce97e366ce73085d3164129604acbbedde2ec23a3955158793ec74d3c4be05b2 SHA512 3307c144ee296fa50f3d3233b34b3985d005b72f9576c2e1c23f8fbb9a96f89cf30ff23a3afd33c3f4e6fb0bbbb6152c0fa99d13f5052dacfb6b3f887a1eab71 WHIRLPOOL 9a771e32470a0bbfffc4b9cce9de350b5350f946efce9fed44aa48d06d67c4122e2783ddf2a8d8dfc3a34a7247963380c3bcceee94f05e37e246e7d954cfbfce
-MISC ChangeLog 2566 SHA256 b62579fdff22fb0fb5897ed77264a844fda6910ca1529e05cb8bd7a43b0c182d SHA512 1ecc3c73b72a5dbdc64a0ed672f22a97ee97e1eace86c0faaec4892f82de8cb5cb6cccc7121a73c186773af87555d3d843cc61510bfd88ca9b9a7bc9c830836f WHIRLPOOL 140f1262891e61236db994ae6376430be54cea8278fa718caab3902f1a69d1c2fb94c6dbb0601c233752b1b80c6e91463a58700ea5992e238f85a00ed52df68a
+EBUILD teeworlds-0.6.2-r1.ebuild 2548 SHA256 73bd4eb1c5efe475d42b2abf5c4fa8a21e445787a8fb31a081608d0da972ee1a SHA512 6f44c025d05c3ea664300f975cbce4fe40db939d60a63f593da202a47d0f69b59e4b16fb85da5fa293c9ec8c0e6650ed530a99ac6bead7206992c119f1321dfe WHIRLPOOL 36be713aba18d69b8a25255972b6caee28476a8a5af67920edeb11ffd0553c02307ac20b7f39f44a992e508595ccb2c4091be00283138402b48b6211300385f0
+MISC ChangeLog 2852 SHA256 9c70cb522107254dbcf58e0bcae14724738008955979d12fbe23b8d0947a9761 SHA512 8d1ef803ae38fd929eac15803998cd7460fa245f8dd92e01b9bfadf3d911a661bda51f22fbaf0e56fa92d7b3ab81c1bb16e6a5968168bd1dea83bc220ef49788 WHIRLPOOL ec761fb4f22ca38b8ec477ad88224ca1dcfc59d1d64e0b6621b4c6c814f9573965ee69f1932b76094d69826a85a49e27e9a5292af71c00903ae6ade1e053e998
 MISC metadata.xml 160 SHA256 03e34b6506e114bf8eee720498f15d09a5344e83b766a45c59ee7ea1d633b38b SHA512 80110e2b6ef0090c930e59a08f8fc233483a32660cc6017b0ce74d9a6fb56ff8b45f2548d68af5773f7f2d746bd1a910c8c6b9ab369f8e1ffcee5bd5741a6c63 WHIRLPOOL fb75ede00e701e3ce31b5f7638062b35fdf47e0cc59eca112c82273c366a4b2aa9ad4063812373713212617a73127c75daa1c545655e8021fd96322ad2aed809
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSKM9tAAoJEFpvPKfnPDWzCBYH/2iBtNzNVRmzk2FQPWknngij
-uVkQ/5rDLbGEXLw/5ah/ewYfKGulRzI31gH1LvfSenx39Mf9AaDYbQybiqRP5OK/
-abVWbfMCjq+qcvTwHAS3JLxYN9u7VO8nt1qHe2fJGPBmGlvZe063siNjP/OGpLEP
-AcM3TRY3yenOPzgJ/rj6e/751Ri+nUB/0a1DFGALnJtq+XAxylV0Ekp9Ev1fA2Jo
-i/X6FYX6+v4du2/Uib585PVlNoQTLyoPB3E2PFdxIPM2akcJP+20f24ptt1sRg3Z
-P7rhkklHupdkl2No/K5EIJ3pzOO7RJrCS+onKiKd45TbSriZ9fXBKugs1ig+kcc=
-=RWnC
+iQEcBAEBCAAGBQJSLG5iAAoJEFpvPKfnPDWzlhEH/0uoD3lDlWb6Yru8CzCmpAgz
+yJPiktQzRrU7jSfsYnZk1/xZ/9sCkopRhBYc7FAfLuhTZvc2eVaqx4lSzuDkATtP
+Kwb/KM11VhDVuO/43K4X7ffgFKyh4CPmLdCqzt80N+iA/0GaurTCSoSOMsfCfEbg
+543eXUEIxpEt7C1GZ/AXhTdsjjNIa93msL+4U8euPJdOj/tnDWRfiNrRaR/335WR
+WeGu3/cGjGN2I7TytdCAf0j8D18xcSIiTT6y6ogV9yTsGdpbyf5GLVtCA2vygzNE
+z2pflf3sPbJ42v17nP/LCwalXRfI8F67IAh42iDGME/mWSRvZmpNZiXgrjCwEPA=
+=Mh4L
 -----END PGP SIGNATURE-----
diff --git a/games-action/teeworlds/files/0.6.2/04-dedicated.patch b/games-action/teeworlds/files/0.6.2/04-dedicated.patch
new file mode 100644
index 000000000000..fc61b71283b6
--- /dev/null
+++ b/games-action/teeworlds/files/0.6.2/04-dedicated.patch
@@ -0,0 +1,15 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Sep  8 11:05:26 UTC 2013
+Subject: fix DATADIR detection for minimal setups
+
+--- a/src/engine/shared/storage.cpp
++++ b/src/engine/shared/storage.cpp
+@@ -208,7 +208,7 @@
+ 			for (i = 0; i < DirsCount; i++)
+ 			{
+ 				char aBuf[128];
+-				str_format(aBuf, sizeof(aBuf), "%s/mapres", aDirs[i]);
++				str_format(aBuf, sizeof(aBuf), "%s/maps", aDirs[i]);
+ 				if(fs_is_dir(aBuf))
+ 				{
+ 					str_copy(m_aDatadir, aDirs[i], sizeof(m_aDatadir));
diff --git a/games-action/teeworlds/files/0.6.2/05-cc-cflags.patch b/games-action/teeworlds/files/0.6.2/05-cc-cflags.patch
new file mode 100644
index 000000000000..dec6b8d306fc
--- /dev/null
+++ b/games-action/teeworlds/files/0.6.2/05-cc-cflags.patch
@@ -0,0 +1,18 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Sep  8 12:25:19 UTC 2013
+Subject: respect our gentoo settings
+
+	this has to be at this place or later
+	otherwise some of our settings would be overwritten
+
+--- a/bam.lua
++++ b/bam.lua
+@@ -168,6 +168,8 @@
+ 	-- set some platform specific settings
+ 	settings.cc.includes:Add("src")
+ 
++	dofile("gentoo.lua") addSettings(settings)
++
+ 	if family == "unix" then
+ 		if platform == "macosx" then
+ 			settings.link.frameworks:Add("Carbon")
diff --git a/games-action/teeworlds/teeworlds-0.6.2.ebuild b/games-action/teeworlds/teeworlds-0.6.2-r1.ebuild
index cf415f1b7768..535226135f55 100644
--- a/games-action/teeworlds/teeworlds-0.6.2.ebuild
+++ b/games-action/teeworlds/teeworlds-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/teeworlds-0.6.2.ebuild,v 1.1 2013/09/05 18:37:31 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/teeworlds-0.6.2-r1.ebuild,v 1.1 2013/09/08 12:32:29 hasufell Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -59,12 +59,12 @@ src_prepare() {
 	__EOF__
 
 	sed -i \
-		-e '/^function build(settings)/a dofile("gentoo.lua") addSettings(settings)' \
-		bam.lua || die
+		-e "s#/usr/share/games/teeworlds/data#${GAMES_DATADIR}/${PN}/data#" \
+		src/engine/shared/storage.cpp || die
 }
 
 src_configure() {
-	bam config || die
+	bam -v config || die
 }
 
 src_compile() {
@@ -83,7 +83,7 @@ src_compile() {
 		fi
 	fi
 
-	bam -a -j $(makeopts_jobs) ${myopt} || die
+	bam -v -a -j $(makeopts_jobs) ${myopt} || die
 }
 
 src_install() {