Version bump + serious clean up.

8 files changed, 40 insertions, 73 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 5508fd1ca262..8d789ba2ed9e 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/expect
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.15 2004/03/26 18:05:23 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.16 2004/04/04 22:13:08 zx Exp $
+
+  04 Apr 2004; Chris Aniszczyk <zx@gentoo.org> expect-5.33.0.ebuild,
+  expect-5.37.1.ebuild:
+  Version bump and serious clean up.
 
   26 Mar 2004; Guy Martin <gmsoft@gentoo.org> expect-5.37.1-r1.ebuild:
   Marked stable on hppa.
diff --git a/dev-tcltk/expect/expect-5.33.0.ebuild b/dev-tcltk/expect/expect-5.33.0.ebuild
deleted file mode 100644
index 7a970c6a0f13..000000000000
--- a/dev-tcltk/expect/expect-5.33.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.33.0.ebuild,v 1.12 2004/03/13 09:53:56 mr_bones_ Exp $
-
-#remove the trailing ".0" from the tarball version
-S=${WORKDIR}/${P%.0}
-
-DESCRIPTION="tool for automating interactive applications"
-SRC_URI="http://expect.nist.gov/src/${P}.tar.gz"
-HOMEPAGE="http://expect.nist.gov/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha"
-IUSE="X"
-
-DEPEND=">=dev-lang/tcl-8.2
-	X? ( >=dev-lang/tk-8.2 )"
-
-src_compile() {
-	local myconf
-	local tclv
-	local tkv
-
-	# Find the version of tcl/tk that has headers installed.
-	# This will be the most recently merged, not necessarily the highest
-	# 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/')
-
-	#configure needs to find the files tclConfig.sh and tclInt.h
-	myconf="--with-tcl=/usr/lib --with-tclinclude=/usr/lib/tcl$tclv/include/generic"
-
-	if [ `use X` ]; then
-		#--with-x is enabled by default
-		#configure needs to find the file tkConfig.sh and tk.h
-		#tk.h is in /usr/lib so don't need to explicitly set --with-tkinclude
-		myconf="${myconf} --with-tk=/usr/lib"
-	else
-		#configure knows that tk depends on X so just disable X
-		myconf="$myconf --without-x"
-	fi
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-}
diff --git a/dev-tcltk/expect/expect-5.37.1.ebuild b/dev-tcltk/expect/expect-5.40.0.ebuild
index 3af93cb0abd8..027dc306d129 100644
--- a/dev-tcltk/expect/expect-5.37.1.ebuild
+++ b/dev-tcltk/expect/expect-5.40.0.ebuild
@@ -1,27 +1,31 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.37.1.ebuild,v 1.10 2004/03/13 09:53:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.40.0.ebuild,v 1.1 2004/04/04 22:13:08 zx Exp $
 
-#remove the trailing ".0" from the tarball version
-S=${WORKDIR}/${P%.1}
+inherit gnuconfig
 
 DESCRIPTION="tool for automating interactive applications"
-SRC_URI="http://expect.nist.gov/src/${P}.tar.gz"
 HOMEPAGE="http://expect.nist.gov/"
+SRC_URI="http://expect.nist.gov/src/${P}.tar.gz"
 
-SLOT="0"
-KEYWORDS="x86 sparc"
 LICENSE="BSD"
-IUSE="X"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64"
+IUSE="X doc"
 
 DEPEND=">=dev-lang/tcl-8.2
 	X? ( >=dev-lang/tk-8.2 )"
 
+S=${WORKDIR}/${P%.0}
+
 src_compile() {
+	if [ "${ARCH}" == "amd64" ]; then
+		gnuconfig_update
+	fi
+
 	local myconf
 	local tclv
 	local tkv
-
 	# Find the version of tcl/tk that has headers installed.
 	# This will be the most recently merged, not necessarily the highest
 	# version number.
@@ -32,21 +36,30 @@ src_compile() {
 	#configure needs to find the files tclConfig.sh and tclInt.h
 	myconf="--with-tcl=/usr/lib --with-tclinclude=/usr/lib/tcl$tclv/include/generic"
 
-	if [ `use X` ]; then
+	if use X; then
 		#--with-x is enabled by default
 		#configure needs to find the file tkConfig.sh and tk.h
 		#tk.h is in /usr/lib so don't need to explicitly set --with-tkinclude
-		myconf="${myconf} --with-tk=/usr/lib"
+		myconf="$myconf --with-tk=/usr/lib"
 	else
 		#configure knows that tk depends on X so just disable X
-		myconf="${myconf} --without-x"
+		myconf="$myconf --without-x"
 	fi
 
-	econf ${myconf} || die
+	econf $myconf --enable-shared || die
 	emake || die
 }
 
-src_install() {
+src_install () {
 	einstall || die
+
+	#docs
 	dodoc Changelog FAQ HISTORY NEWS README
+
+	#install examples if 'doc' is set
+	if use doc; then
+		cd ${S}
+		dodir /usr/share/doc/${PF}/examples/
+		cp example/* ${D}/usr/share/doc/${PF}/examples/
+	fi
 }
diff --git a/dev-tcltk/expect/files/digest-expect-5.33.0 b/dev-tcltk/expect/files/digest-expect-5.33.0
deleted file mode 100644
index 076ef70675ec..000000000000
--- a/dev-tcltk/expect/files/digest-expect-5.33.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 12bbd009b67deadc494b0577b494163c expect-5.33.0.tar.gz 494473
diff --git a/dev-tcltk/expect/files/digest-expect-5.37.1 b/dev-tcltk/expect/files/digest-expect-5.37.1
deleted file mode 100644
index 6543a4578374..000000000000
--- a/dev-tcltk/expect/files/digest-expect-5.37.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d570837b6dc6311036d7bdeab19f0e03 expect-5.37.1.tar.gz 517284
diff --git a/dev-tcltk/expect/files/digest-expect-5.40.0 b/dev-tcltk/expect/files/digest-expect-5.40.0
new file mode 100644
index 000000000000..8d44a97c4e78
--- /dev/null
+++ b/dev-tcltk/expect/files/digest-expect-5.40.0
@@ -0,0 +1 @@
+MD5 6ae1b87c9af993a69b901b6e52962c18 expect-5.40.0.tar.gz 521414
diff --git a/dev-tcltk/expect/metadata.xml b/dev-tcltk/expect/metadata.xml
new file mode 100644
index 000000000000..20ce219711a2
--- /dev/null
+++ b/dev-tcltk/expect/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+</pkgmetadata>
diff --git a/dev-tcltk/itcl/Manifest b/dev-tcltk/itcl/Manifest
index 1481641d8a63..238026e8f33e 100644
--- a/dev-tcltk/itcl/Manifest
+++ b/dev-tcltk/itcl/Manifest
@@ -1,9 +1,6 @@
-MD5 7e08bdc7ad9270a3a73eaef12fe6bb9b ChangeLog 2094
-MD5 99cbc877fd4f1df8c6107f42425825b2 itcl-3.2-r2.ebuild 879
-MD5 eb15065a91eaf5ac5686ed6c13c23773 itcl-3.2.1-r1.ebuild 1030
-MD5 461f0fc5de2b397505ddfc09b03be348 itcl-3.2.1.ebuild 921
-MD5 d78d1b2bd36da73b8fb0ff8e5663ec26 files/digest-itcl-3.2-r2 60
-MD5 e3a3b717c90821cebb7c3e22fa8be626 files/digest-itcl-3.2.1 62
+MD5 7a4977edb91c05fa37c6a67a095acc1d itcl-3.2.1-r1.ebuild 1023
+MD5 6342b060ad43c8a351b03b217fafc751 ChangeLog 2254
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 e3a3b717c90821cebb7c3e22fa8be626 files/digest-itcl-3.2.1-r1 62
 MD5 d491331a9a5e13cc91ebb8070cc378da files/itcl-3.2-r2-gentoo.diff 1540
 MD5 67dc49dd69f1b7df89aa5f4198b18352 files/itcl-3.2.1-gentoo.diff 4282