add parallel-build patch from Alec Moskvin (bug #335148)

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 38 insertions, 27 deletions

diff --git a/games-action/teeworlds/ChangeLog b/games-action/teeworlds/ChangeLog
index 380a2d7e0f06..1f5d576181b0 100644
--- a/games-action/teeworlds/ChangeLog
+++ b/games-action/teeworlds/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/teeworlds
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/ChangeLog,v 1.6 2012/03/27 15:16:11 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/ChangeLog,v 1.7 2012/04/18 21:43:33 mr_bones_ Exp $
+
+  18 Apr 2012; Michael Sterrett <mr_bones_@gentoo.org> teeworlds-0.6.1.ebuild:
+  add parallel-build patch from Alec Moskvin (bug #335148)
 
 *teeworlds-0.6.1 (27 Mar 2012)
 
diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
index dafcc4a5daf3..43c71923f3e6 100644
--- a/games-action/teeworlds/Manifest
+++ b/games-action/teeworlds/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.6.1/01-use-system-wavpack.patch 3063 RMD160 b660e44cc888d606bfbe3e43a5c0e3a5cd7d065a SHA1 13596a8da27de3c1713b9519566b91e3ff9238ae SHA256 2475275f1dd8264cb9e880bfccca13951a9bcdfbee24c4c9953e830cdf6a5180
 AUX 0.6.1/02-fixed-wavpack-sound-loading.patch 2905 RMD160 cd090c942e755a36fc2ce661deb00995fece1f84 SHA1 66c03ce5f9755e0525d5da9c4c8c3b02b6ab0126 SHA256 4da6873dff90d89ea786daa1f9d67e38cd7038860eb45e655401d94c692e25cf
 AUX 0.6.1/03-use-system-pnglite.patch 3935 RMD160 a060bb0ecb92727a160fe62bab1880c14ad37666 SHA1 8f3584bd8e462cd13f318d33b50bef9442773b00 SHA256 e035cb3074de6c8bc95c7e8486baa51fd2c85b10f2f8badbeb91253cb6721415
@@ -13,13 +10,6 @@ AUX teeworlds_srv.cfg 193 RMD160 256e8dee12d3f6bf4653bbe52443f9277c39425e SHA1 0
 DIST teeworlds-0.5.2-src.tar.gz 6393472 RMD160 12b3384b3059d5ec0ebb437686f613f8d9430e61 SHA1 26d8059b1ad81ca6959b96fd3ff881f9db7550ef SHA256 1811a71bf9a1470c7a69308035744492f3e850aefdd12f1bc223fb85d98cf4c0
 DIST teeworlds-0.6.1-source.tar.gz 8599538 RMD160 38ea0148ce9caf296403774b8b395df462e564ea SHA1 27f74db7c035143c7b539acc7aab7fb825b972ab SHA256 6328d48fb98d451af8e1dba0999190496e851842c84e4594d413b79aca67b908
 EBUILD teeworlds-0.5.2.ebuild 2389 RMD160 c11b14424b34682d2a25fa061a08cb321b0a02dd SHA1 b5de3d8ccf765a617dd9c8c158f213c7fa3ed780 SHA256 55a315dcc02532fa9d525ec66497674edb84e901938e1559f11d55483bf7de5e
-EBUILD teeworlds-0.6.1.ebuild 2155 RMD160 6de1641a2f15dfae334f0e7e4b4e79778eb885a9 SHA1 9e229c324ff5221f425ea458dd277c4281b3e290 SHA256 95e75f8bc8f0d6511a0da53cb5be30ad38551af412980c937eefa7a4b11af479
-MISC ChangeLog 1706 RMD160 35205cf0ea0a3fd31766d35406ca398c28c9b158 SHA1 23afecfb1f3d98134fa042d1432c59fe5d70dbea SHA256 9eede659780057101ab244f6eee31fda533a6fd9dccdaefd3a540106b0d45d4e
+EBUILD teeworlds-0.6.1.ebuild 2653 RMD160 39d5cae7b10c49cc0184032a8dc36473f2b89d78 SHA1 dd7e40436383945a703a89bdd718a72a99d363a2 SHA256 c801c3090362f35ce5a4cf26f0e641098e11bd6aea0ac7333ec5e8e4990272c7
+MISC ChangeLog 1848 RMD160 fd00701456cd6e6d7ecf6817bd9541de4b3a176f SHA1 2b15c7f8df4914a802817565ab9354be78793083 SHA256 b33e18d10aae744c0142f9e9429553e93bb9d2dace4dfbbe9b6f1a5f8fda6214
 MISC metadata.xml 309 RMD160 77d06e39802ded0077343efe4e113a4fc23cbe0d SHA1 479fb96f2b7ad915bee07e5f46e407908bd678d7 SHA256 483d678f443d433b99a05dca001e83ae6f3d9128c2d6236196ec972386ef337a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk9x2cEACgkQIY77eQFFFC2wswCePbCraIthArW5w/zOwilFeQ8+
-9X8AniNgl5btuZVvSK2yeu7n6adjKDyB
-=xUTQ
------END PGP SIGNATURE-----
diff --git a/games-action/teeworlds/teeworlds-0.6.1.ebuild b/games-action/teeworlds/teeworlds-0.6.1.ebuild
index 985a5b92eab0..042a3219f646 100644
--- a/games-action/teeworlds/teeworlds-0.6.1.ebuild
+++ b/games-action/teeworlds/teeworlds-0.6.1.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/teeworlds-0.6.1.ebuild,v 1.1 2012/03/27 15:16:11 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/teeworlds-0.6.1.ebuild,v 1.2 2012/04/18 21:43:33 mr_bones_ Exp $
 
 EAPI=3
-
 PYTHON_DEPEND="2"
-
-inherit eutils python games
+inherit eutils python toolchain-funcs games
 
 REVISION="b177-r50edfd37"
 
@@ -43,10 +41,27 @@ src_prepare() {
 	# 01 & 02 from pull request: https://github.com/oy/teeworlds/pull/493
 	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
 		epatch
+
+	cat <<- __EOF__ > "${S}/gentoo.lua"
+		function addSettings(settings)
+			print("Adding Gentoo settings")
+			settings.optimize = 0
+			settings.cc.exe_c = "$(tc-getCC)"
+			settings.cc.exe_cxx = "$(tc-getCXX)"
+			settings.cc.flags_c:Add("${CFLAGS}")
+			settings.cc.flags_cxx:Add("${CXXFLAGS}")
+			settings.link.exe = "$(tc-getCXX)"
+			settings.link.flags:Add("${LDFLAGS}")
+		end
+	__EOF__
+
+	sed -i \
+		-e '/^function build(settings)/a dofile("gentoo.lua") addSettings(settings)' \
+		bam.lua || die
 }
 
 src_configure() {
-	bam config || die "bam config failed"
+	bam config || die
 }
 
 src_compile() {
@@ -65,36 +80,39 @@ src_compile() {
 		fi
 	fi
 
-	bam ${myopt} || die "bam failed"
+	# Taken from the libreoffice-3.5.2.2 ebuild
+	local jobs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
+
+	bam -a -j ${jobs} ${myopt} || die
 }
 
 src_install() {
 	if use debug; then
-		newgamesbin ${PN}_srv_d ${PN}_srv || die "newgamesbin failed"
+		newgamesbin ${PN}_srv_d ${PN}_srv || die
 	else
-		dogamesbin ${PN}_srv || die "dogamesbin failed"
+		dogamesbin ${PN}_srv || die
 	fi
 	if ! use dedicated; then
 		if use debug; then
-			newgamesbin ${PN}_d ${PN} || die "newgamesbin failed"
+			newgamesbin ${PN}_d ${PN} || die
 		else
-			dogamesbin ${PN} || die "dogamesbin failed"
+			dogamesbin ${PN} || die
 		fi
 
-		doicon "${FILESDIR}"/${PN}.xpm || die "doicon failed"
+		doicon "${FILESDIR}"/${PN}.xpm || die
 		make_desktop_entry ${PN} Teeworlds
 
 		insinto "${GAMES_DATADIR}"/${PN}/data
-		doins -r data/* || die "doins failed"
+		doins -r data/* || die
 	else
 		insinto "${GAMES_DATADIR}"/${PN}/data/maps
-		doins -r data/maps/* || die "doins failed"
+		doins -r data/maps/* || die
 	fi
 	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
 	insinto "/etc/${PN}"
 	doins "${FILESDIR}"/teeworlds_srv.cfg
 
-	dodoc readme.txt || die "dodoc failed"
+	dodoc readme.txt || die
 
 	prepgamesdirs
 }