gentoo resync : 25.01.2018

3 files changed, 71 insertions, 0 deletions

diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 910d5a60479e..62cd6ae6d1bc 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,3 +1,6 @@
+AUX nDPI-2.2-libcache-include.patch 1038 BLAKE2B 654e66477b6fa32589d57dde8ba44baab2defaf2a001cc82eb46486fe62d840b25f5480c1512c0f4947162cca767530794eb2a6e74ef6edb02a0712d44603b8c SHA512 b93a74066e94ba767973cf1f2ca7dd8776459d8fe9eb352185ded766bbabcc6a28fb57f5acaca1e7660be0778c3298e22e5066969c6298c6782925c077e2ff35
 DIST nDPI-2.0.tar.gz 19280901 BLAKE2B d08bd807b556394b708713061ef23025be296b3c847c90680170b2d39f23f05fac35a1ced091925383f57c0d0be6e5f0c7ad239168c76caa7b9a46847413e860 SHA512 c8dac1990ff49fc04ee321068d8fc722528c6be0543af2d0bda77936eff12713c36d5abd3fd2472121f2e322e99ba8e57facca813f7b012240c61e16c1a6cd44
+DIST nDPI-2.2.tar.gz 19937173 BLAKE2B a00287d5901487f7e56d7aeab7dcb357c0eb6348be5621952d9f357058419b6378d41b42d0d6e9ea6e20680cfda96fa501f2ebaae5c83dd4e62f756d1089a160 SHA512 ee1e0a1cc87a3971408877bd5d3154f6bd5d4ddcd2437c8e03e5d8a5093da2b1cbfefad1e28e77145af4286eecbd341ef90f94aa5c7f36a98e3625e9948e96d6
 EBUILD nDPI-2.0.ebuild 630 BLAKE2B eea945c7fdb4c68e7dc87fd754dc58d6816470b4872639c2ac867978d8e1507c1b9f49f6f07adcc24a87a6343fc09b8af0c917f12b5951893fffbddfe1886493 SHA512 269357550fde0644e13e2597ad9af379c2eb11525d00579bda9a8d67442ec233eaf8b501686c81069f9e1fffa41bf85133d9b94ca8eef0da11566b31238b6fb8
+EBUILD nDPI-2.2.ebuild 1007 BLAKE2B 1af51273f98e60a3b00dae950f500b7cb709bba212efc12e8722afe17a9e0ad7eed4b2cb22b0def165a6fc2e758d20f864cba5bcaecc1c51ae45fc82f7cf6e2e SHA512 acfe331941841949ea601f23a8ac8269a7d19474ba6ed5d7f61289075ca8b8c08534abd8e502b8d5da74ab0110cf3bb22fcf7ffe7f32ce9da92e05d4ff73fb31
 MISC metadata.xml 297 BLAKE2B 2e455c6a6ad027d81612f6f4ec28e25389848def5c8f8ad836ddb920f6b3dfb83a8038c2114194ea7cf79fb63b9ce720f946e02776b0915a41e7eaba0ae4026d SHA512 5f765ad3cc06c790fb16873bc7a759ebb0a432cde847b4e7b8e9dc0f2049441c44d90d54caf007e11deaeca4282ba213f927951060a0ec62bb1836a9cb94e22a
diff --git a/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch b/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch
new file mode 100644
index 000000000000..5ee089f46bf3
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch
@@ -0,0 +1,32 @@
+--- src/include/Makefile.am.orig	2018-01-22 21:24:17.802100061 +0100
++++ src/include/Makefile.am	2018-01-22 21:24:30.080100801 +0100
+@@ -7,4 +7,5 @@
+ 		ndpi_protocol_ids.h \
+ 		ndpi_protocols.h \
+ 		ndpi_win32.h \
+-		ndpi_includes.h
++		ndpi_includes.h \
++		libcache.h
+--- src/include/ndpi_typedefs.h.orig	2018-01-22 21:27:35.994112009 +0100
++++ src/include/ndpi_typedefs.h	2018-01-22 21:27:47.463112701 +0100
+@@ -25,7 +25,7 @@
+ #define __NDPI_TYPEDEFS_H__
+ 
+ #include "ndpi_define.h"
+-#include "../lib/third_party/include/libcache.h"
++#include "libcache.h"
+ 
+ #define BT_ANNOUNCE
+ #define SNAP_EXT
+--- src/lib/Makefile.am.orig	2018-01-22 21:34:57.055138600 +0100
++++ src/lib/Makefile.am	2018-01-22 21:35:10.431139406 +0100
+@@ -12,7 +12,8 @@
+ 			     ../include/ndpi_includes.h \
+ 			     ../include/ndpi_protocol_ids.h \
+ 			     ../include/ndpi_protocols.h \
+-			     ../include/ndpi_typedefs.h
++			     ../include/ndpi_typedefs.h \
++			     ../include/libcache.h
+ 
+ libndpi_la_SOURCES = ndpi_content_match.c.inc \
+ 		     ndpi_main.c \
diff --git a/net-libs/nDPI/nDPI-2.2.ebuild b/net-libs/nDPI/nDPI-2.2.ebuild
new file mode 100644
index 000000000000..6c0160ff6cd8
--- /dev/null
+++ b/net-libs/nDPI/nDPI-2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils multilib versionator
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="http://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"
+IUSE="static-libs"
+
+DEPEND="dev-libs/json-c:=
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e "s/@NDPI_MAJOR@/$(get_version_component_range 1)/g;s/@NDPI_MINOR@/$(get_version_component_range 2)/g;s/@NDPI_PATCH@/$(get_version_component_range 3)/g;s/@NDPI_VERSION_SHORT@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die
+
+	mv "${S}/src/lib/third_party/include/libcache.h" "${S}/src/include"
+	epatch "${FILESDIR}/${P}-libcache-include.patch"
+
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+	fi
+	prune_libtool_files
+}