gentoo resync : 31.05.2021

2 files changed, 25 insertions, 17 deletions

diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index ea5c9efc03eb..2e31899b5ba2 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -4,8 +4,8 @@ AUX nfdump-1.6.19-compiler.patch 528 BLAKE2B b289f32a18a03b2725360b84314b294ebe6
 AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4
 AUX nfdump-1.6.21-remove-strict-rfc-7011-handling.patch 1726 BLAKE2B 6f2d2c0ebb336eafba60aabec9bc2eb120c61b67401704786ed105eaeba090d893004ea4c8be4e40b360cf91c2b306c4cbb9ef9f60dc6b5c3b92fe1c5c5d904f SHA512 e7ca0512b01a0838ec9a6d52710da23ce6db5021af19a354bc59cbaf7c6b246fee50e7c3ae9b71eb34e94396cffba7f1069140c0f476c8a2b61fa9a06113f425
 AUX nfdump-1.6.22-libtool-archives-slibtool.patch 3503 BLAKE2B 1118f50a17b134dfbd93cbb66e54c3228906782fabc6e0df174c912569120c588a03170a8bfd715389611b0dcc5b469415d2932f610f8b5398b8424f6e0c5342 SHA512 646606077ef1771b8f4c776939773ab7b2875c4f28710f44df826b7d8d5e5b8a163fff60eb6869ee4dfab8a7edc0f277e19ed88511719d2455b9bc5133e81124
-DIST nfdump-1.6.21.tar.gz 561617 BLAKE2B 61a52cb7ee724c47f93e0ce8dd0515306c16b94d8b351f9543deecc2b28c813f09f0e4ba621f2561760924af683ffd527d00936fbc5f91f83d6f727d6cf9e5d9 SHA512 c9162b7a6653267cd4d66a2d75bb2c3d65c431bb29ee549bac2a208fe7f2bc871bb91dfa6d89d6f18cd69f1d435dd25ba1c5dfe6e10b0efc4a582f2e67913a34
 DIST nfdump-1.6.22.tar.gz 563266 BLAKE2B f985a8f8bcbb7ff3ab98d4f01449b121e92914bc47ec7fa07c1a7a068f6722447228b0166d0f2e966c0bab2c93e34133743e8dff7d8dc41a1c70ffac64fbbf6e SHA512 3508e54b4c4785a79118147779300eebd9485532e157b37ed6487255dacaa49959d425c8fc489caa98ff559a4859b9e456e97a6c8a06a1029eb904aa1f9efb61
-EBUILD nfdump-1.6.21-r1.ebuild 1534 BLAKE2B c56602c05b7dcf8bc53076a140bda37026f85377f43ceec13447a240a3bfe45cb0bdc060eac7d0b6d0ba6c3c5b79bac04f7cd138650f8231e1ab895b6c23b69c SHA512 23e2444d93ff39358fd3647fd10ea8efcb15e83b317149bdc6e006cdc04d150678bf9049120affb7faa36b36f1525ec0d61cf4512e340d482d49f0692699f4b6
+DIST nfdump-1.6.23.tar.gz 568879 BLAKE2B ca844f87e02fb3761d5b470cac11beada9873b0c7e3e9ca7ccc7899d57f0cfd96329698ac84467a55d683e83ce16c2b114a571845c7cb6069addcdd5d4a43903 SHA512 e3f79af69a170985fcbd1757fab86e90840d040cf7a6214c7f9851ed59695d3844a15269904c3ba989b6b6ed2ddf29fd19a493165d3037e49aa2bb69b831f168
 EBUILD nfdump-1.6.22-r1.ebuild 1720 BLAKE2B e0d274c34ddf13ea1c7de9e6010641f11a564ca3cd35c87cc4a2557f7beae27e183de37734d51f1e785053acd7ba729eeda55fc83c0ffa949cee17cd7740890d SHA512 426138c255976b081d91fc0640974e4fff47b0438acb617bc7bc469f84a1b1f54d3fa6b1b562e0efe8fbe556d839cb3633c9801eeac8eed2a5c4c768c1534829
+EBUILD nfdump-1.6.23.ebuild 1674 BLAKE2B f09df24b3d422fcb371057531f858d5411dc73ed325b79e2fb4ee1285ff4f77ec0a98dfcb442a493821953db73e2568e7c9b8ac77efa26218e28f86142a666a8 SHA512 e7981d17b39ee22dbd68ab6bc263487e932d5a24d57e5ec5e22de28af6d29e3d3823a3e957aa699b7873c8ad5212731cf8fb0c49291160adeef60bfcca1ac78a
 MISC metadata.xml 1277 BLAKE2B 627dfd7acef2f5734027131342b29bfc3307fa8e462896b9a08870768aa3c452c41e32289cde6aa84967ae64ffafba8a0390d342e0363d30ccd0a81fb536575e SHA512 bd88e71c62abaf83eea07bf97441f9d66061d459c44785e382ea760fd4f8a706b6bd089ead6ade13a381066355c12070839ec2c9a6d6477397055e7fb3b1b089
diff --git a/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.23.ebuild
index 84ebe03aee28..6790afe4e55d 100644
--- a/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.23.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="A set of tools to collect and process netflow data"
@@ -9,33 +10,34 @@ HOMEPAGE="https://github.com/phaag/nfdump"
 SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0/1.6.15"
-KEYWORDS="amd64 x86"
-IUSE="debug doc ftconv nfprofile nftrack readpcap sflow static-libs"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow"
+
+REQUIRED_USE="?? ( jnat nsel )"
 
-COMMON_DEPEND="
+RDEPEND="
 	app-arch/bzip2
 	sys-libs/zlib
-	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
+	ftconv? ( net-analyzer/flow-tools )
+	nfpcapd? ( net-libs/libpcap )
 	nfprofile? ( net-analyzer/rrdtool )
 	nftrack? ( net-analyzer/rrdtool )
 	readpcap? ( net-libs/libpcap )
 "
-DEPEND="
-	${COMMON_DEPEND}
-"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/flex
 	virtual/yacc
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	${COMMON_DEPEND}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
 "
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.19-compiler.patch
 	"${FILESDIR}"/${PN}-1.6.19-libft.patch
-	"${FILESDIR}"/${PN}-1.6.21-remove-strict-rfc-7011-handling.patch
 )
 
 DOCS=( AUTHORS ChangeLog README.md )
@@ -51,15 +53,18 @@ src_prepare() {
 }
 
 src_configure() {
-	# --without-ftconf is not handled well #322201
+	# --without-ftconf is not handled well, bug #322201
 	econf \
 		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+		$(use nfpcapd && echo --enable-nfpcapd) \
 		$(use nfprofile && echo --enable-nfprofile) \
 		$(use nftrack && echo --enable-nftrack) \
 		$(use_enable debug devel) \
+		$(use_enable jnat) \
+		$(use_enable nsel) \
 		$(use_enable readpcap) \
 		$(use_enable sflow) \
-		$(use_enable static-libs static)
+		--disable-static
 }
 
 src_install() {
@@ -67,6 +72,9 @@ src_install() {
 
 	find "${ED}" -name '*.la' -delete || die
 
+	newinitd "${FILESDIR}"/nfcapd.initd nfcapd
+	newconfd "${FILESDIR}"/nfcapd.confd nfcapd
+
 	if use doc; then
 		dodoc -r doc/html
 	fi