gentoo resync : 14.12.2020

3 files changed, 2 insertions, 43 deletions

diff --git a/net-libs/libpcapnav/Manifest b/net-libs/libpcapnav/Manifest
index 7e769501692c..7e29210dc33e 100644
--- a/net-libs/libpcapnav/Manifest
+++ b/net-libs/libpcapnav/Manifest
@@ -1,6 +1,5 @@
 AUX libpcapnav-0.8-includes.patch 395 BLAKE2B 6904addab4a42d233780616364a4603bf691133313614d3f3b36a4b736aa1acbe77d07f0f7751e7069fbadc1e1c87bcf6086b1cde574731dabf0a9a4cfe243d9 SHA512 04570a0f0b5c33565e79922e878171bb98640d2961cc9378c64e17a7144636960fe099bcca4c043d8a4532b98fe7960fdfa24af8145df5c8682af4dcc5d9b99c
 AUX libpcapnav-0.8-noinst_test.patch 609 BLAKE2B 191f9d223334160d8c3d904fe2540f44edbc65f83c263e8f90659ab9b92cc42a7f6addf60914d20bc77d13dda9e9cf500fa2bb03876ec8b9989af8682d22c19c SHA512 f3797711b665d0d094e1c814fcca5c761a51628bf0c807a6caa1a76e6cb06f06b74c741c010e05b84f1f39e61672a886519c81ceb2875101c5e28187633a67fe
 DIST libpcapnav-0.8.tar.gz 387476 BLAKE2B f3027f17307a76fe6baad6fc79ce054726def17c834b814a07c628f8420fe481e661d72e72d7b3dde494ca17b2e36abba3a27d02f68924f88c2a89d57fae8b44 SHA512 bc0357d17228c157de5b480532df37a62459882d5a4fb8d2285fe4e86c1dca301e7cc505f2917bb3421d926bed263d93b2c587311431d9c3a5b02f04c93fdf18
-EBUILD libpcapnav-0.8-r1.ebuild 928 BLAKE2B 86c066397db0ee43b8066edba7358dfa30437cde98131ba0868ec842fdd775899f0e3f226c55862b8416b309e7217fa7832f890efd409ad7c14dae874eb4f3df SHA512 5c7004f0afe4dea863509dc060d2bae387f95b1a7c92f394513d9fb4a054e7e9e9514817e6c56bb0b981b71f96eb9fff3b3b99633b7df54dd6b0e21e4d26834d
-EBUILD libpcapnav-0.8.ebuild 815 BLAKE2B 1b7df5b4e754936e84f01d8850a5b70dc8762a26290bb217ffbb319aab02a8c3d359095879308d723dc840dd16d8c79771528dcb97a0c893888fa2bef095ea12 SHA512 f39d670d58f9d0072a35a600f950323d13523b7291fa57d97f534342987483743d7d05152cbc7baf64fef52cc916b17e5bcb5dbcd891bb7f7e3c0ff3b98068c3
+EBUILD libpcapnav-0.8-r1.ebuild 927 BLAKE2B 846f975caa8ce1271a29f9dfa356695be0f06611a84dd8ee529b028174316ae81ee449b11e4b95505fa85dba8951d9da696a6414c14717737de7117fbf7980c2 SHA512 0e4fb9fe4ee1ed22df20ce3e38f5db3015b5ec61bcf0dcc59fe358c655726050ff7a78679fa5fc7f982bcf680eb36b58091813a723b356ffd7722dfb819692d1
 MISC metadata.xml 357 BLAKE2B ddcf544a7ae28909b7fb7810c0a6bb368099397e2bf7d6e68a2475c5d701d7589aacf0a15f76f00f68b623a7b37c46d60a5faa3c92f1ac73eb2d99fa29b48ccc SHA512 9cf449d26b416d995b8371fe2e6aed6964080b8b84bf0ceace749ceebd4ddbcc8b3d7d9c1d8c2a07a4c7cb880492ffc8b34ad31b4602a646e004f3aaf52f3ae8
diff --git a/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild b/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
index a7d6c94bbf77..bfa3f2123330 100644
--- a/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
+++ b/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc x86"
+KEYWORDS="amd64 ~arm ~sparc x86"
 IUSE="doc static-libs"
 
 DEPEND="net-libs/libpcap"
diff --git a/net-libs/libpcapnav/libpcapnav-0.8.ebuild b/net-libs/libpcapnav/libpcapnav-0.8.ebuild
deleted file mode 100644
index 6e3be2c60800..000000000000
--- a/net-libs/libpcapnav/libpcapnav-0.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils ltprune
-
-DESCRIPTION="Libpcap wrapper library to navigate to arbitrary packets in a tcpdump trace file"
-HOMEPAGE="http://netdude.sourceforge.net/"
-SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
-IUSE="doc static-libs"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-includes.patch
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	emake SUBDIRS="src docs"
-}
-
-src_install() {
-	default
-	rm -fr "${D}"/usr/share/gtk-doc
-	use doc && dohtml -r docs/*.css docs/html/*.html docs/images
-	prune_libtool_files
-}