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/net-libs/libotr/ChangeLog b/net-libs/libotr/ChangeLog
index 2cb897c52cf5..e0e2409bf28f 100644
--- a/net-libs/libotr/ChangeLog
+++ b/net-libs/libotr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libotr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/ChangeLog,v 1.6 2005/05/17 14:12:09 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/ChangeLog,v 1.7 2005/07/10 21:04:16 swegener Exp $
+
+  10 Jul 2005; Sven Wegener <swegener@gentoo.org> libotr-1.0.4.ebuild,
+  libotr-2.0.0.ebuild, libotr-2.0.1.ebuild, libotr-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.
 
 *libotr-2.0.2 (17 May 2005)
 
diff --git a/net-libs/libotr/libotr-1.0.4.ebuild b/net-libs/libotr/libotr-1.0.4.ebuild
index 6e4ab456d1f5..428ab3e0acfb 100644
--- a/net-libs/libotr/libotr-1.0.4.ebuild
+++ b/net-libs/libotr/libotr-1.0.4.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/net-libs/libotr/libotr-1.0.4.ebuild,v 1.1 2005/01/24 03:25:27 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/libotr-1.0.4.ebuild,v 1.2 2005/07/10 21:04:16 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() {
diff --git a/net-libs/libotr/libotr-2.0.0.ebuild b/net-libs/libotr/libotr-2.0.0.ebuild
index 5698a0194e64..ac1f77b7c00c 100644
--- a/net-libs/libotr/libotr-2.0.0.ebuild
+++ b/net-libs/libotr/libotr-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/net-libs/libotr/libotr-2.0.0.ebuild,v 1.1 2005/02/10 20:33:35 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/libotr-2.0.0.ebuild,v 1.2 2005/07/10 21:04:16 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() {
diff --git a/net-libs/libotr/libotr-2.0.1.ebuild b/net-libs/libotr/libotr-2.0.1.ebuild
index ae39bd81e997..9533b435bb12 100644
--- a/net-libs/libotr/libotr-2.0.1.ebuild
+++ b/net-libs/libotr/libotr-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/net-libs/libotr/libotr-2.0.1.ebuild,v 1.2 2005/03/30 21:56:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/libotr-2.0.1.ebuild,v 1.3 2005/07/10 21:04:16 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() {
diff --git a/net-libs/libotr/libotr-2.0.2.ebuild b/net-libs/libotr/libotr-2.0.2.ebuild
index d4b6580e6f7f..dda8fa74a864 100644
--- a/net-libs/libotr/libotr-2.0.2.ebuild
+++ b/net-libs/libotr/libotr-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/net-libs/libotr/libotr-2.0.2.ebuild,v 1.1 2005/05/17 14:12:09 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/libotr-2.0.2.ebuild,v 1.2 2005/07/10 21:04:16 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() {