gentoo auto-resync : 18:08:2022 - 02:33:40

9 files changed, 2 insertions, 411 deletions

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index ad832ea786da..f57ac6e0de89 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,17 +1,8 @@
-AUX ntopng-4.0-ndpi-includes.patch 388 BLAKE2B 59ad343a40c9a0034c4d3fdaf16b0e5f1e5ca010e76b80867ed73afa710798bfb9950144ec2549741262ac234e2bae193b9d751f3a511f7335861ae6e2fd5095 SHA512 80fecb323bbd2d5ad06f77b2d35d162e09d47b2a7cfe611b625883c7e70842700e491b52a654eb97ee14221cd54646706f6b6038be8bd35240717a47010c1346
-AUX ntopng-4.2-PKG_CONFIG.patch 4622 BLAKE2B b88f0d52ce1784b03caa2929b31bc2165d8a6da9e21a036c8f77efa4545187de508a4023308f9869657840849d61cdff01d5e8663631f4c5aafa165d82f8b0b4 SHA512 84c1070fa190f464b4dbb3d8597a1ae1c0ab488fbfaadf38a65c121de662f669b3198b0db926d12aeb29f7e48218ddab013824e31b6b8dc5a6ecd91990c507b4
-AUX ntopng-4.2-mysqltool.patch 567 BLAKE2B b788a433213c2b29cc27869649fcc60cb8e88542b4797fe20a4641f560067cbbdd578e6fb02172365bbdbf31490dacd9324af1dc53ffa473a6bb55a8eb245687 SHA512 378fd97264c9f7c4e997e7f2319ec9e8e7c359393b8ac333b23a7406e2756de49b4adfecb1baa0d340a2f2cf86c164a41341fbb6f4450fae786acce168ebc2df
-AUX ntopng-4.2-nogit.patch 1522 BLAKE2B c6d445a4b8ba2b4229073f6ab3b0bac1dc7cfa805ec75ce7addcf08a7963bb5028a6f0a36650194199def5ef7b885f04817a0dfbfe014156e7d2cb54d9cb1588 SHA512 d33feb7c6109ff5728ff21b704d6e08d2ae6ea70563b1ac4d89d8f69123c77989bdb764d99ce2c9b36690bed07486b9f3b7e0d7ff6059b3cb75965343695b778
-AUX ntopng-4.2-parallel-make.patch 352 BLAKE2B e2411060d85820b0808c735cabdeb1f4e372dbd199e2308b3cac463c706b4a8c255bb838a0ba160f80d600ad8e569401fb5de57637737be3485df301862fb06f SHA512 2c6987006ea2f60a9f46e5b2cd7e94e55ad93e866a8ef935ebb40067cc4082f96c4918e4a13c618f2a2d0e7274ccf741457c198f0dd65dfa76c172a222f60b2e
 AUX ntopng-5.2.1-build-system.patch 2624 BLAKE2B 5fa408c42203009152d20b207e64b411ba9fa36687d4ec9264cfb0250ed5d701189b4549e8c147ca437d19fe92334b71c315ccc71074dcbe32e44b6ec2dbf510 SHA512 fcc46ee8c0173dd04e51c93cea009295fd636b7c9ad8aeb43bb96ef31e3a4a45763a6732fceb901ee58646f47067411faf600d5dba8820acfcba4b3ceec0c98b
 AUX ntopng-5.2.1-mysqltool.patch 494 BLAKE2B cff0845f604a0c73a025043417a2b70e7d8f36feb73684230e410dcf3b67c08432b79e852018299c829d36fce6d082fb7b9172d216477c8f928f720c04cba643 SHA512 0aed88a94fc21888e468c71212389f89765f5b394411e6a2838299a280a9cba8e996ebe652b8d116ddc8b9c51b66a463c206917187b138badc76246ade3a780f
 AUX ntopng-5.2.1-ndpi-linking.patch 474 BLAKE2B cacf4f42af93bc656558873f732734bac70f6732325686b8c4f4e38c9f9fb39e6fcfc3b189da29b27b155c55249717c546d408d27ba488682e364e794caba2d9 SHA512 cc5cd78e7ed6499c91f16695f45d0284ed6430a435364919d320ca80f4c7c25bbb68cdea070b8710535fd327faa6f0d62b6c0dfa605e34555c14a6cd8b4dc36b
 AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061
 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84
-DIST ntopng-4.2.tar.gz 57554819 BLAKE2B a9eaf7ea670dbd9c830696a4b017330e25a82307852a0a85d95ddbb4e32a3123d43eda1b686c359da1fef77e601cd3791dcdf257141e2e1d3ed7974b92edaac8 SHA512 e89ec3f35644ae8bc570d9802ecfadbf0067145e23a589df2032e8781e9c954f4166d3abb650ddafc65e4fbad656730ee1abf9c5273d3e09f8173d423436b8ff
-DIST ntopng-5.0.tar.gz 57935381 BLAKE2B 420bda10ecc264d6baea0714367e8c475e72480ab1a114251c6712535ad1415288154623aa3ef780a5bab55bec684ddd7c0582997654f8fbb96ec08e17cb099f SHA512 e157430d9c98871d0136d2f51af6c7fed3a95fa21f8d3a9447ee69ac2aaee3752b6eddfd584715e3ee36234fd0fdcf865b761b0ec1a08727f6d988bc115d21e6
 DIST ntopng-5.2.1.tar.gz 60280025 BLAKE2B e7885a1ec9e5d37ee06def83a83c62f41acf87d939d18c33c8d114fe0bed0c973a6146f26fd92343aa7c7e7484970c3e95c33fe76468fe382809daddeed6541b SHA512 01cdf21deac61a3b11e7d0e6b662c911123241332e812bb676cb8c5c003fe1d50a4c61231f9c327d467e89dd1345fc1bdbab5d2599fe04b04a8fe12654c01bdd
-EBUILD ntopng-4.2-r1.ebuild 2007 BLAKE2B 11fc39c77829db81cee9c8f598151a0ba056dd40f03482f042cd8885ba81c4237a07addc8100cc65ceeb366e6411a5ee819c51131b614e4c0c4cd45496ecd9b2 SHA512 64371bfa4a1ba20b5650ab65f4f673b85e98704b4a8cac59751eea645d870d9f63a68480ce2fefcd12075bfe06768771fc2d735c6973fde0bb087b62ee36c780
-EBUILD ntopng-5.0.ebuild 1928 BLAKE2B 4f105b044967cf595e184229e4dd5dee5b03a6c453d00c16478d05f18fced9517c8954c75aae25b45cc30701512313bd9e717f95c6bdffbb0c8037168a0883ef SHA512 573cb8e2cb1db7652788451a428acc0b92bcf34937a2521bea8d5305be9149770e3c8c3f7fa0e94f422bb09ff1574c3aeec32c43d4bb9fcc0910967c35a7b892
-EBUILD ntopng-5.2.1.ebuild 2210 BLAKE2B bae2e642a9a3c989935371ec31e9f4906c9417e032ddef260b0e190fd077cb9ee921d48358c504aa7cb03c4e8ddfb07ed4ec4239298dc5d94da9ebe58728acfa SHA512 86adb96b03e60caf6ec1548983d146ef9a6eeba851660268fd91a28d55fd0a94b52962a99f9f80349a491f069a488e832db3b3f7080dbb069c0954b08df47160
+EBUILD ntopng-5.2.1-r1.ebuild 2232 BLAKE2B b1a55a7eff04c3e6fcdabfff960846e10353bc7899c4221cad0f0c482b33eebcd59ab9b18f66c06bb654b4335fb90d6344545a15ccd8050631c6f8aed74f8c01 SHA512 f2badf2841ba9920b955c39c766bd7a7bad59bea7905befd2a5ab4dfe362669d1f18cdcc0138cf0bbd1538ed481e976dd95e79da100c9937360d9e2af7eec352
 MISC metadata.xml 295 BLAKE2B 2b7f20f08d1cef4e5cfa80981f282a4907a8496b565a1a146f27a3d8736653d35c6b03e07299b0b4bbbb32100d01c873c683b90ca96bed98e85cfd71a6175ddf SHA512 4d5b0f4892ca44c672c5f9b1291a91fb3333b36830df22432df5cfed48e3c6c93ca88a0675a50fd33013d7f01805df99d474e8c98b9c94f3c878366b32d5bc6f
diff --git a/net-analyzer/ntopng/files/ntopng-4.0-ndpi-includes.patch b/net-analyzer/ntopng/files/ntopng-4.0-ndpi-includes.patch
deleted file mode 100644
index d1f61ce52abe..000000000000
--- a/net-analyzer/ntopng/files/ntopng-4.0-ndpi-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.seed
-+++ b/configure.seed
-@@ -134,7 +134,7 @@
- PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [
-    NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`
-    # Use static libndpi library as building against the dynamic library fails
--   NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic"
-+   NDPI_LIB="$NDPI_LIBS"
-    NDPI_LIB_DEP=
-    ], [
-       AC_MSG_CHECKING(for nDPI source)
diff --git a/net-analyzer/ntopng/files/ntopng-4.2-PKG_CONFIG.patch b/net-analyzer/ntopng/files/ntopng-4.2-PKG_CONFIG.patch
deleted file mode 100644
index 8218c948b178..000000000000
--- a/net-analyzer/ntopng/files/ntopng-4.2-PKG_CONFIG.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -44,9 +44,9 @@ LUA_LIB=$(LUA_HOME)/src/liblua.a
- 
- ######
- LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8
--HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd && echo 0)
-+HAS_LIBRRDTOOL=$(shell ${PKG_CONFIG} --atleast-version=1.4.8 librrd && echo 0)
- ifeq ($(HAS_LIBRRDTOOL), 0)
--	LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
-+	LIBRRDTOOL_INC = $(shell ${PKG_CONFIG} --cflags librrd)
- 	LIBRRDTOOL_LIB = @LIBRRD_LD_FLAGS@
- else
- 	LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/
-@@ -74,21 +74,21 @@ SNMP_LIB=@SNMP_LIB@
- ######
- 
- ifeq (@NEDGE@, 0)
-- HAS_SODIUM=$(shell pkg-config --exists libsodium && echo 0)
-+ HAS_SODIUM=$(shell ${PKG_CONFIG} --exists libsodium && echo 0)
-  ifeq ($(HAS_SODIUM), 0)
--	SODIUM_INC = $(shell pkg-config --cflags libsodium)
--	SODIUM_LIB = $(shell pkg-config --libs libsodium)
-+	SODIUM_INC = $(shell ${PKG_CONFIG} --cflags libsodium)
-+	SODIUM_LIB = $(shell ${PKG_CONFIG} --libs libsodium)
-  else
- 	SODIUM_INC=
- 	SODIUM_LIB=
-  endif
- 
-- HAS_ZEROMQ=$(shell pkg-config --exists libzmq && echo 0)
-+ HAS_ZEROMQ=$(shell ${PKG_CONFIG} --exists libzmq && echo 0)
-  ifeq ($(HAS_ZEROMQ), 0)
--	ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
-+	ZEROMQ_INC = $(shell ${PKG_CONFIG} --cflags libzmq)
- 	ZMQ_STATIC=/usr/local/lib/libzmq.a
- 	ifeq ($(wildcard $(ZMQ_STATIC)),)
--		ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
-+		ZEROMQ_LIB = $(shell ${PKG_CONFIG} --libs libzmq)
- 	else
- 		ZEROMQ_LIB = $(ZMQ_STATIC)
- 	endif
-@@ -98,9 +98,9 @@ ifeq (@NEDGE@, 0)
- 	ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a
-  endif
- 
-- HAS_ZSTD=$(shell pkg-config --exists libzstd && echo 0)
-+ HAS_ZSTD=$(shell ${PKG_CONFIG} --exists libzstd && echo 0)
-  ifeq ($(HAS_ZSTD), 0)
--	ZSTD_LIB = $(shell pkg-config --libs libzstd)
-+	ZSTD_LIB = $(shell ${PKG_CONFIG} --libs libzstd)
-  endif
- endif
- 
---- a/configure.seed
-+++ b/configure.seed
-@@ -190,10 +190,10 @@ if test -z "$NDPI_INC" || test -z "$NDPI_LIB" ; then :
- fi
- dnl finish: nDPI handling
- 
--pkg-config --exists json-c
-+${PKG_CONFIG} --exists json-c
- if test "$?" -ne 1; then
--  JSON_INC=`pkg-config --cflags json-c`
--  JSON_LIB=`pkg-config --libs json-c`
-+  JSON_INC=`${PKG_CONFIG} --cflags json-c`
-+  JSON_LIB=`${PKG_CONFIG} --libs json-c`
- else
-   echo "Please install libjson-c-dev package prerequisite"
-   exit -1
-@@ -211,11 +211,11 @@ dnl>     JSON_LIB=$JSON_HOME/libjson-c.a
- dnl>   fi
- dnl> fi
- 
--pkg-config --exists libssl
-+${PKG_CONFIG} --exists libssl
- if test "$?" -ne 1; then
-   AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
--  SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl"
--  SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto"
-+  SSL_INC="`${PKG_CONFIG} --cflags libssl` -I/usr/include/openssl"
-+  SSL_LIB="`${PKG_CONFIG} --libs libssl` -lssl -lcrypto"
- else
-   dnl Workaround for MacOS Brew
-   if test -d "/usr/local/opt/openssl/lib"; then
-@@ -329,8 +329,8 @@ AC_DEFINE_UNQUOTED(PACKAGE_REVISION, "${GIT_COMMITS}", [Package Revision])
- AC_DEFINE_UNQUOTED(NTOPNG_GIT_RELEASE, "${GIT_BRANCH}:${GIT_RELEASE}", [GIT Release])
- AC_DEFINE_UNQUOTED(NTOPNG_GIT_DATE, "${GIT_DATE}", [Last GIT change])
- 
--if test -z `which pkg-config`; then
--  echo "#!/bin/sh\n" > pkg-config
-+if test -z `which ${PKG_CONFIG}`; then
-+  echo "#!/bin/sh\n" > ${PKG_CONFIG}
- fi
- 
- if test -f ".git/index"; then
-@@ -362,8 +362,8 @@ DATE=`date +"%Y-%m-%d"`
- 
- if test -d "/usr/include/hiredis"; then
-   AC_DEFINE_UNQUOTED(HAVE_HIREDIS, 1, [Local hiredis package present])
--  HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis"
--  HIREDIS_LIB="`pkg-config --libs hiredis` -lhiredis"
-+  HIREDIS_INC="`${PKG_CONFIG} --cflags hiredis` -I/usr/include/hiredis"
-+  HIREDIS_LIB="`${PKG_CONFIG} --libs hiredis` -lhiredis"
- else
-   HIREDIS_INC="-I ${PWD}/third-party/hiredis"
- fi
-@@ -490,7 +490,7 @@ if test x$UGLIFYJS != x; then
-   UGLIFYJS_MAJOR_VERSION="${UGLIFYJS_VERSION%%.*}"
- fi
- 
--AC_CHECK_LIB([rrd_th], [rrd_update_r], [LIBRRD_LD_FLAGS=-lrrd_th], [LIBRRD_LD_FLAGS=`pkg-config --libs librrd`])
-+AC_CHECK_LIB([rrd_th], [rrd_update_r], [LIBRRD_LD_FLAGS=-lrrd_th], [LIBRRD_LD_FLAGS=`${PKG_CONFIG} --libs librrd`])
- 
- AC_CHECK_LIB([nl], [nl_handle_alloc], [LDFLAGS="${LDFLAGS} -lnl"])
- AC_CHECK_LIB([rt], [clock_gettime],   [LDFLAGS="${LDFLAGS} -lrt"])
-@@ -509,7 +509,7 @@ else
-   dnl> https://github.com/curl/curl/blob/curl-7_20_0/TODO-RELEASE
- 
-   AC_MSG_CHECKING(for curl SMTP support)
--  if `pkg-config --atleast-version="7.20.0" libcurl` ; then
-+  if `${PKG_CONFIG} --atleast-version="7.20.0" libcurl` ; then
-     AC_DEFINE_UNQUOTED(HAVE_CURL_SMTP, 1, [curl supports SMTP])
-     AC_MSG_RESULT(yes)
-   else
diff --git a/net-analyzer/ntopng/files/ntopng-4.2-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-4.2-mysqltool.patch
deleted file mode 100644
index a961bc28902f..000000000000
--- a/net-analyzer/ntopng/files/ntopng-4.2-mysqltool.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/configure.seed b/configure.seed
-index a321f9b..9f0f1cc 100644
---- a/configure.seed
-+++ b/configure.seed
-@@ -596,13 +596,7 @@ if test "${with_nedge+set}" != set; then
-   if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
-     MYSQLTOOL="mariadb_config"
-   else
--    PATH=$PATH:/usr/local/mysql/bin
--    AC_CHECK_TOOL(MYSQL, mysql_config)
--    if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
--      MYSQLTOOL="mysql_config"
--    else
--      MYSQLTOOL=""
--    fi
-+    MYSQLTOOL="mysql_config"
-   fi
- 
-   if test -n "$MYSQLTOOL"; then
diff --git a/net-analyzer/ntopng/files/ntopng-4.2-nogit.patch b/net-analyzer/ntopng/files/ntopng-4.2-nogit.patch
deleted file mode 100644
index 17b68f0918fb..000000000000
--- a/net-analyzer/ntopng/files/ntopng-4.2-nogit.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 38209c7..6945ce7 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -171,7 +171,6 @@ $(LIBRRDTOOL_LIB):
- 	cd $(LIBRRDTOOL_HOME); ./configure --disable-libdbi --disable-libwrap --disable-rrdcgi --disable-libtool-lock --disable-nls --disable-rpath --disable-perl --disable-ruby --disable-lua --disable-tcl --disable-python --disable-dependency-tracking --disable-rrd_graph ; cd src; @GMAKE@ librrd_th.la
- 
- hooks/.enabled:
--	git config core.hooksPath hooks || true
- 	touch hooks/.enabled
- 
- clean:
-diff --git a/configure.seed b/configure.seed
-index 7e2eced..dd3257d 100644
---- a/configure.seed
-+++ b/configure.seed
-@@ -77,7 +77,6 @@ fi
- # On CentOS 6 `git rev-list HEAD --count` does not work
- #
- #
--REVISION=`git log --pretty=oneline | wc -l`
- 
- if test -d "/usr/local/include"; then
-   CFLAGS="${CFLAGS} -I/usr/local/include"
-@@ -323,7 +322,6 @@ else
-   AC_MSG_RESULT(not found)
- fi
- 
--GIT_COMMITS=`git rev-list --all |wc -l | tr -d '[[:space:]]'`
- AC_DEFINE_UNQUOTED(PACKAGE_REVISION, "${GIT_COMMITS}", [Package Revision])
- 
- AC_DEFINE_UNQUOTED(NTOPNG_GIT_RELEASE, "${GIT_BRANCH}:${GIT_RELEASE}", [GIT Release])
-@@ -671,11 +669,6 @@ AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows])
- 
- GMAKE='$(MAKE)'
- 
--GIT=`which git`
--if test x$GIT = x; then
--  AC_MSG_RESULT(FATAL ERROR: git is not installed on your host)
--fi
--
- WGET=`which wget`
- if test x$WGET = x; then
-   AC_MSG_RESULT(ERROR. wget is not installed on your host: you cannot download GeoIP data)
diff --git a/net-analyzer/ntopng/files/ntopng-4.2-parallel-make.patch b/net-analyzer/ntopng/files/ntopng-4.2-parallel-make.patch
deleted file mode 100644
index b3086284a5a9..000000000000
--- a/net-analyzer/ntopng/files/ntopng-4.2-parallel-make.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/configure.seed b/configure.seed
-index a321f9b..d27d35d 100644
---- a/configure.seed
-+++ b/configure.seed
-@@ -675,10 +675,7 @@ fi
- 
- AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows])
- 
--GMAKE=`which gmake`
--if test x$GMAKE = x; then
--  GMAKE="make"
--fi
-+GMAKE='$(MAKE)'
- 
- GIT=`which git`
- if test x$GIT = x; then
diff --git a/net-analyzer/ntopng/ntopng-4.2-r1.ebuild b/net-analyzer/ntopng/ntopng-4.2-r1.ebuild
deleted file mode 100644
index 539835c3e078..000000000000
--- a/net-analyzer/ntopng/ntopng-4.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-db/mysql-connector-c:=
-	dev-db/sqlite:3
-	dev-libs/hiredis:=
-	dev-libs/json-c:=
-	dev-libs/libmaxminddb
-	dev-libs/libsodium:=
-	dev-libs/openssl:=
-	net-analyzer/rrdtool
-	net-libs/libpcap
-	>=net-libs/nDPI-3.0:=
-	>=net-libs/zeromq-3:=
-	net-misc/curl
-	sys-libs/libcap
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	acct-user/ntopng
-	acct-group/ntopng
-	dev-db/redis"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2-mysqltool.patch"
-	"${FILESDIR}/${PN}-4.2-parallel-make.patch"
-	"${FILESDIR}/${PN}-4.0-ndpi-includes.patch"
-	"${FILESDIR}/${PN}-4.2-PKG_CONFIG.patch"
-	"${FILESDIR}/${PN}-4.2-nogit.patch"
-)
-
-src_prepare() {
-	default
-
-	# Follows upstream's autogen.sh
-	sed \
-		-e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \
-		-e "s/@SHORT_VERSION@/${PV}/g" \
-		-e "s/@GIT_DATE@/$(date)/g" \
-		-e "s/@GIT_RELEASE@/${PV}.$(date +%y%m%d)/g" \
-		-e "s/@GIT_BRANCH@//g" < "${S}/configure.seed" \
-		> "${S}/configure.ac" || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-	default
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		MYCFLAGS="${CFLAGS}" \
-		MYLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
-	insinto "${SHARE_NTOPNG_DIR}"
-	doins -r httpdocs
-	doins -r scripts
-
-	insinto "${SHARE_NTOPNG_DIR}/third-party"
-	doins -r third-party/i18n.lua-master
-	doins -r third-party/lua-resty-template-master
-
-	exeinto /usr/bin
-	doexe "${PN}"
-	doman "${PN}.8"
-
-	newinitd "${FILESDIR}"/ntopng.init.d ntopng
-	newconfd "${FILESDIR}"/ntopng.conf.d ntopng
-
-	keepdir /var/lib/ntopng
-	fowners ntopng /var/lib/ntopng
-}
-
-pkg_postinst() {
-	elog "ntopng default credentials are user='admin' password='admin'"
-}
diff --git a/net-analyzer/ntopng/ntopng-5.0.ebuild b/net-analyzer/ntopng/ntopng-5.0.ebuild
deleted file mode 100644
index e879c8456307..000000000000
--- a/net-analyzer/ntopng/ntopng-5.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-db/mysql-connector-c:=
-	dev-db/sqlite:3
-	dev-libs/hiredis:=
-	dev-libs/json-c:=
-	dev-libs/libmaxminddb
-	dev-libs/libsodium:=
-	dev-libs/openssl:=
-	net-analyzer/rrdtool
-	net-libs/libpcap
-	>=net-libs/nDPI-3.0:=
-	>=net-libs/zeromq-3:=
-	net-misc/curl
-	sys-libs/libcap
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	acct-user/ntopng
-	acct-group/ntopng
-	dev-db/redis"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2-mysqltool.patch
-	"${FILESDIR}"/${PN}-4.2-parallel-make.patch
-	"${FILESDIR}"/${PN}-4.0-ndpi-includes.patch
-)
-
-src_prepare() {
-	default
-
-	# Follows upstream's autogen.sh
-	sed \
-		-e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \
-		-e "s/@SHORT_VERSION@/${PV}/g" \
-		-e "s/@GIT_DATE@/$(date)/g" \
-		-e "s/@GIT_RELEASE@/${PV}.$(date +%y%m%d)/g" \
-		-e "s/@GIT_BRANCH@//g" < "${S}/configure.seed" \
-		> "${S}/configure.ac" || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-	default
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		MYCFLAGS="${CFLAGS}" \
-		MYLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
-	insinto "${SHARE_NTOPNG_DIR}"
-	doins -r httpdocs
-	doins -r scripts
-
-	insinto "${SHARE_NTOPNG_DIR}/third-party"
-	doins -r third-party/i18n.lua-master
-	doins -r third-party/lua-resty-template-master
-
-	exeinto /usr/bin
-	doexe "${PN}"
-	doman "${PN}.8"
-
-	newinitd "${FILESDIR}"/ntopng.init.d ntopng
-	newconfd "${FILESDIR}"/ntopng.conf.d ntopng
-
-	keepdir /var/lib/ntopng
-	fowners ntopng /var/lib/ntopng
-}
-
-pkg_postinst() {
-	elog "ntopng default credentials are user='admin' password='admin'"
-}
diff --git a/net-analyzer/ntopng/ntopng-5.2.1.ebuild b/net-analyzer/ntopng/ntopng-5.2.1-r1.ebuild
index b1e0ebb11864..84dd505dc13f 100644
--- a/net-analyzer/ntopng/ntopng-5.2.1.ebuild
+++ b/net-analyzer/ntopng/ntopng-5.2.1-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="dev-db/mysql-connector-c:=
 	net-analyzer/rrdtool
 	net-libs/libpcap
 	>=net-libs/nDPI-4.2:=
+	<net-libs/nDPI-4.4:=
 	>=net-libs/zeromq-3:=
 	net-misc/curl
 	sys-libs/libcap