gentoo resync : 28.04.2021

10 files changed, 174 insertions, 342 deletions

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 5095364f0639..009d143914a0 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,13 +1,10 @@
-AUX ntopng-3.8-mysqltool.patch 437 BLAKE2B 13df7c163168b59917843a2c7dee13f41c6d3b95e16a0967c849771dbb552c72f1d5e8d16dd76ed6b51c149a1143707d432761abd907bec3d7b6257a099debca SHA512 f13a6d529e2e2d659763c2ec013ebdb61f3b741d242f375345e60e66d7cf4adeefdff6876d3a15497fc9b2f1966268665e550719f7bd86ca1b44252f459c9029
-AUX ntopng-3.8-ndpi-includes.patch 456 BLAKE2B 517864615e89088aafdd21c50d550e8991387120252126a9bde7531bc0ac6f9691e69e8ae38db4a623e0f6d6161b2f780dd304be377c90c2cf8a1caf20100e0e SHA512 5033c87fdf3fc32539db886a9675bf69dd71aab22ee8d3357f8f700198ba15a69bf4d4f633941b2c806dcf7ad866b9d18373d02a76ffcfea56b6ebe6e22a82ee
-AUX ntopng-3.8.1-PKG_CONFIG.patch 2994 BLAKE2B 4ff178522c28f93d19550080e1338970413fa5a25dfcd4745fc3ab8a8ccb27166771285e68ee1b47353b610121630cd62c1c1c9b8672e5b59d13957185ca7ffc SHA512 77516304306ac66e6d691679209a9a93ef481c38a6eab4681430cf5864387664389e016ccab6106f576c90dfbd398b9f8711be61783c05017bf3c1dd1e99905c
-AUX ntopng-3.8.1-parallel-make.patch 267 BLAKE2B f68ab75b32b3275b5513039f947f1dc8ca1f4b3642730cba5ff461ebaa6c9114fe238574087bf4a4f1be91b31954e1d17dcaf535709714c2fc5a04ef10bfd0b1 SHA512 ade7e22747cb750bc5f7d4a3480c003414f99d39401e0bcfe1c3d0b58cb2c409f962d58becc3c6c40a5b95d057fe5b4dfeb9cfd0855a30b4c5be1d26ba3c0e62
-AUX ntopng-4.0-PKG_CONFIG.patch 4288 BLAKE2B acd842c113cb340becd5515ab47a8f0c3eef5d9051dcbc4a6dc17063b12ff28a8b4d4d46a83bf58b0dcdf6f75eba06fbd7dec7e194ce596832e767ddb5fa77e6 SHA512 9bab76e36e560c0ee4488d5c9402cb1c9aac2b9e443b1202ea71a0bfc99e754943c05303b8b50ff5092be747065a493472b303edc984d30e7c68b6e0c0c59b3f
 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.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061
 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84
-DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742 SHA512 4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970
-DIST ntopng-4.0.tar.gz 43239175 BLAKE2B 689883685d46d339d61c338607e2164e36903313cdc0e0e2b649acd7468505f72fce75118a2c3ef55e54d942fc5cc3c312efbd46f8e2603bbcfaf206908bce82 SHA512 a278cc5f304e3040b31c691286650a54d61b5587033724c4513dd7372168477d5b0b471a1d2a5c5682034464b022b88e971567a38d836216431ea77bf1ed90c9
-EBUILD ntopng-3.8.1-r4.ebuild 1918 BLAKE2B de068e1989232534eb853d274bbb8993d6a31b8366ca6e36b6a0b0ea512cfa2d235dd5e44fc37bd84ea6508d480656ab68e40805a0a17f15c0ed62b6e8b955a3 SHA512 b29c347de506cfd771392dd1548651a7c1ac6429ef954b6d56cd94262e929cb41c710a160e8e408c8c193d58f7b84ecb64a70a322405b4ebd12cd1beb0e8fcc3
-EBUILD ntopng-4.0.ebuild 1916 BLAKE2B d288cc2f2b096a377a00a8814541e79a5328589f43963e118ccfd42c938fca1a7c684b769a81b2753ee2ab9c6431ee425d4d190444767a4b9059ceb6ebb64278 SHA512 37d3c01d11f761d2baec2047e52186a96ba7157cd11857eb7c1198bd6952994e6f1c37d12a20718d4319ac4b294a65dbb2bb96b3c7da0bc351d929769fc1e118
+DIST ntopng-4.2.tar.gz 57554819 BLAKE2B a9eaf7ea670dbd9c830696a4b017330e25a82307852a0a85d95ddbb4e32a3123d43eda1b686c359da1fef77e601cd3791dcdf257141e2e1d3ed7974b92edaac8 SHA512 e89ec3f35644ae8bc570d9802ecfadbf0067145e23a589df2032e8781e9c954f4166d3abb650ddafc65e4fbad656730ee1abf9c5273d3e09f8173d423436b8ff
+EBUILD ntopng-4.2.ebuild 2005 BLAKE2B 806cfa0f72aac5ee4077bb991b50c9ca7bf00128af4fdd04bd829518defc82e6d41ba72d506cfbe3150056660b45a06bb09c82e4461bdfa85c5438aa280b997f SHA512 fa211e29eee9a9df9db6b1a52342719d40c74881e711fc799eec3599b994b1e47100f349bdd04d028429ceab51cf939266593ac5d8e33f5429d0a54d3ef8f3b4
 MISC metadata.xml 294 BLAKE2B 81c505fe10f4b55e7a2bf6a01959efd75f9a8bea62afa2ff31f036ef3d999ad6f88d8c4fa7ccbc1852c51c63354cf02cb023a562997f06b8b58699d76bb6761b SHA512 e98be1164a275f023b7f96d6ca2c37fa44733b776c39a2e45839e60881b3ce5bd2f81dd50af97340afcaaa0da0bcc32e144f72e968b1a7e6c06755ea9eb471ac
diff --git a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch
deleted file mode 100644
index 62c328a3505e..000000000000
--- a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/configure.seed
-+++ b/configure.seed
-@@ -355,13 +355,7 @@
-  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-3.8-ndpi-includes.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
deleted file mode 100644
index cdd5e827147c..000000000000
--- a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.seed
-+++ b/configure.seed
-@@ -129,9 +129,9 @@
- fi
- 
- PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [
--   NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`/libndpi
-+   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-3.8.1-PKG_CONFIG.patch b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch
deleted file mode 100644
index 12117d791bcd..000000000000
--- a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/configure.seed
-+++ b/configure.seed
-@@ -6,6 +6,8 @@
- 
- AC_PROG_CXX
- 
-+PKG_PROG_PKG_CONFIG
-+
- dnl> Add /usr/local/ /opt/local
- CFLAGS="-I${PWD} -I${PWD}/include"
- CPPFLAGS="${CPPFLAGS} -I${PWD} -I${PWD}/include"
-@@ -179,10 +179,10 @@
- fi
- dnl finish: nDPI handling
- 
--if test -z `pkg-config --exists libssl`; then
-+if ${PKG_CONFIG} --exists libssl; 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"
- fi
- 
- AC_MSG_CHECKING(for ntopng professional edition)
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -44,10 +44,10 @@
- 
- ######
- LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8
--HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd; echo $$?)
-+HAS_LIBRRDTOOL=$(shell $(PKG_CONFIG) --atleast-version=1.4.8 librrd; echo $$?)
- ifeq ($(HAS_LIBRRDTOOL), 0)
--	LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
--	LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd) # -lrrd_th
-+	LIBRRDTOOL_INC = $(shell $(PKG_CONFIG) --cflags librrd)
-+	LIBRRDTOOL_LIB = $(shell $(PKG_CONFIG) --libs librrd) # -lrrd_th
- else
- 	LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/
- 	ifeq ($(OS), $(filter $(OS), OpenBSD FreeBSD))
-@@ -70,10 +70,10 @@
- 
- ######
- 
--HAS_JSON=$(shell pkg-config --exists json-c; echo $$?)
-+HAS_JSON=$(shell $(PKG_CONFIG) --exists json-c; echo $$?)
- ifeq ($(HAS_JSON), 0)
--	JSON_INC = $(shell pkg-config --cflags json-c)
--	JSON_LIB = $(shell pkg-config --libs json-c)
-+	JSON_INC = $(shell $(PKG_CONFIG) --cflags json-c)
-+	JSON_LIB = $(shell $(PKG_CONFIG) --libs json-c)
- else
- 	JSON_HOME=${PWD}/third-party/json-c
- 	JSON_INC=-I$(JSON_HOME)
-@@ -83,21 +83,21 @@
- ######
- 
- ifeq (@NEDGE@, 0)
-- HAS_SODIUM=$(shell pkg-config --exists libsodium; echo $$?)
-+ HAS_SODIUM=$(shell $(PKG_CONFIG) --exists libsodium; echo $$?)
-  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 $$?)
-+ HAS_ZEROMQ=$(shell $(PKG_CONFIG) --exists libzmq; echo $$?)
-  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
-@@ -106,11 +106,6 @@
- 	ZEROMQ_INC=-I$(ZEROMQ_HOME)/include
- 	ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a
-  endif
--
-- HAS_ZSTD=$(shell pkg-config --exists libzstd; echo $$?)
-- ifeq ($(HAS_ZSTD), 0)
--	ZSTD_LIB = $(shell pkg-config --libs libzstd)
-- endif
- endif
- 
- ######
diff --git a/net-analyzer/ntopng/files/ntopng-4.0-PKG_CONFIG.patch b/net-analyzer/ntopng/files/ntopng-4.2-PKG_CONFIG.patch
index cc97d3875676..8218c948b178 100644
--- a/net-analyzer/ntopng/files/ntopng-4.0-PKG_CONFIG.patch
+++ b/net-analyzer/ntopng/files/ntopng-4.2-PKG_CONFIG.patch
@@ -1,76 +1,6 @@
---- a/configure.seed
-+++ b/configure.seed
-@@ -182,21 +182,21 @@
- 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
- 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
-@@ -303,8 +303,8 @@
- 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
-@@ -336,8 +336,8 @@
- 
- 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
-@@ -433,7 +433,7 @@
-    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"])
-@@ -452,7 +452,7 @@
-     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
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -45,9 +45,9 @@
+@@ -44,9 +44,9 @@ LUA_LIB=$(LUA_HOME)/src/liblua.a
  
  ######
  LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8
@@ -82,7 +12,7 @@
  	LIBRRDTOOL_LIB = @LIBRRD_LD_FLAGS@
  else
  	LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/
-@@ -77,21 +77,21 @@
+@@ -74,21 +74,21 @@ SNMP_LIB=@SNMP_LIB@
  ######
  
  ifeq (@NEDGE@, 0)
@@ -110,7 +40,7 @@
  	else
  		ZEROMQ_LIB = $(ZMQ_STATIC)
  	endif
-@@ -101,9 +101,9 @@
+@@ -98,9 +98,9 @@ ifeq (@NEDGE@, 0)
  	ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a
   endif
  
@@ -122,3 +52,74 @@
   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
new file mode 100644
index 000000000000..a961bc28902f
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-4.2-mysqltool.patch
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000000..17b68f0918fb
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-4.2-nogit.patch
@@ -0,0 +1,44 @@
+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-3.8.1-parallel-make.patch b/net-analyzer/ntopng/files/ntopng-4.2-parallel-make.patch
index 9089c0a9b04d..b3086284a5a9 100644
--- a/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch
+++ b/net-analyzer/ntopng/files/ntopng-4.2-parallel-make.patch
@@ -1,15 +1,16 @@
+diff --git a/configure.seed b/configure.seed
+index a321f9b..d27d35d 100644
 --- a/configure.seed
 +++ b/configure.seed
-@@ -526,11 +520,7 @@
+@@ -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"
+-if test x$GMAKE = x; then
+-  GMAKE="make"
 -fi
 +GMAKE='$(MAKE)'
  
  GIT=`which git`
- if test x$GIT = x
+ if test x$GIT = x; then
diff --git a/net-analyzer/ntopng/ntopng-4.0.ebuild b/net-analyzer/ntopng/ntopng-4.0.ebuild
deleted file mode 100644
index 45fcb2be47c3..000000000000
--- a/net-analyzer/ntopng/ntopng-4.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools user 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="
-	>=net-libs/nDPI-3.0:=
-	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/zeromq-3:=
-	net-misc/curl
-	sys-libs/libcap
-	sys-libs/zlib
-"
-RDEPEND="
-	${DEPEND}
-	dev-db/redis
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8-mysqltool.patch
-	"${FILESDIR}"/${PN}-3.8.1-parallel-make.patch
-	"${FILESDIR}"/${PN}-4.0-ndpi-includes.patch
-	"${FILESDIR}"/${PN}-4.0-PKG_CONFIG.patch
-)
-RESTRICT="test"
-
-pkg_setup() {
-	enewuser ntopng
-}
-
-src_prepare() {
-	default
-
-	sed \
-		-e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \
-		-e "s/@SHORT_VERSION@/${PV}/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}"
-	dodir ${SHARE_NTOPNG_DIR}
-	insinto ${SHARE_NTOPNG_DIR}
-	doins -r httpdocs
-	doins -r scripts
-
-	dodir ${SHARE_NTOPNG_DIR}/third-party
-	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-3.8.1-r4.ebuild b/net-analyzer/ntopng/ntopng-4.2.ebuild
index b4562c2a6b21..de038c42e391 100644
--- a/net-analyzer/ntopng/ntopng-3.8.1-r4.ebuild
+++ b/net-analyzer/ntopng/ntopng-4.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools user toolchain-funcs
+
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Network traffic analyzer with web interface"
 HOMEPAGE="https://www.ntop.org/"
@@ -12,9 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="
-	>=net-libs/nDPI-3.0:=
-	dev-db/mysql-connector-c:=
+DEPEND="dev-db/mysql-connector-c:=
 	dev-db/sqlite:3
 	dev-libs/hiredis:=
 	dev-libs/json-c:=
@@ -23,37 +22,35 @@ DEPEND="
 	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}
-	dev-db/redis
-"
-BDEPEND="
-	virtual/pkgconfig
-"
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	acct-user/ntopng
+	acct-group/ntopng
+	dev-db/redis"
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.8-mysqltool.patch
-	"${FILESDIR}"/${PN}-3.8-ndpi-includes.patch
-	"${FILESDIR}"/${PN}-3.8.1-PKG_CONFIG.patch
-	"${FILESDIR}"/${PN}-3.8.1-parallel-make.patch
+	"${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"
 )
-RESTRICT="test"
-
-pkg_setup() {
-	enewuser ntopng
-}
 
 src_prepare() {
 	default
 
+	# Follows upstream's autogen.sh
 	sed \
 		-e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \
 		-e "s/@SHORT_VERSION@/${PV}/g" \
-		< "${S}/configure.seed" \
+		-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
@@ -73,19 +70,17 @@ src_compile() {
 
 src_install() {
 	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
-	dodir ${SHARE_NTOPNG_DIR}
-	insinto ${SHARE_NTOPNG_DIR}
+	insinto "${SHARE_NTOPNG_DIR}"
 	doins -r httpdocs
 	doins -r scripts
 
-	dodir ${SHARE_NTOPNG_DIR}/third-party
-	insinto ${SHARE_NTOPNG_DIR}/third-party
+	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
+	doexe "${PN}"
+	doman "${PN}.8"
 
 	newinitd "${FILESDIR}"/ntopng.init.d ntopng
 	newconfd "${FILESDIR}"/ntopng.conf.d ntopng