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

4 files changed, 28 insertions, 21 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/Manifest b/gnome-base/gnome-desktop/Manifest
index 34f294da5828..9cd8d9bd41a4 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,10 +1,10 @@
-MD5 5aae51d19cb7d91ecf69150336646aa9 gnome-desktop-2.4.0.ebuild 1433
-MD5 ad5b1f974784d6b7b0a99a7f4bd2db5e gnome-desktop-2.6.0.1.ebuild 1199
-MD5 924f07858107a1d5f38db499285ae3c6 gnome-desktop-2.4.1.1.ebuild 1478
-MD5 084aacf75149fae513bfcc45a6a9044e ChangeLog 7071
+MD5 849f7bbb7b7f9b7826ed647d1c3fbb5a ChangeLog 7415
+MD5 70eacf12bedd687fa86c0a38f5aa35b8 gnome-desktop-2.4.1.1.ebuild 1536
+MD5 2ac539e7a9c9a132f32b4bb54fd80eae gnome-desktop-2.6.0.1.ebuild 1255
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 66cf0386beeacad0617909c364c6ab37 files/digest-gnome-desktop-2.4.1.1 75
+MD5 5aae51d19cb7d91ecf69150336646aa9 gnome-desktop-2.4.0.ebuild 1433
 MD5 8e943c5d49e88e9088c320d48090b4ff files/digest-gnome-desktop-2.6.0.1 75
-MD5 563fc396af7466178c556e249112ec6b files/digest-gnome-desktop-2.4.0 73
+MD5 66cf0386beeacad0617909c364c6ab37 files/digest-gnome-desktop-2.4.1.1 75
 MD5 821d72fd07e396d980c3940523a387be files/gnome-desktop-2.4-no_deprecated_about.patch 1641
 MD5 ae9938d0ae2bab5488efbec5b205eb22 files/00_all_gentoo-vendor.patch 272
+MD5 563fc396af7466178c556e249112ec6b files/digest-gnome-desktop-2.4.0 73
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
 }