Clean up ebuild and fix missing prototype warnings #337943 by David J Cozatt.

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

4 files changed, 113 insertions, 31 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 6180a88edea4..4fd8e466ff0c 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,10 @@
 # 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.80 2010/08/07 16:57:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.81 2010/09/20 07:27:45 vapier Exp $
+
+  20 Sep 2010; Mike Frysinger <vapier@gentoo.org> expect-5.44.1.15.ebuild,
+  +files/expect-5.44.1.15-headers.patch:
+  Clean up ebuild and fix missing prototype warnings #337943 by David J Cozatt.
 
   07 Aug 2010; Raúl Porcel <armin76@gentoo.org> expect-5.44.1.15.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #324951
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 95c9510e3a81..a9464d540177 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
@@ -5,6 +8,7 @@ AUX expect-5.43.0-avoid-tcl-internals-1.patch 3376 RMD160 2a99f4496dbbb7b1575189
 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.15-gfbsd.patch 659 RMD160 cf566cacac006231459cb13ae4ec53d362535317 SHA1 441465aaa7cb4481a934ea97c75e5630ee3053f7 SHA256 0b40a0798b7851a97b2e67043e1346d76c97b9f1084ca1d51d57f2d3f129fb01
+AUX expect-5.44.1.15-headers.patch 1669 RMD160 33d25a4bd9a00eacc6c16b40a467217c07ddd710 SHA1 a6428d5920ccc5c3535290a73977b2cb0351a2e2 SHA256 d71497e07abd1407dc532406031cbc56a4087fbd0612b462dbf7670a18b190da
 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.m4 20468 RMD160 b06e075db9afed2b0a59d9b5721f874d74acdef5 SHA1 14d4cfc26131f8231af0bfa126722b123573aac4 SHA256 6b60f18a68792050c1cb8745508fd1595eb2789fd780195af0492e344d00faca
@@ -15,6 +19,13 @@ EBUILD expect-5.42.1-r1.ebuild 3062 RMD160 37e2632986cfa482437551c2e8842fa773505
 EBUILD expect-5.42.1-r2.ebuild 3182 RMD160 15ba15d1cf65267408c690390e8139576dc71509 SHA1 cce29a75c72bb943f3d55f2715c7eb1baffcbc4b SHA256 f9b02c01b8473854790f4f153ddf48b9ed63db4b3d76145001eda1c99e658553
 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 3230 RMD160 865c723aa0a4237866a05a40f3366c4422b727b3 SHA1 c448a7e2f18814ce280d0834150f1cf226b3d7d0 SHA256 d9111ddc2592d2da64d26297bb56e4a068c547607c04ce814b97a5971a0bb76a
-MISC ChangeLog 11276 RMD160 351cb536b2c0182ff0ee6440e60d1881a60246d4 SHA1 704503063265cf22a105dee3a9b331a76827f4fd SHA256 9896e2fe2fd359605937ae5b2bbc328189afabe9b204f8a2644b212322e1e68a
+EBUILD expect-5.44.1.15.ebuild 3077 RMD160 a984991171fb2662029554156bbb3ddebb282d8e SHA1 8f6f0c2020a944df630cdfe05047ba471dafe7e9 SHA256 3b6b9a147161c2c9fda5230f91b00a5419a6d415cd284892225c5efad3fcb909
+MISC ChangeLog 11472 RMD160 b79f9b00e22e2dcfcc73e87cc4c646f557db61ee SHA1 f91ef77b85732d380102cddd2ab1045c82d81efe SHA256 db46ad6154f2fad6b1ded48dd24e43c9c13de476bdd4fe025609bbe50db7654b
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkyXDOMACgkQTwhj9JtAlp5kaQD/WJ9VLOX5QZJBTwSvVfS/2fME
+aHRR7bpmpjkUV8wX93ABAKUjMJ4J0Idbtj6BVg12FRjq1Xg76ToFeGC8CHffxhTE
+=U6ok
+-----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
index 825eafc78e82..3f6ce55d48b1 100644
--- a/dev-tcltk/expect/expect-5.44.1.15.ebuild
+++ b/dev-tcltk/expect/expect-5.44.1.15.ebuild
@@ -1,10 +1,9 @@
 # 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.13 2010/08/07 16:57:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v 1.14 2010/09/20 07:27:45 vapier Exp $
 
 EAPI="3"
 
-WANT_AUTOCONF="2.5"
 inherit autotools eutils
 
 DESCRIPTION="tool for automating interactive applications"
@@ -23,21 +22,18 @@ DEPEND=">=dev-lang/tcl-8.2[threads?]
 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 "s#/usr/local/bin#${EPREFIX}/usr/bin#" expect{,k}.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}/${P}-gfbsd.patch"
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	epatch "${FILESDIR}/${P}_with-tk-no.patch"
+	epatch "${FILESDIR}"/${P}-gfbsd.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}_with-tk-no.patch
+	epatch "${FILESDIR}"/${P}-headers.patch #337943
+	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
 
 	eautoconf
 }
@@ -79,26 +75,21 @@ src_test() {
 	emake test || die "emake test failed"
 }
 
-src_install() {
-	dodir /usr/$(get_libdir)
-	emake install DESTDIR="${D}" || die "make install failed"
+expect_make_var() {
+	touch pkgIndex.tcl-hand
+	printf 'all:;echo $('$1')\ninclude Makefile' | emake -s -f -
+	rm -f pkgIndex.tcl-hand
+}
 
+src_install() {
+	emake install DESTDIR="${D}" || die
 	dodoc ChangeLog FAQ HISTORY NEWS README
 
-	#install examples if 'doc' is set
+	# install examples if 'doc' is set
 	if use doc ; then
-		docinto examples
-		local scripts=$(make -qp | \
-			sed -e 's/^SCRIPTS = //' -et -ed | head -n1)
 		insinto /usr/share/doc/${PF}/examples
-		for s in ${scripts}; do
-			doins example/${s} || die
-		done
-		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
+		doins $(printf 'example/%s ' $(expect_make_var SCRIPTS)) || die
+		docinto examples
+		dodoc example/README $(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES)) || die
 	fi
 }
diff --git a/dev-tcltk/expect/files/expect-5.44.1.15-headers.patch b/dev-tcltk/expect/files/expect-5.44.1.15-headers.patch
new file mode 100644
index 000000000000..33253bf381cc
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.44.1.15-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);