net-libs/nDPI: drop 2.x (QA fixes)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: John Helmert III <jchelmert3@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/18128
Signed-off-by: Sam James <sam@gentoo.org>

7 files changed, 0 insertions, 162 deletions

diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 11430d2ded9a..957317cfcc58 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,6 +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
 DIST nDPI-3.0.tar.gz 26902734 BLAKE2B 79380ce5138b8ba99169ce3a2afeaa2a2bcded9bc7834d32af6911e9cee60395613a390d2d5d0530b9ff9263ad707e78f49d35098428c66a9c95a98aee2d8df8 SHA512 74c4a41201e809b476f4c23b99c2391b7bcbc76507a11261d216caf2350db8fd4ae3dac69d1d2179b12217901da1e04676aeca05d3a8e63d1a162469b33ab4c0
 DIST nDPI-3.2.tar.gz 29586049 BLAKE2B 4ea7f1cf39b5363b724c2db84c006de2f0e05ea275586241c3e1b9a53681f1da83dc752e69d379d6b8c8bcf8b15b146e8a2de127931d3b2061112aef297f7d79 SHA512 bf3a6e66479110b8e1a51a3b66cc0a85aef98af455f2895a75fe2a8b06a9fb72a4dca3d4bbfa6f44959c5043c038927a1a8acb312e881d4e2bb544dc84b6eea8
 DIST nDPI-3.4.tar.gz 37976087 BLAKE2B 49e25586671a91278d90775c3dbc881ce4ca9ae4afd3108b1caff3b0d38251808bcd52ead253f451474195994fbf94658f70241acedb23c35a475df3b15c4a20 SHA512 ed5a22b6ddc14ad707a18a0bd96746c1df489969faaa42016fa9aad8d414fc4ee303b96cac15c3ba86f484a80a0aaa2dd1be5f92be672912e0e0d30da4bdad4c
diff --git a/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch b/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch
deleted file mode 100644
index 44d78e99f327..000000000000
--- a/net-libs/nDPI/files/nDPI-2.2-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-2.8-fix-pkgconfigdir.patch b/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
deleted file mode 100644
index f6f805bbeeb1..000000000000
--- a/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -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
deleted file mode 100644
index 6a0230d65599..000000000000
--- a/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/lib/Makefile.in
-+++ b/src/lib/Makefile.in
-@@ -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.0.ebuild b/net-libs/nDPI/nDPI-2.0.ebuild
deleted file mode 100644
index 4ab5cd458c2a..000000000000
--- a/net-libs/nDPI/nDPI-2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune 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"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="dev-libs/json-c:=
-	net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
-	fi
-	prune_libtool_files
-}
diff --git a/net-libs/nDPI/nDPI-2.2.ebuild b/net-libs/nDPI/nDPI-2.2.ebuild
deleted file mode 100644
index d1934b2381d4..000000000000
--- a/net-libs/nDPI/nDPI-2.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune 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
-
-	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
-}
diff --git a/net-libs/nDPI/nDPI-2.8.ebuild b/net-libs/nDPI/nDPI-2.8.ebuild
deleted file mode 100644
index 1412a46256d6..000000000000
--- a/net-libs/nDPI/nDPI-2.8.ebuild
+++ /dev/null
@@ -1,37 +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="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
-}