From ec1a0f1b704a8a187a719d72d4be44fcf912e82f Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Tue, 11 May 2010 10:06:15 +0000 Subject: [PATCH] Fix parallel make. Bug #316845 Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- games-arcade/koules/ChangeLog | 5 ++++- games-arcade/koules/Manifest | 4 ++-- games-arcade/koules/koules-1.4-r2.ebuild | 18 +++++++++++++----- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/games-arcade/koules/ChangeLog b/games-arcade/koules/ChangeLog index 7a7c53c5a81b..dc14a3afe670 100644 --- a/games-arcade/koules/ChangeLog +++ b/games-arcade/koules/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-arcade/koules # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/koules/ChangeLog,v 1.16 2010/01/04 16:16:00 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/koules/ChangeLog,v 1.17 2010/05/11 10:06:15 tupone Exp $ + + 11 May 2010; Tupone Alfredo koules-1.4-r2.ebuild: + Fix parallel make. Bug #316845 by flameeyes@gentoo.org 04 Jan 2010; Tupone Alfredo koules-1.4-r2.ebuild, +files/koules-1.4-io_h.patch: diff --git a/games-arcade/koules/Manifest b/games-arcade/koules/Manifest index a01819da948c..768501b62eda 100644 --- a/games-arcade/koules/Manifest +++ b/games-arcade/koules/Manifest @@ -2,6 +2,6 @@ AUX koules-1.4-io_h.patch 423 RMD160 828252ce2b9a84f8db54754dd0c8e4901db8ffc3 SH AUX koules-1.4-sndsrv.patch 1033 RMD160 e511dfa0149059f4eb72ee500131e67d60342489 SHA1 981bb676f4f8888fd5dda6a673f6f65f113731a7 SHA256 44e45510029579af5363f08f31787c5fd2548fda23a7627ec852e4e06585aae9 DIST koules-1.4-gcc3.patch.bz2 5635 RMD160 cf2751890aff57cc87fa241137e832a0d158ab6d SHA1 338e3da351e593fd015b72a777b6d60215b42fe9 SHA256 adf7b6b6353b024088a90b5b80b00a10813a624d2d1a4f63ecebad613ca591d4 DIST koules1.4-src.tar.gz 315386 RMD160 d43eb5cf68abad12d4d8a16789cda43f307b2fe7 SHA1 bfd6ece4452b067b0b0f9a9a7085cf43b88f0ef9 SHA256 c36f93feafeebd59983bf44100240e67a84a8bacabd7ee528c93046defe4a21b -EBUILD koules-1.4-r2.ebuild 2649 RMD160 6cb28b1716d624a6aabeab6fa52f46f972d13fc5 SHA1 d9f32b550b563915d26630dab06893746ff9850f SHA256 3034121e72f9a392fb06d2070c2f80b53ecd64541d0da64c0ba82270fb0817a0 -MISC ChangeLog 2236 RMD160 7b7e6c8b15408b3fe921be68aa082c8ea4ac2537 SHA1 b00254d91d90147a9b3eff41783b047f1b2260b4 SHA256 082cab147bf9530787ac602da81c459b12f166ba29e03916eba5f006ca377577 +EBUILD koules-1.4-r2.ebuild 2769 RMD160 8793622cf2801db2d7588b5c2c944b80606b6b04 SHA1 c88d37980e6aa4802d247b38f511e7239b36b39b SHA256 ed453ebe2f37348b62ff1ff87cd17ca688203fd1a96c12006b5f21cd6753c7fe +MISC ChangeLog 2366 RMD160 579d178ce8eeaacefef6ac8df21551b97ea89e29 SHA1 d296eaa11ab2e856501ed84fe7e2be276ff6c255 SHA256 87e1b02c4406da4264c8a66880da59a3f932e022f039d91a5958e35bfa1fce0d MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-arcade/koules/koules-1.4-r2.ebuild b/games-arcade/koules/koules-1.4-r2.ebuild index 0b2304243469..c0cf7efd53c0 100644 --- a/games-arcade/koules/koules-1.4-r2.ebuild +++ b/games-arcade/koules/koules-1.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/koules/koules-1.4-r2.ebuild,v 1.6 2010/01/04 16:16:00 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/koules/koules-1.4-r2.ebuild,v 1.7 2010/05/11 10:06:15 tupone Exp $ EAPI=2 inherit eutils games @@ -70,15 +70,23 @@ src_prepare() { ln -s xkoules.6 xkoules._man } -src_compile() { - mkdir bins +src_configure() { if ! use svga ; then xmkmf -a sed -i \ -e '/SYSDEFS =/d' \ - -e "/^ *CFLAGS =/s:$: ${CFLAGS}:" Makefile \ - || die "sed Makefile failed" + -e "/^ *CFLAGS =/s:$: ${CFLAGS}:" \ + -e "/xkoules/s:^all:all1:" \ + Makefile \ + || die "sed Makefile failed" + fi +} + +src_compile() { + mkdir bins + if ! use svga ; then emake || die "emake X failed" + emake all1 || die "emake X failed" mv xkoules bins/ fi if use svga ; then -- 2.26.2