gentoo Easter resync : 12.04.2020

3 files changed, 117 insertions, 0 deletions

diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 0fa1a9dadd60..317b96dc2ad0 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -5,9 +5,12 @@ DIST nDPI-2.0.tar.gz 19280901 BLAKE2B d08bd807b556394b708713061ef23025be296b3c84
 DIST nDPI-2.2.tar.gz 19937173 BLAKE2B a00287d5901487f7e56d7aeab7dcb357c0eb6348be5621952d9f357058419b6378d41b42d0d6e9ea6e20680cfda96fa501f2ebaae5c83dd4e62f756d1089a160 SHA512 ee1e0a1cc87a3971408877bd5d3154f6bd5d4ddcd2437c8e03e5d8a5093da2b1cbfefad1e28e77145af4286eecbd341ef90f94aa5c7f36a98e3625e9948e96d6
 DIST nDPI-2.8.tar.gz 19754226 BLAKE2B c112ae2d9fff872f116a23bbffe7bca39a5c876346b4e41ef503934301f39413517fce169a37a766ffae16b0cb1ee81d96573ffa1ee2519d295dfb32cc1f115e SHA512 aae757047810bbc32700ecf7ac2e5df4b93528021a50da4a0b83865a5248dfca8b1643c75aa7eeb6eac4f155638d45666db487318b2be9adb2f3412cb8ec8497
 DIST nDPI-3.0.tar.gz 26902734 BLAKE2B 79380ce5138b8ba99169ce3a2afeaa2a2bcded9bc7834d32af6911e9cee60395613a390d2d5d0530b9ff9263ad707e78f49d35098428c66a9c95a98aee2d8df8 SHA512 74c4a41201e809b476f4c23b99c2391b7bcbc76507a11261d216caf2350db8fd4ae3dac69d1d2179b12217901da1e04676aeca05d3a8e63d1a162469b33ab4c0
+DIST nDPI-3.2.tar.gz 29586049 BLAKE2B 4ea7f1cf39b5363b724c2db84c006de2f0e05ea275586241c3e1b9a53681f1da83dc752e69d379d6b8c8bcf8b15b146e8a2de127931d3b2061112aef297f7d79 SHA512 bf3a6e66479110b8e1a51a3b66cc0a85aef98af455f2895a75fe2a8b06a9fb72a4dca3d4bbfa6f44959c5043c038927a1a8acb312e881d4e2bb544dc84b6eea8
 EBUILD nDPI-2.0.ebuild 636 BLAKE2B 0fe243e30b94361eba3ede095dd9fb811a71067ce3a46e00ea437daece431e42a3f72665e918c497254bd99f092aca381bb6f870180a30a8008e5c22eed1099f SHA512 8b4c2650841a748683fb4ee4bee41c999a9c0cd60c92cf0160577f5f1d8fbede979e5e02f0e3c60f78c010661826993c804a9e07a23fd6042baee89ed259683e
 EBUILD nDPI-2.2.ebuild 1013 BLAKE2B 4e5423411ded7c631b27615da56f8b1cd55ad0f66847f78aaf26348de286e0ab9436f9369ad1f5a1a0b24edca6dab921cdfb88bbde3d9078add58ff251109bf7 SHA512 ba79f9c582c89d86bc26998958de455f0ebdc30a96bb5bea46e6f24c099288a0e6485b53bee801bf4d5c7430700cfbfd54791c722dd70851af87a81bbb786ab3
 EBUILD nDPI-2.8.ebuild 1073 BLAKE2B 62465dfb22f70d24ba4947d7005ffebe89b930336c7ba1dd651649840b39245cd470e72c16c5ca46393bc28120d52315a0685249e7a2aa7f04ded86798b69e62 SHA512 dcf8abb346221acf640f858165a5049522c20ce7919466e733f34839c943b487e9beba309e73f7ee1b7a89ffa3b95115e4c7eb51f48cb42e4c7b5430017ccbe9
 EBUILD nDPI-3.0-r1.ebuild 966 BLAKE2B c0b61a5243af862d1373a734ba8f0ffe8f95c40bb0ffac40dc72b1bca0a704eece2893d4c8d876744ee298a05243b21490f89218d9c493f7cdcd4ae4c3da2527 SHA512 8f0e6004fea392c1573477976b83de81e2bb3467bbcf4ffa18817f79c5b1cca00a6c35fbeccc753e41edbf7a8d15d1dd74bd68bd2af9d4726265c60bf8a3ebbe
 EBUILD nDPI-3.0-r2.ebuild 1176 BLAKE2B 57e01bdf62c55c2c69f1bd64599a1838eb050371ac0f18e5beca7d453840e1abee0aea3cce222ce044fb7f9a084e5030459164eac680af892b897fdc8f1c1d10 SHA512 c82c47552699b3feaff9e2007fa357c0eded3175b28fa5817d64c35283fed2e9ed7499a5ac0944664243a859fcee4e41db0d1382eb8c0cd52bafec3388702724
+EBUILD nDPI-3.2.ebuild 1340 BLAKE2B 4d4829ebbb8a0bc90e05a78969c5a96e924bea9602b4d885df3033c4838f4b768da28b299fca715b54dc735f29fceb547f72669252a2532e287e5e924f8fc873 SHA512 cfa71e603ad0cf9275ada9c9c477280e694195e511204fa0a04437e295ad178a45c4fee3d71fdc24585c00e848caa6ded5b759c1edbbac0c02bc99ac5eba4ed1
+EBUILD nDPI-9999.ebuild 1293 BLAKE2B d69406384a02ff5fa67aabcf6d97183b362b4fcf7bfb06fa4ba95e53469007305e197459e9250b4be800a89506a3542df3abf07ab60aef3d9aab93bcca5daa0d SHA512 6def195805ee8aff6339bb0a38a098048a95391b6aeed6319946d550e79aac36251d23d4401854b043e7f46003490d15736b67b1c3af044ffcc11b939bc38ff3
 MISC metadata.xml 292 BLAKE2B 387a2816be3615c7a1430ca3888546eecd1b5c679805b87cf7975cf7d4b59a224c8edea34ca354b8bf4d793457531f6388816cdf86641fcc3f6df89432848b46 SHA512 488fc61860f278d9f7be4a6cd246eb45bac7efafe57e777f1c46984a07f132a76dcca6170b4876edea4d720f4696549b85989ae012749a00d234a0137b98ec6f
diff --git a/net-libs/nDPI/nDPI-3.2.ebuild b/net-libs/nDPI/nDPI-3.2.ebuild
new file mode 100644
index 000000000000..012aff2f4458
--- /dev/null
+++ b/net-libs/nDPI/nDPI-3.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	dev-libs/json-c:=
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_prepare() {
+	eval $(grep '^NDPI_MAJOR=' autogen.sh)
+	eval $(grep '^NDPI_MINOR=' autogen.sh)
+	eval $(grep '^NDPI_PATCH=' autogen.sh)
+	NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}"
+
+	sed \
+		-e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \
+		-e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \
+		-e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \
+		-e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \
+		< "${S}/configure.seed" \
+		> "${S}/configure.ac" || die
+
+	sed -i \
+		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
+		src/lib/Makefile.in || die
+
+	default
+	eautoreconf
+
+	# Taken from autogen.sh (bug #704074):
+	sed -i \
+		-e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
+		-e "s/#define VERSION/#define NDPI_VERSION/g" \
+		configure || die
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+	fi
+}
diff --git a/net-libs/nDPI/nDPI-9999.ebuild b/net-libs/nDPI/nDPI-9999.ebuild
new file mode 100644
index 000000000000..6e8aa6700933
--- /dev/null
+++ b/net-libs/nDPI/nDPI-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3 multilib
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+EGIT_REPO_URI="https://github.com/ntop/${PN}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="static-libs"
+
+DEPEND="
+	dev-libs/json-c:=
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_prepare() {
+	eval $(grep '^NDPI_MAJOR=' autogen.sh)
+	eval $(grep '^NDPI_MINOR=' autogen.sh)
+	eval $(grep '^NDPI_PATCH=' autogen.sh)
+	NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}"
+
+	sed \
+		-e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \
+		-e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \
+		-e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \
+		-e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \
+		< "${S}/configure.seed" \
+		> "${S}/configure.ac" || die
+
+	sed -i \
+		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
+		src/lib/Makefile.in || die
+
+	default
+	eautoreconf
+
+	# Taken from autogen.sh (bug #704074):
+	sed -i \
+		-e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
+		-e "s/#define VERSION/#define NDPI_VERSION/g" \
+		configure || die
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+	fi
+}