QA: Removed 'emake || make || die' and variants. Either a package is parallel build safe or it is not. There's nothing like trying and falling back.

(Portage version: 2.0.51.22-r1)

5 files changed, 15 insertions, 9 deletions

diff --git a/x11-plugins/gaim-otr/ChangeLog b/x11-plugins/gaim-otr/ChangeLog
index 1faa7e183dc3..ef10be27d2ea 100644
--- a/x11-plugins/gaim-otr/ChangeLog
+++ b/x11-plugins/gaim-otr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/gaim-otr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/ChangeLog,v 1.9 2005/05/17 14:12:24 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/ChangeLog,v 1.10 2005/07/10 20:43:58 swegener Exp $
+
+  10 Jul 2005; Sven Wegener <swegener@gentoo.org> gaim-otr-1.0.3.ebuild,
+  gaim-otr-2.0.0.ebuild, gaim-otr-2.0.1.ebuild, gaim-otr-2.0.2.ebuild:
+  QA: Removed 'emake || make || die' and variants. Either a package is
+  parallel build safe or it is not. There's nothing like trying and falling
+  back.
 
 *gaim-otr-2.0.2 (17 May 2005)
 
diff --git a/x11-plugins/gaim-otr/gaim-otr-1.0.3.ebuild b/x11-plugins/gaim-otr/gaim-otr-1.0.3.ebuild
index b1ec0e12496c..e88e24bfcf83 100644
--- a/x11-plugins/gaim-otr/gaim-otr-1.0.3.ebuild
+++ b/x11-plugins/gaim-otr/gaim-otr-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-1.0.3.ebuild,v 1.3 2005/02/09 11:16:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-1.0.3.ebuild,v 1.4 2005/07/10 20:43:58 swegener Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -28,7 +28,7 @@ src_compile() {
 	strip-flags
 	replace-flags -O? -O2
 
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
diff --git a/x11-plugins/gaim-otr/gaim-otr-2.0.0.ebuild b/x11-plugins/gaim-otr/gaim-otr-2.0.0.ebuild
index f510846c900b..5601ac1e4799 100644
--- a/x11-plugins/gaim-otr/gaim-otr-2.0.0.ebuild
+++ b/x11-plugins/gaim-otr/gaim-otr-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-2.0.0.ebuild,v 1.1 2005/02/10 20:33:46 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-2.0.0.ebuild,v 1.2 2005/07/10 20:43:58 swegener Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -20,7 +20,7 @@ src_compile() {
 	strip-flags
 	replace-flags -O? -O2
 
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
diff --git a/x11-plugins/gaim-otr/gaim-otr-2.0.1.ebuild b/x11-plugins/gaim-otr/gaim-otr-2.0.1.ebuild
index c9060b58cb98..c22b77cb920f 100644
--- a/x11-plugins/gaim-otr/gaim-otr-2.0.1.ebuild
+++ b/x11-plugins/gaim-otr/gaim-otr-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-2.0.1.ebuild,v 1.2 2005/03/30 21:58:08 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-2.0.1.ebuild,v 1.3 2005/07/10 20:43:58 swegener Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -20,7 +20,7 @@ src_compile() {
 	strip-flags
 	replace-flags -O? -O2
 
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
diff --git a/x11-plugins/gaim-otr/gaim-otr-2.0.2.ebuild b/x11-plugins/gaim-otr/gaim-otr-2.0.2.ebuild
index cb249bc02174..d08d07049d78 100644
--- a/x11-plugins/gaim-otr/gaim-otr-2.0.2.ebuild
+++ b/x11-plugins/gaim-otr/gaim-otr-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-2.0.2.ebuild,v 1.1 2005/05/17 14:12:24 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-2.0.2.ebuild,v 1.2 2005/07/10 20:43:58 swegener Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -21,7 +21,7 @@ src_compile() {
 	replace-flags -O? -O2
 
 	econf || die "econf failed"
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {