Version Bump, per 313567, thanks Harald van Dijk for patches

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 120 insertions, 52 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 97fd23557b77..43e4253c45dc 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,13 @@
 # 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.66 2010/04/08 06:19:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.67 2010/04/12 20:17:41 jlec Exp $
+
+*expect-5.44.1.15 (12 Apr 2010)
+
+  12 Apr 2010; Justin Lecher <jlec@gentoo.org> +expect-5.44.1.15.ebuild,
+  +files/expect-5.44.1.15-gfbsd.patch,
+  +files/expect-5.44.1.15-ldflags.patch, -files/expect-5.44.1-ldflags.patch:
+  Version Bump, per 313567, thanks Harald van Dijk for patches
 
   08 Apr 2010; Justin Lecher <jlec@gentoo.org> -expect-5.44.1.ebuild:
   Removed due to a upstream recall of this version, #313567
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index fbe5704f1528..3d4342751c8f 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -7,22 +7,22 @@ AUX expect-5.42.1-multilib.patch 507 RMD160 d086ba11fb79048f1b800d17d93ffeb90912
 AUX expect-5.43.0-avoid-tcl-internals-1.patch 3376 RMD160 2a99f4496dbbb7b1575189fe284e847851b4bedf SHA1 e85341cfd075dc27c9f79c86ac6c035e82203a15 SHA256 2dbfcf569e766d6e5d2b6bc83a7556c0cb189a7da334e07b7201bb0b764fb610
 AUX expect-5.43.0-missing-includes.patch 1767 RMD160 9f5e3f92da5f651111220abd6a2571aaf247210c SHA1 02c957d9d0b5d110412ae9a77d8d7ff4c377312e SHA256 28f0a57901a714f52a29b829f01e934a45fd3b71aead7b7946a024719495f68b
 AUX expect-5.43.0-multilib.patch 507 RMD160 d086ba11fb79048f1b800d17d93ffeb90912110b SHA1 b59faccf8a0e8c538126d68c5eed181d789f45d7 SHA256 a707e4d6f513f1b2b09edb3c7bb393b9f2f3fcfaf79db0326e82e018b842d002
-AUX expect-5.44.1-darwin.patch 437 RMD160 75fac7c93e284b8c73ed983862059cab882a7b31 SHA1 bd774850775b0fb9ddc133a68c674060b9132708 SHA256 28439ab383c498a364536f677666d8da127201ed76623b556b0ab6bc4dc561bc
-AUX expect-5.44.1-destdir.patch 1072 RMD160 b5dcc02f39215616e790b79088ee197ea74af7f6 SHA1 a662f32614cf37a40991e80cea8d43646ca72947 SHA256 41102ebbd7da6eccea0a88c29e5b5a1ce7039effdf8c271fe09d9bbe3fe55f0e
-AUX expect-5.44.1-gfbsd.patch 720 RMD160 c2601d99b3e8d631af37d3f249c32aa9f9a3f488 SHA1 5c63fb190d20f0288e973bd24861075ebb4110e3 SHA256 7dc2e2bd43808f60574e300682c800b373ea0832488e684e589f33d79a3150bf
-AUX expect-5.44.1-ldflags.patch 360 RMD160 07385db6345811c5f43316e508ea6e2677662197 SHA1 366ecf4a44558819fac92a6f7800961997d060d5 SHA256 2e9d3a614edc020044480ba78802696880be638f5b5dcb0fff02c632e0e738d2
+AUX expect-5.44.1.15-gfbsd.patch 659 RMD160 cf566cacac006231459cb13ae4ec53d362535317 SHA1 441465aaa7cb4481a934ea97c75e5630ee3053f7 SHA256 0b40a0798b7851a97b2e67043e1346d76c97b9f1084ca1d51d57f2d3f129fb01
+AUX expect-5.44.1.15-ldflags.patch 360 RMD160 07385db6345811c5f43316e508ea6e2677662197 SHA1 366ecf4a44558819fac92a6f7800961997d060d5 SHA256 2e9d3a614edc020044480ba78802696880be638f5b5dcb0fff02c632e0e738d2
 AUX expect.m4 20468 RMD160 b06e075db9afed2b0a59d9b5721f874d74acdef5 SHA1 14d4cfc26131f8231af0bfa126722b123573aac4 SHA256 6b60f18a68792050c1cb8745508fd1595eb2789fd780195af0492e344d00faca
 DIST expect-5.42.1.tar.gz 524882 RMD160 d354d5d3ffa941d89e668fb4ad1ccbb59be4f341 SHA1 84ca72f0abd2b7a31ee332049b34575a286e8f27 SHA256 a2b64dbca4dc127dfcb6d7e16dd3c08ef8bba2056104ce89819d3e6f0e1df430
 DIST expect-5.43.0.tar.gz 525570 RMD160 223b78f39dca8cc7900d82230cf7db91e6770389 SHA1 4da64b7c50cea22ac87fcf0f8f98f786793ee785 SHA256 d11a77e680ddc0244370b46f117f0b28a6571db842885bee3b7c15372c1ca079
+DIST expect-5.44.1.15.tar.bz2 547655 RMD160 e992c650f546cc5fedaebc5f9617893a9f0905a9 SHA1 946c3591d16c216f409882f294378fc53e4f6c0a SHA256 c8565b869d67389995684b60553685168dd40135aa50022bd759f2d5e757d6f1
 EBUILD expect-5.42.1-r1.ebuild 3062 RMD160 37e2632986cfa482437551c2e8842fa773505d66 SHA1 21a51490a22cbcaac3ff158159af9583d34082e1 SHA256 e3315c6b5fd88d502bc53c735ca654308084a3cd4d0ba814b197f92ff4229183
 EBUILD expect-5.42.1-r2.ebuild 3182 RMD160 15ba15d1cf65267408c690390e8139576dc71509 SHA1 cce29a75c72bb943f3d55f2715c7eb1baffcbc4b SHA256 f9b02c01b8473854790f4f153ddf48b9ed63db4b3d76145001eda1c99e658553
 EBUILD expect-5.43.0.ebuild 3541 RMD160 0a9309f8707f4b3af96efe595fc26cf11b203d4c SHA1 ea1607517c769490e976ff3191de0914414348d4 SHA256 fd457236e9f6396133dc1e8ff52ec04466e04ba62b6b0dfa044bddf799ed974f
-MISC ChangeLog 9383 RMD160 7d2ea85f1b9b82f264b2d065c3782fbdd357f4d0 SHA1 f07bd42e4081946dddbb8486225419497c2d3da1 SHA256 b8a82af87315b43537bcca8291db3d49361bc4ec7c82ade26621423f8d8fe46d
+EBUILD expect-5.44.1.15.ebuild 3088 RMD160 a9f90560c6dd3c37a19049d77dec358fbb7ff0eb SHA1 78fc302d856fbf4db93ce634212f096b5e85375f SHA256 1abab951a8e1566bb27a055cc647518f77d602052a2b4eef424352b8683bee30
+MISC ChangeLog 9669 RMD160 990cf127ab294a3c40180127ff66fda726c922d4 SHA1 dcbdd9536823f3ad3b007003e9b4effe74ac92ea SHA256 e54119bea7ab140ca70db1f246bf591eecfed1ff2e568ac6beae44292b6d9d70
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAku9dXUACgkQgAnW8HDreRZ4yACfTv3fDCD8/JnGuzNaJORCjjJw
-R08An0WFgyGEi5owAr+rkluyqvSHF+mB
-=Dfpz
+iEYEARECAAYFAkvDgDkACgkQgAnW8HDreRYJIgCggw2YwkXhJWe/u53RehWxBL3G
+hkcAn3zqD6GK9bIpPxM5MTbJx17+0pDZ
+=c+Xu
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/expect-5.44.1.15.ebuild b/dev-tcltk/expect/expect-5.44.1.15.ebuild
new file mode 100644
index 000000000000..ba7baf72fbff
--- /dev/null
+++ b/dev-tcltk/expect/expect-5.44.1.15.ebuild
@@ -0,0 +1,99 @@
+# 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.44.1.15.ebuild,v 1.1 2010/04/12 20:17:41 jlec Exp $
+
+EAPI="3"
+
+WANT_AUTOCONF="2.5"
+inherit autotools eutils
+
+DESCRIPTION="tool for automating interactive applications"
+HOMEPAGE="http://expect.nist.gov/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="X doc"
+
+# 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
+	>=dev-lang/tk-8.2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# fix install_name on darwin
+	[[ ${CHOST} == *-darwin* ]] && \
+		epatch "${FILESDIR}"/${P}-darwin.patch
+
+	sed -i "s#/usr/local/bin#${EPREFIX}/usr/bin#" expect.man
+	sed -i "s#/usr/local/bin#${EPREFIX}/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
+
+	epatch "${FILESDIR}/${P}-gfbsd.patch"
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+
+	eautoconf
+}
+
+src_configure() {
+	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 ${EPREFIX}/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=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${EPREFIX}/usr/$(get_libdir)/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=${EPREFIX}/usr/$(get_libdir) --with-tkinclude=${EPREFIX}/usr/include"
+	else
+		#configure knows that tk depends on X so just disable X
+		myconf="$myconf --without-x"
+	fi
+
+	econf $myconf --enable-shared || die "econf failed"
+}
+
+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 "emake test failed"
+}
+
+src_install() {
+	dodir /usr/$(get_libdir)
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	dodoc ChangeLog FAQ HISTORY NEWS README
+
+	#install examples if 'doc' is set
+	if use doc ; then
+		docinto examples
+		local scripts=$(make -qp | \
+						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)
+		for m in ${scripts_manpages}; do
+			dodoc example/${m}.man
+		done
+		dodoc example/README
+	fi
+}
diff --git a/dev-tcltk/expect/files/expect-5.44.1-darwin.patch b/dev-tcltk/expect/files/expect-5.44.1-darwin.patch
deleted file mode 100644
index bdbfffb959dc..000000000000
--- a/dev-tcltk/expect/files/expect-5.44.1-darwin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=287072
-
-patch by Stuart Shelton
-
---- Makefile.in.dist	2009-10-09 15:09:49 +0100
-+++ Makefile.in	2009-10-09 15:09:59 +0100
-@@ -148,7 +148,7 @@
- RANLIB		= @RANLIB@
- RANLIB_STUB	= @RANLIB_STUB@
- SHLIB_CFLAGS	= @SHLIB_CFLAGS@
--SHLIB_LD	= @SHLIB_LD@
-+SHLIB_LD	= @SHLIB_LD@ -install_name $(tcl_libdir)/$(EXP_SHARED_LIB_FILE)
- SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
- STLIB_LD	= @STLIB_LD@
- TCL_DEFS	= @TCL_DEFS@
diff --git a/dev-tcltk/expect/files/expect-5.44.1-destdir.patch b/dev-tcltk/expect/files/expect-5.44.1-destdir.patch
deleted file mode 100644
index 1fc8aac58d1f..000000000000
--- a/dev-tcltk/expect/files/expect-5.44.1-destdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.in.orig	2008-10-26 13:15:44.000000000 +0100
-+++ Makefile.in	2008-10-26 13:16:25.000000000 +0100
-@@ -256,14 +256,14 @@ install-doc: doc
- 	@mkdir -p $(DESTDIR)$(mandir)/man3
- 	@echo "Installing documentation in $(DESTDIR)$(mandir)"
- # install Expectk man page if present
--	$(INSTALL_DATA) $(srcdir)/expectk.man $(mandir)/man1/expectk.1 ; \
-+	$(INSTALL_DATA) $(srcdir)/expectk.man $(DESTDIR)$(mandir)/man1/expectk.1 ; \
- # install Expect man page
--	$(INSTALL_DATA) $(srcdir)/expect.man $(mandir)/man1/expect.1
-+	$(INSTALL_DATA) $(srcdir)/expect.man $(DESTDIR)$(mandir)/man1/expect.1
- # install man page for Expect and Expectk libraries
--	$(INSTALL_DATA) $(srcdir)/libexpect.man $(mandir)/man3/libexpect.3
-+	$(INSTALL_DATA) $(srcdir)/libexpect.man $(DESTDIR)$(mandir)/man3/libexpect.3
- 	-for i in $(SCRIPT_MANPAGE_LIST) ; do \
- 	  if [ -f $(srcdir)/example/$$i.man ] ; then \
--	    $(INSTALL_DATA) $(srcdir)/example/$$i.man $(mandir)/man1/$$i.1 ; \
-+	    $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(mandir)/man1/$$i.1 ; \
- 	  else true; fi ; \
- 	done
- 
diff --git a/dev-tcltk/expect/files/expect-5.44.1-gfbsd.patch b/dev-tcltk/expect/files/expect-5.44.1.15-gfbsd.patch
index 84f3bfeeb6fe..d67de2126a07 100644
--- a/dev-tcltk/expect/files/expect-5.44.1-gfbsd.patch
+++ b/dev-tcltk/expect/files/expect-5.44.1.15-gfbsd.patch
@@ -1,8 +1,6 @@
-Index: expect-5.44.1/tclconfig/tcl.m4
-===================================================================
---- expect-5.44.1.orig/tclconfig/tcl.m4
-+++ expect-5.44.1/tclconfig/tcl.m4
-@@ -1395,12 +1395,12 @@ dnl AC_CHECK_TOOL(AR, ar, :)
+--- expect-5.44.1.15/tclconfig/tcl.m4.orig	2010-04-08 22:49:51.568043292 -0700
++++ expect-5.44.1.15/tclconfig/tcl.m4	2010-04-08 22:50:28.207915301 -0700
+@@ -1579,12 +1579,12 @@
  	FreeBSD-*)
  	    # FreeBSD 3.* and greater have ELF.
  	    SHLIB_CFLAGS="-fPIC"
@@ -14,6 +12,6 @@ Index: expect-5.44.1/tclconfig/tcl.m4
  	    DL_LIBS=""
 -	    LDFLAGS="$LDFLAGS -export-dynamic"
 +	    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
- 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  	    if test "${TCL_THREADS}" = "1" ; then
- 		# The -pthread needs to go in the CFLAGS, not LIBS
diff --git a/dev-tcltk/expect/files/expect-5.44.1-ldflags.patch b/dev-tcltk/expect/files/expect-5.44.1.15-ldflags.patch
index be3641c2105c..be3641c2105c 100644
--- a/dev-tcltk/expect/files/expect-5.44.1-ldflags.patch
+++ b/dev-tcltk/expect/files/expect-5.44.1.15-ldflags.patch