commit:     3ea02c91dce90ad12716507d32633bcb923cf774
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 11:50:02 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 11:54:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea02c91

net-analyzer/sngrep: Backport tinfo patch

- In case 1.4.7 has bugs that 1.4.6 does not, apply the fixed tinfo
  patch there as well.
- The tinfo patch fixes the test suite problems as well, so drop
  RESTRICT=test again.

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Bug: https://bugs.gentoo.org/709852
Bug: https://bugs.gentoo.org/727790
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch          | 13 -------------
 .../{sngrep-1.4.6-r2.ebuild => sngrep-1.4.6-r3.ebuild}      |  2 +-
 net-analyzer/sngrep/sngrep-1.4.7.ebuild                     |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch 
b/net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch
deleted file mode 100644
index f3829560264..00000000000
--- a/net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -98,6 +98,10 @@
-       ])
- ])
- 
-+AC_SEARCH_LIBS([keyname], [tinfo], [], [
-+      AC_MSG_ERROR([ You need to have ncurses panelw library installed to 
compile sngrep.])
-+])
-+
- ####
- #### GnuTLS Support
- ####

diff --git a/net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild 
b/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild
similarity index 95%
rename from net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild
rename to net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild
index 011fb09336b..b9f731a5e64 100644
--- a/net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild
+++ b/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild
@@ -24,8 +24,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 PATCHES=(
-       "${FILESDIR}"/${PN}-1.4.5-tinfo.patch
        "${FILESDIR}"/${PN}-1.4.6-stdin.patch
+       "${FILESDIR}"/${PN}-1.4.7-tinfo.patch
 )
 
 src_prepare() {

diff --git a/net-analyzer/sngrep/sngrep-1.4.7.ebuild 
b/net-analyzer/sngrep/sngrep-1.4.7.ebuild
index f6b04daa278..6782684125c 100644
--- a/net-analyzer/sngrep/sngrep-1.4.7.ebuild
+++ b/net-analyzer/sngrep/sngrep-1.4.7.ebuild
@@ -23,7 +23,6 @@ DEPEND="
        gnutls? ( net-libs/gnutls )
 "
 RDEPEND="${DEPEND}"
-RESTRICT="test"
 PATCHES=(
        "${FILESDIR}"/${PN}-1.4.7-tinfo.patch
        "${FILESDIR}"/${PN}-1.4.7-LDFLAGS.patch

Reply via email to