diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-11-19 23:08:31 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-11-19 23:08:31 +0000 |
| commit | 57d2e4eceec4977e373cb34e00916283743e3a88 (patch) | |
| tree | 44e765db162c3db64aa1ee30b59ea88d3a818280 /games-strategy | |
| parent | Version bump with bugfixes and translation updates. Stop compiling tests and ... (diff) | |
| download | historical-57d2e4eceec4977e373cb34e00916283743e3a88.tar.gz historical-57d2e4eceec4977e373cb34e00916283743e3a88.tar.bz2 historical-57d2e4eceec4977e373cb34e00916283743e3a88.zip | |
use scons-utils; honor CXX
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/glob2/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/glob2/Manifest | 5 | ||||
| -rw-r--r-- | games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch | 26 | ||||
| -rw-r--r-- | games-strategy/glob2/glob2-0.9.4.4.ebuild | 20 |
4 files changed, 40 insertions, 17 deletions
diff --git a/games-strategy/glob2/ChangeLog b/games-strategy/glob2/ChangeLog index ff3b2968de64..710a9cda22a3 100644 --- a/games-strategy/glob2/ChangeLog +++ b/games-strategy/glob2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/glob2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.52 2010/09/11 20:37:55 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.53 2010/11/19 23:08:31 mr_bones_ Exp $ + + 19 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org> glob2-0.9.4.4.ebuild, + +files/glob2-0.9.4.4-scons-blows.patch: + use scons-utils; honor CXX 11 Sep 2010; Michael Sterrett <mr_bones_@gentoo.org> glob2-0.9.4.4.ebuild: update sdl-image dep for bug #336791 diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest index 5a72030be8fa..e6fcb6c47d62 100644 --- a/games-strategy/glob2/Manifest +++ b/games-strategy/glob2/Manifest @@ -1,5 +1,6 @@ AUX glob2-0.9.4.4-gcc44.patch 256 RMD160 75b0d67440f043255dc26aa361a9c98b41b2a31b SHA1 35ed41922dddc42194341e07a6a4605b2715f102 SHA256 053cf0dc887340c9ded2e012e7e9dd87763fe5a6e4134e61baa791d6e8e6494c +AUX glob2-0.9.4.4-scons-blows.patch 975 RMD160 42404a8054029b7ea7f189700caed11ab9bb1d85 SHA1 9081e1ba7b68e42d3cadf5f7ad57bffc6129ceac SHA256 9e9146dd8e7ee3f23c9ebbd2c3cf3d16cf4b271c75cb6cd16a9161759e6fd45b DIST glob2-0.9.4.4.tar.gz 11338986 RMD160 c0f1c2534eeb95bb901bc61a462495183f191be2 SHA1 14aa8d840ef5f95a9af591789082fe2322fa8cad SHA256 0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8 -EBUILD glob2-0.9.4.4.ebuild 1458 RMD160 49aa35b87544104518b38dc3a4f96fde5af873aa SHA1 ceec004f8530dff4e9a6dc6686fd0a21c614147b SHA256 505466e09c7f3fbfbd565cd20a717d3232efff3698bbaf24e3930ab37fc008d6 -MISC ChangeLog 6289 RMD160 741ae19106ce8807091c6df3ee11b107223a2820 SHA1 46d864a41abfbe8179cea31fd1c72defe199dfcf SHA256 aa957a9cb4359213d30d3d3a0ef4160b34ee0412d7cf11cb6a3f6c2660c7b0db +EBUILD glob2-0.9.4.4.ebuild 1266 RMD160 b9cc2683d02fd155701590030435aa33e327dc5f SHA1 c9186b5fa19d655b7aaad513abb53d1eb6b8456c SHA256 0e0e3206c44c9b5ad3954eb6024947b8fbeb5cce51db58011989aea010651518 +MISC ChangeLog 6438 RMD160 00fa3cbd055e2c06eb7c10fe523eba605a912c12 SHA1 416b4e1a08b03fd93c71fde46d4cbe810c0cd695 SHA256 68f90163ec32563adef2f6545f754a49754a203c833f5decbfca5548ec61db4d MISC metadata.xml 546 RMD160 702338ae8936b3f81e43ded8c08aa74ce919a1c8 SHA1 0cddda4674a8c9a8ac51f68fa211131220c814a5 SHA256 f55b8dd9eba3e7bbaf5765b86e7c434d6f53285c3aa43923c3ec247c569cf8fd diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch new file mode 100644 index 000000000000..e8aa31d84d94 --- /dev/null +++ b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch @@ -0,0 +1,26 @@ +--- SConstruct.orig 2010-11-19 17:56:30.206360948 -0500 ++++ SConstruct 2010-11-19 17:58:48.914746243 -0500 +@@ -1,6 +1,7 @@ + EnsureSConsVersion(0, 96, 92) + import sys + import os ++import SCons.Util + import glob + sys.path.append( os.path.abspath("scons") ) + import bundle +@@ -268,6 +269,15 @@ + env["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] + ".tar.gz" + env["TARFLAGS"] = "-c -z" + env.Alias("dist", env["TARFILE"]) ++ # Using suggestions for http://dev.gentoo.org/~vapier/scons-blows.txt ++ if os.environ.has_key('CC'): ++ env['CC'] = os.environ['CC'] ++ if os.environ.has_key('CXX'): ++ env['CXX'] = os.environ['CXX'] ++ 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']) + + def PackTar(target, source): + if "dist" in COMMAND_LINE_TARGETS: diff --git a/games-strategy/glob2/glob2-0.9.4.4.ebuild b/games-strategy/glob2/glob2-0.9.4.4.ebuild index 42a8d13b6a69..c62dc4d8cf6e 100644 --- a/games-strategy/glob2/glob2-0.9.4.4.ebuild +++ b/games-strategy/glob2/glob2-0.9.4.4.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.9.4.4.ebuild,v 1.4 2010/09/11 20:37:55 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.9.4.4.ebuild,v 1.5 2010/11/19 23:08:31 mr_bones_ Exp $ EAPI=2 -inherit eutils games +inherit eutils scons-utils games DESCRIPTION="Real Time Strategy (RTS) game involving a brave army of globs" HOMEPAGE="http://globulation2.org/" @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64 ~hppa ppc x86" IUSE="" -RDEPEND="virtual/opengl +DEPEND="virtual/opengl virtual/glu >=dev-libs/boost-1.34 media-libs/libsdl[opengl] @@ -24,21 +24,13 @@ RDEPEND="virtual/opengl media-libs/libvorbis dev-libs/fribidi media-libs/speex" -DEPEND="${RDEPEND} - >=dev-util/scons-1" -PATCHES=( "${FILESDIR}"/${P}-gcc44.patch ) +PATCHES=( "${FILESDIR}"/${P}-gcc44.patch "${FILESDIR}"/${P}-scons-blows.patch ) src_compile() { - local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[:space:]*[0-9]\+\).*/\1/; p }") - - scons \ - ${sconsopts} \ - CXXFLAGS="${CXXFLAGS}" \ - LINKFLAGS="${LDFLAGS}" \ + escons \ INSTALLDIR="${GAMES_DATADIR}"/${PN} \ - DATADIR="${GAMES_DATADIR}"/${PN} \ - || die "scons failed again" + DATADIR="${GAMES_DATADIR}"/${PN} } src_install() { |