fix implicit missing declarations (bug 204878)

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

4 files changed, 147 insertions, 12 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index f17e5fae26d3..09996ccdedbd 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/expect
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.52 2009/05/16 13:11:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.53 2009/06/07 17:01:04 mescalinum Exp $
+
+  07 Jun 2009; Federico Ferri <mescalinum@gentoo.org>
+  +files/expect-5.42.1-missing-includes.patch, +expect-5.42.1-r2.ebuild:
+  fix implicit missing declarations (bug 204878)
 
   16 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   expect-5.44.1.ebuild, +files/expect-5.44.1-gfbsd.patch:
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index eb8a7f06438e..4b4c14a0d387 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX expect-5.39.0-libdir.patch 480 RMD160 e58373778379907bf68ce6e61acce5dad4852421 SHA1 f438e6899688f0b3d5bdb854246483ec29848c9a SHA256 971ac5bd88e393d1029ab248c1071529337baf0b50445c53e35f49fdb7c6365a
+AUX expect-5.42.1-missing-includes.patch 1031 RMD160 fbbf4d66eb9029e332fa6b4b73be2c96498025ff SHA1 67854b3950d2e71833ce45d9dc24beda34ddaf7e SHA256 22c393a04f1120b811fe366c0ab6a81500060414be2dd80fc9ba222b5710c493
 AUX expect-5.42.1-multilib.patch 507 RMD160 d086ba11fb79048f1b800d17d93ffeb90912110b SHA1 b59faccf8a0e8c538126d68c5eed181d789f45d7 SHA256 a707e4d6f513f1b2b09edb3c7bb393b9f2f3fcfaf79db0326e82e018b842d002
 AUX expect-5.43.0-avoid-tcl-internals-1.patch 3376 RMD160 2a99f4496dbbb7b1575189fe284e847851b4bedf SHA1 e85341cfd075dc27c9f79c86ac6c035e82203a15 SHA256 2dbfcf569e766d6e5d2b6bc83a7556c0cb189a7da334e07b7201bb0b764fb610
 AUX expect-5.43.0-multilib.patch 507 RMD160 d086ba11fb79048f1b800d17d93ffeb90912110b SHA1 b59faccf8a0e8c538126d68c5eed181d789f45d7 SHA256 a707e4d6f513f1b2b09edb3c7bb393b9f2f3fcfaf79db0326e82e018b842d002
@@ -12,14 +10,8 @@ DIST expect-5.42.1.tar.gz 524882 RMD160 d354d5d3ffa941d89e668fb4ad1ccbb59be4f341
 DIST expect-5.43.0.tar.gz 525570 RMD160 223b78f39dca8cc7900d82230cf7db91e6770389 SHA1 4da64b7c50cea22ac87fcf0f8f98f786793ee785 SHA256 d11a77e680ddc0244370b46f117f0b28a6571db842885bee3b7c15372c1ca079
 DIST expect-5.44.1.tar.gz 623422 RMD160 5f206d9e5b9bb73c97bb7fc0d7df7318d4525a32 SHA1 b897c7626e7dde0fd090a572389a5e2a95056de8 SHA256 e41a6b82d67150f0dc38faa5c96715d93b68d3e55be40a585737cc4f59c4fd8f
 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 3271 RMD160 f9dae46d98d364b86d3d2d36221c3dde2e262e86 SHA1 5cb2c9860af9c45cbc06d8ed1936fc2eb528953e SHA256 7e828063384563eb6dae764d87dcc77e07309fe4341af5e5f7ed34d09035f5d7
 EBUILD expect-5.44.1.ebuild 3327 RMD160 5e52ad948f23a3cca56a5287d3536d35e8f20715 SHA1 32d729660889a4ce7eddd79cdae8a7c451aa2ce9 SHA256 476fd0417956a6538b0af071b3ac3e824b69296fd728e5e330522cd17412e257
-MISC ChangeLog 7661 RMD160 df14049051a948d1620442c147d157593228251e SHA1 0e5fb001603e7c44de90ccb65adca56dc860f0f9 SHA256 c661b44faf58cb663350e7a9f5d238e9601cfda76798d6e67b8ca85bf211abb4
+MISC ChangeLog 7839 RMD160 dd1f4a4dee053d7306d0838de9b476edd172ab48 SHA1 8494fab311d49209eebb0b2ea302f95887d7b16d SHA256 da3a42d36d8ffbe9a5f10263f016e17c8252913a38658249e06ced05957f0c1c
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoOu34ACgkQAiZjviIA2XiKUwCeMfXApKlC6felojIIUhJGbNq8
-2SAAn1BprfbVBKm6xAgU1YnQuCVMd70H
-=rpdg
------END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/expect-5.42.1-r2.ebuild b/dev-tcltk/expect/expect-5.42.1-r2.ebuild
new file mode 100644
index 000000000000..a67ae00d9f61
--- /dev/null
+++ b/dev-tcltk/expect/expect-5.42.1-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2009 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-r2.ebuild,v 1.1 2009/06/07 17:01:04 mescalinum Exp $
+
+WANT_AUTOCONF="2.1"
+inherit autotools eutils
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+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
+	X? ( >=dev-lang/tk-8.2 )"
+RDEPEND="${DEPEND}"
+
+NON_MICRO_V=${P%.[0-9]}
+S=${WORKDIR}/${NON_MICRO_V}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-multilib.patch
+
+	# fix the rpath being set to /var/tmp/portage/...
+	epatch ${FILESDIR}/expect-5.39.0-libdir.patch
+
+	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
+
+	# fix implicit missing declarations (bug 204878)
+	epatch "${FILESDIR}"/"${P}"-missing-includes.patch
+
+	eautoconf
+}
+
+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/$(get_libdir) --with-tclinclude=/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=/usr/$(get_libdir)"
+	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_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
+	make check || die "make check failed"
+}
+
+src_install() {
+	dodir /usr/$(get_libdir)
+	make install INSTALL_ROOT=${D} || die "make install failed"
+
+	dodoc ChangeLog FAQ HISTORY NEWS README
+
+	local static_lib="lib${NON_MICRO_V/-/}.a"
+	rm ${D}/usr/$(get_libdir)/${NON_MICRO_V/-/}/${static_lib}
+
+	#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.42.1-missing-includes.patch b/dev-tcltk/expect/files/expect-5.42.1-missing-includes.patch
new file mode 100644
index 000000000000..ec4ce5184eb2
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.42.1-missing-includes.patch
@@ -0,0 +1,33 @@
+diff -urN work.orig/expect-5.42/exp_glob.c work/expect-5.42/exp_glob.c
+--- work.orig/expect-5.42/exp_glob.c	2009-06-02 00:07:02.429807485 -0400
++++ work/expect-5.42/exp_glob.c	2009-06-02 00:09:05.039817979 -0400
+@@ -11,6 +11,7 @@
+ 
+ */
+ 
++#include <string.h>
+ #include "expect_cf.h"
+ #include "tcl.h"
+ #include "exp_int.h"
+diff -urN work.orig/expect-5.42/exp_main_exp.c work/expect-5.42/exp_main_exp.c
+--- work.orig/expect-5.42/exp_main_exp.c	2009-06-02 00:07:02.429807485 -0400
++++ work/expect-5.42/exp_main_exp.c	2009-06-02 00:08:09.867365455 -0400
+@@ -9,6 +9,7 @@
+ 
+ #include "expect_cf.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "tcl.h"
+ #include "expect_tcl.h"
+ 
+diff -urN work.orig/expect-5.42/pty_termios.c work/expect-5.42/pty_termios.c
+--- work.orig/expect-5.42/pty_termios.c	2009-06-02 00:07:02.449818499 -0400
++++ work/expect-5.42/pty_termios.c	2009-06-02 00:08:41.878505396 -0400
+@@ -8,6 +8,7 @@
+ */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <signal.h>
+ 
+ #if defined(SIGCLD) && !defined(SIGCHLD)