gentoo resync : 13.06.2020

6 files changed, 85 insertions, 16 deletions

diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index 8e6747b4ea55..907dba68fd8f 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1,5 +1,8 @@
-AUX sngrep-1.4.5-tinfo.patch 237 BLAKE2B 2ba30ab0828f475e790175d8c3dcd25160ff691194ebb6b8e86380251863b40ef52bd942cdd65c694b84bae8de8d216244f9ab5fa75066e640b8427099a39342 SHA512 7c47e530caa1c44f8452a536925fd1133a1f0aad3822117e5ce2e1b7b03307a90423d70bb031639305b638d4c6732d980f3dbe617adc489fd0c2b438354f5ce6
 AUX sngrep-1.4.6-stdin.patch 405 BLAKE2B 206e735df529efe81c3d272e8ccd7c3e759301c6b9ff8f607e3a60c4fc6f06f1ad8c61259b7353d42c991cc28daeffc376c121fc26cf1f60a01ab0deb3828412 SHA512 60766958dc218ee258902ec9944070539c272f2db5dfba638647e2d8942a8160745c3c5f11dd64af34cf8d3f258207e94b325ec0370a47628ce7cf628edadf4c
+AUX sngrep-1.4.7-LDFLAGS.patch 290 BLAKE2B f15317a47b09dca8c0d28f2aa8c9bb96fdbb4f10cecfc0e5fb2f40d0cd98ad675471f793e46ff4092086b887c99bc7d6efea6d6170b3c7bb4d1db3e4032da5d3 SHA512 0c63147bcedab91a0b5a8c34b55a0c8ac11dfdd52f607b31658e8e8891963b87b8fdce8674f1eecf30829257006219c7ea42945fff5dce4502b62dcaf72505b3
+AUX sngrep-1.4.7-tinfo.patch 699 BLAKE2B 92943ef1b2b4b9bd0d0101667999ebbd7ef9dbfbfa4c2cc39a24f190e88482bbe6053813a8e32745565e3f61d3585207a540de823e715e4e0d1f013fd398ca0f SHA512 59276d306b6db2e5318f3b23c172b692b4f35884c7bf68f27a1a8636b2a5187dcdfbee58f11bee0a7de7afe068e0e1486d6a305d0b215a58627a041804452a4f
 DIST sngrep-1.4.6.tar.gz 235721 BLAKE2B e01f2a1d83b9147b99196f7ff2e5562552b16badc2ca634e63b2e2f5955a5d0328c9fcdb841f42a950899511a81fffd8eb64169758dc319875e3052d4359de93 SHA512 25c67e26158b140bded775b217f313ad5a6268684f03d0b9875ddd423d7548b50fa9c358346330d3873984f456aefa9401c2b0fdd136dd95061e34da6530bcc3
-EBUILD sngrep-1.4.6-r2.ebuild 878 BLAKE2B 8ea141c0d63a12b4b72ff587088421eacd286ca5848c808a6963b6683095bb498e384d6aec376969714e83165e816192b1727858109ed3ddf64baa1764772530 SHA512 6dfbeeb8760c22d90c691e662a73ab4688b3c21a8bf5ad646335d59bfff4c5ca547dfeb4062484ab0d5707fdf4c477628e951e0e5e6dbc466eeec116bd963060
+DIST sngrep-1.4.7.tar.gz 237978 BLAKE2B 30172748aeab2910e7fa13f35b447d7bd1688bb206576af6233c8c47405eb3fe93316cc72255169f19f3752e7fe3ada63c5c0bba0d9ab75706c1b0d3ac296474 SHA512 f414f9cc49b0c34cbbf5a77d285f12eb4091af3395953ed93dbe2f57d4ba3731d16c4b56c37e90744cf3784572975f485aed48cdd100898ffaee18e9a18943b1
+EBUILD sngrep-1.4.6-r3.ebuild 878 BLAKE2B 0fce80e75ed5959ffa4ef3a930028b59b5f09b60aafafbbcf14160485d3d5f542216b5f88490fad2d40b18c5c12821ca98ced7fd7a657ddff6d2cc5348bdc58e SHA512 4db6ee2085e7cd5dadfb24a6ef044c4b2a709b9a3788fd0e33aa352274785576eb489a11dfbf122f6d74e521f00d3e3da4cd03a05988ed63f5461f62c6813967
+EBUILD sngrep-1.4.7.ebuild 880 BLAKE2B 985c02fe8faeb7d69614571dc5ee17b5be9837135243e09d06a370d6ca9c7fa37664ae7a4ba83de58189ff2f35ecf0f3772f37f86beff834706241e3fe52be6b SHA512 553168f488dfbe3f0fd1062d58d5c86c6b67c53d390f3fcb979ae2cba74a52b6bf717a8d12173833ef191c725fa90be7d58b2bcda3b2fdb07292941f642a6df6
 MISC metadata.xml 468 BLAKE2B c4ecbf2a09c6361f3cdd82c6c2280d1885565eb1a834be6093b3acbde6ecad83b49026524c68b067bee7f2764dbf4d3bc73e7e8fc5d13ac499a04001c97b1b30 SHA512 def85ed081107978cef4e8cad0ce80a0717c5c644494ebb907a9a616ad571f13e518019d6d51447f05f1a9545c739dd31874d888cb06ce91ecc224fb2c40e446
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 f3829560264d..000000000000
--- 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/files/sngrep-1.4.7-LDFLAGS.patch b/net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch
new file mode 100644
index 000000000000..3e63dc245dab
--- /dev/null
+++ b/net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/m4/sngrep.m4
++++ b/m4/sngrep.m4
+@@ -44,7 +44,7 @@
+          LIBS="$sngrep_config_script $LIBS "
+          sngrep_script_success=yes
+       ], [])
+-      LDFLAGS="$save_LDFLAGS"
++      LDFLAGS="$sngrep_save_LDFLAGS"
+    fi
+    if test "x$sngrep_script_success" = xno; then
+       [$5]
diff --git a/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch b/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch
new file mode 100644
index 000000000000..8a01eeb2560b
--- /dev/null
+++ b/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,6 +74,10 @@
+ 	AC_CHECK_LIB([menuw], [new_item], [], [
+ 	    AC_MSG_ERROR([ You need to have ncurses menuw library installed to compile sngrep.])
+ 	])
++
++	AC_SEARCH_LIBS([keyname], [tinfow], [], [
++	    AC_MSG_ERROR([ You need to have ncurses tinfow library installed to compile sngrep.])
++	])
+ 	], [
+ 
+ 	# Ncurses without wide-character support
+@@ -96,6 +100,10 @@
+ 	AC_CHECK_LIB([menu], [new_item], [], [
+ 	    AC_MSG_ERROR([ You need to have ncurses menu library installed to compile sngrep.])
+ 	])
++
++	AC_SEARCH_LIBS([keyname], [tinfo], [], [
++	    AC_MSG_ERROR([ You need to have ncurses tinfo library installed to compile sngrep.])
++	])
+ ])
+ 
+ ####
diff --git a/net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild b/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild
index 011fb09336bd..b9f731a5e648 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
new file mode 100644
index 000000000000..f021e73049e6
--- /dev/null
+++ b/net-analyzer/sngrep/sngrep-1.4.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Ncurses SIP Messages flow viewer"
+HOMEPAGE="https://github.com/irontec/sngrep"
+SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="eep gnutls ipv6 openssl pcre unicode"
+REQUIRED_USE="
+	gnutls? ( !openssl )
+"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:0=[unicode?]
+	openssl? ( dev-libs/openssl:0= )
+	gnutls? ( net-libs/gnutls )
+"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.7-tinfo.patch
+	"${FILESDIR}"/${PN}-1.4.7-LDFLAGS.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable eep) \
+		$(use_enable ipv6) \
+		$(use_enable unicode) \
+		$(use_with gnutls) \
+		$(use_with openssl) \
+		$(use_with pcre)
+}