From 60c1fd66a073d217a30eb83799f5ded28bc6a7ac Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 27 Dec 2020 05:44:52 +0000 Subject: app-admin/lnav: style changes Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sam James --- app-admin/lnav/files/639332-tinfow.patch | 10 ---------- app-admin/lnav/files/lnav-0.9.0-bug639332-tinfow.patch | 10 ++++++++++ app-admin/lnav/lnav-0.9.0.ebuild | 7 +++++-- 3 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 app-admin/lnav/files/639332-tinfow.patch create mode 100644 app-admin/lnav/files/lnav-0.9.0-bug639332-tinfow.patch (limited to 'app-admin/lnav') diff --git a/app-admin/lnav/files/639332-tinfow.patch b/app-admin/lnav/files/639332-tinfow.patch deleted file mode 100644 index 8399412f0cf1..000000000000 --- a/app-admin/lnav/files/639332-tinfow.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/m4/ax_with_curses.m4 2019-07-28 08:49:13.670014444 -0500 -+++ b/m4/ax_with_curses.m4 2019-07-28 08:46:32.280013473 -0500 -@@ -216,6 +216,8 @@ - ax_cv_curses=yes - ax_cv_curses_which=ncursesw - CURSES_LIB="-lncursesw" -+ temp_lib=`echo $ax_saved_LIBS|sed 's/tinfo/tinfow/'` -+ ax_saved_LIBS=$temp_lib - AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present]) - AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) diff --git a/app-admin/lnav/files/lnav-0.9.0-bug639332-tinfow.patch b/app-admin/lnav/files/lnav-0.9.0-bug639332-tinfow.patch new file mode 100644 index 000000000000..8399412f0cf1 --- /dev/null +++ b/app-admin/lnav/files/lnav-0.9.0-bug639332-tinfow.patch @@ -0,0 +1,10 @@ +--- a/m4/ax_with_curses.m4 2019-07-28 08:49:13.670014444 -0500 ++++ b/m4/ax_with_curses.m4 2019-07-28 08:46:32.280013473 -0500 +@@ -216,6 +216,8 @@ + ax_cv_curses=yes + ax_cv_curses_which=ncursesw + CURSES_LIB="-lncursesw" ++ temp_lib=`echo $ax_saved_LIBS|sed 's/tinfo/tinfow/'` ++ ax_saved_LIBS=$temp_lib + AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present]) + AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) diff --git a/app-admin/lnav/lnav-0.9.0.ebuild b/app-admin/lnav/lnav-0.9.0.ebuild index 79a41f429d3b..64c7de8adaed 100644 --- a/app-admin/lnav/lnav-0.9.0.ebuild +++ b/app-admin/lnav/lnav-0.9.0.ebuild @@ -25,8 +25,11 @@ RDEPEND=" DEPEND="${RDEPEND}" DOCS=( AUTHORS NEWS README ) -# The second patch is a fix for https://bugs.gentoo.org/723242 -PATCHES=( "${FILESDIR}"/${PN}-0.8.4-disable-tests.patch "${FILESDIR}"/639332-tinfow.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-0.8.4-disable-tests.patch + # bug 723242 + "${FILESDIR}"/${PN}-0.9.0-bug639332-tinfow.patch +) src_prepare() { default -- cgit v1.2.3-65-gdbad