| 1 |
commit: 22e8c1793ab27d5d18180e225a02c8dce798e656 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 26 19:04:41 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 26 19:04:41 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e8c179 |
| 7 |
|
| 8 |
app-shells/hstr: Drop duplicate file |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
.../files/hstr-2.1-fix-ncurses-configure.patch | 81 ---------------------- |
| 13 |
app-shells/hstr/hstr-2.1.ebuild | 2 +- |
| 14 |
2 files changed, 1 insertion(+), 82 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
deleted file mode 100644 |
| 18 |
index 215fd5cedfc..00000000000 |
| 19 |
--- a/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,81 +0,0 @@ |
| 22 |
-diff --git a/configure.ac b/configure.ac |
| 23 |
-index 1676ec8..73c8be5 100644 |
| 24 |
---- a/configure.ac |
| 25 |
-+++ b/configure.ac |
| 26 |
-@@ -47,39 +47,33 @@ then |
| 27 |
- fi |
| 28 |
- |
| 29 |
- # PKG_CHECK_MODULES macro is NOT used to avoid confusing syntax errors in case that pkg-config is NOT installed |
| 30 |
--AC_CHECK_LIB(ncursesw, killwchar, [], |
| 31 |
--[ |
| 32 |
-- AC_CHECK_LIB(ncurses, killwchar, [], |
| 33 |
-- [ |
| 34 |
-- AC_SUBST([NCURSESW_CFLAGS]) |
| 35 |
-- AC_SUBST([NCURSESW_LIBS]) |
| 36 |
-- if pkg-config --exists ncursesw |
| 37 |
-- then |
| 38 |
-- AC_MSG_NOTICE([Module ncursesw found]) |
| 39 |
-- NCURSESW_CFLAGS=`pkg-config --cflags ncursesw` |
| 40 |
-- NCURSESW_LIBS=`pkg-config --libs ncursesw` |
| 41 |
-- else |
| 42 |
-- if pkg-config --exists ncurses |
| 43 |
-- then |
| 44 |
-- AC_MSG_NOTICE([Module ncurses found]) |
| 45 |
-- NCURSESW_CFLAGS=`pkg-config --cflags ncursesw` |
| 46 |
-- NCURSESW_LIBS=`pkg-config --libs ncurses` |
| 47 |
-- else |
| 48 |
-- AS_CASE([$host_os], |
| 49 |
-- [darwin*], |
| 50 |
-- [ |
| 51 |
-- AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) |
| 52 |
-- AC_CHECK_HEADER(curses.h) |
| 53 |
-- ], |
| 54 |
-- [ |
| 55 |
-- AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])]) |
| 56 |
-- AC_CHECK_HEADER(ncursesw/curses.h) |
| 57 |
-- ] |
| 58 |
-- ) |
| 59 |
-- fi |
| 60 |
-- fi |
| 61 |
-- ]) # FAIL of ncurses |
| 62 |
--]) # FAIL of ncursesw |
| 63 |
-+AC_SUBST([NCURSESW_CFLAGS]) |
| 64 |
-+AC_SUBST([NCURSESW_LIBS]) |
| 65 |
-+if pkg-config --exists ncursesw |
| 66 |
-+then |
| 67 |
-+ AC_MSG_NOTICE([Module ncursesw found]) |
| 68 |
-+ NCURSESW_CFLAGS=`pkg-config --cflags ncursesw` |
| 69 |
-+ NCURSESW_LIBS=`pkg-config --libs ncursesw` |
| 70 |
-+else |
| 71 |
-+ if pkg-config --exists ncurses |
| 72 |
-+ then |
| 73 |
-+ AC_MSG_NOTICE([Module ncurses found]) |
| 74 |
-+ NCURSESW_CFLAGS=`pkg-config --cflags ncursesw` |
| 75 |
-+ NCURSESW_LIBS=`pkg-config --libs ncurses` |
| 76 |
-+ else |
| 77 |
-+ AS_CASE([$host_os], |
| 78 |
-+ [darwin*], |
| 79 |
-+ [ |
| 80 |
-+ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) |
| 81 |
-+ AC_CHECK_HEADER(curses.h) |
| 82 |
-+ ], |
| 83 |
-+ [ |
| 84 |
-+ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])]) |
| 85 |
-+ AC_CHECK_HEADER(ncursesw/curses.h) |
| 86 |
-+ ] |
| 87 |
-+ ) |
| 88 |
-+ fi |
| 89 |
-+fi |
| 90 |
- |
| 91 |
- |
| 92 |
- # Checks for libraries. |
| 93 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
| 94 |
-index 7640d21..17a82b7 100644 |
| 95 |
---- a/src/Makefile.am |
| 96 |
-+++ b/src/Makefile.am |
| 97 |
-@@ -37,4 +37,4 @@ hstr_SOURCES = \ |
| 98 |
- install-exec-hook: |
| 99 |
- ln $(DESTDIR)$(bindir)/hstr$(EXEEXT) $(DESTDIR)$(bindir)/hh$(EXEEXT) |
| 100 |
- |
| 101 |
--hstr_LDADD = $(NCURSES_LIBS) |
| 102 |
-+hstr_LDADD = $(NCURSESW_LIBS) |
| 103 |
|
| 104 |
diff --git a/app-shells/hstr/hstr-2.1.ebuild b/app-shells/hstr/hstr-2.1.ebuild |
| 105 |
index f9bffba4e61..95a0c74991a 100644 |
| 106 |
--- a/app-shells/hstr/hstr-2.1.ebuild |
| 107 |
+++ b/app-shells/hstr/hstr-2.1.ebuild |
| 108 |
@@ -22,7 +22,7 @@ DEPEND=" |
| 109 |
|
| 110 |
DOCS=( CONFIGURATION.md README.md ) |
| 111 |
|
| 112 |
-PATCHES=( ${FILESDIR}/${P}-fix-ncurses-configure.patch ) |
| 113 |
+PATCHES=( ${FILESDIR}/${PN}-2.0-fix-ncurses-configure.patch ) |
| 114 |
|
| 115 |
src_prepare() { |
| 116 |
default |
Archives