gentoo resync : 05.02.2020

4 files changed, 4 insertions, 36 deletions

diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
index 93c2e983255d..1f81a34af812 100644
--- a/net-analyzer/prelude-correlator/Manifest
+++ b/net-analyzer/prelude-correlator/Manifest
@@ -2,12 +2,10 @@ AUX prelude-correlator-4.1.1-fix_python3.patch 984 BLAKE2B 5b51c44d1da541e16b687
 AUX prelude-correlator.initd 654 BLAKE2B 10bb6e1ba38c916394cbeab1d314e39ee61753c6f46e613f2a500fb3deffa3d62861ffb41fb1dbed30126cc3cb1a7afd381632c229cc33732d6e6a627ef08ef6 SHA512 15be6f991499d6d2b72bd11cd91343a1be164c13454c702b6f42f55b69dbfdda4a380cc6f24aecbf0e9d6a2b3f21b1a947838038ad95e7d7377c3d36118f12e5
 AUX prelude-correlator.run 139 BLAKE2B 2eac955ca980c1e49d39946d3890c5dba1b7f5a40670c28f788d66535e1a52735fb8620a78a1ec6cdb59ae517d0317c363c72779087fcfbdc7011e3b1bdd9370 SHA512 f05c771f387b2eb59e37006ba5bb959d8d67cbdbdfdd5a7c5a42b592d2c9d4532bfa425565722745ad52e7fb1d327738c02f1602e0eeb42ea403275d69380f51
 AUX prelude-correlator.service 339 BLAKE2B 25275e92b5471521e1f8e3f23d1a0a483c7cb3300edbcc563cb84c280f64a7555b47e4cbe97c00ee76777e9f44de9bbd911de69deec5bec2898a09c1a206f7a1 SHA512 8f0d0478bea87e2bdc8266044e580f983b12dcaafec1b7cb87074f9cd3825a9c0b2b6d59fba8fc4a62a5af0b9f0dede6f8c5d3cbf436fcf900b031947ea20f68
-DIST prelude-correlator-3.0.1.tar.gz 181019 BLAKE2B 9156b7c76ac641326dcbb6e89f336ad1a65ed9c0af3b32acaa2d4430d3ba0b5015b5baf6372bdeb8e08d269b7742304f84ac026c512b63ca8710cc757697d0c6 SHA512 2aa159251cf7f9fead117737f67cc01e7cb2012c4fd9db77454c7d639cf477888d5ea6476661bf501c2da7aaef58ea7101b7780669f025af1480acd9480ce8d3
 DIST prelude-correlator-4.0.0.tar.gz 347973 BLAKE2B 93f383d5d3ca3632f841b8523efa829f00ee36e4fdce76c982ef638f468dc574fa69452b4e9e5abcdaec87697a4a824faf543f0383756d15a72e99c0ac02cabe SHA512 aeeb5d1e29a464afa41b8a04f5324e0915b8450eceea68a07cb6d8bb61823ab8da8df51e1a331f5a66fd295bd2a514f484da5c396e0508c4fc5634c98382779b
 DIST prelude-correlator-4.1.1.tar.gz 237036 BLAKE2B f3965b179d101450bd5b64805d0c982cc093de47fbbc4b4e0077f231cffcf152f3ace78cab5e96d7e18d8af0fae7de0fb5c70c17b8888245558ab091bee6438d SHA512 ac6eb554ab8d20325afbe49fcec9e238d84579cb68ee5731e6ec7d1da11c1b745e60117fade76d8747c93f57d4ae91461fd6e82160f659f88a0bb545e4990597
 DIST prelude-correlator-5.1.0.tar.gz 242620 BLAKE2B 70d4c4cc620fe4aa605812a83979b097e78ea97c5684d0d7ac8f0de2975f68d54f712f0d6dcd341f2928c846663fdf5182f8481fe6142de7648ba8fd2443d369 SHA512 db3a4cb1c4a8254270f63552ee2a959bc28cec8fdb48340f1c301fa65df73115292060067bed4b5945da4717a216313aa6eb2525bc02de4a6a45716b9827f5fd
-EBUILD prelude-correlator-3.0.1-r1.ebuild 723 BLAKE2B 7eadb37a0f6316a87acd061ea90011fdf5158b2d1e0dd025eaa8b07426959af0fe55a57dc76bac474eaa1a43fadf4836621a60f6a708682bcb30ce49f2aca2c5 SHA512 23cfb488a3d604f4bc5351de67c2fedfafc9668c04e81ada545525f0b134ec5765b6555329f8b50fd5ffe7f3f41a79801d556a9faa67b17cd0e4c45604a3c9d1
-EBUILD prelude-correlator-4.0.0.ebuild 750 BLAKE2B 9b56784560d7d8878a4a7628d72e38e602a0cf9cd59a577c5fc97cd0d27277013e91bd31b4c25a39951a32b44f2736ac0c09973e5d4ca376a2152b12f51b6ba7 SHA512 ea44d448216ab4f47686d734454efbcf922f05a855d80ea95797fc4a4804d7961bc4e00c1f8e16fd15d4e21c97c74b38ea7e0e4c9b28b4f18048c66f4d793f1a
-EBUILD prelude-correlator-4.1.1.ebuild 808 BLAKE2B 8b176bde732306db2357376cc3e11f0f3f3b00a66103f1c089fbe6cffe911e9dab158ed9240f04425b72f5abc1bf4383af4fd36c4d1e1ec76d6278168d974eb2 SHA512 6676802aa703fd738470fb5d1182a357f3fe530ef4fb78bc8ded7f09160ba6a03064b707b76aaa321de8b78817c539c4e0b38bc73fe3a5338ebd4801a9d25ed6
+EBUILD prelude-correlator-4.0.0.ebuild 744 BLAKE2B 9c8bd8db36fda98e2f550ea932f50af9666eacc543099138a4acf7fedaa860fc28c3ff2d595e6791509ecad650f93ccbf4369c4e94e97e29bbd805af70e9fcea SHA512 2750e8ba8632395ef76e3b1a9dab51bf53581cf098cf7a63a0a58553f474509730e28a82b9701973735d1bc16238df41a93dae55e4fcf6ab1ab856d71ff0d237
+EBUILD prelude-correlator-4.1.1.ebuild 802 BLAKE2B 8528650cb4cafd831b77dbe5f95a0d2f2efa8a3bedd0579aeceee460a6b24f9fb5c35eca106c6f32a5e142eef7dd3fecaa93797b42a91725c9ae15cf61fe013e SHA512 58fb60ce4dd8d32347c35598a623f2f6a08dc89b377a466b0c46137f463a1b7da7b7ae8a0181f29033d01d7046d355f5dde67f6ee50694dfc07f614224f7bf06
 EBUILD prelude-correlator-5.1.0.ebuild 749 BLAKE2B bab459f78c726959988daa71cf2125b01a0e074cfedcfb96a5638def4efc88b95c773f7e22ea9e7755439ebdf7f3bbb3dcc367c1d6daa314149a8cfee72b8646 SHA512 c0242da96d1337bccf3154399405b68965570496dde459ad74f950825c3517a508838fa9aae268434559795d8c6c4370989ceb28a821f15146fd01ac472e0a3b
 MISC metadata.xml 824 BLAKE2B c17f62271dea0b8f93fdc83b0ccf67545ea24c5bd3f71d782832bc9c8588bdd98b513ed3f6bc5c307aebb3bc3be76e7e8311e38438234779d5da6f248383fb15 SHA512 3b0db2aace5a45f8994622063ca9fb32a06bcb385b63fb013c191606f07e9bb03c1354549b07ac4c17d74a9f25db44be7ea45fc34d6332079209cc56f5262209
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-3.0.1-r1.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-3.0.1-r1.ebuild
deleted file mode 100644
index 68d50b36d690..000000000000
--- a/net-analyzer/prelude-correlator/prelude-correlator-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit systemd distutils-r1
-
-DESCRIPTION="Real time correlator of events received by Prelude Manager"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools"
-
-RDEPEND="dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-libs/libprelude[python,${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
index d7861468dbf9..147c825eb4c2 100644
--- a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
+++ b/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 systemd
 
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
index 2bcda4ece273..384e4b199c8c 100644
--- a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
+++ b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 systemd