5 files changed, 180 insertions, 5 deletions
diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index fe8112bd9769..b95a48617a0b 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/expect
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.84 2010/12/17 22:56:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.85 2010/12/17 23:23:44 vapier Exp $
+
+*expect-5.45 (17 Dec 2010)
+
+  17 Dec 2010; Mike Frysinger <vapier@gentoo.org> +expect-5.45.ebuild,
+  +files/expect-5.45-gfbsd.patch, +files/expect-5.45-headers.patch:
+  Version bump.
 
   17 Dec 2010; Mike Frysinger <vapier@gentoo.org> expect-5.44.1.15.ebuild,
   +files/expect-5.44.1.15-expectk.patch,
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index fb21a5fe4a91..7543df6da0b1 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -10,18 +10,22 @@ AUX expect-5.44.1.15-gfbsd.patch 659 RMD160 cf566cacac006231459cb13ae4ec53d36253
 AUX expect-5.44.1.15-headers.patch 1879 RMD160 e30840ddc1c84dbcd33c7b353cd1eddd64ee9aae SHA1 173f4a05795a7c6cdc3003423411172c22925382 SHA256 98f6b9607679b81da4d80b00e73c0f4550bfa8ba2c516e109092c42ff705696b
 AUX expect-5.44.1.15-ldflags.patch 360 RMD160 07385db6345811c5f43316e508ea6e2677662197 SHA1 366ecf4a44558819fac92a6f7800961997d060d5 SHA256 2e9d3a614edc020044480ba78802696880be638f5b5dcb0fff02c632e0e738d2
 AUX expect-5.44.1.15_with-tk-no.patch 3471 RMD160 704da66e65df54f66567c62f7e98efea39a21737 SHA1 571d894e59267cd812d727ad3b6f5a4c7b4b98ab SHA256 41e889fc40d1a501285fe0acb1324d8be016654ee92b2a9dcdfe7bd2f3df06a0
+AUX expect-5.45-gfbsd.patch 384 RMD160 e0c2fb7681c26d10eccf6bde9befa4cb84e4e156 SHA1 bbe5793661a108ad3a4d50f8ce71243b85108ef4 SHA256 211c7ec65228cff009e51db7e120de523adeb034fc86ff376ef4d6760a1e06cc
+AUX expect-5.45-headers.patch 1669 RMD160 33d25a4bd9a00eacc6c16b40a467217c07ddd710 SHA1 a6428d5920ccc5c3535290a73977b2cb0351a2e2 SHA256 d71497e07abd1407dc532406031cbc56a4087fbd0612b462dbf7670a18b190da
 AUX expect.m4 20468 RMD160 b06e075db9afed2b0a59d9b5721f874d74acdef5 SHA1 14d4cfc26131f8231af0bfa126722b123573aac4 SHA256 6b60f18a68792050c1cb8745508fd1595eb2789fd780195af0492e344d00faca
 DIST expect-5.43.0.tar.gz 525572 RMD160 2cc91f5bd42c7429550747c590085edb9a517a59 SHA1 854440d937c1d05103bf2d02f911005b739fa1e9 SHA256 4c9decec3c5541806f1758706fe649193d5c8afa2913a79361d9fa5f2c993ba1
 DIST expect-5.44.1.15.tar.bz2 547655 RMD160 e992c650f546cc5fedaebc5f9617893a9f0905a9 SHA1 946c3591d16c216f409882f294378fc53e4f6c0a SHA256 c8565b869d67389995684b60553685168dd40135aa50022bd759f2d5e757d6f1
+DIST expect5.45.tar.gz 628808 RMD160 edffe881ee45abe6e9aa150ea5958a04d0ffeab0 SHA1 e634992cab35b7c6931e1f21fbb8f74d464bd496 SHA256 b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040
 EBUILD expect-5.43.0-r1.ebuild 3820 RMD160 49a753c043884ebebe8018b964de122f111f7d78 SHA1 8bd6235c2e20d34664973bc4aec95f567f8d29c7 SHA256 de5dcecfa85e53ae9166711673bfba1bf308439b523e49faf7baae279fe1f25a
 EBUILD expect-5.43.0.ebuild 3539 RMD160 9b361ac2065c322c017271b7931c4c809bdcd9db SHA1 5d8a4211466e0d49d777afb1e11a5f305787788f SHA256 b68fcde292800697bb761562efc4682ac6fa8c77b6a807f639bbf404a9d3bac9
 EBUILD expect-5.44.1.15.ebuild 3139 RMD160 3a727d8462ee3747c632865efc55cb9ad6931303 SHA1 2cc9a095a66a349beead379c72882512f063bea9 SHA256 df20ad91023a4ff16b447068b5590791c88cf15ef49fae49c5de8af675925ac1
-MISC ChangeLog 12076 RMD160 755e6c6490fc029b9e339e73dd6cd6121df04563 SHA1 38c6b76ad10842464fc89a07fdd23374627a7e6b SHA256 d741e291a21fa212e93ef68faf40bac125097bb1069476a2464f0e3c9c8796c4
+EBUILD expect-5.45.ebuild 2225 RMD160 6f4a9a5b3a51dae4948defb1823e1e0e7fe4ef9d SHA1 805f10c23cdfdc46e2b2635fb9bca9ee3bab466e SHA256 1324c92422edfe5c686a6a277607ad9f9a9b1fa0246db87d419b786ffd54c118
+MISC ChangeLog 12260 RMD160 9193c909b4b181c73a7ab0b87fd1809e69812023 SHA1 14a25cb59242c2cc10cee410489301c25bfd8da6 SHA256 09e63766154fd31ad1d509632d1499a151b5d86f3bdb70a712e94877ecfdd4d1
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAk0L6kwACgkQTwhj9JtAlp5F5AD/S5LrtOQgosZQq7b73inhi2rB
-Hchqlqz9Ha1mtsc7WI0A/0tnK12BfX8+LAyX+2mlg3byNSWsnHaGJT3glTfmqila
-=QciY
+iF4EAREIAAYFAk0L8LkACgkQTwhj9JtAlp5qBQD/bWeSYSLnfwNZt9eurEZQnjE2
+R6vrVmAmNIYc3avR4wsBAIeR3ZQu+SytVbYbOYBV5KxMolnS6pPz4znRYtdzV+9S
+=00jP
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/expect-5.45.ebuild b/dev-tcltk/expect/expect-5.45.ebuild
new file mode 100644
index 000000000000..65bb15433ce2
--- /dev/null
+++ b/dev-tcltk/expect/expect-5.45.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.45.ebuild,v 1.1 2010/12/17 23:23:44 vapier Exp $
+
+EAPI="3"
+
+inherit autotools eutils
+
+MY_P="${PN}${PV}"
+DESCRIPTION="tool for automating interactive applications"
+HOMEPAGE="http://expect.nist.gov/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="debug doc threads"
+
+# We need dejagnu for src_test, but dejagnu needs expect
+# to compile/run, so we cant add dejagnu to DEPEND :/
+DEPEND=">=dev-lang/tcl-8.2[threads?]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" expect.man || die
+	# stops any example scripts being installed by default
+	sed -i \
+		-e '/^install:/s/install-libraries //' \
+		-e 's/^SCRIPTS_MANPAGES = /_&/' \
+		Makefile.in
+
+	epatch "${FILESDIR}"/${PN}-5.45-gfbsd.patch
+	epatch "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-5.45-headers.patch #337943
+	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
+
+	eautoconf
+}
+
+src_configure() {
+	# the 64bit flag is useless ... it only adds 64bit compiler flags
+	# (like -m64) which the target toolchain should already handle
+	econf \
+		--with-tcl=${EPREFIX}/usr/$(get_libdir) \
+		--disable-64bit \
+		--enable-shared \
+		$(use_enable threads) \
+		$(use_enable debug symbols mem)
+}
+
+src_test() {
+	# we need dejagnu to do tests ... but dejagnu needs
+	# expect ... so don't do tests unless we have dejagnu
+	type -p runtest || return 0
+	emake test || die
+}
+
+expect_make_var() {
+	touch pkgIndex.tcl-hand
+	printf 'all:;echo $('$1')\ninclude Makefile' | emake --no-print-directory -s -f -
+	rm -f pkgIndex.tcl-hand
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog FAQ HISTORY NEWS README
+
+	if use doc ; then
+		docinto examples
+		dodoc \
+			example/README \
+			$(printf 'example/%s ' $(expect_make_var SCRIPTS)) \
+			$(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES)) \
+			|| die
+	fi
+}
diff --git a/dev-tcltk/expect/files/expect-5.45-gfbsd.patch b/dev-tcltk/expect/files/expect-5.45-gfbsd.patch
new file mode 100644
index 000000000000..229eb2726fe1
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.45-gfbsd.patch
@@ -0,0 +1,11 @@
+--- a/tclconfig/tcl.m4
++++ b/tclconfig/tcl.m4
+@@ -1579,7 +1579,7 @@
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
+ 	    SHLIB_SUFFIX=".so"
+-	    LDFLAGS="$LDFLAGS -export-dynamic"
++	    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+ 	    AS_IF([test $doRpath = yes], [
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
diff --git a/dev-tcltk/expect/files/expect-5.45-headers.patch b/dev-tcltk/expect/files/expect-5.45-headers.patch
new file mode 100644
index 000000000000..33253bf381cc
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.45-headers.patch
@@ -0,0 +1,76 @@
+https://sourceforge.net/tracker/?func=detail&aid=3071706&group_id=13179&atid=113179
+
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -15,6 +15,12 @@
+ #endif
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif
++#ifdef HAVE_SYS_WAIT_H
++#include <sys/wait.h>
++#endif
+ 
+ #ifdef TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+--- a/exp_trap.c
++++ b/exp_trap.c
+@@ -13,6 +13,7 @@
+ #include <stdio.h>
+ #include <signal.h>
+ #include <sys/types.h>
++#include <string.h>
+ 
+ #ifdef HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+--- a/pty_termios.c
++++ b/pty_termios.c
+@@ -9,6 +9,8 @@
+ 
+ #include <stdio.h>
+ #include <signal.h>
++#include <string.h>
++#include <pty.h>
+ 
+ #if defined(SIGCLD) && !defined(SIGCHLD)
+ #define SIGCHLD SIGCLD
+@@ -100,6 +100,7 @@
+ 
+ #include "exp_tty_in.h"
+ #include "exp_rename.h"
++#include "exp_int.h"
+ #include "exp_pty.h"
+ 
+ void expDiagLog();
+--- a/exp_chan.c
++++ b/exp_chan.c
+@@ -34,6 +34,7 @@
+ #include "exp_rename.h"
+ #include "exp_prog.h"
+ #include "exp_command.h"
++#include "exp_event.h"
+ #include "exp_log.h"
+ #include "tcldbg.h" /* Dbg_StdinMode */
+ 
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -1955,6 +1955,7 @@
+ 
+ #include "expect.h"
+ #include "exp_int.h"
++EXTERN void		exp_init_tty _ANSI_ARGS_((void));
+ 
+ /* exp_glob.c - expect functions for doing glob
+  *
+--- a/exp_tty.h
++++ b/exp_tty.h
+@@ -17,6 +17,7 @@
+ 
+ void exp_tty_raw(int set);
+ void exp_tty_echo(int set);
++int exp_tty_cooked_echo(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo);
+ void exp_tty_break(Tcl_Interp *interp, int fd);
+ int exp_tty_raw_noecho(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo);
+ int exp_israw(void);