From: Tristan Heaven Date: Wed, 7 Mar 2007 16:47:16 +0000 (+0000) Subject: Don't use MAKEOPTS with scons X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cfeebe8a6989f8ae7386e41736a98c1074129410;p=gentoo.git Don't use MAKEOPTS with scons Package-Manager: portage-2.1.2.1 --- diff --git a/games-board/pouetchess/ChangeLog b/games-board/pouetchess/ChangeLog index 755a7aa2cf58..f335e9e8bf30 100644 --- a/games-board/pouetchess/ChangeLog +++ b/games-board/pouetchess/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-board/pouetchess -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/pouetchess/ChangeLog,v 1.3 2006/12/01 20:58:52 wolf31o2 Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-board/pouetchess/ChangeLog,v 1.4 2007/03/07 16:47:16 nyhm Exp $ + + 07 Mar 2007; Tristan Heaven + files/pouetchess-0.2.0-sconstruct-sandbox.patch, pouetchess-0.2.0.ebuild: + Don't use MAKEOPTS with scons 01 Dec 2006; Chris Gianelloni pouetchess-0.2.0.ebuild: diff --git a/games-board/pouetchess/Manifest b/games-board/pouetchess/Manifest index 45b219a326ab..25a1b230deee 100644 --- a/games-board/pouetchess/Manifest +++ b/games-board/pouetchess/Manifest @@ -5,19 +5,19 @@ AUX pouetchess-0.2.0-nvidia_glext.patch 373 RMD160 34d53944251ea3b6363ba0a4a4a5c MD5 65d18a3d457e64f6168ed2975cfa4b00 files/pouetchess-0.2.0-nvidia_glext.patch 373 RMD160 34d53944251ea3b6363ba0a4a4a5cd7a831ffe93 files/pouetchess-0.2.0-nvidia_glext.patch 373 SHA256 d0466dee4b11efab347409e7e83fffac5ea9c6b1350b660c01b20a0107564a4b files/pouetchess-0.2.0-nvidia_glext.patch 373 -AUX pouetchess-0.2.0-sconstruct-sandbox.patch 307 RMD160 96d132fcaa5ece5e342980d0b53763e1475c5814 SHA1 6371efafc3c9b069dbde52083bb40534672c058b SHA256 54906095519371346b590316227ca3017473d0ca0c2f17b57c86fc1bbc880fbf -MD5 e9e3e8c496dc915249531cfcdb30e870 files/pouetchess-0.2.0-sconstruct-sandbox.patch 307 -RMD160 96d132fcaa5ece5e342980d0b53763e1475c5814 files/pouetchess-0.2.0-sconstruct-sandbox.patch 307 -SHA256 54906095519371346b590316227ca3017473d0ca0c2f17b57c86fc1bbc880fbf files/pouetchess-0.2.0-sconstruct-sandbox.patch 307 +AUX pouetchess-0.2.0-sconstruct-sandbox.patch 737 RMD160 f87cd2751ec05b88fdded2c016ef09757ffa4505 SHA1 bd68f2f45ca6813818b2258e3cf09c3c6a851152 SHA256 5fe18c0cdd21a0a1a6fe34e4cac9b1a0acf62e59dca2f2bd712044268979a86e +MD5 f1396240dcbf1346bbc7d57cc51a3d66 files/pouetchess-0.2.0-sconstruct-sandbox.patch 737 +RMD160 f87cd2751ec05b88fdded2c016ef09757ffa4505 files/pouetchess-0.2.0-sconstruct-sandbox.patch 737 +SHA256 5fe18c0cdd21a0a1a6fe34e4cac9b1a0acf62e59dca2f2bd712044268979a86e files/pouetchess-0.2.0-sconstruct-sandbox.patch 737 DIST pouetchess_src_0.2.0.tar.gz 1055338 RMD160 29611b78ef75b3707ad98752055da775335c0490 SHA1 023bea8043b5dcf8a134531b920497c7efb89adb SHA256 fe966ff1b0aa2dd6d0ca2b62692f5b788e3a286050a6a374e58ca0612f68b2ef -EBUILD pouetchess-0.2.0.ebuild 1994 RMD160 164a3e987b3a6cd386ad1a1ead3dbd457a39e752 SHA1 284a5ad19b5d6a704f8960f5bf95df2cf7e80dab SHA256 7c88b2cf66a364228df278899b8910c4a1ee0c2dbf20806028cac2015d847075 -MD5 1b41d554cfedd6f41c56cbe0f544f265 pouetchess-0.2.0.ebuild 1994 -RMD160 164a3e987b3a6cd386ad1a1ead3dbd457a39e752 pouetchess-0.2.0.ebuild 1994 -SHA256 7c88b2cf66a364228df278899b8910c4a1ee0c2dbf20806028cac2015d847075 pouetchess-0.2.0.ebuild 1994 -MISC ChangeLog 944 RMD160 bf47a69e5f1852c1243521ce3afe3c62761d00a1 SHA1 649a57d993f0a784c0aaab36022e6061015f0266 SHA256 2ecf83a23f6b1bfb26f65df7a06d93baaff077e5c5f2fc2003994209ff5a8ea5 -MD5 b1ceb802a80978b6107673affff891eb ChangeLog 944 -RMD160 bf47a69e5f1852c1243521ce3afe3c62761d00a1 ChangeLog 944 -SHA256 2ecf83a23f6b1bfb26f65df7a06d93baaff077e5c5f2fc2003994209ff5a8ea5 ChangeLog 944 +EBUILD pouetchess-0.2.0.ebuild 1697 RMD160 39b3e5daf5a3134b15a9efc40a07224e9ff3d43c SHA1 efdedfbad9578927519e49da04d1142c964434ec SHA256 9593d79b2ced13e0b6ecacbba1f2ab5c9fccec62bdf76e54543548e1f6f2db77 +MD5 283f770b32c0507f294c393a9bf06377 pouetchess-0.2.0.ebuild 1697 +RMD160 39b3e5daf5a3134b15a9efc40a07224e9ff3d43c pouetchess-0.2.0.ebuild 1697 +SHA256 9593d79b2ced13e0b6ecacbba1f2ab5c9fccec62bdf76e54543548e1f6f2db77 pouetchess-0.2.0.ebuild 1697 +MISC ChangeLog 1097 RMD160 177dca8e142f289e97aac0bb6564e8fd420dff21 SHA1 7b374d8fb29797c34a93d3d36a23672630b7b101 SHA256 6536b30d86829546f662e9b6fb66f5863d9512acf7ec999e270ba584228b768f +MD5 1d3a421f609c74677f64d22dfbe5222f ChangeLog 1097 +RMD160 177dca8e142f289e97aac0bb6564e8fd420dff21 ChangeLog 1097 +SHA256 6536b30d86829546f662e9b6fb66f5863d9512acf7ec999e270ba584228b768f ChangeLog 1097 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -26,9 +26,9 @@ MD5 7eadcc6fa4e9f41e6368827f20cef2e6 files/digest-pouetchess-0.2.0 265 RMD160 e825bbeb7f491e368fabe13571d8fe089b9834f3 files/digest-pouetchess-0.2.0 265 SHA256 702f567d5b88e40b6fa2a4769319aaad242f3eb11283dfd03c094de78d64c110 files/digest-pouetchess-0.2.0 265 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD4DBQFFcJeTkT4lNIS36YERAgbhAJiNUhmG288GDWu7tUQ9HQA9Q+pTAJ4mAaiS -IK47IZ3wjlsbnqMaUh3Kaw== -=boUh +iD8DBQFF7uyadz7hIScOURERAnxyAKCNULWghQbm8QYZuUzWRcTcMEjkgACgyOtf +meTBmd9zfWPWe7StVgoVf+c= +=sUzI -----END PGP SIGNATURE----- diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch b/games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch index 99149b7f6a7f..c33c9164787c 100644 --- a/games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch +++ b/games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch @@ -1,11 +1,30 @@ ---- SConstruct 2006-05-27 03:44:34.000000000 +0200 -+++ SConstruct 2006-06-01 13:12:54.000000000 +0200 -@@ -28,6 +28,8 @@ +--- SConstruct ++++ SConstruct +@@ -22,14 +22,25 @@ + + + +-import os,glob ++import os,glob,SCons.Util + + ++# http://dev.gentoo.org/~vapier/scons-blows.txt # create build environment -+env = Environment() -+env.SConsignFile() env = Environment(tools = ['default', 'pouetChess'], toolpath = ['.']) - env.AppendUnique(CXXFLAGS = ['-Wall']) +-env.AppendUnique(CXXFLAGS = ['-Wall']) ++env.SConsignFile() ++ ++env['CC'] = os.environ['CC'] ++env['CXX'] = os.environ['CXX'] ++ ++if os.environ.has_key('CFLAGS'): ++ env['CCFLAGS'] = SCons.Util.CLVar(os.environ['CFLAGS']) ++if os.environ.has_key('CXXFLAGS'): ++ env['CXXFLAGS'] = SCons.Util.CLVar(os.environ['CXXFLAGS']) ++if os.environ.has_key('LDFLAGS'): ++ env['LINKFLAGS'] = SCons.Util.CLVar(os.environ['LDFLAGS']) + # gather a list of source files + SOURCES = glob.glob('src/*.cpp') diff --git a/games-board/pouetchess/pouetchess-0.2.0.ebuild b/games-board/pouetchess/pouetchess-0.2.0.ebuild index 54dd7284d163..0a10b7507776 100644 --- a/games-board/pouetchess/pouetchess-0.2.0.ebuild +++ b/games-board/pouetchess/pouetchess-0.2.0.ebuild @@ -1,27 +1,22 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/pouetchess/pouetchess-0.2.0.ebuild,v 1.2 2006/12/01 20:58:52 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/pouetchess/pouetchess-0.2.0.ebuild,v 1.3 2007/03/07 16:47:16 nyhm Exp $ -inherit eutils games +inherit eutils toolchain-funcs games MY_PN=${PN/c/C} DESCRIPTION="3D and open source chess game" HOMEPAGE="http://pouetchess.sourceforge.net/" -SRC_URI="mirror://sourceforge/pouetchess/${PN}_src_${PV}.tar.gz" +SRC_URI="mirror://sourceforge/${PN}/${PN}_src_${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc x86" IUSE="debug" -RDEPEND=">=media-libs/libsdl-1.2.8 +RDEPEND="media-libs/libsdl media-libs/sdl-image - virtual/opengl - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext" - + virtual/opengl" DEPEND="${RDEPEND} dev-util/scons" @@ -39,9 +34,6 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}" - # modify SConstruct file like seen on - # http://permalink.gmane.org/gmane.comp.audio.csound.devel/6646 - # Fix up nvidia headers epatch \ "${FILESDIR}"/${P}-sconstruct-sandbox.patch \ "${FILESDIR}"/${P}-nvidia_glext.patch @@ -51,30 +43,29 @@ src_unpack() { -e "s:sdlver.split('.') >= \['1','2','8'\]:sdlver.split('.') >= [1,2,8]:" \ pouetChess.py \ || die "sed failed" - sed -i \ - -e "/strip/d" \ - SConstruct \ - || die "sed failed" } src_compile() { - local myconf="prefix=${GAMES_PREFIX} datadir=${GAMES_DATADIR}/${PN}" - use debug && myconf="${myconf} debug=1 strip=false" - - scons configure ${myconf} || die "scons configure failed" - scons ${MAKEOPTS} || die "scons make failed" + tc-export CC CXX + scons configure \ + strip=false \ + prefix="${GAMES_PREFIX}" \ + datadir="${GAMES_DATADIR}"/${PN} \ + $(use debug && echo debug=1) \ + || die "scons configure failed" + scons || die "scons failed" } src_install() { - dogamesbin bin/"${MY_PN}" || die "dogamesbin failed" + dogamesbin bin/${MY_PN} || die "dogamesbin failed" - insinto "${GAMES_DATADIR}/${PN}" - doins -r data/* || die "installing data failed" + insinto "${GAMES_DATADIR}"/${PN} + doins -r data/* || die "doins failed" dodoc ChangeLog README doicon data/icons/${MY_PN}.png - make_desktop_entry ${MY_PN} "pouetChess" ${MY_PN}.png "KDE;Qt;Game;BoardGame" + make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN}.png "KDE;Qt;Game;BoardGame" prepgamesdirs }