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, 26 insertions, 18 deletions

diff --git a/media-plugins/avi-xmms/ChangeLog b/media-plugins/avi-xmms/ChangeLog
index ac6b8d2c3680..0bddda4c470c 100644
--- a/media-plugins/avi-xmms/ChangeLog
+++ b/media-plugins/avi-xmms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/avi-xmms
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/avi-xmms/ChangeLog,v 1.8 2004/07/06 21:06:36 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/avi-xmms/ChangeLog,v 1.9 2005/07/10 21:12:40 swegener Exp $
+
+  10 Jul 2005; Sven Wegener <swegener@gentoo.org> avi-xmms-1.2.3.ebuild,
+  avi-xmms-1.2.3-r1.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.
 
   06 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   avi-xmms-1.2.3-r1.ebuild:
diff --git a/media-plugins/avi-xmms/avi-xmms-1.2.3-r1.ebuild b/media-plugins/avi-xmms/avi-xmms-1.2.3-r1.ebuild
index 535cd015cb38..9e7d0a181550 100644
--- a/media-plugins/avi-xmms/avi-xmms-1.2.3-r1.ebuild
+++ b/media-plugins/avi-xmms/avi-xmms-1.2.3-r1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/avi-xmms/avi-xmms-1.2.3-r1.ebuild,v 1.8 2004/07/06 21:06:36 eradicator Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/avi-xmms/avi-xmms-1.2.3-r1.ebuild,v 1.9 2005/07/10 21:12:40 swegener Exp $
 
 inherit flag-o-matic
 
@@ -10,6 +8,7 @@ DESCRIPTION="A xmms plugin for AVI/DivX movies"
 SRC_URI="http://www.xmms.org/files/plugins/avi-xmms/${P}.tar.gz"
 HOMEPAGE="http://www.xmms.org/plugins_input.html"
 
+IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
 # Contains x86 assembly
@@ -29,7 +28,7 @@ src_compile() {
 	filter-flags -fno-exceptions
 
 	econf || die
-	emake || make || die
+	emake -j1 || die
 }
 
 src_install () {
diff --git a/media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild b/media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild
index 0a78984b8622..88d8b5217013 100644
--- a/media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild
+++ b/media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild,v 1.8 2004/06/24 23:26:53 agriffis Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild,v 1.9 2005/07/10 21:12:40 swegener Exp $
 
 inherit flag-o-matic
 
@@ -10,6 +8,7 @@ DESCRIPTION="A xmms plugin for AVI/DivX movies"
 SRC_URI="http://www.xmms.org/files/plugins/avi-xmms/${P}.tar.gz"
 HOMEPAGE="http://www.xmms.org/plugins_input.html"
 
+IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
@@ -21,7 +20,7 @@ src_compile() {
 	filter-flags -fno-exceptions
 
 	econf || die
-	emake || make || die
+	emake -j1 || die
 }
 
 src_install () {
diff --git a/media-video/mpeg-movie/ChangeLog b/media-video/mpeg-movie/ChangeLog
index f6cd314cab85..47f176c5bfc7 100644
--- a/media-video/mpeg-movie/ChangeLog
+++ b/media-video/mpeg-movie/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mpeg-movie
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-movie/ChangeLog,v 1.8 2005/01/09 06:18:29 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-movie/ChangeLog,v 1.9 2005/07/10 21:11:06 swegener Exp $
+
+  10 Jul 2005; Sven Wegener <swegener@gentoo.org>
+  mpeg-movie-1.6.0-r1.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.
 
   09 Jan 2005; <lucky@gentoo.org> +files/mpeg-movie-1.6.0-r1-gentoo.patch,
   mpeg-movie-1.6.0-r1.ebuild:
diff --git a/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild b/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild
index 4ad1b48b48b2..8fba9e0acac9 100644
--- a/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild
+++ b/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.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/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild,v 1.11 2005/01/09 06:18:29 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild,v 1.12 2005/07/10 21:11:06 swegener Exp $
 
 inherit eutils
 
@@ -85,14 +85,12 @@ src_unpack() {
 	sed -e 's:\(#include "quicktime.h"\):\1\n#include <cstring>:' \
 		mpeg_export.h.orig > mpeg_export.h
 }
-src_compile() {
-	emake || make || die
 
+src_compile() {
+	emake -j1 || die
 }
 
 src_install () {
-
-	into /usr
 	newbin audio_in/encode mpeg_audio_encode
 	newbin audio_out/plaympeg mpeg_audio_play
 	newbin mplex_in/mplex mpeg_mplex