media-video/bombono-dvd: Improved handling of non-standard MAKEOPTS

svn path=/sunrise/; revision=9808

diff --git a/media-video/bombono-dvd/ChangeLog b/media-video/bombono-dvd/ChangeLog
index ee260af5e73dcbf60b337f92e25a8054b48acd91..c78488ddef18c0416a40073a257f091cd81f8135 100644 (file)
--- a/media-video/bombono-dvd/ChangeLog
+++ b/media-video/bombono-dvd/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for media-video/bombono-dvd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Jan 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
+  bombono-dvd-0.5.2.ebuild:
+  Improved handling of non-standard MAKEOPTS
+
   07 Nov 2009; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   bombono-dvd-0.5.2.ebuild:
   Minor fixes to build command and error messages.

diff --git a/media-video/bombono-dvd/Manifest b/media-video/bombono-dvd/Manifest
index 78d7ad19710deeba4acb2cf3130393bf8317c946..ff7dea574c84397e4c21c45a72eade9c950cbbe1 100644 (file)
--- a/media-video/bombono-dvd/Manifest
+++ b/media-video/bombono-dvd/Manifest
@@ -1,5 +1,5 @@
 AUX bombono-dvd-0.5.2-twolame.patch 2450 RMD160 5b0ee435d3076c511387f65e2001dbd2d214d374 SHA1 54c180aa8b4008959c9e65ad423b308b1b2d4d60 SHA256 ef1ca7e74da6137bb48725412bc382b6046719ee041735047f3e41ff11cc0b62
 DIST bombono-dvd-0.5.2.tar.bz2 1700497 RMD160 2b24cc0d09c008503805e910a50e5c92dda83320 SHA1 0fa2c27656c2868d516393a0117eccab4ec0453b SHA256 d80ec05ef806528e01f1bded5a5268feab91402ad5b42c78d80301e27bc0964f
-EBUILD bombono-dvd-0.5.2.ebuild 1022 RMD160 8d8f8301d0fa7f3b6ae44f2b8c56d7890623c0e2 SHA1 1b241f5bb3afc488acddb744bdc06101e3f790f2 SHA256 fad309af39714819c1ef2f14da1e5284e02bc9358f53d19c07b3f03e05540417
-MISC ChangeLog 483 RMD160 4bdf57a7e138008c73fd26399a2ecb5b2fc551fc SHA1 3492598c27477aad3d273be8acc17f1f236c1b41 SHA256 07a3cb5dcfef90d47bc41d54fb70d68449dd16f5f39fe76190e677a59035ff88
+EBUILD bombono-dvd-0.5.2.ebuild 1160 RMD160 c46455596771267d1c61ce36f3c22e71964eed8a SHA1 f0d76acc4f484dd8c3cc0dc7f9514e9a240f45a5 SHA256 65f55690dbb25744bc5b9fcba49e70bd4ba9699bdba6d4c08efce5b0debc3307
+MISC ChangeLog 623 RMD160 f574950a5cd645a605449afd959b3cbeb02d0c85 SHA1 22385a31a527d90b81ec896848e9345f9100d586 SHA256 3925eea40cd0a046362a36ad71492fafa10bad76cdf063331a4b801d12635142
 MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf

diff --git a/media-video/bombono-dvd/bombono-dvd-0.5.2.ebuild b/media-video/bombono-dvd/bombono-dvd-0.5.2.ebuild
index 234e318f0d259635a482b99ac4c4cb40e8520ff7..84b517efe44a1e49f8b98dbdecbcb3707aa5c4fd 100644 (file)
--- a/media-video/bombono-dvd/bombono-dvd-0.5.2.ebuild
+++ b/media-video/bombono-dvd/bombono-dvd-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -31,9 +31,11 @@ DEPEND=">=dev-util/scons-0.96.1
 PATCHES=( "${FILESDIR}/${P}-twolame.patch" )
 
 src_compile() {
-       # scons uses -l differently -> remove it
+       # scons options differ from make options -> remove everything except "-jX" and "-j X"
+       local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
+
        scons CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-               ${MAKEOPTS/-l[0-9]} DESTDIR="${D}" PREFIX="/usr" \
+               ${sconsopts} DESTDIR="${D}" PREFIX="/usr" \
                || die 'Please add "${S}/config.opts" when filing bugs reports!'
 }