From f6312a05dea50a63c3b6db188315c7334b30b15b Mon Sep 17 00:00:00 2001 From: blshkv Date: Wed, 25 Dec 2019 09:27:50 +0800 Subject: [PATCH] nDPI: remove, gentoo adopted it --- net-libs/nDPI/Manifest | 1 - .../files/nDPI-2.8-libcache-include.patch | 32 -------------- net-libs/nDPI/files/nDPI-symlink.patch | 10 ----- net-libs/nDPI/metadata.xml | 10 ----- net-libs/nDPI/nDPI-2.8.ebuild | 42 ------------------- 5 files changed, 95 deletions(-) delete mode 100644 net-libs/nDPI/Manifest delete mode 100644 net-libs/nDPI/files/nDPI-2.8-libcache-include.patch delete mode 100644 net-libs/nDPI/files/nDPI-symlink.patch delete mode 100644 net-libs/nDPI/metadata.xml delete mode 100644 net-libs/nDPI/nDPI-2.8.ebuild diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest deleted file mode 100644 index 9bcf791ef..000000000 --- a/net-libs/nDPI/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nDPI-2.8.tar.gz 19754226 BLAKE2B c112ae2d9fff872f116a23bbffe7bca39a5c876346b4e41ef503934301f39413517fce169a37a766ffae16b0cb1ee81d96573ffa1ee2519d295dfb32cc1f115e SHA512 aae757047810bbc32700ecf7ac2e5df4b93528021a50da4a0b83865a5248dfca8b1643c75aa7eeb6eac4f155638d45666db487318b2be9adb2f3412cb8ec8497 diff --git a/net-libs/nDPI/files/nDPI-2.8-libcache-include.patch b/net-libs/nDPI/files/nDPI-2.8-libcache-include.patch deleted file mode 100644 index 44d78e99f..000000000 --- a/net-libs/nDPI/files/nDPI-2.8-libcache-include.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/src/include/Makefile.am -+++ b/src/include/Makefile.am -@@ -7,4 +7,5 @@ - ndpi_protocol_ids.h \ - ndpi_protocols.h \ - ndpi_win32.h \ -- ndpi_includes.h -+ ndpi_includes.h \ -+ libcache.h ---- a/src/include/ndpi_typedefs.h -+++ b/src/include/ndpi_typedefs.h -@@ -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 ---- a/src/lib/Makefile.am -+++ b/src/lib/Makefile.am -@@ -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/files/nDPI-symlink.patch b/net-libs/nDPI/files/nDPI-symlink.patch deleted file mode 100644 index b7c55240d..000000000 --- a/net-libs/nDPI/files/nDPI-symlink.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lib/Makefile.in.orig 2018-10-08 16:03:43.859000536 -0600 -+++ src/lib/Makefile.in 2018-10-08 16:12:43.250000380 -0600 -@@ -49,6 +49,6 @@ - install: $(NDPI_LIBS) - mkdir -p $(DESTDIR)$(libdir) - cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/ -- ln -Fs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE) - + ln -Fs $(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE) - mkdir -p $(DESTDIR)$(includedir) - cp ../include/*.h $(DESTDIR)$(includedir) diff --git a/net-libs/nDPI/metadata.xml b/net-libs/nDPI/metadata.xml deleted file mode 100644 index 7224cca2b..000000000 --- a/net-libs/nDPI/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - slis@gentoo.org - - - ntop/nDPI - - diff --git a/net-libs/nDPI/nDPI-2.8.ebuild b/net-libs/nDPI/nDPI-2.8.ebuild deleted file mode 100644 index d9ee44902..000000000 --- a/net-libs/nDPI/nDPI-2.8.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# 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="https://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 -e "s/\${prefix}\/lib/\${prefix}\/$(get_libdir)/g" -i src/lib/Makefile.in || die - - sed -e "s|\$(DESTDIR)\$(libdir)\/\$(NDPI_LIB_SHARED)|\$(NDPI_LIB_SHARED)|g" -i src/lib/Makefile.in || die - - sed -e "s/libdata/$(get_libdir)/g" -i Makefile.am || die - - cp "${S}/src/lib/third_party/include/libcache.h" "${S}/src/include" - - - default - eautoreconf -} - -src_install() { - default - if ! use static-libs; then - rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die - fi - prune_libtool_files -}