Add libsdl use dep; honor CXX; allow parallel make

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/games-simulation/dangerdeep/ChangeLog b/games-simulation/dangerdeep/ChangeLog
index f55993b5a8108255eb1a5c89e0902e3e8ab00c05..7f0ef7ae59a003e328b9490d68e5b625760abcef 100644 (file)
--- a/games-simulation/dangerdeep/ChangeLog
+++ b/games-simulation/dangerdeep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/dangerdeep
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/dangerdeep/ChangeLog,v 1.11 2010/05/24 18:53:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/dangerdeep/ChangeLog,v 1.12 2010/06/24 17:46:35 mr_bones_ Exp $
+
+  24 Jun 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  dangerdeep-0.3.0.ebuild, files/dangerdeep-0.3.0-build.patch:
+  Add libsdl use dep; honor CXX; allow parallel make
 
   24 May 2010; Pacho Ramos <pacho@gentoo.org> dangerdeep-0.3.0.ebuild:
   stable amd64, bug 317241

diff --git a/games-simulation/dangerdeep/Manifest b/games-simulation/dangerdeep/Manifest
index 1eeb18be46827f310ea8b3cef5dbd552ee8b4144..797cb10cfa522c6bbcad8c2c347798650bdb6d34 100644 (file)
--- a/games-simulation/dangerdeep/Manifest
+++ b/games-simulation/dangerdeep/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX dangerdeep-0.3.0-build.patch 1450 RMD160 6476f9f4015caf3e3fb82aede90800e0aadc4e81 SHA1 56a00f9c335c9a48a0058ff9d1fbb87ade2795e9 SHA256 26a5ee68fb00c3f73417b5790d1c529f70b4ed410b066d10a05ad5f62fbfffa0
+AUX dangerdeep-0.3.0-build.patch 1516 RMD160 b19758c2e93714900acd4d9596de4ad2a5d00b80 SHA1 5b004dea38b4c4569d07a3e54ccf2b2892aad9fb SHA256 bb319cb89a4d5b049114768880c4dfa20b2ce65d22e73f7654307af4d4e768c5
 AUX dangerdeep-0.3.0-gcc43.patch 1704 RMD160 f56cbbf104c284c41a3dfa80a7e69f8fd66ce6ce SHA1 c07940d5d4bd66d9e69f17b466e5c3777494d90e SHA256 0699f53e7d51c5fc660613dceffb2a441c87b5716eb72bf2902e35d31b8b3082
 AUX dangerdeep-0.3.0-gcc44.patch 339 RMD160 4510d06552eb066331af57f0d10192c7107aabf0 SHA1 bbc3e4a4125df267a066e940e0d4ffcc34c87b0f SHA256 030ce07756d2a420541306180e508810329c511ba3daceb8b66bc36d86bad042
 DIST dangerdeep-0.3.0.tar.gz 1100972 RMD160 f4959c78592700542514b31beb5e641cc43e10a8 SHA1 b3bb8a89b6016a26d0ce6c00af4ed70b33f549e2 SHA256 bdab6b9b1c2b5f8e618f5c346965ec1f48c9edc9bff1d4f5ff7c8d235464283f
 DIST dangerdeep-data-0.3.0.zip 61914764 RMD160 b37fc081824089db6eda3491288b83f4bd0f3dd7 SHA1 5415256683fc5dc432ce36dccd17727eab3f1153 SHA256 00412a4f8f571a9291df48fa40fbbe846680b4fcb1de2f168539b1606cb4fb81
-EBUILD dangerdeep-0.3.0.ebuild 1532 RMD160 d1a7cb50521a08549af2c2c41b311062b6b857ca SHA1 14d913e786d6e0aaebf45945ceef9ddaea54faa9 SHA256 d8e04f3dfeffff7bc650866a583cde37de7dca4ff0c44b3d1e6f2f53acffe816
-MISC ChangeLog 1773 RMD160 d382e87ad2777fd0cd59210b15abe3e0e6d2bba8 SHA1 d4cdd8a2f4d9d92a06513e317226c5d63aa24748 SHA256 fcc6d4649daa0d134fd996d5775f809559750fdfc01bd90d064b0448512654d1
+EBUILD dangerdeep-0.3.0.ebuild 1657 RMD160 5bb740ef63a70a97e5a20e6ad6d0bdc109d64225 SHA1 2d4b63d683702e37fe59e60bc9bf4dbaac8a1283 SHA256 45a88482618c28c33331d20ed9837e50cf00eb80509a4588cec2dfb307a1f337
+MISC ChangeLog 1949 RMD160 121d0d443bc5200cdd85c01184e4a5ddcdf29f1c SHA1 f4df5cba09e34759b86cdcfeb7aeb581d631e1a7 SHA256 0f1fa190fae95308827cf9a407cdf6c46dc1306658ff1530a0ff108f2dddca1e
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkv6yzAACgkQCaWpQKGI+9R7eACggyvLgh4LlEvMfv0UxUhjEmz5
-sZMAniy5kM65SZ2UV4/DFWEAl0LKajwt
-=LRRy
------END PGP SIGNATURE-----

diff --git a/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild b/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild
index 47e26e7ade4c7d2976e22cc393c034b3f9289389..c79c9881d0054b336a2e2647d5f66b488089efc6 100644 (file)
--- a/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild
+++ b/games-simulation/dangerdeep/dangerdeep-0.3.0.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-simulation/dangerdeep/dangerdeep-0.3.0.ebuild,v 1.7 2010/05/24 18:53:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild,v 1.8 2010/06/24 17:46:35 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -18,7 +18,7 @@ IUSE="sse debug"
 RDEPEND="virtual/opengl
        virtual/glu
        sci-libs/fftw:3.0
-       media-libs/libsdl
+       media-libs/libsdl[video]
        media-libs/sdl-mixer[vorbis]
        media-libs/sdl-image[jpeg,png]
        media-libs/sdl-net"
@@ -39,12 +39,14 @@ src_prepare() {
 
 src_compile() {
        local sse=-1
+       local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[:space:]*[0-9]\+\).*/\1/; p }")
 
        if use sse ; then
                use amd64 && sse=3 || sse=1
        fi
 
        scons \
+               ${sconsopts} \
                usex86sse=${sse} \
                datadir="${GAMES_DATADIR}"/${PN} \
                $(use debug && echo debug=1) \

diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch
index 1f3c4a47ce6db1626ae02170f9e367f5766b7f66..367db1cfbb964d87890839e46f8810aa63d3c557 100644 (file)
--- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch
+++ b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch
@@ -8,10 +8,12 @@
        env = Environment(ENV = os.environ)
        env.Append(CPPPATH = ['/usr/include/SDL', '/usr/include/GL'])
        libpath = ['/usr/X11R6/lib']
-@@ -126,13 +127,16 @@
+@@ -126,13 +127,18 @@
        sdllibs = ['SDL', 'SDL_image']
        ccflags = '-Wall `sdl-config --cflags` `pkg-config --cflags x11`'
        env.Append(LINKFLAGS = '`pkg-config --libs-only-L x11`')
++      if os.environ.has_key('CXX'):
++              env['CXX'] = os.environ['CXX']
 +      if os.environ.has_key('CXXFLAGS'):
 +              ccflags += os.environ['CXXFLAGS']
 +      if os.environ.has_key('LDFLAGS'):