removed die from epatch || die

(Portage version: 2.0.51.22-r2)

7 files changed, 18 insertions, 13 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 8f819a1c8e9b..a7a90b6302b5 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.119 2005/07/02 00:22:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.120 2005/07/29 22:41:54 dragonheart Exp $
+
+  29 Jul 2005; Daniel Black <dragonheart@gentoo.org> gnupg-1.2.4.ebuild,
+  gnupg-1.2.6.ebuild, gnupg-1.4.0-r1.ebuild, gnupg-1.4.0-r2.ebuild,
+  gnupg-1.4.1.ebuild, gnupg-1.4.1-r1.ebuild:
+  removed die from epatch || die
 
   02 Jul 2005; Daniel Black <dragonheart@gentoo.org>
   +files/gnupg-1.4.1-selftest.patch, gnupg-1.4.1.ebuild,
diff --git a/app-crypt/gnupg/gnupg-1.2.4.ebuild b/app-crypt/gnupg/gnupg-1.2.4.ebuild
index f26402ec54a3..8bb0bec8e9e7 100644
--- a/app-crypt/gnupg/gnupg-1.2.4.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.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/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.29 2005/01/27 18:55:06 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.30 2005/07/29 22:41:54 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -50,7 +50,7 @@ src_unpack() {
 }
 
 src_compile() {
-	# Certain sparc32 machines seem to have trouble building correctly with 
+	# Certain sparc32 machines seem to have trouble building correctly with
 	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
 	# fix until the gcc problem can be tracked down.
 	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
diff --git a/app-crypt/gnupg/gnupg-1.2.6.ebuild b/app-crypt/gnupg/gnupg-1.2.6.ebuild
index f314a1e0db1f..56367eb39ec2 100644
--- a/app-crypt/gnupg/gnupg-1.2.6.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.6.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/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.23 2005/01/27 18:55:06 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.24 2005/07/29 22:41:54 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -47,7 +47,7 @@ src_unpack() {
 }
 
 src_compile() {
-	# Certain sparc32 machines seem to have trouble building correctly with 
+	# Certain sparc32 machines seem to have trouble building correctly with
 	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
 	# fix until the gcc problem can be tracked down.
 	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
diff --git a/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild
index d91beef6ab86..3ba26960b1c0 100644
--- a/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.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/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild,v 1.7 2005/07/07 00:11:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild,v 1.8 2005/07/29 22:41:54 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -59,7 +59,7 @@ src_unpack() {
 }
 
 src_compile() {
-	# Certain sparc32 machines seem to have trouble building correctly with 
+	# Certain sparc32 machines seem to have trouble building correctly with
 	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
 	# fix until the gcc problem can be tracked down.
 	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
diff --git a/app-crypt/gnupg/gnupg-1.4.0-r2.ebuild b/app-crypt/gnupg/gnupg-1.4.0-r2.ebuild
index 637fe9105485..2f449fa27d33 100644
--- a/app-crypt/gnupg/gnupg-1.4.0-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.0-r2.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/app-crypt/gnupg/gnupg-1.4.0-r2.ebuild,v 1.5 2005/06/24 22:01:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.0-r2.ebuild,v 1.6 2005/07/29 22:41:54 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -57,7 +57,7 @@ src_unpack() {
 
 	cd ${S}
 	if use ecc; then
-		epatch ${WORKDIR}/${P}-ecc${ECCVER}.diff || die "ecc patch failed"
+		epatch ${WORKDIR}/${P}-ecc${ECCVER}.diff
 	fi
 	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c
 	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S
diff --git a/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
index 4b20f5e93e14..e2c464274003 100644
--- a/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.1-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/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild,v 1.3 2005/07/02 00:22:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild,v 1.4 2005/07/29 22:41:54 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -60,7 +60,7 @@ src_unpack() {
 			einfo "Tweaking PV in ECC patch"
 			sed -i "s/ VERSION='${ECCVER_GNUPG}/ VERSION='${PV}/g" $eccpatch
 		fi
-		EPATCH_OPTS="-p1 -d ${S}" epatch $eccpatch || die "ecc patch failed"
+		EPATCH_OPTS="-p1 -d ${S}" epatch $eccpatch
 	fi
 
 	# maketest fix
diff --git a/app-crypt/gnupg/gnupg-1.4.1.ebuild b/app-crypt/gnupg/gnupg-1.4.1.ebuild
index 40f1ae127ffe..c8324f61e97c 100644
--- a/app-crypt/gnupg/gnupg-1.4.1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.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/app-crypt/gnupg/gnupg-1.4.1.ebuild,v 1.15 2005/07/02 00:22:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.1.ebuild,v 1.16 2005/07/29 22:41:54 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -59,7 +59,7 @@ src_unpack() {
 			einfo "Tweaking PV in ECC patch"
 			sed -i "s/ VERSION='${ECCVER_GNUPG}/ VERSION='${PV}/g" $eccpatch
 		fi
-		EPATCH_OPTS="-p1 -d ${S}" epatch $eccpatch || die "ecc patch failed"
+		EPATCH_OPTS="-p1 -d ${S}" epatch $eccpatch
 	fi
 
 	# maketest fix