gentoo resync : 18.03.2018

3 files changed, 2 insertions, 27 deletions

diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest
index 3b127691165f..d8e109769a42 100644
--- a/net-analyzer/chaosreader/Manifest
+++ b/net-analyzer/chaosreader/Manifest
@@ -4,6 +4,5 @@ AUX chaosreader-0.94-divisionbyzero.patch 640 BLAKE2B 50d8d24212d1150128f22d74d0
 AUX chaosreader-0.94-oldmultiline.patch 487 BLAKE2B 596eac7253649813d6f3486522a998c8c647d2cde8830964480a394b91486f3b710c2fb7a54862be6ef8f60c8db40052cf8d4e6c8e638efc648194462354e244 SHA512 dcb98d8e5000fd0d130217e582ae21a519fd6e1554cd1e4902db632e7760c1708c9754f97f28f90d3371ccf76bb7b499b023d0985c27e799c27205f410515941
 AUX chaosreader-0.94-zombies.patch 349 BLAKE2B 607cd4f48c77613ab794f8d2fe00f5653854fe3d5a669412190e520015724cc9ad1c246e308a0c43c1ec0b4e29ec261c6eb77910dccbc0f8ddfdc730ff9f8cac SHA512 d3348cd6f29d01b1e94e4aa7f89b7f76fa9a4c8a557c437d0495ae32c6a6399019fe3affed5f1611a77a6b70fd1f30d011c87e00b614640c155f3afd8470a0f3
 DIST chaosreader-0.94.bz2 41039 BLAKE2B 664ac7de3ea15dcc2942f7d9ffa4a7ffd2066a521345877127594ece197cab8d49d2f3441335c012dc09041543cda31c723d021ae86a512b4d578f958acc3afc SHA512 f2c2b31e6f7fc27c5cb59a43ce9cdea67de520c79f6354c9a0f627c098d73f4666461fb4f3c393a0a9ac36105979fe36b08035c4404371db2f573dd534e1adad
-EBUILD chaosreader-0.94-r1.ebuild 798 BLAKE2B 21f05d27abc4da3457da6c49f43c4a132c5a83b2e6a23ce78b58d6b9b9422629f411bae7b6dec704685d32137a17731a01b653da6f5403f8f95f818d79dd6dc1 SHA512 c0d95454d4cb0bc2b8c429d2c40e0c0fcc5ada85e726c6511e5c1ed5bd168a61f44ccecfc89a60ee4b27d1987a8fbbbb1486c38757524a2d17ee6b339269641d
-EBUILD chaosreader-0.94.ebuild 578 BLAKE2B a5f7f8a8333ad8f5f17d8ee2254ab8d0f94650576f15977f8c1ba1372456ec35c06f6ae3df2515c7a67bd879360891c95c60b4107e79461ff27f43e64b0a04e6 SHA512 2aa14858e54b22764d751dda2a08520ea38abff12740719d31d596712d916a4bb0faafb0f39d3ec601c68d12bc2b459e4a5422287472c528a3251e78dcb3e5d6
+EBUILD chaosreader-0.94-r1.ebuild 797 BLAKE2B ba97daaaa2377c2fd3b21ab297c5e7c3613896d57a6406b9b602437fe980a483f2cd0cd60eb97050588fd6c5f2ba07f6685baa76bcd62a838ff936c72636c327 SHA512 517498a840b8143362be0d9c97a9fa5b7b03f91eea3acb09f067cc8e4ae7e1dd23316592e7de0571484a5c31a33e45006e3299ac15b7329b337ce03046f1991e
 MISC metadata.xml 412 BLAKE2B c0864f8b120780471a2c840a1258abc3a70d3183e318aecd7e2ac4852428bf2c57fa32713e50283dbcb5de311ab33893c0b8f66a2bc72463872e7758e5d96ab9 SHA512 fe8a71cba4549b081b24d302c3b97cfbce59e5c338089fd12f706320fd9752fe2ca7f8875a768da68a9ef9c8e36a3e291a29b5a79e414586c38c21e6d54d340c
diff --git a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
index a1d5cbdad5b1..33c7a6f55825 100644
--- a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
+++ b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://chaosreader.sourceforge.net"
 SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
 SLOT="0"
 
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 LICENSE="GPL-2"
 
 IUSE=""
diff --git a/net-analyzer/chaosreader/chaosreader-0.94.ebuild b/net-analyzer/chaosreader/chaosreader-0.94.ebuild
deleted file mode 100644
index 0e9d613171e6..000000000000
--- a/net-analyzer/chaosreader/chaosreader-0.94.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Trace TCP/UDP/... sessions and fetch application data."
-HOMEPAGE="http://chaosreader.sourceforge.net"
-SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-LICENSE="GPL-2"
-IUSE=""
-DEPEND=">=dev-lang/perl-5.8.0"
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/chaosreader-0.94-zombies.patch
-}
-
-src_install() {
-	newbin ${P} chaosreader || die
-}