gentoo resync : 06.08.2019

4 files changed, 64 insertions, 0 deletions

diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 326c5df432b2..6e751942ae76 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,6 +1,10 @@
 AUX nDPI-2.2-libcache-include.patch 819 BLAKE2B 5a0698bc19917ebfd737e886937d023e83452bfdd812010e2b2622461ca8eb6758533ecf5c1b01495eab21de72fd7f0608dd826d864336446f893d083b68ed55 SHA512 854b65c5dbdb19bd73040ed12740c945e0f31e50c51a0ebd32c646177043e28eee79e572747fe23580f7c2cca7cf59a22655f084e111bec3e146a4d4b6d941cc
+AUX nDPI-2.8-fix-pkgconfigdir.patch 321 BLAKE2B 1098b213f60fefb46c264f4092e6ac31aa3f227cdc0fc50ee6e2f5a06d1a5fb48735b0d1daeac662ade0ccfd4032837f26f4c3e6805a6cbabcff4f0f0083838f SHA512 e85fedae14902bf11e5520932d0455d517d8ce09821c72ea23afd124a490f072c8b92b0ceb73adc14a35037c3f16a04d99d691e3130d751edb55c5c13d117e68
+AUX nDPI-2.8-relative-sym.patch 691 BLAKE2B 257ee665e40fba3f6a697be8a2a3b7b9954b2b17b6117d4262c448f6bfed7e1043c09c848e8b2ae4ef8e036bceca6e4e617b12d509f34769be1b7dc150e22650 SHA512 3a415dca74bf6a9c1679d48fa469cd035aaf252d22568ff587ac8e5124b765f37795b7d806e6379905bca903e5593058c309c708c40070f45a510efa7538ca16
 DIST nDPI-2.0.tar.gz 19280901 BLAKE2B d08bd807b556394b708713061ef23025be296b3c847c90680170b2d39f23f05fac35a1ced091925383f57c0d0be6e5f0c7ad239168c76caa7b9a46847413e860 SHA512 c8dac1990ff49fc04ee321068d8fc722528c6be0543af2d0bda77936eff12713c36d5abd3fd2472121f2e322e99ba8e57facca813f7b012240c61e16c1a6cd44
 DIST nDPI-2.2.tar.gz 19937173 BLAKE2B a00287d5901487f7e56d7aeab7dcb357c0eb6348be5621952d9f357058419b6378d41b42d0d6e9ea6e20680cfda96fa501f2ebaae5c83dd4e62f756d1089a160 SHA512 ee1e0a1cc87a3971408877bd5d3154f6bd5d4ddcd2437c8e03e5d8a5093da2b1cbfefad1e28e77145af4286eecbd341ef90f94aa5c7f36a98e3625e9948e96d6
+DIST nDPI-2.8.tar.gz 19754226 BLAKE2B c112ae2d9fff872f116a23bbffe7bca39a5c876346b4e41ef503934301f39413517fce169a37a766ffae16b0cb1ee81d96573ffa1ee2519d295dfb32cc1f115e SHA512 aae757047810bbc32700ecf7ac2e5df4b93528021a50da4a0b83865a5248dfca8b1643c75aa7eeb6eac4f155638d45666db487318b2be9adb2f3412cb8ec8497
 EBUILD nDPI-2.0.ebuild 628 BLAKE2B 22d7c6797b085bd92a24e8fe85c4509c832857d10f6158a54ba2e9dfe0a0d8d3d3731def8fe3df7363d4e7b6191977f15b24a4a9010eeac1462bc9c9f8f866d9 SHA512 af0f66872a28048b36a994727c756e365a611e875976568698160ee59f1c0e6dc9401e743c1197e7dbe51e083611ac0557f18d02dde2282a769054311a49e3dc
 EBUILD nDPI-2.2.ebuild 1005 BLAKE2B 21c2bf8c4ecca6458b8023b2fd530193c2986cf6777db3d981a50b80cf22b002c3d041e70f092c917bfd4570b3bd2679a746f7f7d07c09ca406f1d9c905555c5 SHA512 97821a39be0ae0a1a58d8c9b275a674a1a2fba937588191292cfa7d8b281b3a755259e10845750ef22860d57b2d66016d56b1c680ef4741b72224ed83825227d
+EBUILD nDPI-2.8.ebuild 1073 BLAKE2B 62465dfb22f70d24ba4947d7005ffebe89b930336c7ba1dd651649840b39245cd470e72c16c5ca46393bc28120d52315a0685249e7a2aa7f04ded86798b69e62 SHA512 dcf8abb346221acf640f858165a5049522c20ce7919466e733f34839c943b487e9beba309e73f7ee1b7a89ffa3b95115e4c7eb51f48cb42e4c7b5430017ccbe9
 MISC metadata.xml 297 BLAKE2B 2e455c6a6ad027d81612f6f4ec28e25389848def5c8f8ad836ddb920f6b3dfb83a8038c2114194ea7cf79fb63b9ce720f946e02776b0915a41e7eaba0ae4026d SHA512 5f765ad3cc06c790fb16873bc7a759ebb0a432cde847b4e7b8e9dc0f2049441c44d90d54caf007e11deaeca4282ba213f927951060a0ec62bb1836a9cb94e22a
diff --git a/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch b/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
new file mode 100644
index 000000000000..2604b8c34d8c
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2018-10-08 19:04:23.241000607 -0600
++++ Makefile.am	2018-10-08 19:04:46.710000661 -0600
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = src/lib example tests
+ 
+-pkgconfigdir = $(prefix)/libdata/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libndpi.pc
+ 
+ EXTRA_DIST = autogen.sh
diff --git a/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch b/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch
new file mode 100644
index 000000000000..b889d0546ba4
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch
@@ -0,0 +1,12 @@
+--- src/lib/Makefile.in.orig	2019-08-20 07:34:29.667187396 +0200
++++ src/lib/Makefile.in	2019-08-20 07:34:40.202187657 +0200
+@@ -61,7 +61,7 @@
+ install: $(NDPI_LIBS)
+ 	mkdir -p $(DESTDIR)$(libdir)
+ 	cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/
+-	ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE)
+-	ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
++	ln -Ffs $(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE)
++	ln -Ffs $(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
+ 	mkdir -p $(DESTDIR)$(includedir)
+ 	cp ../include/*.h $(DESTDIR)$(includedir)
diff --git a/net-libs/nDPI/nDPI-2.8.ebuild b/net-libs/nDPI/nDPI-2.8.ebuild
new file mode 100644
index 000000000000..1412a46256d6
--- /dev/null
+++ b/net-libs/nDPI/nDPI-2.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+
+	sed -i "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" src/lib/Makefile.in || die
+
+	epatch "${FILESDIR}/${P}-fix-pkgconfigdir.patch"
+	epatch "${FILESDIR}/${P}-relative-sym.patch"
+
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+	fi
+}