summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarty E. Plummer <hanetzer@startmail.com>2018-04-08 15:16:02 -0500
committerPatrice Clement <monsieurp@gentoo.org>2018-04-10 00:29:52 +0200
commit030bc2ae565a37260ce8b379a2e4f9f0eca8b248 (patch)
treeb85de251d63bfed16de492a977e67026b1a1cf3f /app-shells
parentapp-office/calcurse: clean duplicate patches. (diff)
downloadgentoo-030bc2ae565a37260ce8b379a2e4f9f0eca8b248.tar.gz
gentoo-030bc2ae565a37260ce8b379a2e4f9f0eca8b248.tar.bz2
gentoo-030bc2ae565a37260ce8b379a2e4f9f0eca8b248.zip
app-shells/hstr: clean duplicate patches.
Package-Manager: Portage-2.3.28, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/7897
Diffstat (limited to 'app-shells')
-rw-r--r--app-shells/hstr/files/hstr-1.24-tinfo.patch11
-rw-r--r--app-shells/hstr/hstr-1.23.ebuild4
-rw-r--r--app-shells/hstr/hstr-1.24.ebuild2
3 files changed, 3 insertions, 14 deletions
diff --git a/app-shells/hstr/files/hstr-1.24-tinfo.patch b/app-shells/hstr/files/hstr-1.24-tinfo.patch
deleted file mode 100644
index 85a4743c0e94..000000000000
--- a/app-shells/hstr/files/hstr-1.24-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.23.ebuild b/app-shells/hstr/hstr-1.23.ebuild
index cc9f3fc66fad..6fbe6ef2f86a 100644
--- a/app-shells/hstr/hstr-1.23.ebuild
+++ b/app-shells/hstr/hstr-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,7 +20,7 @@ DEPEND="
virtual/pkgconfig"
DOCS=( CONFIGURATION.md README.md )
-PATCHES=( "${FILESDIR}/${P}-tinfo.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.23-tinfo.patch" )
src_prepare() {
default
diff --git a/app-shells/hstr/hstr-1.24.ebuild b/app-shells/hstr/hstr-1.24.ebuild
index fc44e8039c0b..4e958038c0c9 100644
--- a/app-shells/hstr/hstr-1.24.ebuild
+++ b/app-shells/hstr/hstr-1.24.ebuild
@@ -20,7 +20,7 @@ DEPEND="
virtual/pkgconfig"
DOCS=( CONFIGURATION.md README.md )
-PATCHES=( "${FILESDIR}/${P}-tinfo.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.23-tinfo.patch" )
src_prepare() {
default