[gentoo-commits] repo/gentoo:master commit in: dev-vcs/tig/files/, dev-vcs/tig/

2020-04-09 Thread Patrick McLean 
commit: ccd6fa117173bc4fb0ba74519d1c4a99a2ec996f
Author: Patrick McLean  sony  com>
AuthorDate: Thu Apr  9 21:35:11 2020 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Thu Apr  9 21:35:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccd6fa11

dev-vcs/tig-2.5.1: Version bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Patrick McLean  gentoo.org>

 dev-vcs/tig/Manifest   |  1 +
 .../tig-2.5.1-bash-completion-qa-warning.patch | 15 +
 dev-vcs/tig/tig-2.5.1.ebuild   | 64 ++
 3 files changed, 80 insertions(+)

diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
index 81c254a3783..8b077aae74d 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,3 +1,4 @@
 DIST tig-2.3.3.tar.gz 1082818 BLAKE2B 
0e9bcd02726b004c233a5efd7f58e4fda478dc1d2b738a7f8c086a3d71807d319ac8bd296b0f7c7569ed69a5b2b1db18e5c957cc5ce890a67b8f6ee7ead29551
 SHA512 
1d1cdf7184eeb3fea301c1959023f4aa97c4f8e25fc96cd61933ca39cf7549b6c7e1d9517f7ffd45d212ae9542ea4be07370b41c623cf6d0db8d025634b1d6d1
 DIST tig-2.4.1.tar.gz 1181900 BLAKE2B 
85bb76008e5c10e94d97ac4cd88ac4eb2a0675ef5b45e9f21a9d2219cf0b6ed55ce52b579b831bc6c6fc530c89fb99f5dfd1f62dab3e1ab329e132707dccf908
 SHA512 
516114ed267a9459e356ca1af35c9eba521f9a11e9462cc5120cc7ea8fba4e54ea0a2e8e0ab96263754d6516354c296df541f8e3642392eaeb205cd88428077c
 DIST tig-2.5.0.tar.gz 1143004 BLAKE2B 
77ccb2e754335f2ceaf26f1885cbca093d811ca479ef21fed532e43aab710fccfab85f1b5944273f53d9ed5ab0a5917392129c5d96f2c3c20d5da5029367b308
 SHA512 
26736fe241dd2dac25d5133ed847a7c1dab4bfeaad83af2effc8e523f8c6d8c179fe3ff05cd4343e4b1048c3c50309908aa32e81dd0789e35afe9bd8ff8772ee
+DIST tig-2.5.1.tar.gz 1144666 BLAKE2B 
f8e96b1e27286ebebd3e3f374b28ed31a69b10bab1e831068341a430c36418d6a412b29caa3a44e3fafb3131d93b6d8d62ade4c92dc06fe753f040957b9e64e6
 SHA512 
e7c27a1e6357ce3cb4c02ff409d40c0ca67d10875eedbf467b9a280d8433cca15d16860256637041003384e7c536aca743ce971e623d3000dceeda598d6d3ae0

diff --git a/dev-vcs/tig/files/tig-2.5.1-bash-completion-qa-warning.patch 
b/dev-vcs/tig/files/tig-2.5.1-bash-completion-qa-warning.patch
new file mode 100644
index 000..01222ddf14c
--- /dev/null
+++ b/dev-vcs/tig/files/tig-2.5.1-bash-completion-qa-warning.patch
@@ -0,0 +1,15 @@
+diff --git a/contrib/tig-completion.bash b/contrib/tig-completion.bash
+index 5aef3fd..cec0632 100755
+--- a/contrib/tig-completion.bash
 b/contrib/tig-completion.bash
+@@ -29,6 +29,10 @@
+ #   at source time then all lookups will be done on demand,
+ #   which may be slightly slower.
+ 
++if ! type -f __git_complete &>/dev/null; then
++  __git_complete() { complete "${1}"; }
++fi
++
+ __tig_options="
+   -v --version
+   -h --help

diff --git a/dev-vcs/tig/tig-2.5.1.ebuild b/dev-vcs/tig/tig-2.5.1.ebuild
new file mode 100644
index 000..a3531564563
--- /dev/null
+++ b/dev-vcs/tig/tig-2.5.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/jonas/tig.git;
+   inherit git-r3 autotools
+else
+   
SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+
+DESCRIPTION="text mode interface for git"
+HOMEPAGE="https://jonas.github.io/tig/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test unicode"
+REQUIRED_USE="test? ( unicode )"
+
+DEPEND="
+   sys-libs/ncurses:0=[unicode?]
+   sys-libs/readline:0="
+RDEPEND="${DEPEND}
+   dev-vcs/git"
+[[ ${PV} == "" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
+
+# encoding/env issues
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}/tig-2.5.1-bash-completion-qa-warning.patch"
+)
+
+src_prepare() {
+   default
+   [[ ${PV} == "" ]] && eautoreconf
+}
+
+src_configure() {
+   econf $(use_with unicode ncursesw)
+}
+
+src_compile() {
+   emake V=1
+   [[ ${PV} == "" ]] && emake V=1 doc-man doc-html
+}
+
+src_test() {
+   # workaround parallel test failures
+   emake -j1 test
+}
+
+src_install() {
+   emake DESTDIR="${D}" install install-doc-man
+   dodoc doc/manual.html README.html NEWS.html
+   newbashcomp contrib/tig-completion.bash ${PN}
+
+   docinto examples
+   dodoc contrib/*.tigrc
+}

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/tig/files/, dev-vcs/tig/

2017-04-12 Thread Tim Harder 
commit: fb4d262b7f065a1304b7adac35ae19d4c4f4f888
Author: Tim Harder  gentoo  org>
AuthorDate: Wed Apr 12 07:46:59 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Wed Apr 12 07:50:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb4d262b

dev-vcs/tig: fix segfault with split tinfo lib (bug #614590)

 dev-vcs/tig/files/tig-2.2.1-termcap-tinfo.patch | 56 +++
 dev-vcs/tig/tig-2.2.1-r1.ebuild | 61 +
 2 files changed, 117 insertions(+)

diff --git a/dev-vcs/tig/files/tig-2.2.1-termcap-tinfo.patch 
b/dev-vcs/tig/files/tig-2.2.1-termcap-tinfo.patch
new file mode 100644
index 000..4b3df2ee35b
--- /dev/null
+++ b/dev-vcs/tig/files/tig-2.2.1-termcap-tinfo.patch
@@ -0,0 +1,56 @@
+From c4aded6c8f63471b30fe171072e11407929301ac Mon Sep 17 00:00:00 2001
+From: Tim Harder 
+Date: Tue, 11 Apr 2017 05:17:52 -0400
+Subject: [PATCH] Check for termcap support in split tinfo libs
+
+Previously only the main ncurses libs were checked leading to users with
+enabled unicode support (ncursesw) and split tinfo libs running into
+segfaults since the checks would fallback to setting TERMCAP_LIB=-lcurses.
+
+Fixes #568.
+---
+ tools/ax_lib_readline.m4 | 16 +++-
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/tools/ax_lib_readline.m4 b/tools/ax_lib_readline.m4
+index 1be9125..24ca194 100644
+--- a/tools/ax_lib_readline.m4
 b/tools/ax_lib_readline.m4
+@@ -34,16 +34,19 @@ fi
+ AC_CACHE_VAL(bash_cv_termcap_lib,
+ [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
+ if test "$ax_cv_curses_which" = "ncursesw"; then
+-  [AC_CHECK_LIB(ncursesw, tgetent, bash_cv_termcap_lib=libncursesw)]
++  [AC_CHECK_LIB(ncursesw, tgetent, bash_cv_termcap_lib=libncursesw,
++  [AC_CHECK_LIB(tinfow, tgetent, bash_cv_termcap_lib=libtinfow)]
++  )]
+ elif test "$ax_cv_curses_which" = "ncurses"; then
+-  [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses)]
++  [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
++  [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo)]
++  )]
+ elif test "$ax_cv_curses_which" = "plaincurses"; then
+   [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses)]
+ else
+   [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
+-  [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
+-  bash_cv_termcap_lib=gnutermcap
+-  )])]
++  bash_cv_termcap_lib=gnutermcap
++  )]
+ fi
+ )])
+ if test "X$_bash_needmsg" = "Xyes"; then
+@@ -57,6 +60,9 @@ TERMCAP_DEP="./lib/termcap/libtermcap.a"
+ elif test $bash_cv_termcap_lib = libtermcap && test -z "$prefer_curses"; then
+ TERMCAP_LIB=-ltermcap
+ TERMCAP_DEP=
++elif test $bash_cv_termcap_lib = libtinfow; then
++TERMCAP_LIB=-ltinfow
++TERMCAP_DEP=
+ elif test $bash_cv_termcap_lib = libtinfo; then
+ TERMCAP_LIB=-ltinfo
+ TERMCAP_DEP=
+-- 
+2.12.0
+

diff --git a/dev-vcs/tig/tig-2.2.1-r1.ebuild b/dev-vcs/tig/tig-2.2.1-r1.ebuild
new file mode 100644
index 000..0947cba842e
--- /dev/null
+++ b/dev-vcs/tig/tig-2.2.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/jonas/tig.git;
+   inherit git-r3 autotools
+else
+   
SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz;
+   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+
+DESCRIPTION="text mode interface for git"
+HOMEPAGE="https://jonas.github.io/tig/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="unicode"
+
+DEPEND="
+   sys-libs/ncurses:0=[unicode?]
+   sys-libs/readline:0="
+RDEPEND="${DEPEND}
+   dev-vcs/git"
+[[ ${PV} == "" ]] && DEPEND+=" app-text/asciidoc"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.2.1-tinfo.patch
+   "${FILESDIR}"/${PN}-2.2.1-termcap-tinfo.patch
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf $(use_with unicode ncursesw)
+}
+
+src_compile() {
+   emake V=1
+   [[ ${PV} == "" ]] && emake V=1 doc-man doc-html
+}
+
+src_test() {
+   # workaround parallel test failures
+   emake -j1 test
+}
+
+src_install() {
+   emake DESTDIR="${D}" install install-doc-man
+   dodoc doc/manual.html README.html NEWS.html
+   newbashcomp contrib/tig-completion.bash ${PN}
+
+   docinto examples
+   dodoc contrib/*.tigrc
+}

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/tig/files/, dev-vcs/tig/

2016-11-26 Thread Justin Lecher 
commit: 6e17e19c703e2e3e99c0f4c776252197ae3a5e7a
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Nov 26 12:24:16 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Nov 26 12:54:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e17e19c

dev-vcs/tig: Add patch for ncurses[tinfo] support

Package-Manager: portage-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 dev-vcs/tig/files/tig-2.2.1-tinfo.patch | 303 
 dev-vcs/tig/tig-2.2.1.ebuild|   6 +-
 2 files changed, 307 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/tig/files/tig-2.2.1-tinfo.patch 
b/dev-vcs/tig/files/tig-2.2.1-tinfo.patch
new file mode 100644
index ..1cb30e7
--- /dev/null
+++ b/dev-vcs/tig/files/tig-2.2.1-tinfo.patch
@@ -0,0 +1,303 @@
+commit 585e5d60fb85eff2e7709d63d80c320049393694
+Author: Justin Lecher 
+Date:   Sat Nov 26 12:55:42 2016 +0100
+
+Update ax_with_curses.m4 to support pkg-config
+
+Latest version of ax_with_curses.m4 supports pkg-config. This is important
+as libcurses is split into libcurses.so and libtinfo.so on many distros
+and linking against libcurses.so is not sufficiant. Pkg-config allows
+proper detection of necessary libs.
+
+Signed-off-by: Justin Lecher 
+
+diff --git a/config.make.in b/config.make.in
+index bf41d85..a7c9ce3 100644
+--- a/config.make.in
 b/config.make.in
+@@ -12,7 +12,7 @@ CC = @CC@
+ CFLAGS = @CFLAGS@ @COVERAGE_CFLAGS@
+ CPPFLAGS = @CPPFLAGS@ -DHAVE_CONFIG_H
+ LDFLAGS = @LDFLAGS@
+-LDLIBS = @LIBS@ @CURSES_LIB@
++LDLIBS = @LIBS@ @CURSES_LIBS@
+ 
+ ASCIIDOC = @ASCIIDOC@
+ XMLTO = @XMLTO@
+diff --git a/configure.ac b/configure.ac
+index 0bcfb3f..d58e2f2 100644
+--- a/configure.ac
 b/configure.ac
+@@ -21,15 +21,23 @@ AC_CHECK_FUNCS([mkstemps], [AC_SUBST([NO_MKSTEMPS], 
["#"])])
+ AC_CHECK_FUNCS([setenv], [AC_SUBST([NO_SETENV], ["#"])])
+ AC_CHECK_FUNCS([strndup], [AC_SUBST([NO_STRNDUP], ["#"])])
+ 
+-AX_WITH_CURSES
+-case "$ax_cv_ncurses" in "no")
+-  AC_MSG_ERROR([ncurses not found])
+-esac
+-case "$ax_cv_ncursesw" in "no")
+-  AC_MSG_WARN([The found ncurses library does not support wide-char.])
+-  AC_MSG_WARN([This means that tig will not correctly render UTF-8.])
+-esac
+-AC_SUBST(CURSES_LIB)
++PKG_CHECK_MODULES([CURSES], [ncursesw],
++  [AC_SUBST(CURSES_LIBS)], [
++  PKG_CHECK_MODULES([CURSES], [ncurses],
++  [AC_SUBST(CURSES_LIBS)
++  AC_MSG_WARN([The found ncurses library does not support 
wide-char.])
++  AC_MSG_WARN([This means that tig will not correctly render 
UTF-8.])],[
++  AX_WITH_CURSES
++  case "$ax_cv_ncurses" in "no")
++  AC_MSG_ERROR([ncurses not found])
++  esac
++  case "$ax_cv_ncursesw" in "no")
++  AC_MSG_WARN([The found ncurses library does not 
support wide-char.])
++  AC_MSG_WARN([This means that tig will not 
correctly render UTF-8.])
++  esac
++  AC_SUBST(CURSES_LIBS)
++  ])
++  ])
+ 
+ AX_LIB_READLINE(6.2)
+ 
+diff --git a/tools/ax_with_curses.m4 b/tools/ax_with_curses.m4
+index 33a37ac..9461eef 100644
+--- a/tools/ax_with_curses.m4
 b/tools/ax_with_curses.m4
+@@ -12,7 +12,9 @@
+ #   present, along with the associated header file.  The NcursesW
+ #   (wide-character) library is searched for first, followed by Ncurses,
+ #   then the system-default plain Curses.  The first library found is the
+-#   one returned.
++#   one returned. Finding libraries will first be attempted by using
++#   pkg-config, and should the pkg-config files not be available, will
++#   fallback to combinations of known flags itself.
+ #
+ #   The following options are understood: --with-ncursesw, --with-ncurses,
+ #   --without-ncursesw, --without-ncurses.  The "--with" options force the
+@@ -52,23 +54,29 @@
+ #
+ #   (These preprocessor symbols are discussed later in this document.)
+ #
+-#   The following output variable is defined by this macro; it is precious
+-#   and may be overridden on the ./configure command line:
++#   The following output variables are defined by this macro; they are
++#   precious and may be overridden on the ./configure command line:
+ #
+-# CURSES_LIB  - library to add to xxx_LDADD
++# CURSES_LIBS  - library to add to xxx_LDADD
++# CURSES_CFLAGS  - include paths to add to xxx_CPPFLAGS
+ #
+-#   The library listed in CURSES_LIB is NOT added to LIBS by default. You
+-#   need to add CURSES_LIB to the appropriate xxx_LDADD line in your
+-#   Makefile.am.  For example:
++#   In previous versions of this macro, the flags CURSES_LIB and
++#   CURSES_CPPFLAGS were defined. These have been renamed, in keeping with
++#   AX_WITH_CURSES's close bigger brother, PKG_CHECK_MODULES, which should
++#   eventually