[gentoo-commits] repo/gentoo:master commit in: dev-libs/libedit/, dev-libs/libedit/files/

[Michał Górny]

commit:     08cf4ad59a10db6550e2b3042fd8d106060f884a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 20:43:45 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 20:47:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08cf4ad5

dev-libs/libedit: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/libedit/Manifest                          |   1 -
 .../libedit/files/libedit-20100424.3.0-bsd.patch   |  13 --
 .../libedit-20110709.3.0-weak-reference.patch      |  20 --
 .../libedit-20120311-3.0-el_fn_sh_complete.patch   | 258 ---------------------
 .../libedit/files/libedit-ncursesprivate.patch     |  13 --
 dev-libs/libedit/libedit-20130712.3.1.ebuild       |  49 ----
 6 files changed, 354 deletions(-)

diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index c0003276adf..e875e257b35 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -1,3 +1,2 @@
-DIST libedit-20130712-3.1.tar.gz 483857 BLAKE2B 9120e9ac2f0d20841fea7d3a41fbfe2c1e79392d3b6dcfcd44517ee61d662427ea6cda312d2ec47ac92d61b9292684b8bbd8f92de0832909fadfb1b0cbbb4f81 SHA512 9fb3173a65ea2cd2ffa9af0666aa3e227b7d6be26f3e84f30ea3449b0c80fc5e91b618e939f7047bf885b96689ede93733f7eba614d4fdd1a4baff3f130b432e
 DIST libedit-20170329-3.1.tar.gz 508504 BLAKE2B 83857f2e56c1f3857e981556c4d5bb90580293a1b9b038bd08beaa2b3954ccee0b30ccdd716cca95d1811841ab8ada010084ec5cd9ab8407e996c713d0991cd8 SHA512 597ed2282240be6dc3c4a7bb8b4ade31fe16ebfeb2229e3aec58643a65882653cc91deb300343d1b1cc588959dbf95698122c4005e47dfb947efa3e6b134bb82
 DIST libedit-20190324-3.1.tar.gz 521999 BLAKE2B c48161626a5cf3140f75ec1df1d9652d961e568a0464a34f9e679f51e1e991a14c9d04a05f0de3815c4a38a9f17789a18e89ebd026450fa1053ef6420c045141 SHA512 240098989e3c5c8c5e28a61036655ad5a57f1c484e1cce2eaf3da157ff238dfb9cd81c766f82efbefa0935b7b5c07328087788cbac007b11dfb558cfaccaedf3

diff --git a/dev-libs/libedit/files/libedit-20100424.3.0-bsd.patch b/dev-libs/libedit/files/libedit-20100424.3.0-bsd.patch
deleted file mode 100644
index e230a76d709..00000000000
--- a/dev-libs/libedit/files/libedit-20100424.3.0-bsd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/chartype.h b/src/chartype.h
-index c35825c..be5aac0 100644
---- a/src/chartype.h
-+++ b/src/chartype.h
-@@ -44,7 +44,7 @@
-  * supports non-BMP code points without requiring UTF-16, but nothing
-  * seems to actually advertise this properly, despite Unicode 3.1 having
-  * been around since 2001... */
--#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__))
-+#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__DragonFly__) && !defined(__FreeBSD__)
- #ifndef __STDC_ISO_10646__
- /* In many places it is assumed that the first 127 code points are ASCII
-  * compatible, so ensure wchar_t indeed does ISO 10646 and not some other

diff --git a/dev-libs/libedit/files/libedit-20110709.3.0-weak-reference.patch b/dev-libs/libedit/files/libedit-20110709.3.0-weak-reference.patch
deleted file mode 100644
index a4399593d63..00000000000
--- a/dev-libs/libedit/files/libedit-20110709.3.0-weak-reference.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libedit-20110709-3.0/src/vi.c.old	2011-07-11 18:21:16.000000000 +0000
-+++ libedit-20110709-3.0/src/vi.c	2011-07-11 18:24:29.000000000 +0000
-@@ -918,7 +918,7 @@
-  * NB: posix implies that we should enter insert mode, however
-  * this is against historical precedent...
-  */
--#ifdef __weak_reference
-+#if defined(__weak_reference) && defined(__NetBSD__)
- __weakref_visible char *my_get_alias_text(const char *)
-     __weak_reference(get_alias_text);
- #endif
-@@ -926,7 +926,7 @@
- /*ARGSUSED*/
- vi_alias(EditLine *el, Int c)
- {
--#ifdef __weak_reference
-+#if defined(__weak_reference) && defined(__NetBSD__)
- 	char alias_name[3];
- 	char *alias_text;
- 

diff --git a/dev-libs/libedit/files/libedit-20120311-3.0-el_fn_sh_complete.patch b/dev-libs/libedit/files/libedit-20120311-3.0-el_fn_sh_complete.patch
deleted file mode 100644
index b0b157a24fd..00000000000
--- a/dev-libs/libedit/files/libedit-20120311-3.0-el_fn_sh_complete.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-Port the el_fn_sh_complete from FreeBSD.
-This function is required by FreeBSD-9.0's sh.
-So that we can drop the bundled version in FreeBSD-9.0
-
-diff -uNr libedit-20120311-3.0/src/filecomplete.c libedit-20120311-3.0.freebsd/src/filecomplete.c
---- libedit-20120311-3.0/src/filecomplete.c	2012-03-11 09:54:58.000000000 +0000
-+++ libedit-20120311-3.0.freebsd/src/filecomplete.c	2012-04-23 12:14:25.000000000 +0000
-@@ -56,6 +56,9 @@
- 
- static const Char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@',
-     '$', '>', '<', '=', ';', '|', '&', '{', '(', '\0' };
-+/* Tilde is deliberately omitted here, we treat it specially. */
-+static const Char extra_quote_chars[] = { ')', '}', '*', '?', '[', '$', '\0' };
-+
- 
- 
- /********************************/
-@@ -411,10 +414,14 @@
- 	char **(*attempted_completion_function)(const char *, int, int),
- 	const Char *word_break, const Char *special_prefixes,
- 	const char *(*app_func)(const char *), size_t query_items,
--	int *completion_type, int *over, int *point, int *end)
-+	int *completion_type, int *over, int *point, int *end,
-+	const char *(*find_word_start_func)(const char *, const char *),
-+	char *(*dequoting_func)(const char *),
-+	char *(*quoting_func)(const char *))
- {
- 	const TYPE(LineInfo) *li;
- 	Char *temp;
-+	char *dequoted_temp;
-         char **matches;
- 	const Char *ctemp;
- 	size_t len;
-@@ -435,17 +442,28 @@
- 
- 	/* We now look backwards for the start of a filename/variable word */
- 	li = FUN(el,line)(el);
-+	if (find_word_start_func)
-+		ctemp = ct_decode_string(find_word_start_func(ct_encode_string(li->buffer,&el->el_scratch), ct_encode_string(li->cursor,&el->el_scratch)),&el->el_scratch);
-+	else {
- 	ctemp = li->cursor;
- 	while (ctemp > li->buffer
- 	    && !Strchr(word_break, ctemp[-1])
- 	    && (!special_prefixes || !Strchr(special_prefixes, ctemp[-1]) ) )
- 		ctemp--;
-+	}
- 
- 	len = (size_t)(li->cursor - ctemp);
- 	temp = el_malloc((len + 1) * sizeof(*temp));
- 	(void)Strncpy(temp, ctemp, len);
- 	temp[len] = '\0';
- 
-+	if (dequoting_func) {
-+		dequoted_temp = dequoting_func(ct_encode_string(temp,&el->el_scratch));
-+		if (dequoted_temp == NULL)
-+			return retval;
-+	} else
-+		dequoted_temp = NULL;
-+
- 	/* these can be used by function called in completion_matches() */
- 	/* or (*attempted_completion_function)() */
- 	if (point != 0)
-@@ -456,14 +474,14 @@
- 	if (attempted_completion_function) {
- 		int cur_off = (int)(li->cursor - li->buffer);
- 		matches = (*attempted_completion_function)(
--		    ct_encode_string(temp, &el->el_scratch),
-+		    dequoted_temp? dequoted_temp : ct_encode_string(temp, &el->el_scratch),
- 		    cur_off - (int)len, cur_off);
- 	} else
- 		matches = 0;
- 	if (!attempted_completion_function || 
- 	    (over != NULL && !*over && !matches))
- 		matches = completion_matches(
--		    ct_encode_string(temp, &el->el_scratch), complet_func);
-+		    dequoted_temp? dequoted_temp : ct_encode_string(temp, &el->el_scratch), complet_func);
- 
- 	if (over != NULL)
- 		*over = 0;
-@@ -478,9 +496,19 @@
- 		 * possible matches if there is possible completion.
- 		 */
- 		if (matches[0][0] != '\0') {
-+			char *quoted_match;
-+			if (quoting_func) {
-+				quoted_match = quoting_func(matches[0]);
-+				if (quoted_match == NULL)
-+					goto free_matches;
-+			} else
-+				quoted_match = NULL;
-+
- 			el_deletestr(el, (int) len);
- 			FUN(el,insertstr)(el,
--			    ct_decode_string(matches[0], &el->el_scratch));
-+			    ct_decode_string(quoted_match? quoted_match : matches[0], &el->el_scratch));
-+
-+			free(quoted_match);
- 		}
- 
- 		if (what_to_do == '?')
-@@ -553,12 +581,14 @@
- 			retval = CC_NORM;
- 		}
- 
-+free_matches:
- 		/* free elements of array and the array itself */
- 		for (i = 0; matches[i]; i++)
- 			el_free(matches[i]);
- 		el_free(matches);
- 		matches = NULL;
- 	}
-+	el_free(dequoted_temp);
- 	el_free(temp);
- 	return retval;
- }
-@@ -572,5 +602,102 @@
- {
- 	return (unsigned char)fn_complete(el, NULL, NULL,
- 	    break_chars, NULL, NULL, (size_t)100,
--	    NULL, NULL, NULL, NULL);
-+	    NULL, NULL, NULL, NULL,
-+	    NULL, NULL, NULL);
-+}
-+
-+static const char *
-+sh_find_word_start(const char *buffer, const char *cursor)
-+{
-+	const char *word_start = buffer;
-+
-+	while (buffer < cursor) {
-+		if (*buffer == '\\')
-+			buffer++;
-+		else if (Strchr(break_chars, *buffer))
-+			word_start = buffer + 1;
-+
-+		buffer++;
-+	}
-+
-+	return word_start;
-+}
-+
-+
-+static char *
-+sh_quote(const char *str)
-+{
-+	const char *src;
-+	int extra_len = 0;
-+	char *quoted_str, *dst;
-+
-+	if (*str == '-' || *str == '+')
-+		extra_len += 2;
-+	for (src = str; *src != '\0'; src++)
-+		if (Strchr(break_chars, *src) ||
-+		    Strchr(extra_quote_chars, *src))
-+			extra_len++;
-+
-+	quoted_str = malloc(sizeof(*quoted_str) *
-+	    (strlen(str) + extra_len + 1));
-+	if (quoted_str == NULL)
-+		return NULL;
-+
-+	dst = quoted_str;
-+	if (*str == '-' || *str == '+')
-+		*dst++ = '.', *dst++ = '/';
-+	for (src = str; *src != '\0'; src++) {
-+		if (Strchr(break_chars, *src) ||
-+		    Strchr(extra_quote_chars, *src))
-+			*dst++ = '\\';
-+		*dst++ = *src;
-+	}
-+	*dst = '\0';
-+
-+	return quoted_str;
-+}
-+
-+
-+static char *
-+sh_dequote(const char *str)
-+{
-+	char *dequoted_str, *dst;
-+
-+	/* save extra space to replace \~ with ./~ */
-+	dequoted_str = malloc(sizeof(*dequoted_str) * (strlen(str) + 1 + 1));
-+	if (dequoted_str == NULL)
-+		return NULL;
-+
-+	dst = dequoted_str;
-+
-+	/* dequote \~ at start as ./~ */
-+	if (*str == '\\' && str[1] == '~') {
-+		str++;
-+		*dst++ = '.';
-+		*dst++ = '/';
-+	}
-+
-+	while (*str) {
-+		if (*str == '\\')
-+			str++;
-+		if (*str)
-+			*dst++ = *str++;
-+	}
-+	*dst = '\0';
-+
-+	return dequoted_str;
-+}
-+
-+
-+/*
-+ * completion function using sh quoting rules; for key binding
-+ */
-+/* ARGSUSED */
-+unsigned char
-+_el_fn_sh_complete(EditLine *el, int ch __attribute__((__unused__)))
-+{
-+	return (unsigned char)fn_complete(el, NULL, NULL,
-+	    break_chars, NULL, NULL, 100,
-+	    NULL, NULL, NULL, NULL,
-+	    sh_find_word_start, sh_dequote, sh_quote);
- }
-diff -uNr libedit-20120311-3.0/src/filecomplete.h libedit-20120311-3.0.freebsd/src/filecomplete.h
---- libedit-20120311-3.0/src/filecomplete.h	2010-04-22 19:13:17.000000000 +0000
-+++ libedit-20120311-3.0.freebsd/src/filecomplete.h	2012-04-23 12:04:12.000000000 +0000
-@@ -35,7 +35,10 @@
-     char *(*)(const char *, int),
-     char **(*)(const char *, int, int),
-     const Char *, const Char *, const char *(*)(const char *), size_t,
--    int *, int *, int *, int *);
-+    int *, int *, int *, int *,
-+    const char *(*)(const char *, const char *),
-+    char *(*)(const char *),
-+    char *(*)(const char *));
- 
- void fn_display_match_list(EditLine *, char **, size_t, size_t);
- char *fn_tilde_expand(const char *);
-Binary files libedit-20120311-3.0/src/filecomplete.o and libedit-20120311-3.0.freebsd/src/filecomplete.o differ
-diff -uNr libedit-20120311-3.0/src/histedit.h libedit-20120311-3.0.freebsd/src/histedit.h
---- libedit-20120311-3.0/src/histedit.h	2011-08-02 06:52:08.000000000 +0000
-+++ libedit-20120311-3.0.freebsd/src/histedit.h	2012-04-23 11:44:33.000000000 +0000
-@@ -113,6 +113,7 @@
- int		 el_set(EditLine *, int, ...);
- int		 el_get(EditLine *, int, ...);
- unsigned char	_el_fn_complete(EditLine *, int);
-+unsigned char	_el_fn_sh_complete(EditLine *, int);
- 
- /*
-  * el_set/el_get parameters
-diff -ur libedit-20120311-3.0/src/readline.c libedit-20120311-3.0.freebsd/src/readline.c
---- libedit-20120311-3.0/src/readline.c	2012-03-11 09:54:58.000000000 +0000
-+++ libedit-20120311-3.0.freebsd/src/readline.c	2012-04-23 12:20:11.000000000 +0000
-@@ -1773,7 +1773,7 @@
- 	    _rl_completion_append_character_function,
- 	    (size_t)rl_completion_query_items,
- 	    &rl_completion_type, &rl_attempted_completion_over,
--	    &rl_point, &rl_end);
-+	    &rl_point, &rl_end, NULL, NULL, NULL);
- 
- 
- }

diff --git a/dev-libs/libedit/files/libedit-ncursesprivate.patch b/dev-libs/libedit/files/libedit-ncursesprivate.patch
deleted file mode 100644
index 0af9b1b882a..00000000000
--- a/dev-libs/libedit/files/libedit-ncursesprivate.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libedit-20110709-3.0/libedit.pc.in
-===================================================================
---- libedit-20110709-3.0.orig/libedit.pc.in
-+++ libedit-20110709-3.0/libedit.pc.in
-@@ -7,6 +7,7 @@ Name: libedit
- Description: command line editor library provides generic line editing, history, and tokenization functions.
- Version: @VERSION@
- Requires:
--Libs: -L${libdir} -ledit @LIBS@
-+Libs: -L${libdir} -ledit
-+Libs.private: @LIBS@
- Cflags: -I${includedir} -I${includedir}/editline
- 

diff --git a/dev-libs/libedit/libedit-20130712.3.1.ebuild b/dev-libs/libedit/libedit-20130712.3.1.ebuild
deleted file mode 100644
index 1427ce62fb0..00000000000
--- a/dev-libs/libedit/libedit-20130712.3.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs versionator base multilib-minimal usr-ldscript
-
-MY_PV=$(get_major_version)-$(get_after_major_version)
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="BSD replacement for libreadline"
-HOMEPAGE="https://thrysoee.dk/editline/"
-SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
-	!<=sys-freebsd/freebsd-lib-6.2_rc1"
-
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-ncursesprivate.patch"
-	"${FILESDIR}/${PN}-20100424.3.0-bsd.patch"
-	"${FILESDIR}/${PN}-20110709.3.0-weak-reference.patch"
-	"${FILESDIR}/${PN}-20120311-3.0-el_fn_sh_complete.patch"
-	)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		--enable-widec \
-		--enable-fast-install
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	gen_usr_ldscript -a edit
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-}