Updated patches, thanks Naohiro Aotaf or this #382961

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

5 files changed, 56 insertions, 21 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index b95a48617a0b..6f948caf4c0d 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.85 2010/12/17 23:23:44 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.86 2011/11/04 12:38:03 jlec Exp $
+
+  04 Nov 2011; Justin Lecher <jlec@gentoo.org> files/expect-5.45-gfbsd.patch,
+  files/expect-5.45-headers.patch, metadata.xml:
+  Updated patches, thanks Naohiro Aotaf or this #382961
 
 *expect-5.45 (17 Dec 2010)
 
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 7543df6da0b1..d144181884ba 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX expect-5.39.0-libdir.patch 480 RMD160 e58373778379907bf68ce6e61acce5dad4852421 SHA1 f438e6899688f0b3d5bdb854246483ec29848c9a SHA256 971ac5bd88e393d1029ab248c1071529337baf0b50445c53e35f49fdb7c6365a
 AUX expect-5.43.0-avoid-tcl-internals-1.patch 3376 RMD160 2a99f4496dbbb7b1575189fe284e847851b4bedf SHA1 e85341cfd075dc27c9f79c86ac6c035e82203a15 SHA256 2dbfcf569e766d6e5d2b6bc83a7556c0cb189a7da334e07b7201bb0b764fb610
@@ -10,8 +10,8 @@ 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-5.45-gfbsd.patch 996 RMD160 60f815e87f71f92377796cae0f4231ede52377f6 SHA1 9717b5fe55eae6668eba7066a5de4ec5eaca4baa SHA256 5126942c16a7186e7d68b47db80949696f4d53c5fe1c643a68d0f3cd5f939dca
+AUX expect-5.45-headers.patch 2280 RMD160 b06277497f8a8d3572b9da3af1808f1fcbb61d02 SHA1 ec345dc7091a4c57db18e02ecc26588ddfc41868 SHA256 a1c49b2491b0d8d5650afa938521e36e4738a2d486ca1b95df05b084113c493f
 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
@@ -20,12 +20,12 @@ EBUILD expect-5.43.0-r1.ebuild 3820 RMD160 49a753c043884ebebe8018b964de122f111f7
 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
 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
+MISC ChangeLog 12442 RMD160 9e123ba45c1747731d445ced3636e74638897292 SHA1 90f5a81c866fb834da377c14e85ba68347989244 SHA256 4f879f21f1ef01f259b817029521c3d5cd92cf7c5c2e3ff88ffb502245b8519b
+MISC metadata.xml 159 RMD160 0b3f1c7d1bf45f7283ab23b3d8fa0a02c688a044 SHA1 0446a3db32f76d33bf9f76b5229b2fd9900d08c6 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk0L8LkACgkQTwhj9JtAlp5qBQD/bWeSYSLnfwNZt9eurEZQnjE2
-R6vrVmAmNIYc3avR4wsBAIeR3ZQu+SytVbYbOYBV5KxMolnS6pPz4znRYtdzV+9S
-=00jP
+iEYEAREKAAYFAk6z3LEACgkQgAnW8HDreRaK8QCZAbpWUagwrBeA7QdVKJjhGwdc
+b78AoIebYJ78OSFxg7znqV85Mzm/MBIU
+=ifw0
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/files/expect-5.45-gfbsd.patch b/dev-tcltk/expect/files/expect-5.45-gfbsd.patch
index 229eb2726fe1..5ae9c26adb88 100644
--- a/dev-tcltk/expect/files/expect-5.45-gfbsd.patch
+++ b/dev-tcltk/expect/files/expect-5.45-gfbsd.patch
@@ -1,11 +1,26 @@
 --- a/tclconfig/tcl.m4
 +++ b/tclconfig/tcl.m4
-@@ -1579,7 +1579,7 @@
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
+@@ -1634,20 +1634,15 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_LD="${CC} -shared"
+ 	    TCL_SHLIB_LD_EXTRAS="-soname \$[@]"
  	    SHLIB_SUFFIX=".so"
--	    LDFLAGS="$LDFLAGS -export-dynamic"
-+	    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+-	    LDFLAGS=""
++	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
  	    AS_IF([test $doRpath = yes], [
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+-		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+-		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
++		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
++	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    AS_IF([test "${TCL_THREADS}" = "1"], [
+ 		# The -pthread needs to go in the LDFLAGS, not LIBS
+ 		LIBS=`echo $LIBS | sed s/-pthread//`
+ 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
+-	    # Version numbers are dot-stripped by system policy.
+-	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
+-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+-	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+-	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	Darwin-*)
+ 	    CFLAGS_OPTIMIZE="-Os"
diff --git a/dev-tcltk/expect/files/expect-5.45-headers.patch b/dev-tcltk/expect/files/expect-5.45-headers.patch
index 33253bf381cc..98330211b328 100644
--- a/dev-tcltk/expect/files/expect-5.45-headers.patch
+++ b/dev-tcltk/expect/files/expect-5.45-headers.patch
@@ -1,5 +1,15 @@
 https://sourceforge.net/tracker/?func=detail&aid=3071706&group_id=13179&atid=113179
-
+--- a/configure.in
++++ b/configure.in
+@@ -133,6 +133,8 @@ AC_CHECK_HEADER(sys/fcntl.h,     AC_DEFINE(HAVE_SYS_FCNTL_H))
+ AC_CHECK_HEADER(sys/ptem.h,      AC_DEFINE(HAVE_SYS_PTEM_H))
+ AC_CHECK_HEADER(sys/strredir.h,  AC_DEFINE(HAVE_STRREDIR_H))
+ AC_CHECK_HEADER(sys/strpty.h,    AC_DEFINE(HAVE_STRPTY_H))
++AC_CHECK_HEADER(pty.h,           AC_DEFINE(HAVE_PTY_H))
++AC_CHECK_HEADER(libutil.h,       AC_DEFINE(HAVE_LIBUTIL_H))
+ 
+ AC_MSG_CHECKING([for sys/bsdtypes.h])
+ if test "ISC_${ISC}" = "ISC_1"   ;    then
 --- a/exp_clib.c
 +++ b/exp_clib.c
 @@ -15,6 +15,12 @@
@@ -27,12 +37,18 @@ https://sourceforge.net/tracker/?func=detail&aid=3071706&group_id=13179&atid=113
  #include <sys/wait.h>
 --- a/pty_termios.c
 +++ b/pty_termios.c
-@@ -9,6 +9,8 @@
+@@ -9,6 +9,14 @@
  
  #include <stdio.h>
  #include <signal.h>
 +#include <string.h>
++#ifdef HAVE_PTY_H
 +#include <pty.h>
++#endif
++#ifdef HAVE_LIBUTIL_H
++#include <sys/types.h>
++#include <libutil.h>
++#endif
  
  #if defined(SIGCLD) && !defined(SIGCHLD)
  #define SIGCHLD SIGCLD
diff --git a/dev-tcltk/expect/metadata.xml b/dev-tcltk/expect/metadata.xml
index d9408d8ab078..815cc916f2b6 100644
--- a/dev-tcltk/expect/metadata.xml
+++ b/dev-tcltk/expect/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
+	<herd>tcltk</herd>
 </pkgmetadata>