[gentoo-commits] repo/gentoo:master commit in: dev-libs/libedit/, dev-libs/libedit/files/
commit: 335178e0dfed10bb089017eb88182aecad0232b9
Author: Michał Górny gentoo org>
AuthorDate: Sun Apr 18 07:02:32 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Apr 18 07:05:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335178e0
dev-libs/libedit: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-libs/libedit/Manifest | 1 -
.../libedit/files/libedit-20170329.3.1-tinfo.patch | 30 -
dev-libs/libedit/libedit-20191211.3.1.ebuild | 49 --
3 files changed, 80 deletions(-)
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index daa6124fd5b..54a89a758e5 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -1,2 +1 @@
-DIST libedit-20191211-3.1.tar.gz 516620 BLAKE2B
765926c035143e8e409d87d4f75709c861d83e2d725ec02c7ecfc3cccebe895be7d2902dd41970811207db32e6847689368f6544ea49ad42a600037a3a4edb58
SHA512
8393477a87e65d330b037494110501b5d6d2c1cbe80d82b9bc7a6315a21fd1327fe91354346966d30541015e2c277be2187fa4bb737b14f706957c70f4083547
DIST libedit-20210216-3.1.tar.gz 518381 BLAKE2B
4b29f08ddccd77148c7ae810c3c4e378f6eab4b6d2c530f21aa9c0da1bc156d646bac6404408510639c34298ef3583fd7f2bde5051c0dac8b3a125e2659d8412
SHA512
2577c66b3f20a7f3cdaac529bda7f55dbed1cd902f39971b8f792885dec7f8c137a980c570dbab195d3d45989cc9d16a96a3567e02c5ac32ed4757fa36e46b4c
diff --git a/dev-libs/libedit/files/libedit-20170329.3.1-tinfo.patch
b/dev-libs/libedit/files/libedit-20170329.3.1-tinfo.patch
deleted file mode 100644
index e52b2559aa7..000
--- a/dev-libs/libedit/files/libedit-20170329.3.1-tinfo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7aa660fd9d446567d3280765ba2a50a46b2a9159 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
-Date: Mon, 12 Jun 2017 21:36:54 +0200
-Subject: [PATCH] configure: Support -ltinfo as split in newer ncurses
-
-The newer versions of ncurses support building terminfo routines
-as a split -ltinfo library. Account for that by adding this library
-to the search list.
- configure.ac | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9a571b2..5d714b5 100644
a/configure.ac
-+++ b/configure.ac
-@@ -49,7 +49,9 @@ EL_MANTYPE
- AC_CHECK_LIB(ncurses, tgetent,,
- [AC_CHECK_LIB(curses, tgetent,,
- [AC_CHECK_LIB(termcap, tgetent,,
-- [AC_MSG_ERROR([libncurses, libcurses, or libtermcap is required!])]
-+ [AC_CHECK_LIB(tinfo, tgetent,,
-+[AC_MSG_ERROR([libncurses, libcurses, libtermcap or libtinfo is
required!])]
-+ )]
- )]
- )]
- )
---
-2.13.1
-
diff --git a/dev-libs/libedit/libedit-20191211.3.1.ebuild
b/dev-libs/libedit/libedit-20191211.3.1.ebuild
deleted file mode 100644
index 6ae55e48c57..000
--- a/dev-libs/libedit/libedit-20191211.3.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit autotools multilib-minimal usr-ldscript
-
-MY_PV=${PV/./-}
-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";
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]"
-DEPEND=${RDEPEND}
-
-PATCHES=(
- "${FILESDIR}/${PN}-20170329.3.1-tinfo.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-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
- find "${D}" -name '*.la' -delete || die
- # file collision with sys-libs/readline
- rm "${ED}/usr/share/man/man3/history.3" || die
-}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libedit/, dev-libs/libedit/files/
commit: 106a7251428a8e845127c3e46c6b1e6cd341ec0b
Author: Michał Górny gentoo org>
AuthorDate: Thu Mar 19 21:53:40 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Mar 19 21:56:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=106a7251
dev-libs/libedit: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-libs/libedit/Manifest | 2 -
.../libedit-20170329.3.1-el_fn_sh_complete.patch | 249 -
.../libedit-20170329.3.1-ncursesprivate.patch | 10 -
dev-libs/libedit/libedit-20170329.3.1.ebuild | 54 -
dev-libs/libedit/libedit-20190324.3.1.ebuild | 52 -
5 files changed, 367 deletions(-)
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index 8a7254ddf24..a823a21029e 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -1,3 +1 @@
-DIST libedit-20170329-3.1.tar.gz 508504 BLAKE2B
83857f2e56c1f3857e981556c4d5bb90580293a1b9b038bd08beaa2b3954ccee0b30ccdd716cca95d1811841ab8ada010084ec5cd9ab8407e996c713d0991cd8
SHA512
597ed2282240be6dc3c4a7bb8b4ade31fe16ebfeb2229e3aec58643a65882653cc91deb300343d1b1cc588959dbf95698122c4005e47dfb947efa3e6b134bb82
-DIST libedit-20190324-3.1.tar.gz 521999 BLAKE2B
c48161626a5cf3140f75ec1df1d9652d961e568a0464a34f9e679f51e1e991a14c9d04a05f0de3815c4a38a9f17789a18e89ebd026450fa1053ef6420c045141
SHA512
240098989e3c5c8c5e28a61036655ad5a57f1c484e1cce2eaf3da157ff238dfb9cd81c766f82efbefa0935b7b5c07328087788cbac007b11dfb558cfaccaedf3
DIST libedit-20191211-3.1.tar.gz 516620 BLAKE2B
765926c035143e8e409d87d4f75709c861d83e2d725ec02c7ecfc3cccebe895be7d2902dd41970811207db32e6847689368f6544ea49ad42a600037a3a4edb58
SHA512
8393477a87e65d330b037494110501b5d6d2c1cbe80d82b9bc7a6315a21fd1327fe91354346966d30541015e2c277be2187fa4bb737b14f706957c70f4083547
diff --git
a/dev-libs/libedit/files/libedit-20170329.3.1-el_fn_sh_complete.patch
b/dev-libs/libedit/files/libedit-20170329.3.1-el_fn_sh_complete.patch
deleted file mode 100644
index c54f27600e3..000
--- a/dev-libs/libedit/files/libedit-20170329.3.1-el_fn_sh_complete.patch
+++ /dev/null
@@ -1,249 +0,0 @@
libedit-20170329-3.1/src/filecomplete.c2017-03-29 21:15:04.0
+0300
-+++ libedit-20170329-3.1/src/filecomplete.c2017-05-21 02:23:16.0
+0300
-@@ -51,6 +51,7 @@
- #include "filecomplete.h"
-
- static const wchar_t break_chars[] = L" \t\n\"\\'`@$><=;|&{(";
-+static const wchar_t extra_quote_chars[] = L")}*?[$\0";
-
- //
- /* completion functions */
-@@ -405,10 +406,14 @@
- char **(*attempted_completion_function)(const char *, int, int),
- const wchar_t *word_break, const wchar_t *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 LineInfoW *li;
- wchar_t *temp;
-+ char *dequoted_temp;
- char **matches;
- const wchar_t *ctemp;
- size_t len;
-@@ -429,17 +434,28 @@
-
- /* We now look backwards for the start of a filename/variable word */
- li = el_wline(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
- && !wcschr(word_break, ctemp[-1])
- && (!special_prefixes || !wcschr(special_prefixes, ctemp[-1]) ) )
- ctemp--;
-+ }
-
- len = (size_t)(li->cursor - ctemp);
- temp = el_malloc((len + 1) * sizeof(*temp));
- (void)wcsncpy(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 != NULL)
-@@ -450,14 +466,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 = NULL;
- if (!attempted_completion_function ||
- (over != NULL && !*over && !matches))
- matches =
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libedit/, dev-libs/libedit/files/
commit: 08cf4ad59a10db6550e2b3042fd8d106060f884a
Author: Michał Górny gentoo org>
AuthorDate: Sun Dec 29 20:43:45 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Dec 29 20:47:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08cf4ad5
dev-libs/libedit: Remove old
Signed-off-by: Michał Górny 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..000
--- 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..000
--- 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.0 +
-+++ libedit-20110709-3.0/src/vi.c 2011-07-11 18:24:29.0 +
-@@ -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..000
--- 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.c2012-03-11 09:54:58.0
+
-+++ libedit-20120311-3.0.freebsd/src/filecomplete.c2012-04-23
12:14:25.0 +
-@@ -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'
};
-+
-
-
- /**
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libedit/, dev-libs/libedit/files/
commit: e6ffdb6a7e3fb4a8c0e72b1d6b5ae7f6d3b7931a
Author: Yegor Timoshenko gmail com>
AuthorDate: Sat May 20 23:59:42 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Jun 12 21:27:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ffdb6a
dev-libs/libedit: bump to 20170329.3.1, #529422
Closes: https://github.com/gentoo/gentoo/pull/4692
dev-libs/libedit/Manifest | 1 +
.../libedit-20170329.3.1-el_fn_sh_complete.patch | 249 +
.../libedit-20170329.3.1-ncursesprivate.patch | 10 +
dev-libs/libedit/libedit-20170329.3.1.ebuild | 48
4 files changed, 308 insertions(+)
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index da608d81c7b..63a5e608754 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -1 +1,2 @@
DIST libedit-20130712-3.1.tar.gz 483857 SHA256
5d9b1a9dd66f1fe28bbd98e4d8ed1a22d8da0d08d902407dcc4a0702c8d88a37 SHA512
9fb3173a65ea2cd2ffa9af0666aa3e227b7d6be26f3e84f30ea3449b0c80fc5e91b618e939f7047bf885b96689ede93733f7eba614d4fdd1a4baff3f130b432e
WHIRLPOOL
550553af1cf3bbd863ef4ce86ef5fd7adf257a7f5946ad186a104c5920d0f58216c135d496d52fd2d6ad51a1fb954bb87719d731aa0eebf6980d1c15345d6034
+DIST libedit-20170329-3.1.tar.gz 508504 SHA256
91f2d90fbd2a048ff6dad7131d9a39e690fd8a8fd982a353f1333dd4017dd4be SHA512
597ed2282240be6dc3c4a7bb8b4ade31fe16ebfeb2229e3aec58643a65882653cc91deb300343d1b1cc588959dbf95698122c4005e47dfb947efa3e6b134bb82
WHIRLPOOL
ae0cc1e6e514bee7cda1a13ccd0c7f7673d4de775a9fe26ee9c32f08d43f3866ba8d9d3f4871ea15d517635be375d5989bbf36e59f00884ece51c94c3273
diff --git
a/dev-libs/libedit/files/libedit-20170329.3.1-el_fn_sh_complete.patch
b/dev-libs/libedit/files/libedit-20170329.3.1-el_fn_sh_complete.patch
new file mode 100644
index 000..c54f27600e3
--- /dev/null
+++ b/dev-libs/libedit/files/libedit-20170329.3.1-el_fn_sh_complete.patch
@@ -0,0 +1,249 @@
+--- libedit-20170329-3.1/src/filecomplete.c2017-03-29 21:15:04.0
+0300
libedit-20170329-3.1/src/filecomplete.c2017-05-21 02:23:16.0
+0300
+@@ -51,6 +51,7 @@
+ #include "filecomplete.h"
+
+ static const wchar_t break_chars[] = L" \t\n\"\\'`@$><=;|&{(";
++static const wchar_t extra_quote_chars[] = L")}*?[$\0";
+
+ //
+ /* completion functions */
+@@ -405,10 +406,14 @@
+ char **(*attempted_completion_function)(const char *, int, int),
+ const wchar_t *word_break, const wchar_t *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 LineInfoW *li;
+ wchar_t *temp;
++ char *dequoted_temp;
+ char **matches;
+ const wchar_t *ctemp;
+ size_t len;
+@@ -429,17 +434,28 @@
+
+ /* We now look backwards for the start of a filename/variable word */
+ li = el_wline(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
+ && !wcschr(word_break, ctemp[-1])
+ && (!special_prefixes || !wcschr(special_prefixes, ctemp[-1]) ) )
+ ctemp--;
++ }
+
+ len = (size_t)(li->cursor - ctemp);
+ temp = el_malloc((len + 1) * sizeof(*temp));
+ (void)wcsncpy(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 != NULL)
+@@ -450,14 +466,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 = NULL;
+ 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)
