Remove everything except -j flags from MAKEOPTS wrt #259162 by Max Klinger.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 18 insertions, 9 deletions

diff --git a/net-p2p/linuxdcpp/ChangeLog b/net-p2p/linuxdcpp/ChangeLog
index 982189708b60..cdbdaf8f780d 100644
--- a/net-p2p/linuxdcpp/ChangeLog
+++ b/net-p2p/linuxdcpp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/linuxdcpp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/ChangeLog,v 1.41 2010/06/18 21:51:21 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/ChangeLog,v 1.42 2010/07/18 18:04:52 ssuominen Exp $
+
+  18 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  linuxdcpp-1.0.3-r1.ebuild, linuxdcpp-9999.ebuild:
+  Remove everything except -j flags from MAKEOPTS wrt #259162 by Max
+  Klinger.
 
 *linuxdcpp-1.0.3-r1 (18 Jun 2010)
 
diff --git a/net-p2p/linuxdcpp/Manifest b/net-p2p/linuxdcpp/Manifest
index 149c51c9aa4a..dfaca4578fc7 100644
--- a/net-p2p/linuxdcpp/Manifest
+++ b/net-p2p/linuxdcpp/Manifest
@@ -1,6 +1,6 @@
 DIST linuxdcpp-1.0.3.tar.bz2 289891 RMD160 b44fe8fb540150786458aa85fbf4631bd9de16cd SHA1 383a55bbc2169280e982571aac92555a25dc05e4 SHA256 3b4eb6cf015f0fe8283508976b24dbb1cd4fb861116d4536f1055136c2442c71
-EBUILD linuxdcpp-1.0.3-r1.ebuild 1416 RMD160 c8836f11efa36595117b15e6b0a94729b515a1d5 SHA1 452cc56cdf8f4592d79385dfde26caeb0e67cc72 SHA256 290698005fb1797e8deea611cb5f9ffd7972c8366d16a8ffe728c6dad4ba2467
+EBUILD linuxdcpp-1.0.3-r1.ebuild 1517 RMD160 eeeacc1b340b98c0d4f9119aed18fa18999946e8 SHA1 e7cd6d712d133ff30eb26901877835ced77c3616 SHA256 bff3c8093a6d763103197b4a426b46ba2f5507ef3c5d379c172ecba7b7cdc2a8
 EBUILD linuxdcpp-1.0.3.ebuild 1228 RMD160 8875d3053d53cdc0a21f2aded9cdb3714f625b8e SHA1 f50db1c25fe722ed107f14bfda572ddd19290e45 SHA256 8a3aad6d2ffeb700448e771869c049024c8eab24782f6eafc5f9b77e39a70019
-EBUILD linuxdcpp-9999.ebuild 1204 RMD160 ed500630773d94ecc34fb057d88df8fddae050b7 SHA1 57c562b5d239d6df9d796c10e5fe1a2492044bcd SHA256 2bb34780959763400ff21d0bf96c9a8c3fd0f62bdf2863f092725ce96d7483e2
-MISC ChangeLog 6076 RMD160 21fb77b5ec183c83252736a4d86d4b04be675de7 SHA1 39647a07e703fe4b7b7efe60108465612f161fab SHA256 e40a3d4e130c4554812c4bdca2b84fe86aa656aeb3ab84b49d25873412c851ee
+EBUILD linuxdcpp-9999.ebuild 1301 RMD160 aafc5390b6b75546997273d516f9e4e81afbf10d SHA1 ff4d6f4554b711298b9e5fb24929d6ff534e7581 SHA256 9e6d1795acef138b7f3b3190a87b671a8a0a35017a897b70eac85e428ed64e76
+MISC ChangeLog 6261 RMD160 1f0bb8d6e9c24e533fc830faaa50bc33bdc7d4eb SHA1 11f13ad0434c9ef0c4ba50f4ed75cc8842c62f0c SHA256 41a42dc1e6ebeac554c70fd6c27e8079abb6c4fd53f7c84b180dbc8dea142dd4
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
diff --git a/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild b/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild
index 27c899e4a641..dd39c9ae9d39 100644
--- a/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild
+++ b/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.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/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild,v 1.2 2010/06/18 22:09:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild,v 1.3 2010/07/18 18:04:52 ssuominen Exp $
 
 EAPI=2
 
@@ -29,10 +29,12 @@ src_prepare() {
 }
 
 src_compile() {
+	local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
+
 	local myconf=""
 	use debug && myconf="${myconf} debug=1"
 
-	scons ${myconf} ${MAKEOPTS} CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed"
+	scons ${myconf} ${sconsopts} CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed"
 }
 
 src_install() {
diff --git a/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild b/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild
index cc49b82ef005..9b88ff8f7111 100644
--- a/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild
+++ b/net-p2p/linuxdcpp/linuxdcpp-9999.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/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild,v 1.13 2010/06/18 19:28:36 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild,v 1.14 2010/07/18 18:04:52 ssuominen Exp $
 
 inherit bzr eutils
 
@@ -14,7 +14,7 @@ IUSE="debug"
 
 EBZR_REPO_URI="lp:linuxdcpp"
 
-S="${WORKDIR}/${P}"
+S=${WORKDIR}/${P}
 
 RDEPEND=">=gnome-base/libglade-2.4
 	>=x11-libs/gtk+-2.6
@@ -27,10 +27,12 @@ DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.35.0-r2"
 
 src_compile() {
+	local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
+
 	local myconf=""
 	use debug && myconf="${myconf} debug=1"
 
-	scons ${myconf} ${MAKEOPTS} CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed"
+	scons ${myconf} ${sconsopts} CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed"
 }
 
 src_install() {