[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/expect/files/, dev-tcltk/expect/

2022-11-17 Thread Sam James 
commit: 0af114cd7cd6a228aaf9c6b370e3614c671fab42
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 17 20:29:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 17 20:37:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af114cd

dev-tcltk/expect: fix clang 16; EAPI 8; fix test deps

Closes: https://bugs.gentoo.org/881687
Signed-off-by: Sam James  gentoo.org>

 dev-tcltk/expect/expect-5.45.4-r4.ebuild   |  79 
 .../files/expect-5.45.4-configure-clang16.patch| 223 +
 2 files changed, 302 insertions(+)

diff --git a/dev-tcltk/expect/expect-5.45.4-r4.ebuild 
b/dev-tcltk/expect/expect-5.45.4-r4.ebuild
new file mode 100644
index ..0241b8c3bc92
--- /dev/null
+++ b/dev-tcltk/expect/expect-5.45.4-r4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edo flag-o-matic
+
+MY_P="${PN}${PV}"
+DESCRIPTION="tool for automating interactive applications"
+HOMEPAGE="https://core.tcl-lang.org/expect/;
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris 
~x86-solaris"
+IUSE="debug doc test threads"
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-lang/tcl-8.2:=[threads?]"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-util/dejagnu )"
+
+PATCHES=( "${FILESDIR}"/${P}-examples.patch )
+
+src_prepare() {
+   default
+   sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" expect.man || die
+
+   eapply "${FILESDIR}"/${PN}-5.45-gfbsd.patch
+   eapply "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
+   eapply "${FILESDIR}"/${PN}-5.45-headers.patch #337943
+   eapply "${FILESDIR}"/${PN}-5.45-format-security.patch
+   eapply "${FILESDIR}"/${PN}-5.45.4-configure-in.patch
+   eapply "${FILESDIR}"/${PN}-5.45.4-configure-clang16.patch || die
+
+   sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c || die
+
+   # fix install_name on darwin
+   [[ ${CHOST} == *-darwin* ]] && \
+   eapply "${FILESDIR}"/${P}-darwin-install_name.patch
+
+   mv configure.{in,ac} || die
+
+   eautoconf
+}
+
+src_configure() {
+   # bug #881687
+   append-flags -std=gnu89
+
+   # the 64bit flag is useless ... it only adds 64bit compiler flags
+   # (like -m64) which the target toolchain should already handle
+   econf \
+   --with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+   --disable-64bit \
+   --enable-shared \
+   $(use_enable threads) \
+   $(use_enable debug symbols mem)
+}
+
+expect_make_var() {
+   touch pkgIndex.tcl-hand || die
+   printf 'all:;echo $('$1')\ninclude Makefile' | emake 
--no-print-directory -s -f -
+   rm -f pkgIndex.tcl-hand || die
+}
+
+src_install() {
+   default
+
+   if use doc ; then
+   docinto examples
+
+   edo dodoc \
+   example/README \
+   $(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
+   $(printf 'example/%s.man ' $(expect_make_var 
_SCRIPTS_MANPAGES))
+   fi
+}

diff --git a/dev-tcltk/expect/files/expect-5.45.4-configure-clang16.patch 
b/dev-tcltk/expect/files/expect-5.45.4-configure-clang16.patch
new file mode 100644
index ..5d40e5ddf684
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.45.4-configure-clang16.patch
@@ -0,0 +1,223 @@
+From 4c3a5051aa9706eea42dab31f9e121d975c08521 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Thu, 17 Nov 2022 20:20:45 +
+Subject: [PATCH] Fix configure with clang 16
+
+Bug: https://bugs.gentoo.org/881687
+Signed-off-by: Sam James 
+--- a/configure.in
 b/configure.in
+@@ -454,7 +454,7 @@ AC_CHECK_FUNC(siglongjmp, AC_DEFINE(HAVE_SIGLONGJMP))
+ # because Unixware 2.0 handles it specially and refuses to compile
+ # autoconf's automatic test that is a call with no arguments
+ AC_MSG_CHECKING([for memcpy])
+-AC_TRY_LINK(,[
++AC_TRY_LINK([#include ],[
+ char *s1, *s2;
+ memcpy(s1,s2,0);
+ ],
+@@ -471,7 +471,7 @@ memcpy(s1,s2,0);
+ AC_MSG_CHECKING([if WNOHANG requires _POSIX_SOURCE])
+ AC_TRY_RUN([
+ #include 
+-main() {
++int main(void) {
+ #ifndef WNOHANG
+   return 0;
+ #else
+@@ -491,7 +491,7 @@ rm -rf wnohang
+ AC_TRY_RUN([
+ #include 
+ #include 
+-main() {
++int main(void) {
+ #ifdef WNOHANG
+   FILE *fp = fopen("wnohang","w");
+   fprintf(fp,"%d",WNOHANG);
+@@ -540,24 +540,23 @@ dnl AC_HEADER_EGREP([(void|sighandler_t).*signal], 
signal.h, retsigtype=void,AC_
+ AC_MSG_CHECKING([if signals need to be re-armed])
+ AC_TRY_RUN([
+ #include 
+-#define RETSIGTYPE $retsigtype
+-
++#include 
++#include 
++#include 
+ int signal_rearms = 0;
+ 
+ RETSIGTYPE
+-child_sigint_handler(n)
+-int n;

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/expect/files/, dev-tcltk/expect/

2018-10-01 Thread Alfredo Tupone 
commit: c0ec62f4668cc2e54e30b222cfb391978ab0f116
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Mon Oct  1 09:16:47 2018 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Mon Oct  1 09:26:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ec62f4

dev-tcltk/expect: Fix installing examples

Closes: https://bugs.gentoo.org/667144
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/expect/expect-5.45.4.ebuild   |  4 
 dev-tcltk/expect/files/expect-5.45.4-examples.patch | 14 --
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dev-tcltk/expect/expect-5.45.4.ebuild 
b/dev-tcltk/expect/expect-5.45.4.ebuild
index 7f540266356..b6d1a0feefe 100644
--- a/dev-tcltk/expect/expect-5.45.4.ebuild
+++ b/dev-tcltk/expect/expect-5.45.4.ebuild
@@ -72,6 +72,10 @@ src_install() {
 
if use doc ; then
docinto examples
+   echo dodoc \
+   example/README \
+   $(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
+   $(printf 'example/%s.man ' $(expect_make_var 
_SCRIPTS_MANPAGES))
dodoc \
example/README \
$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \

diff --git a/dev-tcltk/expect/files/expect-5.45.4-examples.patch 
b/dev-tcltk/expect/files/expect-5.45.4-examples.patch
index 10de8821a01..cd631b30a5c 100644
--- a/dev-tcltk/expect/files/expect-5.45.4-examples.patch
+++ b/dev-tcltk/expect/files/expect-5.45.4-examples.patch
@@ -1,21 +1,23 @@
 --- a/Makefile.in  2018-09-26 15:59:09.049279363 +0200
 +++ b/Makefile.in  2018-09-26 16:00:00.514427553 +0200
-@@ -32,16 +32,12 @@
+@@ -32,15 +32,17 @@
  # SCRIPTS is a target. If this is a problem, just comment out the
  # SCRIPTS target itself.
  
 -SCRIPTS = timed-run timed-read ftp-rfc autopasswd lpunlock weather \
--  passmass rftp kibitz rlogin-cwd xpstat tkpasswd dislocate xkibitz \
--  tknewsbiff unbuffer mkpasswd cryptdir decryptdir autoexpect \
--  multixterm
 +SCRIPTS = unbuffer
++_SCRIPTS = timed-run timed-read ftp-rfc autopasswd lpunlock weather \
+   passmass rftp kibitz rlogin-cwd xpstat tkpasswd dislocate xkibitz \
+-  tknewsbiff unbuffer mkpasswd cryptdir decryptdir autoexpect \
++  tknewsbiff mkpasswd cryptdir decryptdir autoexpect \
+   multixterm
  
  # A couple of the scripts have man pages of their own.
  # You can delete these too if you don't want'em.
  
 -SCRIPTS_MANPAGES = kibitz dislocate xkibitz tknewsbiff unbuffer mkpasswd \
--  passmass cryptdir decryptdir autoexpect multixterm
 +SCRIPTS_MANPAGES = unbuffer
++_SCRIPTS_MANPAGES = kibitz dislocate xkibitz tknewsbiff unbuffer mkpasswd \
+   passmass cryptdir decryptdir autoexpect multixterm
  
  
- # allow us to handle null list gracefully, "end_of_list" should not exist

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/expect/files/, dev-tcltk/expect/

2018-09-26 Thread Alfredo Tupone 
commit: 08233f3ced0f2f02cdd575baac834871ca9ecbcf
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Wed Sep 26 17:07:27 2018 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Wed Sep 26 17:07:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08233f3c

dev-tcltk/expect: Version bump to 5.45.4

Closes: https://bugs.gentoo.org/607106
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-tcltk/expect/Manifest  |  1 +
 dev-tcltk/expect/expect-5.45.4.ebuild  | 80 ++
 .../expect/files/expect-5.45.4-examples.patch  | 21 ++
 3 files changed, 102 insertions(+)

diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 12480be8f29..5334acf4f51 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -1 +1,2 @@
+DIST expect5.45.4.tar.gz 632363 BLAKE2B 
a3a936e7644c922fdd474fa08c45926396ccce9a63e5f65f4d5e157f5160cfe4de47688734b39d13281d9548aac492810f19236e06563903d3d8081e4661048d
 SHA512 
a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
 DIST expect5.45.tar.gz 628808 BLAKE2B 
d7260d3b2ce1bcd72deef121e1f994f45bfa5397291692d794c9b8ad627d7ac183689ba00ba22f728853ac03b6b083fb6f283dc5c453aa991e04263c217be552
 SHA512 
be991c68241e607b3a689eae7e7966056dbfb577e857331d54a4911bd178c1816425217603b43918ad1b6d2e966271a0f01e79d7028a22e223562d59d10c8c51

diff --git a/dev-tcltk/expect/expect-5.45.4.ebuild 
b/dev-tcltk/expect/expect-5.45.4.ebuild
new file mode 100644
index 000..7f540266356
--- /dev/null
+++ b/dev-tcltk/expect/expect-5.45.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+MY_P="${PN}${PV}"
+DESCRIPTION="tool for automating interactive applications"
+HOMEPAGE="http://expect.nist.gov/;
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos 
~x86-macos ~m68k-mint ~x64-solaris ~x86-solaris"
+IUSE="debug doc threads"
+
+# 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:0[threads?]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-examples.patch )
+
+src_prepare() {
+   default
+   sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" expect.man || die
+
+   epatch "${FILESDIR}"/${PN}-5.45-gfbsd.patch
+   epatch "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
+   epatch "${FILESDIR}"/${PN}-5.45-headers.patch #337943
+   epatch "${FILESDIR}"/${PN}-5.45-format-security.patch
+   sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
+
+   # fix install_name on darwin
+   [[ ${CHOST} == *-darwin* ]] && \
+   epatch "${FILESDIR}"/${P}-darwin-install_name.patch
+
+   mv configure.{in,ac} || die
+
+   eautoconf
+}
+
+src_configure() {
+   # the 64bit flag is useless ... it only adds 64bit compiler flags
+   # (like -m64) which the target toolchain should already handle
+   econf \
+   --with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+   --disable-64bit \
+   --enable-shared \
+   $(use_enable threads) \
+   $(use_enable debug symbols mem)
+}
+
+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
+}
+
+expect_make_var() {
+   touch pkgIndex.tcl-hand
+   printf 'all:;echo $('$1')\ninclude Makefile' | emake 
--no-print-directory -s -f -
+   rm -f pkgIndex.tcl-hand || die
+}
+
+src_install() {
+   default
+
+   if use doc ; then
+   docinto examples
+   dodoc \
+   example/README \
+   $(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
+   $(printf 'example/%s.man ' $(expect_make_var 
_SCRIPTS_MANPAGES))
+   fi
+}

diff --git a/dev-tcltk/expect/files/expect-5.45.4-examples.patch 
b/dev-tcltk/expect/files/expect-5.45.4-examples.patch
new file mode 100644
index 000..10de8821a01
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.45.4-examples.patch
@@ -0,0 +1,21 @@
+--- a/Makefile.in  2018-09-26 15:59:09.049279363 +0200
 b/Makefile.in  2018-09-26 16:00:00.514427553 +0200
+@@ -32,16 +32,12 @@
+ # SCRIPTS is a target. If this is a problem, just comment out the
+ # SCRIPTS target itself.
+ 
+-SCRIPTS = timed-run timed-read ftp-rfc autopasswd lpunlock weather \
+-  passmass rftp kibitz rlogin-cwd xpstat tkpasswd dislocate xkibitz \
+-  tknewsbiff unbuffer mkpasswd cryptdir decryptdir autoexpect \
+-  multixterm

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/expect/files/

2017-12-06 Thread Michael Palimaka 
commit: f9ba7161ed0c960f3add84d0edd267e71d9ce379
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Dec  5 17:35:36 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec  6 11:59:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ba7161

dev-tcltk/expect: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/6456

 .../expect/files/expect-5.44.1.15-expectk.patch|  14 ---
 .../expect/files/expect-5.44.1.15-gfbsd.patch  |  17 ---
 .../expect/files/expect-5.44.1.15-headers.patch|  86 ---
 .../expect/files/expect-5.44.1.15_with-tk-no.patch | 117 -
 4 files changed, 234 deletions(-)

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
deleted file mode 100644
index 0c0ba80293e..000
--- a/dev-tcltk/expect/files/expect-5.44.1.15-expectk.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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-gfbsd.patch 
b/dev-tcltk/expect/files/expect-5.44.1.15-gfbsd.patch
deleted file mode 100644
index d67de2126a0..000
--- a/dev-tcltk/expect/files/expect-5.44.1.15-gfbsd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
 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"
--  SHLIB_LD="ld -Bshareable -x"
-+  SHLIB_LD="${CC} -shared"
-   SHLIB_LD_LIBS='${LIBS}'
-   SHLIB_SUFFIX=".so"
-   DL_OBJS="tclLoadDl.o"
-   DL_LIBS=""
--  LDFLAGS="$LDFLAGS -export-dynamic"
-+  LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
-   CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-   LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
-   if test "${TCL_THREADS}" = "1" ; then

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
deleted file mode 100644
index 77e4d91f4bf..000
--- a/dev-tcltk/expect/files/expect-5.44.1.15-headers.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-https://sourceforge.net/tracker/?func=detail=3071706_id=13179=113179
-
 a/exp_clib.c
-+++ b/exp_clib.c
-@@ -15,6 +15,12 @@
- #endif
- #include 
- #include 
-+#ifdef HAVE_UNISTD_H
-+# include 
-+#endif
-+#ifdef HAVE_SYS_WAIT_H
-+#include 
-+#endif
- 
- #ifdef TIME_WITH_SYS_TIME
- # include 
 a/exp_trap.c
-+++ b/exp_trap.c
-@@ -13,6 +13,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #ifdef HAVE_SYS_WAIT_H
- #include 
 a/pty_termios.c
-+++ b/pty_termios.c
-@@ -9,6 +9,8 @@
- 
- #include 
- #include 
-+#include 
-+#include 
- 
- #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);
 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 
- #include 
- 
- #include "tk.h"

diff --git a/dev-tcltk/expect/files/expect-5.44.1.15_with-tk-no.patch 
b/dev-tcltk/expect/files/expect-5.44.1.15_with-tk-no.patch
deleted file mode 100644
index cea372daaac..000
--- a/dev-tcltk/expect/files/expect-5.44.1.15_with-tk-no.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-This is a minimal patch that does not keep indentation consistent in tcl.m4
-Updating indentation would make the patch much bigger and less readable.
-
-Signed-off-by: Gilles Espinasse

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/expect/files/

2016-10-14 Thread Amy Winston 
commit: de3fff546778cffaf9e8fc53094a3e446aaa6d69
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Thu Sep 29 16:48:09 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Fri Oct 14 17:34:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de3fff54

dev-tcltk/expect: remove unused patches

 dev-tcltk/expect/files/expect-5.39.0-libdir.patch  |  11 -
 .../expect-5.43.0-avoid-tcl-internals-1.patch  | 100 
 dev-tcltk/expect/files/expect-5.43.0-darwin.patch  |  11 -
 .../files/expect-5.43.0-missing-includes.patch |  44 --
 .../expect/files/expect-5.43.0-multilib.patch  |  11 -
 dev-tcltk/expect/files/expect.m4   | 609 -
 6 files changed, 786 deletions(-)

diff --git a/dev-tcltk/expect/files/expect-5.39.0-libdir.patch 
b/dev-tcltk/expect/files/expect-5.39.0-libdir.patch
deleted file mode 100644
index 061db83..
--- a/dev-tcltk/expect/files/expect-5.39.0-libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 expect-5.39/Makefile.in.libdir 2003-07-30 00:46:51.0 +0200
-+++ expect-5.39/Makefile.in2003-11-17 17:54:52.0 +0100
-@@ -316,7 +316,7 @@
- CFLAGS_INT = $(MH_CFLAGS) $(CPPFLAGS) $(XCFLAGS)
- 
- LIB_INSTALL_DIR = $(tcl_libdir)
--LIB_RUNTIME_DIR = $(tcl_libdir)
-+LIB_RUNTIME_DIR = $(subst $(INSTALL_ROOT),,$(tcl_libdir))
- # I don't understand why Tcl splits these up, but it does.  LIB_RUNTIME_DIR
- # can appear as part of the LD_SEARCH_FLAGS inherited by configure.
- 

diff --git a/dev-tcltk/expect/files/expect-5.43.0-avoid-tcl-internals-1.patch 
b/dev-tcltk/expect/files/expect-5.43.0-avoid-tcl-internals-1.patch
deleted file mode 100644
index 517fe93..
--- a/dev-tcltk/expect/files/expect-5.43.0-avoid-tcl-internals-1.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Submitted By: Bryan Kadzban 
-Date: 2008-01-12
-Initial Package Version: 5.43
-Upstream status: Not Submitted - Test Version
-Origin: LFS ticket 2126 (http://wiki.linuxfromscratch.org/lfs/ticket/2126)
-Description: Removes references to functions that Tcl 8.5 no longer exposes.
-
-diff -Naur expect-5.43/exp_command.c expect-5.43-patched/exp_command.c
 expect-5.43/exp_command.c  2004-08-20 13:18:01.0 -0400
-+++ expect-5.43-patched/exp_command.c  2008-01-12 11:42:45.0 -0500
-@@ -2265,6 +2265,8 @@
-   /*NOTREACHED*/
- }
- 
-+static struct exp_cmd_data cmd_data[];
-+
- /*ARGSUSED*/
- static int
- Exp_CloseObjCmd(clientData, interp, objc, objv)
-@@ -2311,12 +2313,23 @@
-   /* Historical note: we used "close"  long before there was a */
-   /* Tcl builtin by the same name. */
- 
-+  /* The code that registered this function as the handler for */
-+  /* the "close" command stored away the old handler in the */
-+  /* exp_cmd_data for the "close" command. */
-+
-+  struct exp_cmd_data *cmd_ptr;
-   Tcl_CmdInfo info;
-+
-+  for(cmd_ptr = _data[0]; cmd_ptr->name; cmd_ptr++) {
-+  if(strncmp(cmd_ptr->name, "close", 5) == 0)
-+  break;
-+  }
-+
-   Tcl_ResetResult(interp);
-   if (0 == Tcl_GetCommandInfo(interp,"close",)) {
-   info.clientData = 0;
-   }
--  return(Tcl_CloseObjCmd(info.clientData,interp,objc_orig,objv_orig));
-+  
return(cmd_ptr->old_objProc(info.clientData,interp,objc_orig,objv_orig));
- }
- 
- if (chanName) {
-@@ -2961,7 +2974,10 @@
- /* if successful (i.e., TCL_RETURN is returned) */
- /* modify the result, so that we will handle it specially */
- 
--int result = Tcl_ReturnObjCmd(clientData,interp,objc,objv);
-+Tcl_CmdInfo info;
-+Tcl_GetCommandInfo(interp, "return", );
-+
-+int result = info.objProc(clientData,interp,objc,objv);
- if (result == TCL_RETURN)
- result = EXP_TCL_RETURN;
- return result;
-@@ -3062,8 +3078,7 @@
- 
-   for (;c->name;c++) {
-   /* if already defined, don't redefine */
--  if ((c->flags & EXP_REDEFINE) ||
--  !(Tcl_FindHashEntry(>cmdTable,c->name) ||
-+  if (!(Tcl_FindHashEntry(>cmdTable,c->name) ||
- Tcl_FindHashEntry(>cmdTable,c->name))) {
-   if (c->objproc)
-   Tcl_CreateObjCommand(interp,c->name,
-@@ -3072,6 +3087,21 @@
-   Tcl_CreateCommand(interp,c->name,c->proc,
- c->data,exp_deleteProc);
-   }
-+  else if (c->flags & EXP_REDEFINE) { /* unless the REDEFINE flag 
is present */
-+  Tcl_CmdInfo info;
-+
-+  if (Tcl_GetCommandInfo(interp, c->name, )) {
-+  c->old_proc = info.proc;
-+  c->old_objProc  = info.objProc;
-+  }
-+
-+  if (c->objproc)
-+  Tcl_CreateObjCommand(interp,c->name,
-+