From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D52DD1382C5 for ; Fri, 26 Jun 2020 19:10:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8BAAE09E6; Fri, 26 Jun 2020 19:10:35 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5447E09E4 for ; Fri, 26 Jun 2020 19:10:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0710D34ED85 for ; Fri, 26 Jun 2020 19:10:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 977CE2BD for ; Fri, 26 Jun 2020 19:10:11 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1593198281.22e8c1793ab27d5d18180e225a02c8dce798e656.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/, app-shells/hstr/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch app-shells/hstr/hstr-2.1.ebuild X-VCS-Directories: app-shells/hstr/ app-shells/hstr/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 22e8c1793ab27d5d18180e225a02c8dce798e656 X-VCS-Branch: master Date: Fri, 26 Jun 2020 19:10:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 553efcf3-3086-4576-8682-f6448d6daa8c X-Archives-Hash: b8f8e2db94e72e2c6080bcd276c54f43 commit: 22e8c1793ab27d5d18180e225a02c8dce798e656 Author: Matt Turner gentoo org> AuthorDate: Fri Jun 26 19:04:41 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Jun 26 19:04:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e8c179 app-shells/hstr: Drop duplicate file Signed-off-by: Matt Turner gentoo.org> .../files/hstr-2.1-fix-ncurses-configure.patch | 81 ---------------------- app-shells/hstr/hstr-2.1.ebuild | 2 +- 2 files changed, 1 insertion(+), 82 deletions(-) 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 deleted file mode 100644 index 215fd5cedfc..00000000000 --- a/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch +++ /dev/null @@ -1,81 +0,0 @@ -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 index f9bffba4e61..95a0c74991a 100644 --- a/app-shells/hstr/hstr-2.1.ebuild +++ b/app-shells/hstr/hstr-2.1.ebuild @@ -22,7 +22,7 @@ DEPEND=" DOCS=( CONFIGURATION.md README.md ) -PATCHES=( ${FILESDIR}/${P}-fix-ncurses-configure.patch ) +PATCHES=( ${FILESDIR}/${PN}-2.0-fix-ncurses-configure.patch ) src_prepare() { default