gnuconfig_update in src_unpack

4 files changed, 24 insertions, 17 deletions

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/Manifest b/dev-tcltk/expect/Manifest
index 8a66929a8853..46fffe6282f0 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -1,9 +1,9 @@
-MD5 b8e40d30c56383e32020464f83748a87 expect-5.40.0.ebuild 1782
-MD5 b702779d28e4fa816d97911108cba524 expect-5.37.1-r2.ebuild 3038
+MD5 4fad5b17d60afe4dc6f6b9e304e9c734 ChangeLog 3420
+MD5 efa22ab043d94cd5020be7f5921fbac8 expect-5.40.0.ebuild 1778
 MD5 a15812d97737f672a6d9337ddd345e48 expect-5.37.1-r1.ebuild 1823
-MD5 bc5b75bbc851ee1f11b61dc67c07a5a9 expect-5.40.0-r1.ebuild 2559
-MD5 ac7138d48aa7e8c6d0b6e8da0418fffc ChangeLog 3277
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 b702779d28e4fa816d97911108cba524 expect-5.37.1-r2.ebuild 3038
+MD5 17e19c4aebad7111af07a48c69d71546 expect-5.40.0-r1.ebuild 2497
 MD5 56f93170a590d0db63d826802dcc9847 files/digest-expect-5.40.0 65
 MD5 f4bfc81e857154719e1924f00b505ea3 files/digest-expect-5.37.1-r1 65
 MD5 f4bfc81e857154719e1924f00b505ea3 files/digest-expect-5.37.1-r2 65
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