Fix expectk handling, and include a few more headers #279335 by OKUMURA N. Shin-ya.

Package-Manager: portage-2.2.0_alpha8/cvs/Linux x86_64

5 files changed, 40 insertions, 8 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 42e58a5b8077..fe8112bd9769 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.83 2010/12/17 22:35:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.84 2010/12/17 22:56:19 vapier Exp $
+
+  17 Dec 2010; Mike Frysinger <vapier@gentoo.org> expect-5.44.1.15.ebuild,
+  +files/expect-5.44.1.15-expectk.patch,
+  files/expect-5.44.1.15-headers.patch:
+  Fix expectk handling, and include a few more headers #279335 by OKUMURA N.
+  Shin-ya.
 
   17 Dec 2010; Mike Frysinger <vapier@gentoo.org> expect-5.44.1.15.ebuild:
   Force ignoring of -w in MAKEOPTS #338970 by Drake Wyrm.
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 0552b9d7e800..fb21a5fe4a91 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -5,8 +5,9 @@ AUX expect-5.39.0-libdir.patch 480 RMD160 e58373778379907bf68ce6e61acce5dad48524
 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.15-expectk.patch 450 RMD160 f0e44d4cdd69f6712b4fbd151878ee5a22bbac2d SHA1 9cb5139935996582f7a559ed28e0f1421170d167 SHA256 3a90b1816ecc78b726287fe554d2c1deedff168734ee9cfc22efe020503f969c
 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-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.m4 20468 RMD160 b06e075db9afed2b0a59d9b5721f874d74acdef5 SHA1 14d4cfc26131f8231af0bfa126722b123573aac4 SHA256 6b60f18a68792050c1cb8745508fd1595eb2789fd780195af0492e344d00faca
@@ -14,13 +15,13 @@ DIST expect-5.43.0.tar.gz 525572 RMD160 2cc91f5bd42c7429550747c590085edb9a517a59
 DIST expect-5.44.1.15.tar.bz2 547655 RMD160 e992c650f546cc5fedaebc5f9617893a9f0905a9 SHA1 946c3591d16c216f409882f294378fc53e4f6c0a SHA256 c8565b869d67389995684b60553685168dd40135aa50022bd759f2d5e757d6f1
 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 3098 RMD160 b1b67db474ae46ae3759d1dab548ab40a9146882 SHA1 444f4aea476d955db9ff51865cbcfc67470f5923 SHA256 65b883ff6baad0b45d3371b30f9b11e9ad14ee3e9825bdc3b82e38dcfb4ace74
-MISC ChangeLog 11831 RMD160 455530f5be6e0fccd2bd456b2df9a2426017b0f1 SHA1 d163b06a022a93ac3c3f731d58d206cd287bb3eb SHA256 4068f05f1b03c86abca0048508b3228ca93db07c170ae5943d99f048eab80720
+EBUILD expect-5.44.1.15.ebuild 3139 RMD160 3a727d8462ee3747c632865efc55cb9ad6931303 SHA1 2cc9a095a66a349beead379c72882512f063bea9 SHA256 df20ad91023a4ff16b447068b5590791c88cf15ef49fae49c5de8af675925ac1
+MISC ChangeLog 12076 RMD160 755e6c6490fc029b9e339e73dd6cd6121df04563 SHA1 38c6b76ad10842464fc89a07fdd23374627a7e6b SHA256 d741e291a21fa212e93ef68faf40bac125097bb1069476a2464f0e3c9c8796c4
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAk0L5VEACgkQTwhj9JtAlp7ubAEAj3RgqXCYz+6hxBpwiV9T/A7o
-xaps8FGoibzIs/6yQr8BAJ+1M/wDQDBTXzTwTcgzayKhRKN4yJd/ruKd2cMQcGav
-=DWqo
+iF4EAREIAAYFAk0L6kwACgkQTwhj9JtAlp5F5AD/S5LrtOQgosZQq7b73inhi2rB
+Hchqlqz9Ha1mtsc7WI0A/0tnK12BfX8+LAyX+2mlg3byNSWsnHaGJT3glTfmqila
+=QciY
 -----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 adcb65cab2d5..006a65b115c9 100644
--- a/dev-tcltk/expect/expect-5.44.1.15.ebuild
+++ b/dev-tcltk/expect/expect-5.44.1.15.ebuild
@@ -1,6 +1,6 @@
 # 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.15 2010/12/17 22:35:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v 1.16 2010/12/17 22:56:19 vapier Exp $
 
 EAPI="3"
 
@@ -33,6 +33,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-ldflags.patch
 	epatch "${FILESDIR}"/${P}_with-tk-no.patch
 	epatch "${FILESDIR}"/${P}-headers.patch #337943
+	epatch "${FILESDIR}"/${P}-expectk.patch
 	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
 
 	eautoconf
diff --git a/dev-tcltk/expect/files/expect-5.44.1.15-expectk.patch b/dev-tcltk/expect/files/expect-5.44.1.15-expectk.patch
new file mode 100644
index 000000000000..0c0ba80293e0
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.44.1.15-expectk.patch
@@ -0,0 +1,14 @@
+expectk is only built when TK_BIN_DIR is defined.  the configure script
+takes care of figuring out this value, but then they forgot to actually
+write it out to the Makefile.
+
+--- Makefile.in
++++ Makefile.in
+@@ -24,6 +24,7 @@
+ # SETUID = chmod u+s
+ 
+ LIB_RUNTIME_DIR = $(DESTDIR)@libdir@
++TK_BIN_DIR = @TK_BIN_DIR@
+ 
+ # The following Expect scripts are not necessary to have installed as
+ # commands, but are very useful. Edit out what you don't want
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
index 33253bf381cc..77e4d91f4bf9 100644
--- a/dev-tcltk/expect/files/expect-5.44.1.15-headers.patch
+++ b/dev-tcltk/expect/files/expect-5.44.1.15-headers.patch
@@ -74,3 +74,13 @@ https://sourceforge.net/tracker/?func=detail&aid=3071706&group_id=13179&atid=113
  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);
+--- a/exp_main_tk.c
++++ b/exp_main_tk.c
+@@ -32,6 +32,7 @@
+ static char sccsid[] = "@(#) tkAppInit.c 1.19 95/12/23 17:09:24";
+ #endif /* not lint */
+ 
++#include <string.h>
+ #include <ctype.h>
+ 
+ #include "tk.h"