gentoo auto-resync : 03:02:2023 - 21:11:18

3 files changed, 66 insertions, 6 deletions

diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 1822be569cc1..3dd2b2c950fd 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,6 +1,8 @@
 DIST nDPI-4.2.tar.gz 126559327 BLAKE2B 079267939083e788ce8b13e89b194504031e4c3e628df335ece7aab72cc80b8d8538badd45dac9fdaeeed8cd5dd19a81fece9c1157cba9a91dfa130abef61473 SHA512 c58b228b7de2b5fa111234bb065f9be259cd0282d0058f5985180aab6567c9a18e3453ce9062bd3c057a096ec3dfdc21b7c9680e0148e34af10f707530d853b8
 DIST nDPI-4.4.tar.gz 151062073 BLAKE2B fca968c0d0abcf18a6895dc6066b754925a2aa3cb3f395383f9add25066adf14bb95444a30950e13f7f22223ff203b16e7373c875841f33d8c885be83ed0bb6d SHA512 c5e3d38f7b6533bd4b9f96520c1d965bf0a8e3ec7e2d514bc42683bdb73d8331e28ed695f5d3972ace9e35f1af23359f5a25c0f5a20f7a8cc7a6b5446d592468
+DIST nDPI-4.6.tar.gz 29705235 BLAKE2B 65efdfee7af83093b08897fb726a07cf804a3ff901e7373cdc4b3d4564bbfba6ce9b498ab90172f437568c8275685dc51617e991216e38d515b3b5341760b964 SHA512 12dd50eeaae0aa5c2e3c89cb53cdb9989036759bd900312d3875eaba296646c2e42be31dc2b003cbc2401ccef8fbf8d2e460b9a604d7bece360f17f937d60cad
 EBUILD nDPI-4.2.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
+EBUILD nDPI-4.6.ebuild 1196 BLAKE2B 198fe05fa511a35d30215ddf9a0b0d0322b0dbe7eb306b42c0d245d58ede9f28d05520bf1ac82d916eaa6894323dc00e1072d4c1b17bdc2bf66e12ec05e8e796 SHA512 659e18741e04296c6bb780cecb2568a6ffc99207a4b13e0cf723229fc42e049e558dffa0f4e79d88a74835b6bcff03984f3ba2a7cd627a3e8584d06ea2aca398
+EBUILD nDPI-9999.ebuild 1196 BLAKE2B 198fe05fa511a35d30215ddf9a0b0d0322b0dbe7eb306b42c0d245d58ede9f28d05520bf1ac82d916eaa6894323dc00e1072d4c1b17bdc2bf66e12ec05e8e796 SHA512 659e18741e04296c6bb780cecb2568a6ffc99207a4b13e0cf723229fc42e049e558dffa0f4e79d88a74835b6bcff03984f3ba2a7cd627a3e8584d06ea2aca398
 MISC metadata.xml 293 BLAKE2B 9a139bc75f89728980d35a12c076b25ba8d0f95a6ec0815646588d8f602f2cf6b19c5fbcf6d4eef08b9b7967197e34c7f337b55aa052ccd30ac1cb6d30ef3357 SHA512 32b7db90abc45b9550430d5696f292e16cc467243c289d721b92f1fbec771bbccad095a46de98997fbb16f916f85c801a1139ea90d10d48cb89c2285a7d10d63
diff --git a/net-libs/nDPI/nDPI-4.6.ebuild b/net-libs/nDPI/nDPI-4.6.ebuild
new file mode 100644
index 000000000000..704e7b7703e2
--- /dev/null
+++ b/net-libs/nDPI/nDPI-4.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 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
+
+	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
+
+	# Makefile logic is broken in 4.6, let's wait a bit given history and
+	# go with hack for now.
+	mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/usr/$(get_libdir)/pkgconfig || die
+	mv "${ED}"/usr/usr/* "${ED}"/usr || die
+	rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die
+	rm -rf "${ED}"/usr/usr || die
+}
diff --git a/net-libs/nDPI/nDPI-9999.ebuild b/net-libs/nDPI/nDPI-9999.ebuild
index e2efa26265f9..704e7b7703e2 100644
--- a/net-libs/nDPI/nDPI-9999.ebuild
+++ b/net-libs/nDPI/nDPI-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,10 +27,6 @@ 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
 }
 
@@ -52,5 +48,10 @@ src_test() {
 src_install() {
 	default
 
+	# Makefile logic is broken in 4.6, let's wait a bit given history and
+	# go with hack for now.
+	mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/usr/$(get_libdir)/pkgconfig || die
+	mv "${ED}"/usr/usr/* "${ED}"/usr || die
 	rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die
+	rm -rf "${ED}"/usr/usr || die
 }