Remove gnuconfig_update usage, leave it to econf.

(Portage version: 2.1.2_rc4-r5)

7 files changed, 27 insertions, 34 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index f54b12ed7a3b..32b87f8b4c79 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/expect
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.41 2006/10/18 09:47:57 uberlord Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.42 2007/01/05 07:46:35 flameeyes Exp $
+
+  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  expect-5.37.1-r2.ebuild, expect-5.40.0.ebuild, expect-5.40.0-r1.ebuild,
+  expect-5.42.1.ebuild, expect-5.42.1-r1.ebuild, expect-5.43.0.ebuild:
+  Remove gnuconfig_update usage, leave it to econf.
 
   18 Oct 2006; Roy Marples <uberlord@gentoo.org> expect-5.43.0.ebuild:
   Added ~sparc-fbsd keyword.
diff --git a/dev-tcltk/expect/expect-5.37.1-r2.ebuild b/dev-tcltk/expect/expect-5.37.1-r2.ebuild
index 47584dfa3657..3905c08f9217 100644
--- a/dev-tcltk/expect/expect-5.37.1-r2.ebuild
+++ b/dev-tcltk/expect/expect-5.37.1-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.37.1-r2.ebuild,v 1.10 2005/01/31 18:15:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.37.1-r2.ebuild,v 1.11 2007/01/05 07:46:35 flameeyes Exp $
 
-inherit gnuconfig
 
 #remove the trailing ".0" from the tarball version
 NON_MICRO_V=${P%.[0-9]}
@@ -58,10 +57,6 @@ HERE
 }
 
 src_compile() {
-	if [ "${ARCH}" == "amd64" ]; then
-		gnuconfig_update
-	fi
-
 	local myconf
 	local tclv
 	local tkv
@@ -70,7 +65,7 @@ src_compile() {
 	# version number.
 	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
 	#tkv isn't really needed, included for symmetry and the future
-	tkv=$( grep  TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
+	tkv=$( grep	 TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
 
 	#configure needs to find the files tclConfig.sh and tclInt.h
 	myconf="--with-tcl=/usr/lib --with-tclinclude=/usr/lib/tcl$tclv/include/generic"
diff --git a/dev-tcltk/expect/expect-5.40.0-r1.ebuild b/dev-tcltk/expect/expect-5.40.0-r1.ebuild
index 2b5e10458e0f..8d537d4285f7 100644
--- a/dev-tcltk/expect/expect-5.40.0-r1.ebuild
+++ b/dev-tcltk/expect/expect-5.40.0-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 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.7 2005/01/19 23:37:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.40.0-r1.ebuild,v 1.8 2007/01/05 07:46:35 flameeyes Exp $
 
-inherit gnuconfig
 
 DESCRIPTION="tool for automating interactive applications"
 HOMEPAGE="http://expect.nist.gov/"
@@ -28,7 +27,6 @@ src_unpack() {
 	sed -i \
 		-e '/^install:/s/install-libraries //' \
 		-e 's/^SCRIPTS_MANPAGES = /_&/' Makefile.in
-	gnuconfig_update
 }
 
 src_compile() {
diff --git a/dev-tcltk/expect/expect-5.40.0.ebuild b/dev-tcltk/expect/expect-5.40.0.ebuild
index 4f8e52dc55ed..7e8731aff00e 100644
--- a/dev-tcltk/expect/expect-5.40.0.ebuild
+++ b/dev-tcltk/expect/expect-5.40.0.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 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.7 2005/01/19 23:37:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.40.0.ebuild,v 1.8 2007/01/05 07:46:35 flameeyes Exp $
 
-inherit gnuconfig
 
 DESCRIPTION="tool for automating interactive applications"
 HOMEPAGE="http://expect.nist.gov/"
@@ -21,7 +20,6 @@ S=${WORKDIR}/${P%.0}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	gnuconfig_update
 }
 
 src_compile() {
diff --git a/dev-tcltk/expect/expect-5.42.1-r1.ebuild b/dev-tcltk/expect/expect-5.42.1-r1.ebuild
index 064913b819a8..f73546ba109a 100644
--- a/dev-tcltk/expect/expect-5.42.1-r1.ebuild
+++ b/dev-tcltk/expect/expect-5.42.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.42.1-r1.ebuild,v 1.8 2006/09/04 08:50:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.42.1-r1.ebuild,v 1.9 2007/01/05 07:46:35 flameeyes Exp $
 
-inherit eutils gnuconfig
+inherit eutils
 
 DESCRIPTION="tool for automating interactive applications"
 HOMEPAGE="http://expect.nist.gov/"
@@ -38,7 +38,6 @@ src_unpack() {
 		-e '/^install:/s/install-libraries //' \
 		-e 's/^SCRIPTS_MANPAGES = /_&/' \
 		Makefile.in
-	gnuconfig_update
 	WANT_AUTOCONF=2.1 autoconf
 }
 
diff --git a/dev-tcltk/expect/expect-5.42.1.ebuild b/dev-tcltk/expect/expect-5.42.1.ebuild
index 7509acff95a6..26a05b4d4b26 100644
--- a/dev-tcltk/expect/expect-5.42.1.ebuild
+++ b/dev-tcltk/expect/expect-5.42.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.42.1.ebuild,v 1.9 2005/02/12 18:48:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.42.1.ebuild,v 1.10 2007/01/05 07:46:35 flameeyes Exp $
 
-inherit eutils gnuconfig
+inherit eutils
 
 DESCRIPTION="tool for automating interactive applications"
 HOMEPAGE="http://expect.nist.gov/"
@@ -34,7 +34,6 @@ src_unpack() {
 		-e '/^install:/s/install-libraries //' \
 		-e 's/^SCRIPTS_MANPAGES = /_&/' \
 		Makefile.in
-	gnuconfig_update
 	WANT_AUTOCONF=2.1 autoconf
 }
 
diff --git a/dev-tcltk/expect/expect-5.43.0.ebuild b/dev-tcltk/expect/expect-5.43.0.ebuild
index 46978822be6c..32f5e6a6bf21 100644
--- a/dev-tcltk/expect/expect-5.43.0.ebuild
+++ b/dev-tcltk/expect/expect-5.43.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0.ebuild,v 1.4 2006/10/18 09:47:57 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0.ebuild,v 1.5 2007/01/05 07:46:35 flameeyes Exp $
 
-inherit eutils gnuconfig
+inherit eutils
 
 DESCRIPTION="tool for automating interactive applications"
 HOMEPAGE="http://expect.nist.gov/"
@@ -38,7 +38,6 @@ src_unpack() {
 		-e '/^install:/s/install-libraries //' \
 		-e 's/^SCRIPTS_MANPAGES = /_&/' \
 		Makefile.in
-	gnuconfig_update
 	WANT_AUTOCONF=2.1 autoconf
 }
 
@@ -51,7 +50,7 @@ src_compile() {
 	# version number.
 	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
 	#tkv isn't really needed, included for symmetry and the future
-	#tkv=$(grep  TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
+	#tkv=$(grep	 TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
 
 	#configure needs to find the files tclConfig.sh and tclInt.h
 	myconf="--with-tcl=/usr/$(get_libdir) --with-tclinclude=/usr/$(get_libdir)/tcl${tclv}/include/generic"
@@ -71,7 +70,7 @@ src_compile() {
 }
 
 src_test() {
-	# we need dejagnu to do tests ... but dejagnu needs 
+	# we need dejagnu to do tests ... but dejagnu needs
 	# expect ... so don't do tests unless we have dejagnu
 	type -p runtest || return 0
 	make check || die "make check failed"
@@ -90,11 +89,11 @@ src_install() {
 	if use doc ; then
 		docinto examples
 		local scripts=$(make -qp | \
-		                sed -e 's/^SCRIPTS = //' -et -ed | head -n1)
+						sed -e 's/^SCRIPTS = //' -et -ed | head -n1)
 		exeinto /usr/share/doc/${PF}/examples
 		doexe ${scripts}
 		local scripts_manpages=$(make -qp | \
-		       sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1)
+			   sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1)
 		for m in ${scripts_manpages}; do
 			dodoc example/${m}.man
 		done