gnuconfig_update in src_unpack

5 files changed, 28 insertions, 19 deletions

diff --git a/app-i18n/freewnn/ChangeLog b/app-i18n/freewnn/ChangeLog
index 0953688f6793..3bcb74a84be8 100644
--- a/app-i18n/freewnn/ChangeLog
+++ b/app-i18n/freewnn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/freewnn
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.16 2004/07/22 15:35:41 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.17 2004/08/12 00:30:09 mr_bones_ Exp $
+
+  11 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  freewnn-1.1.1_alpha20-r1.ebuild:
+  gnuconfig_update in src_unpack
 
   17 Jul 2004; Tom Gall <tgall@gentoo.org> freewnn-1.1.1_alpha20-r1.ebuild:
   stable on ppc64 bug #55872
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild
index 23b11993d551..985b960fb6d9 100644
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild,v 1.2 2004/07/18 03:00:13 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild,v 1.3 2004/08/12 00:30:09 mr_bones_ Exp $
 
 inherit eutils gnuconfig
 
@@ -27,12 +27,11 @@ src_unpack() {
 	#Change WNNOWNER to root so we don't need to add wnn user
 	sed -i -e "s/WNNOWNER = wnn/WNNOWNER = root/" makerule.mk.in || die
 	epatch ${FILESDIR}/${P}-gentoo.diff
+	gnuconfig_update
+	get_number_of_jobs
 }
 
 src_compile() {
-
-	use ppc64 && gnuconfig_update; get_number_of_jobs
-
 	econf \
 		--disable-cWnn \
 		--disable-kWnn \
@@ -41,7 +40,6 @@ src_compile() {
 		`use_with ipv6` || die "./configure failed"
 
 	emake || die
-	#make || die
 }
 
 src_install() {
diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 960933241fee..d7afd87fa5ee 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/expect
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.21 2004/07/17 21:21:35 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.22 2004/08/12 00:33:37 mr_bones_ Exp $
+
+  11 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  expect-5.40.0-r1.ebuild, expect-5.40.0.ebuild:
+  gnuconfig_update in src_unpack
 
 *expect-5.37.1-r2 (13 Jul 2004)
 *expect-5.40.0-r1 (13 Jul 2004)
diff --git a/dev-tcltk/expect/expect-5.40.0-r1.ebuild b/dev-tcltk/expect/expect-5.40.0-r1.ebuild
index 5944e8ed5c8f..2cc5ca870d24 100644
--- a/dev-tcltk/expect/expect-5.40.0-r1.ebuild
+++ b/dev-tcltk/expect/expect-5.40.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.40.0-r1.ebuild,v 1.2 2004/07/14 21:43:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.40.0-r1.ebuild,v 1.3 2004/08/12 00:33:37 mr_bones_ Exp $
 
 inherit gnuconfig
 
@@ -21,17 +21,17 @@ S=${WORKDIR}/${NON_MICRO_V}
 
 src_unpack() {
 	unpack ${A}
-	sed -i 's#/usr/local/bin#/usr/bin#' ${S}/expect.man
-	sed -i 's#/usr/local/bin#/usr/bin#' ${S}/expectk.man
+	cd ${S}
+	sed -i 's#/usr/local/bin#/usr/bin#' expect.man
+	sed -i 's#/usr/local/bin#/usr/bin#' expectk.man
 	#stops any example scripts being installed by default
-	sed -i '/^install:/s/install-libraries //' ${S}/Makefile.in
-	sed -i 's/^SCRIPTS_MANPAGES = /_&/' ${S}/Makefile.in
+	sed -i \
+		-e '/^install:/s/install-libraries //' \
+		-e 's/^SCRIPTS_MANPAGES = /_&/' Makefile.in
+	gnuconfig_update
 }
 
 src_compile() {
-	use amd64 && gnuconfig_update
-	use ppc64 && gnuconfig_update
-
 	local myconf
 	local tclv
 	local tkv
diff --git a/dev-tcltk/expect/expect-5.40.0.ebuild b/dev-tcltk/expect/expect-5.40.0.ebuild
index 8e08c6126bbc..c9f757e5aac9 100644
--- a/dev-tcltk/expect/expect-5.40.0.ebuild
+++ b/dev-tcltk/expect/expect-5.40.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.40.0.ebuild,v 1.5 2004/06/25 02:06:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.40.0.ebuild,v 1.6 2004/08/12 00:33:37 mr_bones_ Exp $
 
 inherit gnuconfig
 
@@ -18,10 +18,13 @@ DEPEND=">=dev-lang/tcl-8.2
 
 S=${WORKDIR}/${P%.0}
 
-src_compile() {
-	use amd64 && gnuconfig_update
-	use ppc64 && gnuconfig_update
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
+}
 
+src_compile() {
 	local myconf
 	local tclv
 	local tkv