Fix the alpha conditionals to avoid returning from the function before calling automake/autoconf. This problem was introduced on 22 Mar 2004 when automake/autoconf was inadvertently moved to below the return in src_unpack

3 files changed, 22 insertions, 15 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 4be653fc64a7..3571f9624726 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.55 2004/03/31 22:21:34 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.56 2004/04/06 15:43:37 agriffis Exp $
+
+  06 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  gnome-desktop-2.4.1.1.ebuild, gnome-desktop-2.6.0.1.ebuild:
+  Fix the alpha conditionals to avoid returning from the function before calling
+  automake/autoconf. This problem was introduced on 22 Mar 2004 when
+  automake/autoconf was inadvertently moved to below the return in src_unpack
 
 *gnome-desktop-2.6.0.1 (01 Apr 2004)
 
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.4.1.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.4.1.1.ebuild
index fdaf8474fed1..d0170f9b1d9a 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.4.1.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.4.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.4.1.1.ebuild,v 1.9 2004/03/21 23:23:31 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.4.1.1.ebuild,v 1.10 2004/04/06 15:43:37 agriffis Exp $
 
 inherit gnome2 eutils
 
@@ -37,18 +37,19 @@ src_unpack() {
 	unpack ${A}
 	# Set vendor info
 	cd ${S}
-	sed -i 's:GNOME.Org:Gentoo Linux:' configure.in
+	sed -i 's:GNOME.Org:Gentoo Linux:' configure.in \
+	|| die "sed failed (1)"
 
 	# fix issues with gtk+-2.4 (#45258)
 	epatch ${FILESDIR}/${PN}-2.4-no_deprecated_about.patch
 
 	# Fix bug 16853 by building gnome-about with IEEE to prevent
 	# floating point exceptions on alpha
-	use alpha || return
-	cd ${S}/gnome-about
-	sed -i '/^CFLAGS/s/$/ -mieee/' Makefile.in
+	if use alpha; then
+		sed -i '/^CFLAGS/s/$/ -mieee/' ${S}/gnome-about/Makefile.in \
+		|| die "sed failed (2)"
+	fi
 
-	WANT_AUTOCONF=2.5 autoconf || die
 	WANT_AUTOMAKE=1.4 automake || die
-
+	WANT_AUTOCONF=2.5 autoconf || die
 }
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.6.0.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.6.0.1.ebuild
index 1046387d7432..f2082165ce6f 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.6.0.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.6.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.6.0.1.ebuild,v 1.1 2004/03/31 22:21:34 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.6.0.1.ebuild,v 1.2 2004/04/06 15:43:37 agriffis Exp $
 
 inherit gnome2 eutils
 
@@ -29,19 +29,19 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog COPYING* README INSTALL NEWS HACKING"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 
 	# Set vendor info
-	sed -i 's:GNOME.Org:Gentoo Linux:' configure.in
+	sed -i 's:GNOME.Org:Gentoo Linux:' configure.in \
+	|| die "sed failed (1)"
 
 	WANT_AUTOCONF_2_5=1 autoconf || die
 
 	# Fix bug 16853 by building gnome-about with IEEE to prevent
 	# floating point exceptions on alpha
-	use alpha || return
-	cd ${S}/gnome-about
-	sed -i '/^CFLAGS/s/$/ -mieee/' Makefile.in
-
+	if use alpha; then
+		sed -i '/^CFLAGS/s/$/ -mieee/' ${S}/gnome-about/Makefile.in \
+		|| die "sed failed (2)"
+	fi
 }