commit: 486383c464bb9d6a3b40448a0a05b67ff1640004 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Wed Dec 23 09:15:09 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Wed Dec 23 09:15:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=486383c4
sys-libs/ncurses: drop ~ppc-aix Bug: https://bugs.gentoo.org/760057 Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> sys-libs/ncurses/Manifest | 1 - .../ncurses/files/ncurses-5.5-aix-shared.patch | 12 -- sys-libs/ncurses/files/ncurses-5.6-build.patch | 11 -- sys-libs/ncurses/files/ncurses-5.6-darwin.patch | 11 -- sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch | 24 --- sys-libs/ncurses/files/ncurses-5.6-interix.patch | 21 --- sys-libs/ncurses/files/ncurses-5.6-libtool.patch | 38 ----- sys-libs/ncurses/files/ncurses-5.6-mint.patch | 11 -- sys-libs/ncurses/files/ncurses-5.6-netbsd.patch | 24 --- sys-libs/ncurses/files/ncurses-5.6-solaris2.patch | 84 --------- sys-libs/ncurses/files/ncurses-5.7-emacs.patch | 44 ----- .../ncurses/files/ncurses-5.7-hashdb-open.patch | 88 ---------- sys-libs/ncurses/files/ncurses-5.7-irix.patch | 40 ----- .../files/ncurses-5.7-ldflags-with-libtool.patch | 22 --- .../ncurses/files/ncurses-5.7-mint-terminfo.patch | 175 ------------------- sys-libs/ncurses/files/ncurses-5.7-mint.patch | 13 -- .../files/ncurses-5.7-rxvt-unicode-9.09.patch | 189 --------------------- .../ncurses/files/ncurses-5.7-rxvt-unicode.patch | 174 ------------------- .../files/ncurses-5.7-tic-cross-detection.patch | 58 ------- .../ncurses/files/ncurses-5.7-x64-freebsd.patch | 27 --- .../ncurses/files/ncurses-5.8-rxvt-unicode.patch | 189 --------------------- sys-libs/ncurses/ncurses-5.9-r101.ebuild | 40 +---- sys-libs/ncurses/ncurses-6.1-r2.ebuild | 5 +- sys-libs/ncurses/ncurses-6.1-r3.ebuild | 5 +- sys-libs/ncurses/ncurses-6.2-r1.ebuild | 3 +- 25 files changed, 8 insertions(+), 1301 deletions(-) diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest index 05d911281e..872019d041 100644 --- a/sys-libs/ncurses/Manifest +++ b/sys-libs/ncurses/Manifest @@ -1,4 +1,3 @@ -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 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d diff --git a/sys-libs/ncurses/files/ncurses-5.5-aix-shared.patch b/sys-libs/ncurses/files/ncurses-5.5-aix-shared.patch deleted file mode 100644 index 05b67c6b49..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.5-aix-shared.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ncurses-5.6/configure.orig 2007-01-27 09:02:39.521587000 +0100 -+++ ncurses-5.6/configure 2007-01-27 09:17:49.261587000 +0100 -@@ -5147,6 +5147,9 @@ - fi - MK_SHARED_LIB='${LD} -d y -G -o $@' - ;; -+ aix4.[3-9]*|aix5*) -+ MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${libdir}:/usr/lib -o $@' -+ ;; - *) - CC_SHARED_OPTS='unknown' - MK_SHARED_LIB='echo unknown' diff --git a/sys-libs/ncurses/files/ncurses-5.6-build.patch b/sys-libs/ncurses/files/ncurses-5.6-build.patch deleted file mode 100644 index db17458154..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.6-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure -+++ configure -@@ -9122,7 +9122,7 @@ - echo "$as_me:9122: result: $with_warnings" >&5 - echo "${ECHO_T}$with_warnings" >&6 - --if test -n "$with_warnings"; then -+if test "x$with_warnings" = "xyes"; then - ADAFLAGS="$ADAFLAGS -gnatg" - - INTEL_COMPILER=no diff --git a/sys-libs/ncurses/files/ncurses-5.6-darwin.patch b/sys-libs/ncurses/files/ncurses-5.6-darwin.patch deleted file mode 100644 index c18f9182b8..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.6-darwin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure~ 2006-12-17 19:33:38.000000000 +0300 -+++ configure 2007-02-14 07:44:48.000000000 +0300 -@@ -4922,7 +4922,7 @@ - darwin*) - EXTRA_CFLAGS="-no-cpp-precomp" - CC_SHARED_OPTS="-dynamic" -- MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${DESTDIR}${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' -+ MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' - test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi - cf_cv_shlib_version_infix=yes - echo "$as_me:4928: checking if ld -search_paths_first works" >&5 diff --git a/sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch b/sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch deleted file mode 100644 index 4dc51d35a4..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch +++ /dev/null @@ -1,24 +0,0 @@ -we'll hijack the freebsd* case that comes later - ---- ncurses-5.6/aclocal.m4 -+++ ncurses-5.6/aclocal.m4 -@@ -3806,7 +3806,7 @@ - MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]' - 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="-Wl,-rpath,\$(LOCAL_LIBDIR)" - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" ---- ncurses-5.6/configure -+++ ncurses-5.6/configure -@@ -3806,7 +3806,7 @@ - MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $@` -o $@' - 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="-Wl,-rpath,\$(LOCAL_LIBDIR)" - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" diff --git a/sys-libs/ncurses/files/ncurses-5.6-interix.patch b/sys-libs/ncurses/files/ncurses-5.6-interix.patch deleted file mode 100644 index f9b34e4031..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.6-interix.patch +++ /dev/null @@ -1,21 +0,0 @@ -reported and accepted upstream: http://lists.gnu.org/archive/html/bug-ncurses/2011-05/msg00008.html - ---- configure.orig Tue Dec 18 16:49:58 2007 -+++ configure Tue Dec 18 17:03:14 2007 -@@ -5165,6 +5165,16 @@ - aix4.[3-9]*|aix5*) - MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${libdir}:/usr/lib -o $@' - ;; -+ interix*) -+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel -+ if test "$cf_cv_shlib_version" = rel; then -+ cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}' -+ else -+ cf_shared_soname='`basename $@`' -+ fi -+ CC_SHARED_OPTS= -+ MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${libdir} -Wl,-h,'$cf_shared_soname' -o $@' -+ ;; - *) - CC_SHARED_OPTS='unknown' - MK_SHARED_LIB='echo unknown' diff --git a/sys-libs/ncurses/files/ncurses-5.6-libtool.patch b/sys-libs/ncurses/files/ncurses-5.6-libtool.patch deleted file mode 100644 index ffc2af9655..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.6-libtool.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.in.orig 2008-02-24 22:05:58 +0100 -+++ configure.in 2008-02-24 22:06:06 +0100 -@@ -198,6 +198,7 @@ - if test "$with_libtool" != "no" ; then - - cf_list_models="$cf_list_models libtool" -+OBJEXT=lo - - else - ---- aclocal.m4.orig 2008-02-25 22:06:37 +0100 -+++ aclocal.m4 2008-02-25 22:05:54 +0100 -@@ -4758,6 +4758,7 @@ - case $cf_cv_libtool_version in - 1.[[5-9]]*|[[2-9]]*) - LIBTOOL_CXX="$LIBTOOL --tag=CXX" -+ LIBTOOL="$LIBTOOL --tag=CC" - ;; - *) - LIBTOOL_CXX="$LIBTOOL" ---- configure.orig 2008-02-24 22:06:21 +0100 -+++ configure 2008-02-24 21:56:29 +0100 -@@ -4149,6 +4149,7 @@ - case $cf_cv_libtool_version in - 1.[5-9]*|[2-9]*) - LIBTOOL_CXX="$LIBTOOL --tag=CXX" -+ LIBTOOL="$LIBTOOL --tag=CC" - ;; - *) - LIBTOOL_CXX="$LIBTOOL" -@@ -4164,6 +4164,7 @@ - if test "$with_libtool" != "no" ; then - - cf_list_models="$cf_list_models libtool" -+OBJEXT=lo - - else - diff --git a/sys-libs/ncurses/files/ncurses-5.6-mint.patch b/sys-libs/ncurses/files/ncurses-5.6-mint.patch deleted file mode 100644 index 7f12ea0216..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.6-mint.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.old 2008-02-21 12:14:27.167615327 +0000 -+++ configure 2008-02-21 12:14:04.497615002 +0000 -@@ -6065,7 +6065,7 @@ - irix[56].*) #(vi - CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" - ;; --linux*|gnu*) #(vi -+linux*|mint*|gnu*) #(vi - - echo "$as_me:6070: checking if we must define _GNU_SOURCE" >&5 - echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 diff --git a/sys-libs/ncurses/files/ncurses-5.6-netbsd.patch b/sys-libs/ncurses/files/ncurses-5.6-netbsd.patch deleted file mode 100644 index 68f71f80cc..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.6-netbsd.patch +++ /dev/null @@ -1,24 +0,0 @@ -for netbsd we do the same as for freebsd - ---- ncurses-5.6/aclocal.m4 -+++ ncurses-5.6/aclocal.m4 -@@ -3806,7 +3806,7 @@ - MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]' - cf_cv_rm_so_locs=yes - ;; -- linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) -+ linux*|gnu*|k*bsd*-gnu|netbsd*|freebsd*|dragonfly*) - if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" ---- ncurses-5.6/configure -+++ ncurses-5.6/configure -@@ -3806,7 +3806,7 @@ - MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $@` -o $@' - cf_cv_rm_so_locs=yes - ;; -- linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) -+ linux*|gnu*|k*bsd*-gnu|netbsd*|freebsd*|dragonfly*) - if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" diff --git a/sys-libs/ncurses/files/ncurses-5.6-solaris2.patch b/sys-libs/ncurses/files/ncurses-5.6-solaris2.patch deleted file mode 100644 index 5b4ca56340..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.6-solaris2.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- aclocal.m4.orig 2007-12-07 16:46:29.404007000 +0100 -+++ aclocal.m4 2007-12-07 16:48:41.180069000 +0100 -@@ -3903,19 +3903,33 @@ - ;; - solaris2*) - # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2 -- if test "$GCC" != yes; then -+ if test "$GCC" = yes; then -+ CC_SHARED_OPTS='-fPIC' -+ else - CC_SHARED_OPTS='-KPIC' - fi - if test "$DFT_LWR_MODEL" = "shared" ; then -- LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}" -+ if test "$GCC" = yes; then -+ LOCAL_LDFLAGS="-Wl,-R,\$(LOCAL_LIBDIR):\${libdir}" -+ else -+ LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}" -+ fi - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" - fi - if test "$cf_cv_ld_rpath" = yes ; then -- cf_ld_rpath_opt="-R" -+ if test "$GCC" = yes; then -+ cf_ld_rpath_opt="-Wl,-R" -+ else -+ cf_ld_rpath_opt="-R" -+ fi - EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS" - fi - CF_SHARED_SONAME -- MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $[@]' -+ if test "$GCC" = yes; then -+ MK_SHARED_LIB='${CC} -shared -Wl,-h,'$cf_shared_soname' -o $[@]' -+ else -+ MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $[@]' -+ fi - ;; - sysv5uw7*|unix_sv*) - # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc) ---- configure.orig 2007-12-07 13:58:59.599022000 +0100 -+++ configure 2007-12-07 14:00:36.836157000 +0100 -@@ -5120,15 +5120,25 @@ - ;; - solaris2*) - # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2 -- if test "$GCC" != yes; then -+ if test "$GCC" = yes; then -+ CC_SHARED_OPTS='-fPIC' -+ else - CC_SHARED_OPTS='-KPIC' - fi - if test "$DFT_LWR_MODEL" = "shared" ; then -- LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}" -+ if test "$GCC" = yes; then -+ LOCAL_LDFLAGS="-Wl,-R,\$(LOCAL_LIBDIR):\${libdir}" -+ else -+ LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}" -+ fi - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" - fi - if test "$cf_cv_ld_rpath" = yes ; then -- cf_ld_rpath_opt="-R" -+ if test "$GCC" = yes; then -+ cf_ld_rpath_opt="-Wl,-R" -+ else -+ cf_ld_rpath_opt="-R" -+ fi - EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS" - fi - -@@ -5139,7 +5149,11 @@ - cf_shared_soname='`basename $@`' - fi - -- MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $@' -+ if test "$GCC" = yes; then -+ MK_SHARED_LIB='${CC} -shared -Wl,-h,'$cf_shared_soname' -o $@' -+ else -+ MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $@' -+ fi - ;; - sysv5uw7*|unix_sv*) - # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc) diff --git a/sys-libs/ncurses/files/ncurses-5.7-emacs.patch b/sys-libs/ncurses/files/ncurses-5.7-emacs.patch deleted file mode 100644 index 615a73b291..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.7-emacs.patch +++ /dev/null @@ -1,44 +0,0 @@ -http://bugs.gentoo.org/270527 -Add entry for eterm-color to terminfo file -Part of upstream patch, available at: -ftp://invisible-island.net/ncurses/5.7/ncurses-5.7-20081129.patch - ---- ncurses-5.7-20081122+/misc/terminfo.src 2008-11-15 21:54:35.000000000 +0000 -+++ ncurses-5.7-20081129/misc/terminfo.src 2008-11-29 15:27:35.000000000 +0000 -@@ -4357,6 +4357,26 @@ - sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m, - smul=\E[4m, - -+# The codes supported by the term.el terminal emulation in GNU Emacs 22.2 -+eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, -+ am, mir, msgr, xenl, -+ colors#8, cols#80, lines#24, pairs#64, -+ bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, 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, -+ dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, -+ el=\E[K, el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, -+ il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m, kbs=\177, -+ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, -+ kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~, -+ knp=\E[6~, kpp=\E[5~, op=\E[39;49m, rc=\E8, rev=\E[7m, -+ ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, -+ sc=\E7, setab=\E[%p1%'('%+%dm, setaf=\E[%p1%{30}%+%dm, -+ sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m, -+ sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m, -+ u6=\E[%i%d;%dR, u7=\E[6n, -+ - # Entries for use by the `screen' program by Juergen Weigert, - # Michael Schroeder, Oliver Laumann. The screen and - # screen-w entries came with version 3.7.1. The screen2 and screen3 entries -@@ -21795,6 +21815,9 @@ - # * change several \E[2g (clear tab at current column) to \E[3g - # (clear all tabs) to match definition for tbc capability -TD - # -+# 2008-11-29 -+# * add eterm-color -TD -+# - # The following sets edit modes for GNU EMACS. - # Local Variables: - # fill-prefix:"\t" diff --git a/sys-libs/ncurses/files/ncurses-5.7-hashdb-open.patch b/sys-libs/ncurses/files/ncurses-5.7-hashdb-open.patch deleted file mode 100644 index d2575fd45c..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.7-hashdb-open.patch +++ /dev/null @@ -1,88 +0,0 @@ -http://bugs.gentoo.org/245370 - -ripped from ncurses-5.7-20081213.patch - -20081213 - + add check for failure to open hashed-database needed for db4.6 - (GenToo #245370). - ---- ncurses-5.7-20081206+/ncurses/tinfo/hashed_db.c 2006-08-19 19:48:38.000000000 +0000 -+++ ncurses-5.7-20081213/ncurses/tinfo/hashed_db.c 2008-12-13 20:59:02.000000000 +0000 -@@ -49,27 +49,30 @@ - _nc_db_open(const char *path, bool modify) - { - DB *result = 0; -+ int code; - - #if HASHED_DB_API >= 4 - db_create(&result, NULL, 0); -- result->open(result, -- NULL, -- path, -- NULL, -- DB_HASH, -- modify ? DB_CREATE : DB_RDONLY, -- 0644); -+ if ((code = result->open(result, -+ NULL, -+ path, -+ NULL, -+ DB_HASH, -+ modify ? DB_CREATE : DB_RDONLY, -+ 0644)) != 0) { -+ result = 0; -+ } - #elif HASHED_DB_API >= 3 - db_create(&result, NULL, 0); -- result->open(result, -- path, -- NULL, -- DB_HASH, -- modify ? DB_CREATE : DB_RDONLY, -- 0644); -+ if ((code = result->open(result, -+ path, -+ NULL, -+ DB_HASH, -+ modify ? DB_CREATE : DB_RDONLY, -+ 0644)) != 0) { -+ result = 0; -+ } - #elif HASHED_DB_API >= 2 -- int code; -- - if ((code = db_open(path, - DB_HASH, - modify ? DB_CREATE : DB_RDONLY, -@@ -77,21 +80,22 @@ - (DB_ENV *) 0, - (DB_INFO *) 0, - &result)) != 0) { -- T(("cannot open %s: %s", path, strerror(code))); - result = 0; -- } else { -- T(("opened %s", path)); - } - #else -- result = dbopen(path, -- modify ? (O_CREAT | O_RDWR) : O_RDONLY, -- 0644, -- DB_HASH, -- NULL); -+ if ((result = dbopen(path, -+ modify ? (O_CREAT | O_RDWR) : O_RDONLY, -+ 0644, -+ DB_HASH, -+ NULL)) == 0) { -+ code = errno; -+ } -+#endif - if (result != 0) { - T(("opened %s", path)); -+ } else { -+ T(("cannot open %s: %s", path, strerror(code))); - } --#endif - return result; - } - diff --git a/sys-libs/ncurses/files/ncurses-5.7-irix.patch b/sys-libs/ncurses/files/ncurses-5.7-irix.patch deleted file mode 100644 index 1cc09e9669..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.7-irix.patch +++ /dev/null @@ -1,40 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=262118 - ---- test/Makefile.dist 2009-02-25 15:26:35.226306680 +0000 -+++ test/Makefile 2009-02-25 16:33:38.145363000 +0000 -@@ -241,7 +241,7 @@ $(destdir)demo_termcap$x: $(MODEL)/demo_ - $(LINK) -o $@ $(MODEL)/demo_termcap$o $(LDFLAGS_TINFO) - - $(destdir)ditto$x: $(MODEL)/ditto$o $(LOCAL_LIBS) -- $(LINK) -o $@ $(MODEL)/ditto$o $(LDFLAGS_THREADS) -+ $(LINK) -o $@ $(MODEL)/ditto$o $(MODEL)/use_screen$o $(LDFLAGS_THREADS) - - $(destdir)dots$x: $(MODEL)/dots$o $(LOCAL_LIBS) - $(LINK) -o $@ $(MODEL)/dots$o $(LDFLAGS_TINFO) -@@ -310,7 +310,7 @@ $(destdir)railroad$x: $(MODEL)/railroad$ - $(LINK) -o $@ $(MODEL)/railroad$o $(LDFLAGS_TINFO) - - $(destdir)rain$x: $(MODEL)/rain$o $(LOCAL_LIBS) -- $(LINK) -o $@ $(MODEL)/rain$o $(LDFLAGS_THREADS) -+ $(LINK) -o $@ $(MODEL)/rain$o $(MODEL)/use_window$o $(LDFLAGS_THREADS) - - $(destdir)redraw$x: $(MODEL)/redraw$o $(LOCAL_LIBS) - $(LINK) -o $@ $(MODEL)/redraw$o $(LDFLAGS_CURSES) -@@ -337,7 +337,7 @@ $(destdir)test_inwstr$x: $(MODEL)/test_i - $(LINK) -o $@ $(MODEL)/test_inwstr$o $(LDFLAGS_CURSES) - - $(destdir)test_opaque$x: $(MODEL)/test_opaque$o $(LOCAL_LIBS) -- $(LINK) -o $@ $(MODEL)/test_opaque$o $(LDFLAGS_CURSES) -+ $(LINK) -o $@ $(MODEL)/test_opaque$o $(TEST_ARGS) $(LDFLAGS_CURSES) - - $(destdir)testaddch$x: $(MODEL)/testaddch$o $(LOCAL_LIBS) - $(LINK) -o $@ $(MODEL)/testaddch$o $(LDFLAGS_CURSES) -@@ -352,7 +352,7 @@ $(destdir)view$x: $(MODEL)/view$o $(LOCA - $(LINK) -o $@ $(MODEL)/view$o $(LDFLAGS_CURSES) - - $(destdir)worm$x: $(MODEL)/worm$o $(LOCAL_LIBS) -- $(LINK) -o $@ $(MODEL)/worm$o $(LDFLAGS_THREADS) -+ $(LINK) -o $@ $(MODEL)/worm$o $(MODEL)/use_window$o $(LDFLAGS_THREADS) - - $(destdir)xmas$x: $(MODEL)/xmas$o $(LOCAL_LIBS) - $(LINK) -o $@ $(MODEL)/xmas$o $(LDFLAGS_CURSES) diff --git a/sys-libs/ncurses/files/ncurses-5.7-ldflags-with-libtool.patch b/sys-libs/ncurses/files/ncurses-5.7-ldflags-with-libtool.patch deleted file mode 100644 index f48d9bc084..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.7-ldflags-with-libtool.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- mk-1st.awk.orig 2009-07-07 12:01:15.000000000 +0200 -+++ mk-1st.awk 2009-07-07 12:02:40.000000000 +0200 -@@ -386,7 +386,7 @@ - } - end_name = lib_name; - printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS -- printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)\n", compile, lib_name, OBJS -+ printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST) $(LDFLAGS)\n", compile, lib_name, OBJS - print "" - print "install \\" - print "install.libs \\" ---- c++/Makefile.in.orig 2007-04-28 17:29:12.000000000 +0200 -+++ c++/Makefile.in 2009-07-07 16:56:15.000000000 +0200 -@@ -160,7 +160,7 @@ - cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \ - -o $(LIBNAME) $(LIB_OBJS:$o=.lo) \ - -rpath $(INSTALL_PREFIX)$(libdir) \ -- -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST) -+ -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LDFLAGS_LIBTOOL) $(SHLIB_LIST) - - OBJS_DEMO = $(MODEL)/demo$o - diff --git a/sys-libs/ncurses/files/ncurses-5.7-mint-terminfo.patch b/sys-libs/ncurses/files/ncurses-5.7-mint-terminfo.patch deleted file mode 100644 index c8489c5bf6..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.7-mint-terminfo.patch +++ /dev/null @@ -1,175 +0,0 @@ -https://savannah.gnu.org/bugs/index.php?29268 -http://bugs.gentoo.org/show_bug.cgi?id=310267 - -applied upstream, hence should be able to go next release - - ---- ncurses-5.7/misc/terminfo.src 2010-03-19 17:24:49.000000000 +0000 -+++ ncurses-5.7-mint/misc/terminfo.src 2010-03-19 17:45:18.000000000 +0000 -@@ -657,6 +657,123 @@ - #### ANSI console types - # - -+############################################################################# -+# -+# Atari ST terminals. -+# From Guido Flohr <[email protected]>. -+# -+tw52|tw52-color|Toswin window manager with color, -+ colors#16, pairs#256, -+ setaf=\Eb%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1%{48}%+%c, -+ setab=\Ec%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1%{48}%+%c, -+ setf=\Eb%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1%{48}%+%c, -+ setb=\Ec%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1%{48}%+%c, -+ bce, -+ oc=\Eb?\Ec0, op=\Eb?\Ec0, -+ use=tw52-m, -+tw52-m|Toswin window manager monochrome, -+ ma#999, -+ dch1=\Ea, -+ smso=\EyQ, rmso=\EzQ, smul=\EyH, rmul=\EzH, -+ bold=\Eya, dim=\EyB, rev=\EyP, sgr0=\Ez_, -+ ul, -+ is2=\Ev\Eq\Ez_\Ee\Ei\Eb?\Ec0, rs2=\Ev\Eq\Ez_\Ee\Ei\Eb?\Ec0, -+ use=at-m, -+tt52|Atari TT medium and high resolution, -+ lines#30, -+ use=at-color, -+st52-color|at-color|atari-color|atari_st-color|Atari ST with color, -+ colors#16, pairs#256, -+ setaf=\Eb%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}%=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1%{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\072%e%p1%{11}%=%t\073%e%p1%{12}%=%t<%e%p1%{13}%=%t\075%e%p1%{14}%=%t6%e?, -+ setab=\Ec%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}%=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1%{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\072%e%p1%{11}%=%t\073%e%p1%{12}%=%t<%e%p1%{13}%=%t\075%e%p1%{14}%=%t6%e?, -+ setf=\Eb%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}%=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1%{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\072%e%p1%{11}%=%t\073%e%p1%{12}%=%t<%e%p1%{13}%=%t\075%e%p1%{14}%=%t6%e?, -+ setb=\Ec%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}%=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1%{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\072%e%p1%{11}%=%t\073%e%p1%{12}%=%t<%e%p1%{13}%=%t\075%e%p1%{14}%=%t6%e?, -+ is2=\Ev\Eq\Ee\Eb1\Ec0, rs2=\Ev\Eq\Ee\Eb1\Ec0, -+ bce, -+ use=st52, -+st52|st52-m|at|at-m|atari|atari-m|atari_st|atarist-m|Atari ST, -+ am, clear=\EE, -+ el1=\Eo, il1=\EL, dl1=\EM, mir, -+ smso=\Ep, rmso=\Eq, -+ rev=\Ep, sgr0=\Eq, -+ civis=\Ef, cnorm=\Ee, eo, -+ kcub1=\ED, kcuf1=\EC, kcuu1=\EA, kcud1=\EB, khome=\EE, -+ kf1=\EP, kf2=\EQ, kf3=\ER, kf4=\ES, kf5=\ET, -+ kf6=\EU, kf7=\EV, kf8=\EW, kf9=\EX, kf10=\EY, -+ kf11=\Ep, kf12=\Eq, kf13=\Er, kf14=\Es, kf15=\Et, -+ kf16=\Eu, kf17=\Ev, kf18=\Ew, kf19=\Ex, kf20=\Ey, -+ kbs=^H, kdch1=\177, kich1=\EI, knp=\Eb, kpp=\Ea, -+ khlp=\EH, kLFT=\Ed, kRIT=\Ec, kund=\EK, -+ is2=\Ev\Eq\Ee, rs2=\Ev\Eq\Ee, sc=\Ej, rc=\Ek, -+ npc, -+ cols#80, it#8, lines#24, -+ bel=^G, cr=^M, el=\EK, ed=\EJ, -+ cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cud1=\EB, home=\EH, -+ cub1=\ED, cuf1=\EC, cuu1=\EA, kbs=^H, -+ nel=^M^J, ind=^J, -+ ri=\EI, ht=^I, -+tw100|toswin vt100 window mgr, -+ eo, mir, msgr, xon, -+ colors#8, cols#80, it#8, lines#24, pairs#64, vt#3, -+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++\,\,hhII00, -+ bel=^G, blink=\E[5m, bold=\E[1m, civis=\Ef, -+ clear=\E[2J\E[H, cnorm=\Ee, cr=^M, csr=\E[%i%p1%d;%p2%dr, -+ cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\EB, -+ cuf=\E[%p1%dC, cuf1=\EC, cup=\E[%i%p1%d;%p2%dH, -+ cuu=\E[%p1%dA, cuu1=\EA, dch1=\Ea, dim=\E[2m, dl=\E[%p1%dM, -+ dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I, -+ hts=\EH, ich=\E[%p1%d@, il1=\EL, ind=^J, is2=\E<\E)0, -+ kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, -+ kdch1=\177, kf1=\EOP, kf10=\EOY, kf11=\Ep, kf12=\Eq, -+ kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew, -+ kf19=\Ex, kf2=\EOQ, kf20=\Ey, kf3=\EOR, kf4=\EOS, kf5=\EOT, -+ kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, khlp=\EH, -+ khome=\E\EE, kich1=\EI, knp=\Eb, kpp=\E\Ea, kund=\EK, -+ ll=\E[24H, nel=\EE, op=\E[30;47m, oc=\E[30;47m, rc=\E8, rev=\E[7m, ri=\EM, -+ rmacs=^O, rmcup=\E[?7h, rmir=\Ei, rmkx=\E[?1l\E>, -+ rmso=\E[m, rmul=\E[m, -+ rs1=\E<\E[20l\E[?3;6;9l\E[r\Eq\E(B\017\E)0\E>, -+ sc=\E7, -+ setb=\E[4%p1%'0'%+%Pa%?%ga%'0'%=%t0%e%ga%'1'%=%t4%e%ga%'2'%=%t2%e%ga%'3'%=%t6%e%ga%'4'%=%t1%e%ga%'5'%=%t5%e%ga%'6'%=%t3%e7%;m, -+ setf=\E[3%p1%'0'%+%Pa%?%ga%'0'%=%t0%e%ga%'1'%=%t4%e%ga%'2'%=%t2%e%ga%'3'%=%t6%e%ga%'4'%=%t1%e%ga%'5'%=%t5%e%ga%'6'%=%t3%e7%;m, -+ sgr0=\E[m, -+ smacs=^N, smcup=\E[?7l, smir=\Eh, smkx=\E[?1h\E=, -+ smso=\E[7m, smul=\E[4m, tbc=\E[3g, -+# The entries for stv52 and stv52pc probably need a revision. -+stv52|MiNT virtual console, -+ am, msgr, -+ cols#80, it#8, lines#30, -+ bel=^G, bold=\EyA, civis=\Ef, clear=\EE, cnorm=\E. \Ee, -+ cr=^M, cub1=^H, cud1=\EB, cuf1=\EC, -+ cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\E.", -+ dl1=\EM, ed=\EJ, el=\EK, home=\EH, ht=^I, il1=\EL, -+ ind=\n$<2*/>, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, -+ kcuu1=\EA, kdch1=\177, kf1=\EP, kf10=\EY, kf11=\Ep, kf12=\Eq, -+ kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew, -+ kf19=\Ex, kf2=\EQ, kf20=\Ey, kf3=\ER, kf4=\ES, kf5=\ET, -+ kf6=\EU, kf7=\EV, kf8=\EW, kf9=\EX, khlp=\EH, khome=\EE, -+ kich1=\EI, knp=\Eb, kpp=\Ea, kund=\EK, nel=\r\n$<2*/>, -+ rev=\Ep, ri=\EI$<2*/>, rmcup=\Ev\E. \Ee\Ez_, rmso=\Eq, -+ rmul=\EzH, rs1=\Ez_\Eb@\EcA, sgr0=\Ez_, smcup=\Ev\Ee\Ez_, -+ smso=\Ep, smul=\EyH, dim=\Em, blink=\Er, op=\Eb@\EcO, -+stv52pc|MiNT virtual console with PC charset, -+ am, msgr, -+ cols#80, it#8, lines#30, -+ acsc=`\177a\260f\370g\361j\331k\277l\332m\300n\305o\377p-q\304r-s_t+u+v+w+x\263y\363z\362{\343|\366}\234~\371.v-\^+\257\,\256h\261I\3740\333, -+ bel=^G, bold=\EyA, civis=\Ef, clear=\EE, cnorm=\E. \Ee, -+ cr=^M, cub1=^H, cud1=\EB, cuf1=\EC, -+ cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\E.", -+ dl1=\EM, ed=\EJ, el=\EK, home=\EH, ht=^I, il1=\EL, -+ ind=\n$<2*/>, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, -+ kcuu1=\EA, kdch1=\177, kf1=\EP, kf10=\EY, kf11=\Ep, kf12=\Eq, -+ kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew, -+ kf19=\Ex, kf2=\EQ, kf20=\Ey, kf3=\ER, kf4=\ES, kf5=\ET, -+ kf6=\EU, kf7=\EV, kf8=\EW, kf9=\EX, khlp=\EH, khome=\EE, -+ kich1=\EI, knp=\Eb, kpp=\Ea, kund=\EK, nel=\r\n$<2*/>, -+ rev=\Ep, ri=\EI$<2*/>, rmcup=\Ev\E. \Ee\Ez_, rmso=\Eq, -+ rmul=\EzH, rs1=\Ez_\Eb@\EcA, sgr0=\Ez_, smcup=\Ev\Ee\Ez_, -+ smso=\Ep, smul=\EyH, dim=\Em, blink=\Er, -+ - #### BeOS - # - # BeOS entry for Terminal program Seems to be almost ANSI -@@ -17249,42 +17366,6 @@ - lf7=f8, mc4=\E]+, mc5=\E]=, rmacs=\ERg, rmso=\ER@, sgr0=\ER@, - smacs=\ERG, smso=\ERD, - --#### Atari ST --# -- --# From: Simson L. Garfinkel <[email protected]> --atari|atari st, -- OTbs, am, -- cols#80, it#8, lines#25, -- clear=\EH\EJ, cub1=\ED, cud1=\EB, cuf1=\EC, -- cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dl1=\EM, -- ed=\EJ, el=\EK, ht=^I, il1=\EL, kcub1=\ED, kcud1=\EB, -- kcuf1=\EC, kcuu1=\EA, ri=\EI, rmso=\Eq, sgr0=\Eq, smso=\Ep, --# UniTerm terminal program for the Atari ST: 49-line VT220 emulation mode --# From: Paul M. Aoki <[email protected]> --uniterm|uniterm49|UniTerm VT220 emulator with 49 lines, -- lines#49, -- is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;49r\E[49;1H, -- use=vt220, --# MiNT VT52 emulation. 80 columns, 25 rows. --# MiNT is Now TOS, the operating system which comes with all Ataris now --# (mainly Atari Falcon). This termcap is for the VT52 emulation you get --# under tcsh/zsh/bash/sh/ksh/ash/csh when you run MiNT in `console' mode --# From: Per Persson <[email protected]>, 27 Feb 1996 --st52|Atari ST with VT52 emulation, -- am, km, -- cols#80, lines#25, -- bel=^G, civis=\Ef, clear=\EH\EJ, cnorm=\Ee, cr=^M, cub1=\ED, -- cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, -- cuu1=\EA, dl1=\EM, ed=\EJ, el=\EK, home=\EH, ht=^I, il1=\EL, -- ind=^J, ka1=\E#7, ka3=\E#5, kb2=\E#9, kbs=^H, kc1=\E#1, -- kc3=\E#3, kclr=\E#7, kcub1=\E#K, kcud1=\E#P, kcuf1=\E#M, -- kcuu1=\E#H, kf0=\E#D, kf1=\E#;, kf2=\E#<, kf3=\E#=, kf4=\E#>, -- kf5=\E#?, kf6=\E#@, kf7=\E#A, kf8=\E#B, kf9=\E#C, khome=\E#G, -- kil1=\E#R, kind=\E#2, kri=\E#8, lf0=f10, nel=^M^J, rc=\Ek, -- ri=\EI, rmcup=, rmso=\Eq, rs1=\Ez_\Eb@\EcA, sc=\Ej, sgr0=\Eq, -- smcup=\Ee, smso=\Ep, -- - #### Commodore Business Machines - # - # Formerly located in West Chester, PA; went spectacularly bust in 1994 diff --git a/sys-libs/ncurses/files/ncurses-5.7-mint.patch b/sys-libs/ncurses/files/ncurses-5.7-mint.patch deleted file mode 100644 index e76899b2d8..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.7-mint.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://savannah.gnu.org/support/index.php?106655 - ---- configure.old 2009-04-07 17:36:12.000000000 +0000 -+++ configure 2009-04-07 17:36:32.000000000 +0000 -@@ -6233,7 +6233,7 @@ - irix[56].*) #(vi - CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" - ;; --linux*|gnu*|k*bsd*-gnu) #(vi -+linux*|gnu*|k*bsd*-gnu|mint*) #(vi - - echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5 - echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 diff --git a/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode-9.09.patch b/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode-9.09.patch deleted file mode 100644 index 1d45083588..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode-9.09.patch +++ /dev/null @@ -1,189 +0,0 @@ -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.09 terminfo -which adds support for 256 colors. - ---- misc/terminfo.src -+++ misc/terminfo.src -@@ -3965,6 +3965,176 @@ - rxvt-16color|xterm with 16 colors like aixterm, - ncv#32, use=ibm+16color, use=rxvt, - -+# From: Thomas Dickey <[email protected]> 04 Oct 1997 -+# Updated: Özgür Kesim <[email protected]> 02 Nov 1997 -+# Updated: Marc Lehmann <[email protected]>, 17 Feb 2005 -+# Updated: Marc Lehmann <[email protected]>, 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=\E2$, -+ 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, -+ kcbt=\E[Z, -+ kcub1=\E[D, -+ kcud1=\E[B, -+ kcuf1=\E[C, -+ kcuu1=\E[A, -+ kdch1=\E[3~, -+ kel=\E[8\^, -+ kend=\E[8~, -+ kent=\EOM, -+ kf1=\E[11~, -+ kf10=\E[21~, -+ kf11=\E[23~, -+ kf12=\E[24~, -+ kf13=\E[25~, -+ kf14=\E[26~, -+ kf15=\E[28~, -+ kf16=\E[29~, -+ kf17=\E[31~, -+ kf18=\E[32~, -+ kf19=\E[33~, -+ kf2=\E[12~, -+ kf20=\E[34~, -+ kf3=\E[13~, -+ kf4=\E[14~, -+ kf5=\E[15~, -+ kf6=\E[17~, -+ kf7=\E[18~, -+ kf8=\E[19~, -+ kf9=\E[20~, -+ kfnd=\E[1~, -+ khome=\E[7~, -+ kich1=\E[2~, -+ kmous=\E[M, -+ knp=\E[6~, -+ kpp=\E[5~, -+ kslt=\E[4~, -+ rc=\E8, -+ rev=\E[7m, -+ ri=\EM, -+ rmso=\E[27m, -+ rmul=\E[24m, -+ rs1=\Ec, -+ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, -+ sgr0=\E[m\E(B, -+ enacs=, -+ smacs=\E(0, -+ rmacs=\E(B, -+ smso=\E[7m, -+ smul=\E[4m, -+ tbc=\E[3g, -+ vpa=\E[%i%p1%dd, -+ colors#88, -+ pairs#7744, -+ btns#5, -+ lm#0, -+ ccc, -+ npc, -+ mc5i, -+ ncv#0, -+ mir, -+ xon, -+ bw, -+ ech=\E[%p1%dX, -+ mc0=\E[i, -+ mc4=\E[4i, -+ mc5=\E[5i, -+ sitm=\E[3m, -+ ritm=\E[23m, -+ smam=\E[?7h, -+ rmam=\E[?7l, -+ smir=\E[4h, -+ rmir=\E[4l, -+ smcup=\E[?1049h, -+ rmcup=\E[r\E[?1049l, -+ smkx=\E=, -+ rmkx=\E>, -+ indn=\E[%p1%dS, -+ rin=\E[%p1%dT, -+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, -+ op=\E[39;49m, -+ setaf=\E[38;5;%p1%dm, -+ setab=\E[48;5;%p1%dm, -+ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, -+ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, -+ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, -+ sc=\E7, -+ s0ds=\E(B, -+ s1ds=\E(0, -+ s2ds=\E*B, -+ s3ds=\E+B, -+ u6=\E[%i%d;%dR, -+ u7=\E[6n, -+ u8=\E[?1;2c, -+ u9=\E[c, -+ tsl=\E]2;, -+ fsl=\007, -+ dsl=\E]2;\007, -+ -+rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System), -+ colors#256, -+ pairs#32767, -+ use=rxvt-unicode, -+ - # mrxvt 0.5.3 - # - # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which diff --git a/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode.patch b/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode.patch deleted file mode 100644 index ee9b135ef9..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode.patch +++ /dev/null @@ -1,174 +0,0 @@ ---- misc/terminfo.src.old 2009-10-27 21:02:05.413714694 +0200 -+++ misc/terminfo.src 2009-10-27 21:02:07.637734809 +0200 -@@ -3965,6 +3965,171 @@ - rxvt-16color|xterm with 16 colors like aixterm, - ncv#32, use=ibm+16color, use=rxvt, - -+# From: Thomas Dickey <[email protected]> 04 Oct 1997 -+# Updated: �zg�r Kesim <[email protected]> 02 Nov 1997 -+# Updated: Marc Lehmann <[email protected]>, 17 Feb 2005 -+# Updated: Marc Lehmann <[email protected]>, 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=\E2$, -+ 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, -+ kcbt=\E[Z, -+ kcub1=\E[D, -+ kcud1=\E[B, -+ kcuf1=\E[C, -+ kcuu1=\E[A, -+ kdch1=\E[3~, -+ kel=\E[8\^, -+ kend=\E[8~, -+ kent=\EOM, -+ kf1=\E[11~, -+ kf10=\E[21~, -+ kf11=\E[23~, -+ kf12=\E[24~, -+ kf13=\E[25~, -+ kf14=\E[26~, -+ kf15=\E[28~, -+ kf16=\E[29~, -+ kf17=\E[31~, -+ kf18=\E[32~, -+ kf19=\E[33~, -+ kf2=\E[12~, -+ kf20=\E[34~, -+ kf3=\E[13~, -+ kf4=\E[14~, -+ kf5=\E[15~, -+ kf6=\E[17~, -+ kf7=\E[18~, -+ kf8=\E[19~, -+ kf9=\E[20~, -+ kfnd=\E[1~, -+ khome=\E[7~, -+ kich1=\E[2~, -+ kmous=\E[M, -+ knp=\E[6~, -+ kpp=\E[5~, -+ kslt=\E[4~, -+ rc=\E8, -+ rev=\E[7m, -+ ri=\EM, -+ rmso=\E[27m, -+ rmul=\E[24m, -+ rs1=\Ec, -+ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, -+ sgr0=\E[m\017, -+ enacs=, -+ smacs=\E(0, -+ rmacs=\E(B, -+ smso=\E[7m, -+ smul=\E[4m, -+ tbc=\E[3g, -+ vpa=\E[%i%p1%dd, -+ colors#88, -+ pairs#256, -+ btns#5, -+ lm#0, -+ ccc, -+ npc, -+ mc5i, -+ ncv#0, -+ mir, -+ xon, -+ bw, -+ ech=\E[%p1%dX, -+ mc0=\E[i, -+ mc4=\E[4i, -+ mc5=\E[5i, -+ sitm=\E[3m, -+ ritm=\E[23m, -+ smam=\E[?7h, -+ rmam=\E[?7l, -+ smir=\E[4h, -+ rmir=\E[4l, -+ smcup=\E[?1049h, -+ rmcup=\E[r\E[?1049l, -+ smkx=\E=, -+ rmkx=\E>, -+ indn=\E[%p1%dS, -+ rin=\E[%p1%dT, -+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, -+ op=\E[39;49m, -+ setaf=\E[38;5;%p1%dm, -+ setab=\E[48;5;%p1%dm, -+ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, -+ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, -+ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, -+ sc=\E7, -+ s0ds=\E(B, -+ s1ds=\E(0, -+ s2ds=\E*B, -+ s3ds=\E+B, -+ u6=\E[%i%d;%dR, -+ u7=\E[6n, -+ u8=\E[?1;2c, -+ u9=\E[c, -+ tsl=\E]2;, -+ fsl=\007, -+ dsl=\E]2;\007, -+ - # mrxvt 0.5.3 - # - # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which diff --git a/sys-libs/ncurses/files/ncurses-5.7-tic-cross-detection.patch b/sys-libs/ncurses/files/ncurses-5.7-tic-cross-detection.patch deleted file mode 100644 index a57cd78c77..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.7-tic-cross-detection.patch +++ /dev/null @@ -1,58 +0,0 @@ -use $cross_compiling that autotools already set up rather than trying to -do a custom & fragile job with compiler names - -configure.in also needs AC_SUBST(cross_compiling) ... - -http://bugs.gentoo.org/288881 - ---- a/configure -+++ b/configure -@@ -17300,6 +17300,7 @@ - s,@build_alias@,$build_alias,;t t - s,@host_alias@,$host_alias,;t t - s,@target_alias@,$target_alias,;t t -+s,@cross_compiling@,$cross_compiling,;t t - s,@ECHO_C@,$ECHO_C,;t t - s,@ECHO_N@,$ECHO_N,;t t - s,@ECHO_T@,$ECHO_T,;t t ---- a/misc/run_tic.in -+++ b/misc/run_tic.in -@@ -52,8 +52,7 @@ - : ${ticdir=@TERMINFO@} - : ${source=@TERMINFO_SRC@} - : ${LN_S="@LN_S@"} --: ${THAT_CC=cc} --: ${THIS_CC=cc} -+: ${cross_compiling=@cross_compiling@} - : ${ext_funcs=@NCURSES_EXT_FUNCS@} - - test -z "${DESTDIR}" && DESTDIR= -@@ -61,7 +60,7 @@ - # Allow tic to run either from the install-path, or from the build-directory. - # Do not do this if we appear to be cross-compiling. In that case, we rely - # on the host's copy of tic to compile the terminfo database. --if test "$THAT_CC" = "$THIS_CC" ; then -+if test "$cross_compiling" != "yes" ; then - case "$PATH" in - :*) PATH=../progs:../lib:${DESTDIR}$bindir$PATH ;; - *) PATH=../progs:../lib:${DESTDIR}$bindir:$PATH ;; ---- a/misc/Makefile.in -+++ b/misc/Makefile.in -@@ -59,6 +59,7 @@ - - CC = @CC@ - HOSTCC = @BUILD_CC@ -+cross_compiling = @cross_compiling@ - - tabsetdir = $(datadir)/tabset - ticdir = @TERMINFO@ -@@ -91,8 +92,7 @@ - datadir=${datadir} \ - ticdir=${ticdir} \ - source=terminfo.tmp \ -- THIS_CC="$(CC)" \ -- THAT_CC="$(HOSTCC)" \ -+ cross_compiling="${cross_compiling}" \ - $(SHELL) ./run_tic.sh - @cd $(srcdir)/tabset && \ - $(SHELL) -c 'for i in * ; do \ diff --git a/sys-libs/ncurses/files/ncurses-5.7-x64-freebsd.patch b/sys-libs/ncurses/files/ncurses-5.7-x64-freebsd.patch deleted file mode 100644 index 5c86d27c58..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.7-x64-freebsd.patch +++ /dev/null @@ -1,27 +0,0 @@ -* add back -DPIC for vanilla FreeBSD (64-bits) that got destroyed by the - gfbsd patch - ---- ncurses-5.7/aclocal.m4 -+++ ncurses-5.7/aclocal.m4 -@@ -4289,6 +4289,9 @@ - cf_cv_rm_so_locs=yes - ;; - linux*|gnu*|k*bsd*-gnu|netbsd*|freebsd*|dragonfly*) -+ case $cf_cv_system_name in -+ *bsd*) CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" ;; -+ esac - if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" ---- ncurses-5.7/configure -+++ ncurses-5.7/configure -@@ -5107,6 +5107,9 @@ - cf_cv_rm_so_locs=yes - ;; - linux*|gnu*|k*bsd*-gnu|netbsd*|freebsd*|dragonfly*) -+ case $cf_cv_system_name in -+ *bsd*) CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" ;; -+ esac - if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" diff --git a/sys-libs/ncurses/files/ncurses-5.8-rxvt-unicode.patch b/sys-libs/ncurses/files/ncurses-5.8-rxvt-unicode.patch deleted file mode 100644 index 33a3b0d848..0000000000 --- a/sys-libs/ncurses/files/ncurses-5.8-rxvt-unicode.patch +++ /dev/null @@ -1,189 +0,0 @@ -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.09 terminfo -which adds support for 256 colors. - ---- misc/terminfo.src -+++ misc/terminfo.src -@@ -3965,6 +3965,176 @@ - rxvt-16color|xterm with 16 colors like aixterm, - ncv#32, use=ibm+16color, use=rxvt, - -+# From: Thomas Dickey <[email protected]> 04 Oct 1997 -+# Updated: Özgür Kesim <[email protected]> 02 Nov 1997 -+# Updated: Marc Lehmann <[email protected]>, 17 Feb 2005 -+# Updated: Marc Lehmann <[email protected]>, 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=\E2$, -+ 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, -+ kcbt=\E[Z, -+ kcub1=\E[D, -+ kcud1=\E[B, -+ kcuf1=\E[C, -+ kcuu1=\E[A, -+ kdch1=\E[3~, -+ kel=\E[8\^, -+ kend=\E[8~, -+ kent=\EOM, -+ kf1=\E[11~, -+ kf10=\E[21~, -+ kf11=\E[23~, -+ kf12=\E[24~, -+ kf13=\E[25~, -+ kf14=\E[26~, -+ kf15=\E[28~, -+ kf16=\E[29~, -+ kf17=\E[31~, -+ kf18=\E[32~, -+ kf19=\E[33~, -+ kf2=\E[12~, -+ kf20=\E[34~, -+ kf3=\E[13~, -+ kf4=\E[14~, -+ kf5=\E[15~, -+ kf6=\E[17~, -+ kf7=\E[18~, -+ kf8=\E[19~, -+ kf9=\E[20~, -+ kfnd=\E[1~, -+ khome=\E[7~, -+ kich1=\E[2~, -+ kmous=\E[M, -+ knp=\E[6~, -+ kpp=\E[5~, -+ kslt=\E[4~, -+ rc=\E8, -+ rev=\E[7m, -+ ri=\EM, -+ rmso=\E[27m, -+ rmul=\E[24m, -+ rs1=\Ec, -+ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, -+ sgr0=\E[m\E(B, -+ enacs=, -+ smacs=\E(0, -+ rmacs=\E(B, -+ smso=\E[7m, -+ smul=\E[4m, -+ tbc=\E[3g, -+ vpa=\E[%i%p1%dd, -+ colors#88, -+ pairs#7744, -+ btns#5, -+ lm#0, -+ ccc, -+ npc, -+ mc5i, -+ ncv#0, -+ mir, -+ xon, -+ bw, -+ ech=\E[%p1%dX, -+ mc0=\E[i, -+ mc4=\E[4i, -+ mc5=\E[5i, -+ sitm=\E[3m, -+ ritm=\E[23m, -+ smam=\E[?7h, -+ rmam=\E[?7l, -+ smir=\E[4h, -+ rmir=\E[4l, -+ smcup=\E[?1049h, -+ rmcup=\E[r\E[?1049l, -+ smkx=\E=, -+ rmkx=\E>, -+ indn=\E[%p1%dS, -+ rin=\E[%p1%dT, -+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, -+ op=\E[39;49m, -+ setaf=\E[38;5;%p1%dm, -+ setab=\E[48;5;%p1%dm, -+ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, -+ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, -+ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, -+ sc=\E7, -+ s0ds=\E(B, -+ s1ds=\E(0, -+ s2ds=\E*B, -+ s3ds=\E+B, -+ u6=\E[%i%d;%dR, -+ u7=\E[6n, -+ u8=\E[?1;2c, -+ u9=\E[c, -+ tsl=\E]2;, -+ fsl=\007, -+ dsl=\E]2;\007, -+ -+rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System), -+ colors#256, -+ pairs#32767, -+ use=rxvt-unicode, -+ - # mrxvt 0.5.4 - # - # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses/ncurses-5.9-r101.ebuild index f2cf2869c5..3b19896661 100644 --- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild +++ b/sys-libs/ncurses/ncurses-5.9-r101.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This version is just for the ABI .5 library @@ -13,18 +13,10 @@ DESCRIPTION="console display library" HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"; SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" -HOSTLTV="0.1.0" -HOSTLT="host-libtool-${HOSTLTV}" -HOSTLT_URI="http://github.com/haubi/host-libtool/releases/download/v${HOSTLTV}/${HOSTLT}.tar.gz"; -SRC_URI="${SRC_URI} - kernel_AIX? ( ${HOSTLT_URI} ) - kernel_HPUX? ( ${HOSTLT_URI} ) -" - LICENSE="MIT" # The subslot reflects the SONAME. SLOT="5/5" -KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="gpm tinfo unicode" DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" @@ -44,29 +36,12 @@ PATCHES=( "${FILESDIR}"/${P}-gcc-5.patch #545114 ) -need-libtool() { - # need libtool to build aix-style shared objects inside archive libs, but - # cannot depend on libtool, as this would create circular dependencies... - # And libtool-1.5.26 needs (a similar) patch for AIX (DESTDIR) as found in - # http://lists.gnu.org/archive/html/bug-libtool/2008-03/msg00124.html - # Use libtool on hpux too to get some soname. - [[ ${CHOST} == *'-aix'* || ${CHOST} == *'-hpux'* ]] -} - src_prepare() { epatch "${PATCHES[@]}" # /bin/sh is not always good enough find . -name "*.sh" | xargs sed -i -e '1c\#!/usr/bin/env sh' - if need-libtool; then - S="${WORKDIR}"/${HOSTLT} elibtoolize - - # Don't need local libraries (-L../lib) for libncurses, - # ends up as insecure runpath in libncurses.so[shr.o] on AIX - sed -i -e '/^SHLIB_LIST[ \t]*=/s/\$(SHLIB_DIRS)//' ncurses/Makefile.in || die - fi - # Don't mess with _XOPEN_SOURCE for C++ on (Open)Solaris. The compiler # defines a value for it, and depending on version, a different definition # is used. Defining this variable on these systems is dangerous any time, @@ -86,13 +61,6 @@ src_prepare() { } src_configure() { - if need-libtool; then - cd "${WORKDIR}"/${HOSTLT} || die - econf - export PATH="${WORKDIR}"/${HOSTLT}:${PATH} - cd "${S}" || die - fi - unset TERMINFO #115036 tc-export_build_env BUILD_{CC,CPP} BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642 @@ -159,9 +127,7 @@ do_configure() { --without-hashed-db --disable-pc-files --$( - if need-libtool ; then - echo with-libtool - elif tc-is-static-only ; then + if tc-is-static-only ; then echo without-shared else echo with-shared diff --git a/sys-libs/ncurses/ncurses-6.1-r2.ebuild b/sys-libs/ncurses/ncurses-6.1-r2.ebuild index e53fc18de4..c07a83ebf1 100644 --- a/sys-libs/ncurses/ncurses-6.1-r2.ebuild +++ b/sys-libs/ncurses/ncurses-6.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" 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" +KEYWORDS="~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" DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" @@ -74,7 +74,6 @@ src_configure() { local dbuildflags="-Wl,-rpath,${WORKDIR}/lib" case ${CHOST} in *-darwin*) dbuildflags= ;; - *-aix*) dbuildflags= ;; *-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;; esac echo "int main() {}" | \ diff --git a/sys-libs/ncurses/ncurses-6.1-r3.ebuild b/sys-libs/ncurses/ncurses-6.1-r3.ebuild index 46e8fa420e..5b724f9169 100644 --- a/sys-libs/ncurses/ncurses-6.1-r3.ebuild +++ b/sys-libs/ncurses/ncurses-6.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" 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" +KEYWORDS="~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" DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" @@ -73,7 +73,6 @@ src_configure() { local dbuildflags="-Wl,-rpath,${WORKDIR}/lib" case ${CHOST} in *-darwin*) dbuildflags= ;; - *-aix*) dbuildflags= ;; *-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;; esac echo "int main() {}" | \ diff --git a/sys-libs/ncurses/ncurses-6.2-r1.ebuild b/sys-libs/ncurses/ncurses-6.2-r1.ebuild index dc175394ec..8feae8ec77 100644 --- a/sys-libs/ncurses/ncurses-6.2-r1.ebuild +++ b/sys-libs/ncurses/ncurses-6.2-r1.ebuild @@ -19,7 +19,7 @@ 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" +KEYWORDS="~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 )" @@ -79,7 +79,6 @@ src_configure() { local dbuildflags="-Wl,-rpath,${WORKDIR}/lib" case ${CHOST} in *-darwin*) dbuildflags= ;; - *-aix*) dbuildflags= ;; *-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;; esac echo "int main() {}" | \
