[gentoo-commits] repo/gentoo:master commit in: net-libs/nDPI/, net-libs/nDPI/files/

["Slawek Lis" <slis@gentoo.org>]

commit:     eadd42e7a118ce41c2a3fab5b57e1418ee5e7e55
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 20 05:38:25 2019 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 05:38:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eadd42e7

net-libs/nDPI: version bump to 2.8

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Slawek Lis <slis <AT> gentoo.org>

 net-libs/nDPI/Manifest                             |  1 +
 .../nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch     | 11 +++++++
 net-libs/nDPI/files/nDPI-2.8-relative-sym.patch    | 12 +++++++
 net-libs/nDPI/nDPI-2.8.ebuild                      | 37 ++++++++++++++++++++++
 4 files changed, 61 insertions(+)

diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 4664a599cc3..bcb2f018990 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,2 +1,3 @@
 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

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 00000000000..2604b8c34d8
--- /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 00000000000..b889d0546ba
--- /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 00000000000..1412a46256d
--- /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
+}