[gentoo-commits] repo/proj/prefix:master commit in: sys-libs/ncurses/files/, sys-libs/ncurses/
commit: 0df78fac3d346380af02e2f21f7e0049690222fd
Author: Sam James gentoo org>
AuthorDate: Tue Dec 8 17:46:02 2020 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 8 17:46:02 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0df78fac
sys-libs/ncurses: sync (bump to 6.2)
Let's use -r1 instead of -r0 (implied) to make it easier
to see when we're in sync or not.
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
sys-libs/ncurses/Manifest | 1 +
.../ncurses-6.2-no_user_ldflags_in_libs.patch | 40 +++
sys-libs/ncurses/ncurses-6.2-r1.ebuild | 318 +
3 files changed, 359 insertions(+)
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 7ed866991b..05d911281e 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,3 +1,4 @@
DIST host-libtool-0.1.0.tar.gz 388867 BLAKE2B
e8bfd1212f39d6262721c4a12535799f4e3428b83f3174bac373c15813462950218dd689380ab8caaf84186b60c29a1fafadfa1c2d0e5cb7f76f6d1699bdcabc
SHA512
d8764d7814abf06556fb6eb19c12c2de1d1dc9f2f325deae55606ddfcf88963d65713d6fbd1fae0ab1a0668d90f84204e1cdcbd557944660ab01ecfe3a824ca5
DIST ncurses-5.9.tar.gz 2826473 BLAKE2B
91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1
SHA512
d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
DIST ncurses-6.1.tar.gz 3365395 BLAKE2B
1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de
SHA512
e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
+DIST ncurses-6.2.tar.gz 3425862 BLAKE2B
6680cd7a369a4cb8234442a70869c283f0db6db9d7da1da2a7a5c519eb862a2c9b9411957d99f9ebb5089cad00b42e1ca6bc0784327461113df2eeaec695913c
SHA512
4c1333dcc30e858e8a9525d4b9aefb6cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d
diff --git a/sys-libs/ncurses/files/ncurses-6.2-no_user_ldflags_in_libs.patch
b/sys-libs/ncurses/files/ncurses-6.2-no_user_ldflags_in_libs.patch
new file mode 100644
index 00..66345b51fe
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-6.2-no_user_ldflags_in_libs.patch
@@ -0,0 +1,40 @@
+From be554be06475b36da2f69aabfd873ad55f7ef95c Mon Sep 17 00:00:00 2001
+From: Lars Wendler
+Date: Thu, 13 Feb 2020 11:51:09 +0100
+Subject: [PATCH] Don't bleed user LDFLAGS into Libs
+
+Signed-off-by: Lars Wendler
+---
+ misc/gen-pkgconfig.in | 2 +-
+ misc/ncurses-config.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
+index 8f00b824..009d2156 100644
+--- a/misc/gen-pkgconfig.in
b/misc/gen-pkgconfig.in
+@@ -80,7 +80,7 @@ if [ "$includedir" != "/usr/include" ]; then
+ fi
+
+ lib_flags=
+-for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
++for opt in -L$libdir @LIBS@
+ do
+ case $opt in
+ -l*) # LIBS is handled specially below
+diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
+index 7f8ba697..2f1915cd 100644
+--- a/misc/ncurses-config.in
b/misc/ncurses-config.in
+@@ -101,7 +101,7 @@ fi
+ # There is no portable way to find the list of standard library directories.
+ # Require a POSIX shell anyway, to keep this simple.
+ lib_flags=
+-for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS
++for opt in -L$libdir $LIBS
+ do
+ case $opt in
+ -specs*) # ignore linker specs-files which were used to build library
+--
+2.25.0
+
diff --git a/sys-libs/ncurses/ncurses-6.2-r1.ebuild
b/sys-libs/ncurses/ncurses-6.2-r1.ebuild
new file mode 100644
index 00..dc175394ec
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-6.2-r1.ebuild
@@ -0,0 +1,318 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs
usr-ldscript
+
+MY_PV="${PV:0:3}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="console display library"
+HOMEPAGE="https://www.gnu.org/software/ncurses/
https://invisible-island.net/ncurses/;
+SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
+
+if [[ "${PV}" == *_p* ]] ; then
+ SRC_URI+="
ftp://ftp.invisible-island.net/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2
+
https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2;
+fi
+
+LICENSE="MIT"
+# The subslot reflects the SONAME.
+SLOT="0/6"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo
trace unicode"
+RESTRICT="!test? ( test )"
+
+DEPEND="gpm? (
[gentoo-commits] repo/proj/prefix:master commit in: sys-libs/ncurses/files/, sys-libs/ncurses/
commit: 146df83cbe472cee44ed461b015c185a8a20135f
Author: Fabian Groffen gentoo org>
AuthorDate: Mon Mar 26 15:40:30 2018 +
Commit: Fabian Groffen gentoo org>
CommitDate: Mon Mar 26 15:40:30 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=146df83c
sys-libs/ncurses: sync
Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6
sys-libs/ncurses/Manifest | 1 +
.../files/ncurses-6.1-st07_terminfo_typo.patch | 14 +
...ncurses-6.0-r1.ebuild => ncurses-6.1-r2.ebuild} | 33 +-
3 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index bc5c230fbe..07b5a3ad4a 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,3 +1,4 @@
DIST host-libtool-0.1.0.tar.gz 388867 BLAKE2B
e8bfd1212f39d6262721c4a12535799f4e3428b83f3174bac373c15813462950218dd689380ab8caaf84186b60c29a1fafadfa1c2d0e5cb7f76f6d1699bdcabc
SHA512
d8764d7814abf06556fb6eb19c12c2de1d1dc9f2f325deae55606ddfcf88963d65713d6fbd1fae0ab1a0668d90f84204e1cdcbd557944660ab01ecfe3a824ca5
DIST ncurses-5.9.tar.gz 2826473 BLAKE2B
91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1
SHA512
d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
DIST ncurses-6.0.tar.gz 3131891 BLAKE2B
68670ebdaba28c7a750631da01a0e3681b476cc9e9ae6fd9eae5a254f41fab5f1a5df5fa9897a92d1da751f1cc0b72f2ffee4603865900e67fcbb949c102cf78
SHA512
9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963
+DIST ncurses-6.1.tar.gz 3365395 BLAKE2B
1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de
SHA512
e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
diff --git a/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch
b/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch
new file mode 100644
index 00..4532d648a6
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch
@@ -0,0 +1,14 @@
+https://github.com/tmux/tmux/issues/1264
+https://bugs.gentoo.org/651494
+
+--- ncurses-6.1/misc/terminfo.src
ncurses-6.1/misc/terminfo.src
+@@ -6260,7 +6260,7 @@
+%=%t3%e%p1%d%;m,
+ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+ %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m,
+- Ss=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
++ Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
+ kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~,
+ kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~,
+ kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A,
diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild
b/sys-libs/ncurses/ncurses-6.1-r2.ebuild
similarity index 92%
rename from sys-libs/ncurses/ncurses-6.0-r1.ebuild
rename to sys-libs/ncurses/ncurses-6.1-r2.ebuild
index 6795bf45fb..e53fc18de4 100644
--- a/sys-libs/ncurses/ncurses-6.0-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=6
-inherit eutils flag-o-matic toolchain-funcs multilib-minimal
+inherit flag-o-matic toolchain-funcs multilib-minimal multilib-build
MY_PV=${PV:0:3}
PV_SNAP=${PV:4}
@@ -23,6 +23,7 @@ DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
# Block the older ncurses that installed all files w/SLOT=5. #557472
RDEPEND="${DEPEND}
!<=sys-libs/ncurses-5.9-r4:5
+ !/dev/null)
local basedir=$(basename $(dirname "${termfile}"))
@@ -275,7 +277,10 @@ multilib_src_install_all() {
cd "${S}"
dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
- use doc && dohtml -r doc/html/
+ if use doc ; then
+ docinto html
+ dohtml -r doc/html/
+ fi
}
pkg_preinst() {
[gentoo-commits] repo/proj/prefix:master commit in: sys-libs/ncurses/files/
commit: 085564f4512849c4481433dd75c277cca1bdd6bb
Author: Fabian Groffen gentoo org>
AuthorDate: Tue Sep 15 09:54:02 2015 +
Commit: Fabian Groffen gentoo org>
CommitDate: Tue Sep 15 09:54:02 2015 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=085564f4
sys-libs/ncurses: add missing files
Package-Manager: portage-2.2.20-prefix
sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch | 24 +++
.../ncurses/files/ncurses-6.0-pkg-config.patch | 14 ++
.../files/ncurses-6.0-rxvt-unicode-9.15.patch | 191 +
sys-libs/ncurses/files/ncurses-6.0-ticlib.patch| 15 ++
4 files changed, 244 insertions(+)
diff --git a/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch
b/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch
new file mode 100644
index 000..1403a29
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch
@@ -0,0 +1,24 @@
+we'll hijack the freebsd* case that comes later
+
+--- ncurses-6.0/aclocal.m4
ncurses-6.0/aclocal.m4
+@@ -5711,7 +5711,7 @@
+ fi
+ cf_cv_rm_so_locs=yes
+ ;;
+- (linux*|gnu*|k*bsd*-gnu)
++ (linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*)
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+--- ncurses-6.0/configure
ncurses-6.0/configure
+@@ -6188,7 +6188,7 @@
+ fi
+ cf_cv_rm_so_locs=yes
+ ;;
+- (linux*|gnu*|k*bsd*-gnu)
++ (linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*)
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
diff --git a/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch
b/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch
new file mode 100644
index 000..6808319
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch
@@ -0,0 +1,14 @@
+disable the $PATH search for the PKG_CONFIG tool. it isn't needed and just
+gets in the way when setting to a value that might not yet exist.
+
+--- ncurses-6.0/configure
ncurses-6.0/configure
+@@ -3533,7 +3533,7 @@
+ esac
+
+ test -z "$PKG_CONFIG" && PKG_CONFIG=none
+-if test "$PKG_CONFIG" != none ; then
++if false ; then
+
+ if test "x$prefix" != xNONE; then
+ cf_path_syntax="$prefix"
diff --git a/sys-libs/ncurses/files/ncurses-6.0-rxvt-unicode-9.15.patch
b/sys-libs/ncurses/files/ncurses-6.0-rxvt-unicode-9.15.patch
new file mode 100644
index 000..af3df94
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-6.0-rxvt-unicode-9.15.patch
@@ -0,0 +1,191 @@
+Add rxvt-unicode terminfo, required by rxvt-unicode to function properly.
+
+Providing this in ncurses makes it widely available, much better than having to
+install rxvt-unicode everywhere.
+
+http://bugs.gentoo.org/show_bug.cgi?id=192083
+
+This patch uses the updated rxvt-unicode-9.15 terminfo
+which includes 256 color support and fixes Gentoo bug 383871
+
+http://bugs.gentoo.org/show_bug.cgi?id=383871
+
+--- ncurses-6.0/misc/terminfo.src
ncurses-6.0/misc/terminfo.src
+@@ -5214,6 +5214,176 @@
+ rxvt-16color|rxvt with 16 colors like aixterm,
+ ncv#32, use=ibm+16color, use=rxvt,
+
++# From: Thomas Dickey 04 Oct 1997
++# Updated: Özgür Kesim 02 Nov 1997
++# Updated: Marc Lehmann , 17 Feb 2005
++# Updated: Marc Lehmann , 04 Nov 2008: change init/reset
sequences
++rxvt-unicode|rxvt-unicode terminal (X Window System),
++ am,
++ bce,
++ eo,
++ km,
++ msgr,
++ xenl,
++ hs,
++ cols#80,
++ it#8,
++ lines#24,
++ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG,
++ bel=^G,
++ blink=\E[5m,
++ bold=\E[1m,
++ civis=\E[?25l,
++ clear=\E[H\E[2J,
++ cnorm=\E[?25h,
++ cr=^M,
++ csr=\E[%i%p1%d;%p2%dr,
++ cub=\E[%p1%dD,
++ cub1=^H,
++ cud=\E[%p1%dB,
++ cud1=^J,
++ cuf=\E[%p1%dC,
++ cuf1=\E[C,
++ cup=\E[%i%p1%d;%p2%dH,
++ cuu=\E[%p1%dA,
++ cuu1=\E[A,
++ cvvis=\E[?25h,
++ dch=\E[%p1%dP,
++ dch1=\E[P,
++ dl=\E[%p1%dM,
++ dl1=\E[M,
++ ed=\E[J,
++ el=\E[K,
++ el1=\E[1K,
++ flash=\E[?5h$<20/>\E[?5l,
++ home=\E[H,
++ hpa=\E[%i%p1%dG,
++ ht=^I,
++ hts=\EH,
++ ich=\E[%p1%d@,
++ ich1=\E[@,
++ il=\E[%p1%dL,
++ il1=\E[L,
++ ind=^J,
++ is1=\E[\041p,
++ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
++ kDC=\E[3$,
++ kIC=\E[2$,
++ kEND=\E[8$,
++ kHOM=\E[7$,
++ kLFT=\E[d,
++ kNXT=\E[6$,
++ kPRV=\E[5$,
++ kRIT=\E[c,
++ kbs=\177,
++ ka1=\EOw,
++ ka3=\EOy,
++ kb2=\EOu,
++ kc1=\EOq,
++ kc3=\EOs,
++
