summaryrefslogtreecommitdiff
path: root/dev-tcltk/tclreadline
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:57:42 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:57:42 +0100
commit1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch)
treee48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-tcltk/tclreadline
parentd87262dd706fec50cd150aab3e93883b6337466d (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-tcltk/tclreadline')
-rw-r--r--dev-tcltk/tclreadline/Manifest9
-rw-r--r--dev-tcltk/tclreadline/files/tclreadline-2.1.0-alloc-free.patch121
-rw-r--r--dev-tcltk/tclreadline/files/tclreadline-2.1.0-gold.patch15
-rw-r--r--dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-executing-macro.patch128
-rw-r--r--dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-history-expand.patch35
-rw-r--r--dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-prompt.patch12
-rw-r--r--dev-tcltk/tclreadline/metadata.xml11
-rw-r--r--dev-tcltk/tclreadline/tclreadline-2.1.0-r4.ebuild68
8 files changed, 0 insertions, 399 deletions
diff --git a/dev-tcltk/tclreadline/Manifest b/dev-tcltk/tclreadline/Manifest
deleted file mode 100644
index 81189902920f..000000000000
--- a/dev-tcltk/tclreadline/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX tclreadline-2.1.0-alloc-free.patch 3421 BLAKE2B 76df6d5b1aa2ac89900eeca296ec85f8e16e6076e5447eddcdca9be5bf474b3de886045fef5470101addaf6e81a819e73acbed60ed23ae84e222d922c0e76cca SHA512 52456ed9de43f7a6e646ded04a814e895d40db53ec3c7ce28a9be0eba16d52ebdc7e8eaff76ffc6b7db1db29b8bb0d58908c188fdcf2b2689e28db40046d3517
-AUX tclreadline-2.1.0-gold.patch 458 BLAKE2B 2a9e1c4e3809a03a7539f37b38fa09bcf5f9533555dca8f50817c9f577a90e766cd521a0428b00fba7083d9d7e0098ca9793b3dd57098d0d4c48f236e9d69893 SHA512 91bbf2eb167c33faa02e998bd83da06e3b1e28832700ff79458a2bbc1620920e749985ec6780254a7016e931cca094205224aa3ea3a95effb12dafc1fe9fca45
-AUX tclreadline-2.1.0-rl-executing-macro.patch 3788 BLAKE2B a8f1316c3b3b63832c1bd3d94a12349ae23042ef04b728f12d38efc220c36d657e48992c685a6b0d2dd266904565f4850096aa463099c77d1f11a1b0eb094720 SHA512 f7ba38320c7095b4a8450e24a3ed1a75af6dcd7791c17b5546b36faeb5391b00f389a353838f8ea2b81b25f5d9c5ca1b6ccf7db5e6a30d2e304691db42da67dc
-AUX tclreadline-2.1.0-rl-history-expand.patch 969 BLAKE2B 44b2aaf9f5ea2f518888b338edd04a7b274345af2cd86836b1cb8d101428c98f608eecb3454a51d6ff236d32df068f59db93819c57d1f8d8c5670c99ebe0d7fb SHA512 a015a56413c683e2a41e912891138494f43fd12b5383f9514314d87c9cc353cd95a2ea515978b4d1b0c60d4ab1cc0d1d16d982825949e338c0ac69e84e114304
-AUX tclreadline-2.1.0-rl-prompt.patch 463 BLAKE2B c9faea41e07303d94ec6eb08f4098fd9ca483f47509a1e9a6a791649738cc6b31b2266783b84434b25072f100bc88d1a87c0a765245be305d56fbbdd33aef2b9 SHA512 b547e2077861d39701ed53b485f9758c8e0a636ecba7abfc25aa3fabeaa1337c6e48a08ba51425b95a55bae4021c2aa17e66686ee3836eb31cb6b4d115508073
-DIST tclreadline-2.1.0.tar.gz 160541 BLAKE2B 44dfd7626b969d03343cfa768d0ad72b9322a13175ca7c713c3981c0abc27967e31a62f3451b5d007569a30a7279be7c2a8f1c7c78e8d0c310964ddba18fa5cb SHA512 bd67a65fe2ec708834fb67fabf2e36e778a6aeeb7a7b69cda298f9e18acc9e03f3a379f81ff7d2d289bfbf1093bc86fecbf96fe5d04a2ca954899cc7df6fe4bf
-DIST tclreadline_2.1.0-12.debian.tar.gz 9636 BLAKE2B b84487e2e05649c899f705ee4c4ea80a7b05c99440e9b905587300342ce54d48a7d32b750ec2c2a3a12f1aa991f2a47167243ec962f539e02383aac62530a3d9 SHA512 293e9ad14a469891f68b25caa78a99874de87df4c44af4ada7528cf74e898be42b7846fbb6eeabb2dec34995a9ccd9707c61f406b90b90dbca2c24df05f451eb
-EBUILD tclreadline-2.1.0-r4.ebuild 1848 BLAKE2B 20f63f5ec09196076d03b9c21415c9f010b1c72e08c0e12325a5bd225c7a3d6c6f87c971bf8454063bef080c46e994abc95e9a01e1a2b6e3737a5ebd8eb3fe00 SHA512 456559f0eea55eb24fcda7dee42b5fc153ed229869ab846350898cdf2da92c3e3c8776db20f5064665240d1720277b78619b8670bc590da9f25e0f9f4da4bbc0
-MISC metadata.xml 334 BLAKE2B b04f2a6d45f622095b6c4a34a0752583e773c10a7df53c77f02d642dc8ca715a1ab9dbd2ad64122142fd93122b004cd456350774a082cd3f72d0b920eb54e03c SHA512 23517fbebe1eedf4558ec1c04e10774229762eb7279d0bda99f602fac526afd817968bbff0ba23a1ef433684afda85f830ed7f5643b7c9cca22e7d2f66f71691
diff --git a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-alloc-free.patch b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-alloc-free.patch
deleted file mode 100644
index 6694c29f6042..000000000000
--- a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-alloc-free.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -ur a/tclreadline.c b/tclreadline.c
---- a/tclreadline.c 2000-09-20 19:44:34.000000000 +0200
-+++ b/tclreadline.c 2013-11-18 10:35:13.889610060 +0100
-@@ -343,7 +343,9 @@
- return TCL_ERROR;
- } else if (3 == objc) {
-- if (tclrl_custom_completer)
-+ if (tclrl_custom_completer) {
-- FREE(tclrl_custom_completer);
-+ free(tclrl_custom_completer);
-+ tclrl_custom_completer = NULL;
-+ }
- if (!blank_line(Tcl_GetStringFromObj(objv[2], 0)))
- tclrl_custom_completer =
- stripwhite(strdup(Tcl_GetStringFromObj(objv[2], 0)));
-@@ -378,7 +380,9 @@
- return TCL_ERROR;
- } else if (3 == objc) {
-- if (tclrl_eof_string)
-+ if (tclrl_eof_string) {
-- FREE(tclrl_eof_string);
-+ free(tclrl_eof_string);
-+ tclrl_eof_string = NULL;
-+ }
- if (!blank_line(Tcl_GetStringFromObj(objv[2], 0)))
- tclrl_eof_string =
- stripwhite(strdup(Tcl_GetStringFromObj(objv[2], 0)));
-@@ -506,10 +510,16 @@
- if (status >= 1) {
- /* TODO: make this a valid tcl output */
- printf("%s\n", expansion);
-+ free(ptr);
-+ free(expansion);
-+ return;
- } else if (-1 == status) {
- Tcl_AppendResult
- (tclrl_interp, "error in history expansion\n", (char*) NULL);
- TclReadlineTerminate(TCL_ERROR);
-+ free(ptr);
-+ free(expansion);
-+ return;
- }
- /**
- * TODO: status == 2 ...
-@@ -544,8 +554,8 @@
- * tell the calling routines to terminate.
- */
- TclReadlineTerminate(LINE_COMPLETE);
-- FREE(ptr);
-- FREE(expansion);
-+ free(ptr);
-+ free(expansion);
- }
- }
-
-@@ -673,7 +683,7 @@
- strcpy(rl_line_buffer, expansion);
- rl_end = strlen(expansion);
- rl_point += strlen(expansion) - oldlen;
-- FREE(expansion);
-+ free(expansion);
- /*
- * TODO:
- * because we return 0 == matches,
-@@ -682,7 +690,8 @@
- */
- return matches;
- }
-- FREE(expansion);
-+ free(expansion);
-+ expansion = NULL;
- }
-
- if (tclrl_custom_completer) {
-@@ -699,15 +710,19 @@
- state = Tcl_VarEval(tclrl_interp, tclrl_custom_completer,
- " \"", quoted_text, "\" ", start_s, " ", end_s,
- " \"", quoted_rl_line_buffer, "\"", (char*) NULL);
-- FREE(quoted_text);
-- FREE(quoted_rl_line_buffer);
- if (TCL_OK != state) {
- Tcl_AppendResult (tclrl_interp, " `", tclrl_custom_completer,
- " \"", quoted_text, "\" ", start_s, " ", end_s,
- " \"", quoted_rl_line_buffer, "\"' failed.", (char*) NULL);
- TclReadlineTerminate(state);
-+ free(quoted_text);
-+ free(quoted_rl_line_buffer);
- return matches;
- }
-+ free(quoted_text);
-+ quoted_text = NULL;
-+ free(quoted_rl_line_buffer);
-+ quoted_rl_line_buffer = NULL;
- obj = Tcl_GetObjResult(tclrl_interp);
- status = Tcl_ListObjGetElements(tclrl_interp, obj, &objc, &objv);
- if (TCL_OK != status)
-@@ -715,12 +732,12 @@
-
- if (objc) {
- int i, length;
-- matches = (char**) MALLOC(sizeof(char*) * (objc + 1));
-+ matches = (char**) malloc(sizeof(char*) * (objc + 1));
- for (i = 0; i < objc; i++) {
- matches[i] = strdup(Tcl_GetStringFromObj(objv[i], &length));
- if (1 == objc && !strlen(matches[i])) {
-- FREE(matches[i]);
-+ free(matches[i]);
-- FREE(matches);
-+ free(matches);
- Tcl_ResetResult(tclrl_interp); /* clear result space */
- return (char**) NULL;
- }
-@@ -735,7 +752,7 @@
- */
- if (2 == objc && !strlen(matches[1])) {
- i--;
-- FREE(matches[1]);
-+ free(matches[1]);
- rl_completion_append_character = '\0';
- }
-
diff --git a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-gold.patch b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-gold.patch
deleted file mode 100644
index 5550c89879c8..000000000000
--- a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-gold.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 68d78f1..03dbf06 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -20,6 +20,7 @@ include_HEADERS = tclreadline.h
- INCLUDES = -I$(TCL_INCLUDE_DIR) -I$(READLINE_INCLUDE_DIR)
-
- ## libtclreadline_la_LIBADD = $(LIBS)
-+libtclreadline_la_LIBADD = $(TCL_LIB_SPEC) -lreadline
- libtclreadline_la_LDFLAGS = -release $(MAJOR).$(MINOR).$(PATCHLEVEL)
-
- tclrldir = @TCLRL_DIR@
diff --git a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-executing-macro.patch b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-executing-macro.patch
deleted file mode 100644
index 683622e0d54c..000000000000
--- a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-executing-macro.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac 2000-12-08 01:45:45.000000000 +0100
-+++ b/configure.ac 2013-11-15 13:37:36.490520853 +0100
-@@ -182,29 +182,36 @@
- [ --with-readline-library=DIR
- lib spec to readline (e.g. '-L/usr/local/lib -lreadline')],
- LIBS="$LIBS $withval",
-- AC_CHECK_LIB(readline, rl_callback_read_char, ,
-- AC_MSG_RESULT([
-- Your readline version does not support readline's alternate interface.
-- Please upgrade to readline >= 2.2 and retry.
-- ])
-- exit
-+ AC_SEARCH_LIBS(rl_callback_read_char, readline, ,
-+ AC_MSG_RESULT([
-+ Your readline version does not support readline's alternate interface.
-+ Please upgrade to readline >= 2.2 and retry.
-+ ])
-+ exit
- )
- )
-
-
-
--# check for readline's (macro.c) private variable
--# _rl_executing_macro.
-+# check for readline's rl_executing_macro
-+# (could be macro.c's private variable _rl_executing_macro).
-
--AC_MSG_CHECKING([for _rl_executing_macro in -lreadline])
--AC_TRY_LINK(,[
-+AC_CHECK_DECL(rl_executing_macro
-+, AC_DEFINE(EXECUTING_MACRO_NAME, rl_executing_macro,
-+ [ Define the name of the executing macro variable in libreadline. ])
-+, AC_MSG_CHECKING([for _rl_executing_macro in -lreadline])
-+ AC_TRY_LINK(,[
- extern char* _rl_executing_macro;
- _rl_executing_macro = (char*) 0;
--],
-- AC_MSG_RESULT(yes);
-+ ]
-+ , AC_MSG_RESULT(yes)
- AC_DEFINE(EXECUTING_MACRO_HACK, 1,
-- [ Define if _rl_executing_macro is resolved in libreadline. ]),
-- AC_MSG_RESULT(no))
-+ [ Define if EXECUTING_MACRO_NAME is resolved in libreadline. ])
-+ AC_DEFINE(EXECUTING_MACRO_NAME, _rl_executing_macro,
-+ [ Define the name of the executing macro variable in libreadline. ])
-+ , AC_MSG_RESULT(no))
-+, [AC_INCLUDES_DEFAULT
-+#include "$READLINE_INCLUDE_DIR/readline.h"])
-
- # check for readline's rl_cleanup_after_signal
-
-diff -ur a/tclreadline.c b/tclreadline.c
---- a/tclreadline.c 2000-09-20 19:44:34.000000000 +0200
-+++ b/tclreadline.c 2013-11-15 11:09:42.269771129 +0100
-@@ -41,7 +41,7 @@
- * We need it here to decide, if we should read more
- * characters from a macro. Dirty, but it should work.
- */
--extern char* _rl_executing_macro;
-+extern char* EXECUTING_MACRO_NAME;
- #endif
-
- #include "tclreadline.h"
-@@ -249,14 +249,14 @@
- tclrl_state = LINE_PENDING;
-
- while (!TclReadlineLineComplete()) {
--#ifdef EXECUTING_MACRO_HACK
-+#ifdef EXECUTING_MACRO_NAME
- /**
- * check first, if more characters are
- * available from _rl_executing_macro,
- * because Tcl_DoOneEvent() will (naturally)
- * not detect this `event'.
- */
-- if (_rl_executing_macro)
-+ if (EXECUTING_MACRO_NAME)
- TclReadlineReadHandler((ClientData) NULL, TCL_READABLE);
- else
- #endif
-@@ -468,17 +468,17 @@
- TclReadlineReadHandler(ClientData clientData, int mask)
- {
- if (mask & TCL_READABLE) {
--#ifdef EXECUTING_MACRO_HACK
-+#ifdef EXECUTING_MACRO_NAME
- do {
- #endif
- rl_callback_read_char();
--#ifdef EXECUTING_MACRO_HACK
-+#ifdef EXECUTING_MACRO_NAME
- /**
- * check, if we're inside a macro and
- * if so, read all macro characters
- * until the next eol.
- */
-- } while (_rl_executing_macro && !TclReadlineLineComplete());
-+ } while (EXECUTING_MACRO_NAME && !TclReadlineLineComplete());
- #endif
- }
- }
-@@ -517,12 +517,12 @@
-
- Tcl_AppendResult(tclrl_interp, expansion, (char*) NULL);
-
--#ifdef EXECUTING_MACRO_HACK
-+#ifdef EXECUTING_MACRO_NAME
- /**
- * don't stuff macro lines
- * into readline's history.
- */
-- if(!_rl_executing_macro) {
-+ if(!EXECUTING_MACRO_NAME) {
- #endif
- /**
- * don't stuff empty lines
-@@ -537,7 +537,7 @@
- if (tclrl_last_line)
- free(tclrl_last_line);
- tclrl_last_line = strdup(expansion);
--#ifdef EXECUTING_MACRO_HACK
-+#ifdef EXECUTING_MACRO_NAME
- }
- #endif
- /**
diff --git a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-history-expand.patch b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-history-expand.patch
deleted file mode 100644
index 6e4d5270e41a..000000000000
--- a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-history-expand.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur a/tclreadline.c b/tclreadline.c
---- a/tclreadline.c 2013-11-16 20:14:28.876272386 +0100
-+++ b/tclreadline.c 2013-11-16 20:14:24.191390550 +0100
-@@ -503,25 +503,22 @@
- char* expansion = (char*) NULL;
- int status = history_expand(ptr, &expansion);
-
-- if (status >= 1) {
-+ if (status >= 2) {
- /* TODO: make this a valid tcl output */
- printf("%s\n", expansion);
- free(ptr);
- free(expansion);
- return;
-- } else if (-1 == status) {
-+ } else if (status <= -1) {
- Tcl_AppendResult
-- (tclrl_interp, "error in history expansion\n", (char*) NULL);
-+ (tclrl_interp, "error in history expansion: ", expansion, "\n", (char*) NULL);
- TclReadlineTerminate(TCL_ERROR);
- free(ptr);
- free(expansion);
- return;
-- }
-- /**
-- * TODO: status == 2 ...
-- */
--
-- Tcl_AppendResult(tclrl_interp, expansion, (char*) NULL);
-+ } else {
-+ Tcl_AppendResult(tclrl_interp, expansion, (char*) NULL);
-+ }
-
- #ifdef EXECUTING_MACRO_HACK
- /**
diff --git a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-prompt.patch b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-prompt.patch
deleted file mode 100644
index a10a404100d3..000000000000
--- a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-prompt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/tclreadline.c b/tclreadline.c
---- a/tclreadline.c 2013-11-16 20:14:28.876272386 +0100
-+++ b/tclreadline.c 2013-11-16 20:37:47.455986902 +0100
-@@ -234,7 +234,7 @@
-
- rl_callback_handler_install(
- objc == 3 ? Tcl_GetStringFromObj(objv[2], 0)
-- : "%", TclReadlineLineCompleteHandler);
-+ : "% ", TclReadlineLineCompleteHandler);
-
- Tcl_CreateFileHandler(0, TCL_READABLE,
- TclReadlineReadHandler, (ClientData) NULL);
diff --git a/dev-tcltk/tclreadline/metadata.xml b/dev-tcltk/tclreadline/metadata.xml
deleted file mode 100644
index 4d4cdbb530ea..000000000000
--- a/dev-tcltk/tclreadline/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>tcltk@gentoo.org</email>
- <name>Gentoo Tcltk Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">tclreadline</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-tcltk/tclreadline/tclreadline-2.1.0-r4.ebuild b/dev-tcltk/tclreadline/tclreadline-2.1.0-r4.ebuild
deleted file mode 100644
index e668266ef24e..000000000000
--- a/dev-tcltk/tclreadline/tclreadline-2.1.0-r4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils multilib toolchain-funcs
-
-DEBIAN_PATCH=12
-
-DESCRIPTION="Readline extension to TCL"
-HOMEPAGE="http://tclreadline.sf.net/"
-SRC_URI="
- mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://debian/pool/main/t/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="
- dev-lang/tcl:0=
- sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gold.patch
- "${FILESDIR}"/${P}-alloc-free.patch
- "${FILESDIR}"/${P}-rl-executing-macro.patch
- "${FILESDIR}"/${P}-rl-history-expand.patch
- "${FILESDIR}"/${P}-rl-prompt.patch
- "${WORKDIR}"/debian/patches/complete_nontcl.patch
- "${WORKDIR}"/debian/patches/completion_matches.patch
- "${WORKDIR}"/debian/patches/completion_pbug.patch
- "${WORKDIR}"/debian/patches/kfreebsd.patch
- "${WORKDIR}"/debian/patches/link.patch
- "${WORKDIR}"/debian/patches/manpage.patch
- "${WORKDIR}"/debian/patches/memuse.patch
-# "${WORKDIR}"/debian/patches/tclrldir.patch
- "${WORKDIR}"/debian/patches/tclshpath.patch
- "${WORKDIR}"/debian/patches/tinfo.patch
- "${WORKDIR}"/debian/patches/varnames.patch
-
- )
-
-src_prepare() {
- sed \
- -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
- -e "/^TCLRL_LIBDIR/s:lib:$(get_libdir):g" \
- -i configure.in || die
- mv configure.{in,ac} || die
- sed \
- -e 's:configure.in:configure.ac:g' \
- -i "${WORKDIR}"/debian/patches/* || die
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --with-tcl="${EPREFIX}/usr/$(get_libdir)"
- --with-tcl-includes="${EPREFIX}/usr/include"
- --with-readline-includes="${EPREFIX}/usr/include"
- --with-readline-library="-lreadline"
- )
- autotools-utils_src_configure
-}