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.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 29 insertions, 13 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index f5b96fbd35b7..49eb8281b5da 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.349 2005/07/08 06:48:31 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.350 2005/07/10 21:01:40 swegener Exp $
+
+  10 Jul 2005; Sven Wegener <swegener@gentoo.org> gaim-1.2.1.ebuild,
+  gaim-1.3.1.ebuild, gaim-1.4.0.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.
 
   08 Jul 2005; Hardave Riar <hardave@gentoo.org> gaim-1.3.1.ebuild:
   Stable on mips, bug #95347.
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 6daac7643c5d..9f39cef49237 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,10 +1,20 @@
-MD5 adcb0046d33cd2d0115b330246f8692f ChangeLog 51058
-MD5 0762c69a46371204be4f4088d4c8ecef gaim-1.2.1.ebuild 4142
-MD5 4db24e5580f45b379db3ed0db95bf911 gaim-1.3.1.ebuild 4295
-MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
-MD5 3d4c4085c6236534ccc317b931351635 gaim-1.4.0.ebuild 4172
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d06fdbb6a58b59c73ec51ac4e5fc2b5a ChangeLog 51324
 MD5 ccd9c297b39c84ce83df7011a542900b files/digest-gaim-1.2.1 64
 MD5 34466df05198ffffaa36d5469babd2aa files/digest-gaim-1.3.1 64
+MD5 20166c600c6de257f42af05bea6efd22 files/digest-gaim-1.4.0 64
 MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
 MD5 7eeaeb97528ef69941cf3fa3d04dea3e files/gaim-1.3.0-silc-ft.patch 567
-MD5 20166c600c6de257f42af05bea6efd22 files/digest-gaim-1.4.0 64
+MD5 5ea38df35b915cb91290c9e5052833db gaim-1.2.1.ebuild 4109
+MD5 087db6a0481d7a0d9957c3cd6049f83d gaim-1.3.1.ebuild 4265
+MD5 9d34d138499344ca1deab5890ee3bf8e gaim-1.4.0.ebuild 4143
+MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0YzQI1lqEGTUzyQRAjZtAKCwfuPtAm9deMeJ7159EcFDNZ0sUgCgrA58
+/BD3dh3MxyMBomOmjHEl9Eo=
+=jmzD
+-----END PGP SIGNATURE-----
diff --git a/net-im/gaim/gaim-1.2.1.ebuild b/net-im/gaim/gaim-1.2.1.ebuild
index dca5e6ee8030..9c635c5b5506 100644
--- a/net-im/gaim/gaim-1.2.1.ebuild
+++ b/net-im/gaim/gaim-1.2.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-im/gaim/gaim-1.2.1.ebuild,v 1.11 2005/05/25 16:55:56 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.2.1.ebuild,v 1.12 2005/07/10 21:01:40 swegener Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug
 
@@ -126,7 +126,7 @@ src_compile() {
 
 	econf ${myconf} || die "Configuration failed"
 
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
diff --git a/net-im/gaim/gaim-1.3.1.ebuild b/net-im/gaim/gaim-1.3.1.ebuild
index b890998a3712..43ee2acb9cb2 100644
--- a/net-im/gaim/gaim-1.3.1.ebuild
+++ b/net-im/gaim/gaim-1.3.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-im/gaim/gaim-1.3.1.ebuild,v 1.9 2005/07/08 06:48:31 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.3.1.ebuild,v 1.10 2005/07/10 21:01:40 swegener Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug
 
@@ -134,7 +134,7 @@ src_compile() {
 
 	econf ${myconf} || die "Configuration failed"
 
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
diff --git a/net-im/gaim/gaim-1.4.0.ebuild b/net-im/gaim/gaim-1.4.0.ebuild
index 58d7782b4cd2..ea377eb4e9ef 100644
--- a/net-im/gaim/gaim-1.4.0.ebuild
+++ b/net-im/gaim/gaim-1.4.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-im/gaim/gaim-1.4.0.ebuild,v 1.1 2005/07/08 03:00:16 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.4.0.ebuild,v 1.2 2005/07/10 21:01:40 swegener Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug
 
@@ -127,7 +127,7 @@ src_compile() {
 
 	econf ${myconf} || die "Configuration failed"
 
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {