[gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/, app-shells/hstr/files/

2020-03-10 Thread Patrice Clement 
commit: 748250033d52ef9a8ea16d1b7914a2b3086c4a5f
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Mar 10 15:43:30 2020 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Mar 10 15:45:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74825003

app-shells/hstr: version bump.

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Patrice Clement  gentoo.org>

 app-shells/hstr/Manifest   |  1 +
 .../files/hstr-2.1-fix-ncurses-configure.patch | 81 ++
 app-shells/hstr/hstr-2.1.ebuild| 33 +
 3 files changed, 115 insertions(+)

diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index b14972debef..602b85af6a4 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1 +1,2 @@
 DIST hstr-2.0.tar.gz 1242802 BLAKE2B 
24f1a870e6aa12b6544a38601c6bc654e01aa1a185c4f7735559aa3220ed8d9fb840e298526b9e4a177000f2ec5c08caee5da97e13783e4114bde5276ee1e85e
 SHA512 
50d5e8e61aa853dab0093f4225d3329e98bc59609d8d59abf832cd4cb616d78a2fa091d1ad8d16f3543276c4ead95a419f33a13a96f423bf93dc648da32740b7
+DIST hstr-2.1.tar.gz 1244067 BLAKE2B 
aa37f26a5ba8ee465a03212cc80e55b9581e59cbb535f17fda8e59bed062f0b0065d456d8566927c089595b92270b83235f0bf73f26ac88704bd933c1926cd5b
 SHA512 
ea217ac2b6dcb7e283f83d15524b47f88c5c8cfb82e5728537750a2ec8526f03304503a5bb67970d893e10057aba087aa86a67548aa361c892b6ee3e81903122

diff --git a/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch 
b/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch
new file mode 100644
index 000..215fd5cedfc
--- /dev/null
+++ b/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch
@@ -0,0 +1,81 @@
+diff --git a/configure.ac b/configure.ac
+index 1676ec8..73c8be5 100644
+--- a/configure.ac
 b/configure.ac
+@@ -47,39 +47,33 @@ then
+ fi
+ 
+ # PKG_CHECK_MODULES macro is NOT used to avoid confusing syntax errors in 
case that pkg-config is NOT installed
+-AC_CHECK_LIB(ncursesw, killwchar, [],
+-[
+-AC_CHECK_LIB(ncurses, killwchar, [], 
+-[
+-AC_SUBST([NCURSESW_CFLAGS])
+-AC_SUBST([NCURSESW_LIBS])
+-if pkg-config --exists ncursesw
+-then
+-AC_MSG_NOTICE([Module ncursesw found])
+-NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
+-NCURSESW_LIBS=`pkg-config --libs ncursesw`
+-else
+-if pkg-config --exists ncurses
+-then
+-AC_MSG_NOTICE([Module ncurses found])
+-NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
+-NCURSESW_LIBS=`pkg-config --libs ncurses`
+-else
+-AS_CASE([$host_os],
+-  [darwin*],
+-[
+-  AC_CHECK_LIB(ncurses, killwchar, [], 
[AC_MSG_ERROR([Could not find ncurses library])])
+-  AC_CHECK_HEADER(curses.h)
+-],
+-  [
+-AC_CHECK_LIB(ncursesw, killwchar, [], 
[AC_MSG_ERROR([Could not find ncursesw library])])
+-AC_CHECK_HEADER(ncursesw/curses.h)
+-  ]
+-)
+-fi
+-fi
+-]) # FAIL of ncurses
+-]) # FAIL of ncursesw
++AC_SUBST([NCURSESW_CFLAGS])
++AC_SUBST([NCURSESW_LIBS])
++if pkg-config --exists ncursesw
++then
++  AC_MSG_NOTICE([Module ncursesw found])
++  NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
++  NCURSESW_LIBS=`pkg-config --libs ncursesw`
++else
++  if pkg-config --exists ncurses
++  then
++  AC_MSG_NOTICE([Module ncurses found])
++  NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
++  NCURSESW_LIBS=`pkg-config --libs ncurses`
++  else
++  AS_CASE([$host_os],
++  [darwin*],
++  [
++  AC_CHECK_LIB(ncurses, 
killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
++  
AC_CHECK_HEADER(curses.h)
++  ],
++  [
++  AC_CHECK_LIB(ncursesw, 
killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
++  
AC_CHECK_HEADER(ncursesw/curses.h)
++  ]
++  )
++  fi
++fi
+ 
+ 
+ # Checks for libraries.
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7640d21..17a82b7 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -37,4 +37,4 @@ hstr_SOURCES =   
\
+ install-exec-hook:
+   ln $(DESTDIR)$(bindir)/hstr$(EXEEXT) $(DESTDIR)$(bindir)/hh$(EXEEXT

[gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/, app-shells/hstr/files/

2018-02-23 Thread Patrice Clement 
commit: ac8e675dbf042cd9445b358dcdaf09bf6a000c8a
Author: Patrice Clement  gentoo  org>
AuthorDate: Fri Feb 23 09:06:20 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Feb 23 09:06:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac8e675d

app-shells/hstr: add back tinfo patch.

Closes: https://bugs.gentoo.org/644750
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-shells/hstr/files/hstr-1.24-tinfo.patch | 11 +++
 app-shells/hstr/hstr-1.24.ebuild|  1 +
 2 files changed, 12 insertions(+)

diff --git a/app-shells/hstr/files/hstr-1.24-tinfo.patch 
b/app-shells/hstr/files/hstr-1.24-tinfo.patch
new file mode 100644
index 000..85a4743c0e9
--- /dev/null
+++ b/app-shells/hstr/files/hstr-1.24-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
 b/configure.ac
+@@ -76,7 +76,7 @@
+ AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
+ AC_CHECK_LIB(readline, using_history, [], [AC_MSG_ERROR([Could not find 
readline library])])
+ # ncurses might be linked in libtinfo
+-#AC_CHECK_LIB(tinfo, keypad, [], [AC_MSG_ERROR([Could not find tinfo 
library])])
++AC_SEARCH_LIBS(keypad, tinfo, [], [AC_MSG_ERROR([Could not find tinfo 
library])])
+ 
+ # Checks for header files.
+ AC_CHECK_HEADER(assert.h)

diff --git a/app-shells/hstr/hstr-1.24.ebuild b/app-shells/hstr/hstr-1.24.ebuild
index 0f8e9981f2a..fc44e8039c0 100644
--- a/app-shells/hstr/hstr-1.24.ebuild
+++ b/app-shells/hstr/hstr-1.24.ebuild
@@ -20,6 +20,7 @@ DEPEND="
virtual/pkgconfig"
 
 DOCS=( CONFIGURATION.md README.md )
+PATCHES=( "${FILESDIR}/${P}-tinfo.patch" )
 
 src_prepare() {
default

[gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/, app-shells/hstr/files/

2015-12-08 Thread Patrice Clement 
commit: 730fa101e33ff67aea3c615286f20412b7dda491
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Dec  8 09:59:40 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Dec  8 10:16:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=730fa101

app-shells/hstr: Version bump.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement  gentoo.org>

 app-shells/hstr/Manifest|  1 +
 app-shells/hstr/files/hstr-1.18-tinfo.patch | 47 +
 app-shells/hstr/hstr-1.18.ebuild| 32 
 3 files changed, 80 insertions(+)

diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index 1e13647..b11e114 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1 +1,2 @@
 DIST hstr-1.17.tar.gz 37289 SHA256 
9e4b6e74bb7852945e25727105c5339c49c9ce1218481845c8d0205514d85e70 SHA512 
eb89496c8554eb29ebb30430aa01179f7265a8ec15b0b9452f7e3ac4867ae4349e6141e11f0af01a4d15ba06131c18ec9ab760c8e68100fa2b8f2a793b237f9b
 WHIRLPOOL 
2b33f485525b2cb033a82b249976d7c670d8f02948e84e73f350b19bdc955e551014f14ad4cfc845144ff0e0d8c3690c50ba414c7909f0106242d13a9cc2
+DIST hstr-1.18.tar.gz 43672 SHA256 
85eb071938c2e7314e5fbd245a81c7b0cd93a8864bf9cba5b5041acb5052ba73 SHA512 
e0684a694a514a341c30bfa7fc596f858658f3be9db6c490f628b4c48d1bf08acd8b4b03361ceb6aef65d42a5b01a1c0a8ce94698b5f7f5193ef030d7dc896c4
 WHIRLPOOL 
1bd00be28623ea8e05c1cec3d95451b7f92e6b17bfb5bd2853560955fc5ace9226edefdee820e9cee6c3542180f699b56371b9766a65a8efc669987dd5e961fb

diff --git a/app-shells/hstr/files/hstr-1.18-tinfo.patch 
b/app-shells/hstr/files/hstr-1.18-tinfo.patch
new file mode 100644
index 000..0ffbd0c
--- /dev/null
+++ b/app-shells/hstr/files/hstr-1.18-tinfo.patch
@@ -0,0 +1,47 @@
+diff --git a/configure.ac b/configure.ac
+index 9cf6a53..cbc649d 100644
+--- a/configure.ac
 b/configure.ac
+@@ -18,17 +18,21 @@ AC_PROG_CC
+ 
+ # Platform specific ncurses check.
+ AC_CANONICAL_HOST
+-AS_CASE([$host_os],
+-  [darwin*],
+-[
+-  AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find 
ncurses library])])
+-  AC_CHECK_HEADER(curses.h)
+-],
+-  [
+-AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find 
ncursesw library])])
+-AC_CHECK_HEADER(ncursesw/curses.h)
+-  ]
+-)
++PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [
++  PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
++AS_CASE([$host_os],
++  [darwin*],
++[
++  AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find 
ncurses library])])
++  AC_CHECK_HEADER(curses.h)
++],
++  [
++AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find 
ncursesw library])])
++AC_CHECK_HEADER(ncursesw/curses.h)
++  ]
++)
++  ])
++])
+ 
+ # Checks for libraries.
+ AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5765613..ee411a9 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -15,3 +15,5 @@ hh_SOURCES = 
\
+   hstr_regexp.c include/hstr_regexp.h \
+   radixsort.c include/radixsort.h \
+   hstr.c 
++
++hh_LDADD = $(NCURSES_LIBS)

diff --git a/app-shells/hstr/hstr-1.18.ebuild b/app-shells/hstr/hstr-1.18.ebuild
new file mode 100644
index 000..57a6535
--- /dev/null
+++ b/app-shells/hstr/hstr-1.18.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Shell history suggest box - easily view, navigate, search and 
manage your command history"
+HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com";
+SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+"
+
+DOCS=( CONFIGURATION.md README.md )
+
+src_prepare() {
+   sed \
+   -e 's:-O2::g' \
+   -i src/Makefile.am || die
+   autotools-utils_src_prepare
+}