6 files changed, 32 insertions, 16 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/Manifest b/net-libs/libotr/Manifest
index dac5413f0830..b0e56b5f28b5 100644
--- a/net-libs/libotr/Manifest
+++ b/net-libs/libotr/Manifest
@@ -1,10 +1,20 @@
-MD5 a57c9e952d5af42afd166e4d64ca9eea ChangeLog 875
-MD5 b4baf2a9e6cb4141b3e0eeb9319cafea libotr-2.0.0.ebuild 808
-MD5 71d0f7f41593760118aeec748577c740 libotr-1.0.4.ebuild 808
-MD5 f336d73adb9eb04864ae3f5e98787c12 metadata.xml 223
-MD5 294eb953f46c11e8ec88d3fb30913bc5 libotr-2.0.1.ebuild 818
-MD5 cadb408ac2836850cf00bb1916b0acfd libotr-2.0.2.ebuild 815
-MD5 acbf6ed5147acb3329e98ff711a7262a files/digest-libotr-2.0.0 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 13092603e0aba28da90d29f5786b88bf ChangeLog 1170
 MD5 ce21e4bf4ffd89512e4a9e32f0539761 files/digest-libotr-1.0.4 64
+MD5 acbf6ed5147acb3329e98ff711a7262a files/digest-libotr-2.0.0 64
 MD5 f600de0b44d3f4e5416d3b62f3391d48 files/digest-libotr-2.0.1 64
 MD5 9ac9da4794ae9d04101fa632dadcf886 files/digest-libotr-2.0.2 64
+MD5 c90715a3123a8698777768fe9f5525d7 libotr-1.0.4.ebuild 779
+MD5 6a72458eeb7b7a2993640621d4fa7ad7 libotr-2.0.0.ebuild 779
+MD5 28a0f6549bd851ee71dc274d40f7f163 libotr-2.0.1.ebuild 786
+MD5 93b99c4014c5db7b881785683aed2040 libotr-2.0.2.ebuild 786
+MD5 f336d73adb9eb04864ae3f5e98787c12 metadata.xml 223
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0Y1sI1lqEGTUzyQRAguyAKDfZVjZzD5V3ddss6c+ukndEBuHiQCgw2tv
+mUbCykN2Ei8cgeYd1DS0W/Y=
+=H/FJ
+-----END PGP SIGNATURE-----
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() {