gentoo resync : 28.11.2020

3 files changed, 2 insertions, 33 deletions

diff --git a/net-analyzer/xprobe/Manifest b/net-analyzer/xprobe/Manifest
index a71544fe392e..0bb2975a200a 100644
--- a/net-analyzer/xprobe/Manifest
+++ b/net-analyzer/xprobe/Manifest
@@ -1,6 +1,5 @@
 AUX xprobe-0.3-cxx11.patch 251 BLAKE2B 568fed378da0f4943a328a8f662cf8d02e489a78ff77815b3a73618b7f15ac1a67d71784a8c67d8af54eeb33c51b01b86b8c032862654c6e9e51b1d6ac13f1dd SHA512 f4b6cf1048b9868d4119b063babbf91caa7b98f9ad8a511e4652c053be2d9692b03c62c3be3ea10831d55ddfb5b5f989c029237ce8d7a48da3c05ce9fd96c429
 AUX xprobe-0.3-gcc43.patch 655 BLAKE2B 83831f0420e69a4d673eef69a5f81b63b81ad3897078f60ff761064e31552dafc16b35f93cf83c75027bfdf8485f201c4fef1339b89cc73c5dad51e27f1bf229 SHA512 7ab58b18fe7593f2389d72cc5d9160a65500866f44045c219e8a4fc6d860e34080a50d9e295d38d801c8af3d1b0ceab4f98fec296aa2eb49415561bbe9903950
 DIST xprobe2-0.3.tar.gz 533636 BLAKE2B 1f106a3c08bfc6e205731a2e8c64f7e9f2e52caba38374ab7980fcae95113b6790297a59f5d4d6ad8e09d2145b68801403472b07690ff27b42dec8c6b7d97895 SHA512 fd499ada22be5df3e01630948cb72d1a9e648e0c7bfaf2a688386a61c67bb36a326a9e2f3f2b9960a6a49128343010aafe8a3f04ec05e89420a1384215e41f21
-EBUILD xprobe-0.3-r1.ebuild 772 BLAKE2B f9cdbc797c16e28bc00eeeb75234c2825355ca20ca195f4845502f6ae244fc3e2f13e77c6618bf0b2745e9e74b74a794889c48d5ae473279d6b142967d442a7d SHA512 3282fcd2a43cd919f55db23b3d9138ce3de754136d51401a98020224eb29f39b6dd9d1c788191490e8401ab1215094353d467d5a67b1c0354bfc83b33f88f7d4
-EBUILD xprobe-0.3.ebuild 639 BLAKE2B 2ca5d9b885a23429eb2c75ab66ec4f02b9fbe909d280ee5defa9e2664ed9a2d8af32449e4dcd8fc3031e6eb721591d2e74af04c4bf034e29f3dac5ee2489fd82 SHA512 54f5df5388d324e453bf444d9aab21b982bd5c251487ec8782fa8bd1be652641e7ca76fee940de9fa25242a99fee7775cbafc3ca8e1361074ff25c80a0f051c7
+EBUILD xprobe-0.3-r1.ebuild 771 BLAKE2B 26cb564e6153eb06d22359f0a708ffe91b83dc5458c1f6cbc22020b27bbc2ffb7001df4bfef1b5fd8c1bd67cd874071ca6e4d6c44cc0761f0b10966db4637c01 SHA512 822cacdda125bb2833724488dc878c3cce6a28e5b98e80d23f39be6816ce6adfbe2f3317e00a607155247df8a97ee12dc465cc169df4bd5e05d904a7ecd84e49
 MISC metadata.xml 678 BLAKE2B 8d60a009a757bfb8b9557311e759747cd8c70b0520b06c276f31a90b5897a35720b5ed4ba3a284148efc4abdf73c3996c1b63f6ddf4d0a6e5a305604be9717e2 SHA512 54ad9e288eabc0a3b230504a94310fb9477f392ab7138c7d7f6ff252abbfe0e9e0733b29ab757a39729e916cfde43cbf591a7e4fc099be2bc8bcec44b945cd36
diff --git a/net-analyzer/xprobe/xprobe-0.3-r1.ebuild b/net-analyzer/xprobe/xprobe-0.3-r1.ebuild
index 209b65fecc78..db0208e8db4a 100644
--- a/net-analyzer/xprobe/xprobe-0.3-r1.ebuild
+++ b/net-analyzer/xprobe/xprobe-0.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}"
diff --git a/net-analyzer/xprobe/xprobe-0.3.ebuild b/net-analyzer/xprobe/xprobe-0.3.ebuild
deleted file mode 100644
index fd60ee96cc6d..000000000000
--- a/net-analyzer/xprobe/xprobe-0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P=${PN}2-${PV}
-
-DESCRIPTION="Active OS fingerprinting tool - this is Xprobe2"
-HOMEPAGE="http://sys-security.com/blog/xprobe2"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	sed -i -e 's:strip:true:' src/Makefile.in || die
-}
-
-src_install() {
-	default
-	dodoc AUTHORS CHANGELOG CREDITS README TODO docs/*.{txt,pdf}
-}