From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 12 Apr 2020 03:41:30 +0100
Subject: gentoo Easter resync : 12.04.2020

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

(limited to 'app-shells/hstr')

diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index 4ae8a471a6e4..f2f2f0431b66 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,4 +1,7 @@
 AUX hstr-2.0-fix-ncurses-configure.patch 2626 BLAKE2B 69fb12826fcab4f086b9e951b4e75daf84565f96c519776593d4b6f5f6d16c1745867742849b590bc29e1ab58ca1609f85a5645713da688c5e53fc22712c3c81 SHA512 65e29a8e2b5840d335d741072df44d2a36b260c24cd6e8df68b45b4bd2d6cb18e729d0b695703b95bb968dfc44c6dde28f26ab61c458444200c40862a6281a99
+AUX hstr-2.1-fix-ncurses-configure.patch 2626 BLAKE2B 69fb12826fcab4f086b9e951b4e75daf84565f96c519776593d4b6f5f6d16c1745867742849b590bc29e1ab58ca1609f85a5645713da688c5e53fc22712c3c81 SHA512 65e29a8e2b5840d335d741072df44d2a36b260c24cd6e8df68b45b4bd2d6cb18e729d0b695703b95bb968dfc44c6dde28f26ab61c458444200c40862a6281a99
 DIST hstr-2.0.tar.gz 1242802 BLAKE2B 24f1a870e6aa12b6544a38601c6bc654e01aa1a185c4f7735559aa3220ed8d9fb840e298526b9e4a177000f2ec5c08caee5da97e13783e4114bde5276ee1e85e SHA512 50d5e8e61aa853dab0093f4225d3329e98bc59609d8d59abf832cd4cb616d78a2fa091d1ad8d16f3543276c4ead95a419f33a13a96f423bf93dc648da32740b7
+DIST hstr-2.1.tar.gz 1244067 BLAKE2B aa37f26a5ba8ee465a03212cc80e55b9581e59cbb535f17fda8e59bed062f0b0065d456d8566927c089595b92270b83235f0bf73f26ac88704bd933c1926cd5b SHA512 ea217ac2b6dcb7e283f83d15524b47f88c5c8cfb82e5728537750a2ec8526f03304503a5bb67970d893e10057aba087aa86a67548aa361c892b6ee3e81903122
 EBUILD hstr-2.0.ebuild 642 BLAKE2B 83c4bdcd14bea1f873828f3856183a529144bca3876b960895b86c2c1f2bb82d66d48d9d68a541aa719c9e07f2a072ce7d77783bc32dbc2a5db89de945503140 SHA512 30d50d5190f4476969aa97af6e1af4111f91cbe457fca2b51b34c9c4ac42e24d9e68fb305cd1898c3088faa23ad581b27c03084fc306992b8af4b657304d6a07
+EBUILD hstr-2.1.ebuild 644 BLAKE2B 94d5fe5cb75e3e6c718de6b62c55456393c1ecbb2e3250c9d746000ebb048d04ab0c156c65838d15f9cd284dcb54e0f3956be7778243abf0b8f7da0886832a70 SHA512 64c8372683a3b43ce27845c0b168e99263fc6b06defc2ebd498654711c683873e9bcf9e8c2317be19a19c8f4e4ab2f4b82d9a310b7c702a3481d03676776f204
 MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e
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 000000000000..215fd5cedfc9
--- /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)
+ 
+-hstr_LDADD = $(NCURSES_LIBS)
++hstr_LDADD = $(NCURSESW_LIBS)
diff --git a/app-shells/hstr/hstr-2.1.ebuild b/app-shells/hstr/hstr-2.1.ebuild
new file mode 100644
index 000000000000..f9bffba4e61d
--- /dev/null
+++ b/app-shells/hstr/hstr-2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Shell history suggest box"
+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"
+
+RDEPEND="
+	sys-libs/ncurses:0=[unicode]"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( CONFIGURATION.md README.md )
+
+PATCHES=( ${FILESDIR}/${P}-fix-ncurses-configure.patch )
+
+src_prepare() {
+	default
+	sed \
+		-e 's:-O2::g' \
+		-i src/Makefile.am || die
+	eautoreconf
+}
-- 
cgit v1.2.3