gentoo resync : 28.07.2021

7 files changed, 13 insertions, 20 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 4dfd8772849d..0c7d67c9b672 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index dfe7d87c556d..38aa01ae2ddb 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -8,6 +8,6 @@ AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee35
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
 DIST suricata-5.0.7.tar.gz 29211384 BLAKE2B 939e672d9df61863c7adcc4bf52f5620e3760f0d6178362828474b1a72c4e3a69bf1ab52a3220c0069ae5a545c56307553c2796166af488a72a25dddd68782a8 SHA512 dce3929c796e04778eb9437bd4c7203aa9dae56be0baa4b7d986d3eedff3bfc71aa2886ecdeed9d87ec3d88cd3060ff8ef01540d15eb857698a2c4696da5899c
 DIST suricata-6.0.3.tar.gz 32421197 BLAKE2B c1b339823f2caab73aeb82f96fb703834cd3ca9f0f60662cf340cbc36734aea47106d49869bd70cf3acb419e954ca37bcd22ad1b2d789597bf36f8fe7ceebe11 SHA512 186b871959988ca7cbd0d69e725aed18af915f93363c7ecc0ffa20d8ad8f50a326be08452d085772b1df84ef25258ef0dd6b35d41b0988cb1c653e60aeb103a2
-EBUILD suricata-5.0.7.ebuild 6376 BLAKE2B cee2a276ea306c5738158b034e09516f3eede321a7e7a33ffd6e50fcfca14e0d7724bee6f3dd5c0778399d00d0ae81845e3834de57e6644df073dd63b134a5ed SHA512 515a1109f0bbb606926d51c24b98af7920de52ffc7d1bf3cc4b7c53ccb7e054abb8cbd22d823d478c2dca7a963743209d19a96d7e15ecaa369deaff9593cce4e
-EBUILD suricata-6.0.3.ebuild 6652 BLAKE2B f1538b0887f05227142c0a2b05321bf6e724238ef51d7b6a1538327859c04efbe7001e632e1df1d3bb202ff4a3c72246b5e687eb10e1483d0f420734f3ae9354 SHA512 b6364876158e3a3d64cf438e276d7df46c13f32ec86d984a2c87f39edf878cd616d6f471588f690a590dd3b98fe6e7cf390bb204e7290255e382900d0d147536
-MISC metadata.xml 1015 BLAKE2B 355c550ad2fe7a37d69b92f0bd710824d68a3353be687876449ad5b7d8e2c98b06b833e59ebcf479410aff09dce71e1f7f64be860c348f3d6c3519cd8fe2acf2 SHA512 0837e07a0130baff435e684b47a6b463991aec73b4f570672d0091a70adf163c5e83d19887e1575f12db783d6246050777011d25dc658fe4767cd3fe8fc1d4a5
+EBUILD suricata-5.0.7.ebuild 6298 BLAKE2B 1a476c96d3148077c7e828b8d51b46a3101f40b1bbe7d0ff99d147a2dede4a545eed0a81216159cc28351adc77f9fffeae5ec79d68e2d24f296da6ebbfaf8785 SHA512 fc793b67f9d7f14c99e0d81d4b229a667cdaf0efd35a6c8879e19ca42e3ed6a1dfe8197e15108bdd492d05323c7703c593a5c76e2414ccdf4a90ad934780a6d7
+EBUILD suricata-6.0.3.ebuild 6574 BLAKE2B b738ad0c1151bbc68464443557d02b8d44395e94f51116f80cdd62cdc39acbac6e583d06e7da14be75670c87cff0acb1780b94622b0bca9e9bcaf554582f325c SHA512 858d9be588774b6ab7659b08ef33280de3d0eec8595ac75d8da7f24301c03fbd79a34c9e09252170f49ee3722b8bc369678389b29e5c7c66f3965e028b715d31
+MISC metadata.xml 958 BLAKE2B 944628811fffa8d4c801dfab169a83b31fbca9d5e6c52a7aaf7131b56118bd53e9360002fc5e335253f9bab7c434c2f4defe44f4f1bed00fabc9013454f24c14 SHA512 b077688adea6058d1249a025898c81289ce04f47f6fd2684d8a2aa8e4494f994d68d07393097b1181add90d8f87c62e07e6717e08e3d4a0ebf9c1109859ef551
diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml
index 457a2fbd2e8a..87689ee5189a 100644
--- a/net-analyzer/suricata/metadata.xml
+++ b/net-analyzer/suricata/metadata.xml
@@ -12,7 +12,6 @@
     <flag name="control-socket">Enable unix socket</flag>
     <flag name="cuda">Enable NVIDIA Cuda computations support</flag>
     <flag name="detection">Enable detection modules</flag>
-    <flag name="logrotate">Install logrotate rule</flag>
     <flag name="lz4">Enable support for compressed pcap logging using the LZ4 algorithm</flag>
     <flag name="nflog">Enable libnetfilter_log support</flag>
     <flag name="nfqueue">Enable NFQUEUE support for inline IDP</flag>
diff --git a/net-analyzer/suricata/suricata-5.0.7.ebuild b/net-analyzer/suricata/suricata-5.0.7.ebuild
index d8e5826ae3a5..50b8ba84db3c 100644
--- a/net-analyzer/suricata/suricata-5.0.7.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/5"
 KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua lz4 nflog +nfqueue redis systemd test"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened lua lz4 nflog +nfqueue redis systemd test"
 
 RESTRICT="!test? ( test )"
 
@@ -43,7 +43,6 @@ RDEPEND="${PYTHON_DEPS}
 	bpf?        ( >=dev-libs/libbpf-0.1.0 )
 	cuda?       ( dev-util/nvidia-cuda-toolkit )
 	geoip?      ( dev-libs/libmaxminddb )
-	logrotate?  ( app-admin/logrotate )
 	lua?        ( ${LUA_DEPS} )
 	lz4?        ( app-arch/lz4 )
 	nflog?      ( net-libs/libnetfilter_log )
@@ -142,11 +141,9 @@ src_install() {
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
 
-	if use logrotate; then
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins etc/${PN}.logrotate ${PN}
-	fi
+	insopts -m0644
+	insinto /etc/logrotate.d
+	newins etc/${PN}.logrotate ${PN}
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/suricata/suricata-6.0.3.ebuild b/net-analyzer/suricata/suricata-6.0.3.ebuild
index da57e2c8b344..c6dfbc4f14b8 100644
--- a/net-analyzer/suricata/suricata-6.0.3.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/6"
 KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua lz4 nflog +nfqueue redis systemd test"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened lua lz4 nflog +nfqueue redis systemd test"
 
 RESTRICT="!test? ( test )"
 
@@ -43,7 +43,6 @@ RDEPEND="${PYTHON_DEPS}
 	bpf?        ( >=dev-libs/libbpf-0.1.0 )
 	cuda?       ( dev-util/nvidia-cuda-toolkit )
 	geoip?      ( dev-libs/libmaxminddb )
-	logrotate?  ( app-admin/logrotate )
 	lua?        ( ${LUA_DEPS} )
 	lz4?        ( app-arch/lz4 )
 	nflog?      ( net-libs/libnetfilter_log )
@@ -142,11 +141,9 @@ src_install() {
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
 
-	if use logrotate; then
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins etc/${PN}.logrotate ${PN}
-	fi
+	insopts -m0644
+	insinto /etc/logrotate.d
+	newins etc/${PN}.logrotate ${PN}
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 52c124f2cf9f..837ed09592d8 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,6 +4,6 @@ AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361f
 DIST wireshark-3.4.6.tar.xz 32304604 BLAKE2B 17eb721dd56482e856b10bfb19b3e3f61b9ce4b285415dedcac0b03114969a672b11b975fe2c8c5a56656dc07d744413c3019a2fc38cefa954e735f3cc1162f8 SHA512 eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d
 DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5 SHA512 26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
 EBUILD wireshark-3.4.6.ebuild 7206 BLAKE2B 4808491b469daf8b3185292bcfbbe215a9f32abd4ab0d0f4f78163633524b7b2457b17dc109a653a2ff2aa3f296aa7d9284bbf90c379e593e4bb33e1a6e81675 SHA512 5308aaf15324c020d1fa5bb68ba366f1dc686e0f40b1ea203cd1950cbcaa6e678380c0bc8bf24ec644649a07e364d8318b131cc234db94be2add86046c4626c7
-EBUILD wireshark-3.4.7.ebuild 7208 BLAKE2B e66b2de0af20698b0e8af9aa9f3103436324c39a4f0f48856d6e3ab06bc94bd7ff458a0bea76f0b22709d5d3225334070f0ea1f1f5fb5399e4b5a34eae89e688 SHA512 26fc3ac8e210b0c6039a6fa50bbdee27fa27eb31f5f10ea96e2aa3b313ea5d2b228d603842898af8c0874075eaf7f08ad56e192a2335dc33e1280a903f7bdb9c
+EBUILD wireshark-3.4.7.ebuild 7207 BLAKE2B 3445aa9ca7457f02b265d1ca6216e27d0f16def6be35d7cd727d8d7bf9abc7b6e9e1bd85a8caf2a67b50b94a02b3150e8cd5b8a0f64f10ad40c863b6c06546c9 SHA512 e7c5fe35695e948dd9ef53a23693735d37e3a0e5b2f273d4b0a0894f3a3c63fd904861ca8ed8387c298d92188310f10cc9075af9de877a67807842b996dc52f9
 EBUILD wireshark-9999.ebuild 7211 BLAKE2B 2b907655ef70a51ea09d2e597b84e625b9bf75ea3a23c44768176402dc17a6ed3732bcd6c5bec2dd53e4054920402b2412d2dc28aa0a9666dec990cce66624d3 SHA512 20443697c5a2ed143a16d4327bc1af599414beaac337aef6bd77bc6236a39a2d7f862aeeb42007df91a844a1a70d83403b0a82ae2678653bf4c65f4254c82948
 MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba
diff --git a/net-analyzer/wireshark/wireshark-3.4.7.ebuild b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
index 1a9a1653a897..a10e188cd194 100644
--- a/net-analyzer/wireshark/wireshark-3.4.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"