From 7087373b8d10346a3b779e59e9812f32549ab939 Mon Sep 17 00:00:00 2001 From: Aron Griffis Date: Sun, 23 Feb 2003 19:27:02 +0000 Subject: don't call die from a subshell --- x11-base/xfree/ChangeLog | 6 +++++- x11-base/xfree/xfree-4.2.99.4.ebuild | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'x11-base/xfree') diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 0f5e75d2fef3..a396f39f7222 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for x11-base/xfree # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.96 2003/02/17 19:44:25 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.97 2003/02/23 19:27:02 agriffis Exp $ 17 Feb 2003; Martin Schlemmer xfree-4.2.1-r2.ebuild : @@ -38,6 +38,10 @@ *xfree-4.2.99.4 (02 Feb 2003) + 23 Feb 2003; Aron Griffis xfree-4.2.99.4.ebuild : + Fix minor error in the ebuild where "die" could be called from within + a subshell. + 15 Feb 2003; Mark Guertin xfree-4.2.99.4.ebuild : added patch to enable nv driver on ppc, thanks DarkSpecter. diff --git a/x11-base/xfree/xfree-4.2.99.4.ebuild b/x11-base/xfree/xfree-4.2.99.4.ebuild index 6b64df8089da..4204f6cef784 100644 --- a/x11-base/xfree/xfree-4.2.99.4.ebuild +++ b/x11-base/xfree/xfree-4.2.99.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.99.4.ebuild,v 1.9 2003/02/16 21:57:13 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.99.4.ebuild,v 1.10 2003/02/23 19:27:02 agriffis Exp $ # Make sure Portage does _NOT_ strip symbols. We will do it later and make sure # that only we only strip stuff that are safe to strip ... @@ -165,7 +165,9 @@ src_unpack() { unset EPATCH_EXCLUDE # enable the nv driver on ppc - use ppc && ( patch -p0 < ${FILESDIR}/${PV}/${PV}-enable-nv-on-ppc.patch || die ) + if use ppc; then + epatch ${FILESDIR}/${PV}/${PV}-enable-nv-on-ppc.patch || die + fi # Fix HOME and END keys to work in xterm, bug #15254 epatch ${FILESDIR}/xfree-4.2.x-home_end-keys.patch -- cgit v1.2.3-65-gdbad