4 files changed, 98 insertions, 5 deletions
diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index d7afd87fa5ee..4f4a918dd263 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,11 @@
 # 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.22 2004/08/12 00:33:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.23 2004/09/21 15:30:47 cardoe Exp $
+
+*expect-5.40.0-r2 (21 Sep 2004)
+
+  21 Sep 2004; Doug Goldstein <cardoe@gentoo.org> +expect-5.40.0-r2.ebuild:
+  autoexpect and autopasswd into /usr/bin instead of doc's
 
   11 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
   expect-5.40.0-r1.ebuild, expect-5.40.0.ebuild:
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 46fffe6282f0..f64dc7c5ebb9 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -1,10 +1,12 @@
-MD5 4fad5b17d60afe4dc6f6b9e304e9c734 ChangeLog 3420
 MD5 efa22ab043d94cd5020be7f5921fbac8 expect-5.40.0.ebuild 1778
 MD5 a15812d97737f672a6d9337ddd345e48 expect-5.37.1-r1.ebuild 1823
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 b702779d28e4fa816d97911108cba524 expect-5.37.1-r2.ebuild 3038
+MD5 4fad5b17d60afe4dc6f6b9e304e9c734 ChangeLog 3420
 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 73d27f700171d762da1d01f0a4ba28c2 expect-5.40.0-r2.ebuild 2429
+MD5 b702779d28e4fa816d97911108cba524 expect-5.37.1-r2.ebuild 3038
 MD5 f4bfc81e857154719e1924f00b505ea3 files/digest-expect-5.37.1-r2 65
+MD5 56f93170a590d0db63d826802dcc9847 files/digest-expect-5.40.0 65
 MD5 56f93170a590d0db63d826802dcc9847 files/digest-expect-5.40.0-r1 65
+MD5 f4bfc81e857154719e1924f00b505ea3 files/digest-expect-5.37.1-r1 65
+MD5 56f93170a590d0db63d826802dcc9847 files/digest-expect-5.40.0-r2 65
diff --git a/dev-tcltk/expect/expect-5.40.0-r2.ebuild b/dev-tcltk/expect/expect-5.40.0-r2.ebuild
new file mode 100644
index 000000000000..5019afa15e0a
--- /dev/null
+++ b/dev-tcltk/expect/expect-5.40.0-r2.ebuild
@@ -0,0 +1,85 @@
+# 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-r2.ebuild,v 1.1 2004/09/21 15:30:47 cardoe Exp $
+
+inherit gnuconfig
+
+DESCRIPTION="tool for automating interactive applications"
+HOMEPAGE="http://expect.nist.gov/"
+SRC_URI="http://expect.nist.gov/src/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="X doc"
+
+DEPEND=">=dev-lang/tcl-8.2
+	X? ( >=dev-lang/tk-8.2 )"
+
+NON_MICRO_V=${P%.[0-9]}
+S=${WORKDIR}/${NON_MICRO_V}
+
+src_unpack() {
+	unpack ${A}
+	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 \
+		-e '/^install:/s/install-libraries //' \
+		-e 's/^SCRIPTS_MANPAGES = /_&/' Makefile.in
+	gnuconfig_update
+}
+
+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 --enable-shared || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	make install INSTALL_ROOT=${D} || die "make install failed"
+
+	dodoc ChangeLog FAQ HISTORY NEWS README
+	docinto example
+	dodoc example/README
+
+	local static_lib="lib${NON_MICRO_V/-/}.a"
+	rm ${D}/usr/lib/${NON_MICRO_V/-/}/${static_lib}
+
+	# install example scripts and man pages
+	local scripts=$(make -qp | \
+	                sed -e 's/^SCRIPTS = //' -et -ed | head -n1)
+	exeinto /usr/bin/
+	doexe ${scripts}
+	local scripts_manpages=$(make -qp | \
+		       sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1)
+	cd example
+	for m in ${scripts_manpages}; do
+		mv ${m}.man ${m}.1
+		doman ${m}.1
+	done
+}
+
diff --git a/dev-tcltk/expect/files/digest-expect-5.40.0-r2 b/dev-tcltk/expect/files/digest-expect-5.40.0-r2
new file mode 100644
index 000000000000..8d44a97c4e78
--- /dev/null
+++ b/dev-tcltk/expect/files/digest-expect-5.40.0-r2
@@ -0,0 +1 @@
+MD5 6ae1b87c9af993a69b901b6e52962c18 expect-5.40.0.tar.gz 521414