gentoo resync : 09.07.2022

3 files changed, 68 insertions, 4 deletions

diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index e1fd96ce8d69..2d284eeef928 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -4,8 +4,10 @@ DIST nDPI-3.4.tar.gz 37976087 BLAKE2B 49e25586671a91278d90775c3dbc881ce4ca9ae4af
 DIST nDPI-4.0-patches.tar.bz2 8744 BLAKE2B 48bfb2cf240823b64ab15a3f8a21acece878102ebb4cc807648b264ef091107a05d66fc672cccd1bc721ad3ea0edde786a1f133dfc84c91422604a9929e327ed SHA512 99a780c18c048ceec29c42828c420fe3f9624906eaef70f92af6abdbf7bc29133e048d7f8de85d8b73aa6667066e7ab5843fa293221d5ec8bbe87803dde83db6
 DIST nDPI-4.0.tar.gz 120053617 BLAKE2B ea0f333bd62622c1ab792137f9bbf2e35cb3790aae191c5caeaea36c7ce376bfa84633e99e321c16bcfbe5812d6674b825bdc4197297cee76064ed88f344a577 SHA512 2526041bc02a210e65bad31323a66167d79a37d14697cf4459054cc54715e53f9673b0000cefa6b452bbe3b3e6c25f0bafcf59d24323d210e2ce6782d9153f81
 DIST nDPI-4.2.tar.gz 126559327 BLAKE2B 079267939083e788ce8b13e89b194504031e4c3e628df335ece7aab72cc80b8d8538badd45dac9fdaeeed8cd5dd19a81fece9c1157cba9a91dfa130abef61473 SHA512 c58b228b7de2b5fa111234bb065f9be259cd0282d0058f5985180aab6567c9a18e3453ce9062bd3c057a096ec3dfdc21b7c9680e0148e34af10f707530d853b8
+DIST nDPI-4.4.tar.gz 151062073 BLAKE2B fca968c0d0abcf18a6895dc6066b754925a2aa3cb3f395383f9add25066adf14bb95444a30950e13f7f22223ff203b16e7373c875841f33d8c885be83ed0bb6d SHA512 c5e3d38f7b6533bd4b9f96520c1d965bf0a8e3ec7e2d514bc42683bdb73d8331e28ed695f5d3972ace9e35f1af23359f5a25c0f5a20f7a8cc7a6b5446d592468
 EBUILD nDPI-3.4.ebuild 1542 BLAKE2B c33be0c27e0521e4b75b10a0fd49b8f208120fff45653c9f9da4f8320c7d31b25df5374e33fb8517551bdda081029eb14e5db2278fdaa1c6ab28ed45e13ce9de SHA512 e3825dab00f2e399df07f6753f2e53900d5caaf9f41da325f30ee4c2ed7669f08278b2b96e12c06fad6057eae4587c909de3222b50982f63afb26cec7e206e11
 EBUILD nDPI-4.0-r1.ebuild 1425 BLAKE2B 5085e685f10038dad0b6f22f4e03cb933725f2dcdec5e011065ad1ad21413ef11fed9b82b2e6ff9d5ab142c9d15f6e9a558579c2503d7b21dab4459e9bebae4e SHA512 6eb175d07df79f2750721f3d4c5880bbdb6aa6106e052c4b5ecea2192a034e95c9f18543f36171992e67536bd0c482246eb12fd1e72c50c48f38b3e2a1e5d82f
 EBUILD nDPI-4.2.ebuild 952 BLAKE2B 3f03833a58e9c44b22f52a07375747a7a7074f1e1a653c4f5f03fdbf27378b1cafc6863cb319493d278c2f2f0b7b8109fb8c5920fedd7f2b11579d7c12f0228e SHA512 dde8f9eaf6db619331209f0e66a60a265c9f5c4967e80011b88d19337cdfc8191188d355aed081c7fa5e3198a75df7e482b3d2721ba3db78ed8eee45ade70b82
-EBUILD nDPI-9999.ebuild 952 BLAKE2B 3f03833a58e9c44b22f52a07375747a7a7074f1e1a653c4f5f03fdbf27378b1cafc6863cb319493d278c2f2f0b7b8109fb8c5920fedd7f2b11579d7c12f0228e SHA512 dde8f9eaf6db619331209f0e66a60a265c9f5c4967e80011b88d19337cdfc8191188d355aed081c7fa5e3198a75df7e482b3d2721ba3db78ed8eee45ade70b82
+EBUILD nDPI-4.4.ebuild 1064 BLAKE2B 7213d3f78b517c244e17c9e65c41a9778972e3bf357118a2fcf9fbd7b4578499eda79bd51e96849d939246cba20f7e67ce6b535db67707a7885d8f34e61a5435 SHA512 de52ec43dafc2ae6d6882d32167ac26b903397a022287ebf0e7acd685079596707492303df8977f325c44e95f458706ac4b2867eda53b364ad53d8c5b314cf33
+EBUILD nDPI-9999.ebuild 1064 BLAKE2B 7213d3f78b517c244e17c9e65c41a9778972e3bf357118a2fcf9fbd7b4578499eda79bd51e96849d939246cba20f7e67ce6b535db67707a7885d8f34e61a5435 SHA512 de52ec43dafc2ae6d6882d32167ac26b903397a022287ebf0e7acd685079596707492303df8977f325c44e95f458706ac4b2867eda53b364ad53d8c5b314cf33
 MISC metadata.xml 293 BLAKE2B 9a139bc75f89728980d35a12c076b25ba8d0f95a6ec0815646588d8f602f2cf6b19c5fbcf6d4eef08b9b7967197e34c7f337b55aa052ccd30ac1cb6d30ef3357 SHA512 32b7db90abc45b9550430d5696f292e16cc467243c289d721b92f1fbec771bbccad095a46de98997fbb16f916f85c801a1139ea90d10d48cb89c2285a7d10d63
diff --git a/net-libs/nDPI/nDPI-4.4.ebuild b/net-libs/nDPI/nDPI-4.4.ebuild
new file mode 100644
index 000000000000..e2efa26265f9
--- /dev/null
+++ b/net-libs/nDPI/nDPI-4.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edo
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ntop/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0/$(ver_cut 1)"
+
+DEPEND="dev-libs/json-c:=
+	dev-libs/libgcrypt:=
+	dev-libs/libgpg-error
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
+		src/lib/Makefile.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# "local" here means "local to the system", and hence means
+	# system copy, not the bundled one.
+	econf --with-local-libgcrypt
+}
+
+src_test() {
+	pushd tests || die
+
+	edo ./do.sh
+	edo ./do-unit.sh
+
+	popd || die
+}
+
+src_install() {
+	default
+
+	rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die
+}
diff --git a/net-libs/nDPI/nDPI-9999.ebuild b/net-libs/nDPI/nDPI-9999.ebuild
index a7730e61c252..e2efa26265f9 100644
--- a/net-libs/nDPI/nDPI-9999.ebuild
+++ b/net-libs/nDPI/nDPI-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools
+inherit autotools edo
 
 DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
 HOMEPAGE="https://www.ntop.org/"
@@ -34,11 +34,17 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	# "local" here means "local to the system", and hence means
+	# system copy, not the bundled one.
+	econf --with-local-libgcrypt
+}
+
 src_test() {
 	pushd tests || die
 
-	./do.sh || die "Failed tests"
-	./do-unit.sh || die "Failed unit tests"
+	edo ./do.sh
+	edo ./do-unit.sh
 
 	popd || die
 }