gentoo resync : 28.11.2020

3 files changed, 2 insertions, 38 deletions

diff --git a/net-analyzer/siphon/Manifest b/net-analyzer/siphon/Manifest
index 6323d93aea48..8a89134e4d28 100644
--- a/net-analyzer/siphon/Manifest
+++ b/net-analyzer/siphon/Manifest
@@ -2,6 +2,5 @@ AUX siphon-666-fno-common.patch 363 BLAKE2B 7c81ccf4a524693fc567b5d36938b5b6047f
 AUX siphon-666-gentoo.patch 441 BLAKE2B 048df4192f94c80047c95154a8404dee991993219f59123b4c96822e108094ee52299607988ea1311e25e2dd96843c92c03d92e1ab2ce18fc3a58539352d9807 SHA512 66fa0bc1deaa44bdda3d456e79bfacbe5a620365f5cecdb6d18da127d62b3111770a097c6b63e8d83efeb206f3f6577953028dbe49090ffc22e597bc2bf5d4c5
 AUX siphon-666-log.patch 1177 BLAKE2B 7f4e7c9428143558a5ba362526c882f59fac61c4ac4868b3577f9a500aa9ee17c3c1c7d12212dd089c669af1854ecf93c278871cd6f9e5ee9bd8c2124d989251 SHA512 3f82b38442b29083b95475fe26327d2da852dfed172182903adb7cb1dbf9045158462f70239500301d3c1f88005fb6308cddbd8ff48dc885dbc3dcbf355ba4ce
 DIST siphon-v.666.tar.gz 6951 BLAKE2B 8a37897aa52a73819a92422384252cac4cfecfacb4aedbb91af20592b6b831cd78af1dfc9f6da6f5d555c4d742fc9babe04ec446a3b0d214eab9b4cd0ea64883 SHA512 d355e80e7f102af13be9663d8e7cb28d3f3dc823d79192c287a5800e1239e4f37720b449a879605e5df0da1bb8accc3c70a605d94fc925788fe4a2e7bead650a
-EBUILD siphon-666-r1.ebuild 651 BLAKE2B 73ad60e3d2e7fba8477d5a5150760d116a79415e1361c2b36a9c78e44beccdbaf40e2abd9bf42960ecac9dc949790a362e5f03b5d1e94f1ed2f3ca7b335e7123 SHA512 fcfb276bba369345ccede8d45bd4b3dac888e231ee9e032f5e0e88aec724156bacc79b971c4d5a4f1265914b4e09a2497525fc650e8385efb96a0b1c68a0c0e8
-EBUILD siphon-666-r2.ebuild 660 BLAKE2B ac58988f23b5504a4ad52ec78098a3777f3309617807ecb21637ee656be16e2d1b4350bbe216aba08456898fa836c7f8bbf54da3fe2a070eb8c1c98b022a140c SHA512 91b95433aa67cec74724a630a05d78613036492b7707c71bae691ddde8ea566dbe7e62b87182847f2d5776064e983cb5e564d8072a145755d434dce05b538017
+EBUILD siphon-666-r2.ebuild 659 BLAKE2B eff64afa1ad1a2ceefd6a09234af9e5e5358d310b12c8f0acbaa83d7970b309880a91a96ac9fbde5100a38e023746c5c4674ee9e0732889189c1622848968375 SHA512 f07b85bdee70fd42b56f6ac07423e2410aa58a6fc9e73cfe7ee473298538221a7113048c15b4f7f703792d3e75cdbb605ab4f413488db23917dfc84d585d41ae
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/siphon/siphon-666-r1.ebuild b/net-analyzer/siphon/siphon-666-r1.ebuild
deleted file mode 100644
index dc691089fca8..000000000000
--- a/net-analyzer/siphon/siphon-666-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-MY_P=${PN}-v.${PV}
-
-DESCRIPTION="A portable passive network mapping suite"
-HOMEPAGE="http://siphon.datanerds.net/"
-SRC_URI="http://siphon.datanerds.net/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-log.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /etc
-	doins osprints.conf
-	dodoc README
-}
diff --git a/net-analyzer/siphon/siphon-666-r2.ebuild b/net-analyzer/siphon/siphon-666-r2.ebuild
index 7921c66b9a14..ccd6f70e0ef3 100644
--- a/net-analyzer/siphon/siphon-666-r2.ebuild
+++ b/net-analyzer/siphon/siphon-666-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://siphon.datanerds.net/"
 SRC_URI="http://siphon.datanerds.net/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}"