gentoo resync : 15.06.2021

3 files changed, 2 insertions, 53 deletions

diff --git a/app-forensics/lynis/Manifest b/app-forensics/lynis/Manifest
index adea6cecd30e..e9a57683cbfc 100644
--- a/app-forensics/lynis/Manifest
+++ b/app-forensics/lynis/Manifest
@@ -1,5 +1,4 @@
 AUX lynis.cron-new 72 BLAKE2B 1f2d683c74e9e85f142c23277f24e8c81b33e4d1691a6f171694194bd5d81a5e1473532afe2c6fca23c995d9c7bd08d18d6eed78a07661618c12e22b35e9ff81 SHA512 1cdaaee433912c2ccdec8ad7c9b88be55fe3f1d68e2fca79cc6e0e10112d465a70cfbe0a049623437f604bfc9793e0d29b709e035cbf710d4d38ba48acc5355f
-DIST lynis-3.0.3.tar.gz 331182 BLAKE2B 7b424da8726e474992bcf6b13b6b82b48568b2d1f4268d0cb57f11560c4edbcd60d009c67fd333445392a184f1dbe38a55fde7cb7456498f89c451bc51ba3e8f SHA512 850f832fd45a2e440973c414f2c98caf3add1666573f60ea70bf36f57dbf3ac1b354632f09271b34f85eba25079e564d758e237dcded743a132da771c5bce151
-EBUILD lynis-3.0.3-r2.ebuild 1157 BLAKE2B 4325283944043df8436d178c0a492df13ac37f25d3bebb57e1829da12483a9b29f31ea957f799ef6f45e3fe593feea87714c0fe7eab8d75b4f9b45e956760b93 SHA512 8b044e319f313239101100a5b11c1d1cec81d097f265123cb72163f94ce97f59a8b7fe97ef027b65bef64abc032aca2186e466f96313c0becdd82a84d2db14b6
-EBUILD lynis-3.0.3.ebuild 939 BLAKE2B b05ec4bfab3c2c599299e3e32cb7f9427a4cd35a0a6bbc514923c3405bd67f8123c0be7e091414bd316919853cfd7a28519babd65d4973eebccb9b8f58a3760b SHA512 abe4e09470231a9f8c892050673549ed25eadcef588fb088b33604f9a4b248b108e3bc2ce425ee6197d8b55cba01c1775ae66a2e32ca8d71c31208652566861e
+DIST lynis-3.0.4.tar.gz 332004 BLAKE2B a68d85d679aae19304edc2ea7a982686d03897d806a7b44ca4c5318d8aa753a8b41b5ec2d80fbcda4bf69d35b5a6a0497b42d9b68c869763b09bfcb4922f5f83 SHA512 0e31cab00302678019d4a3d617e376fa1e8ca981b5eeb5dd22ce6f821f33957db351a4cd81a06f44eb0a8ca5094b1a5c062021c637b37e848ed0451de0f6c7c4
+EBUILD lynis-3.0.4.ebuild 1157 BLAKE2B 4325283944043df8436d178c0a492df13ac37f25d3bebb57e1829da12483a9b29f31ea957f799ef6f45e3fe593feea87714c0fe7eab8d75b4f9b45e956760b93 SHA512 8b044e319f313239101100a5b11c1d1cec81d097f265123cb72163f94ce97f59a8b7fe97ef027b65bef64abc032aca2186e466f96313c0becdd82a84d2db14b6
 MISC metadata.xml 251 BLAKE2B 7bfd5f1051cbe4343bd02cc5e869988eb1013ab464ae4ea70e15faff085b7bdc2437feaa34d5db2a90b4999014c146b4d1b9b0a4fd5c99e5bf550577923f49fb SHA512 5031be5fdf8e7fd7c6863c4a56016d80530a7363104272c82b99e2bb46cb7b22247fc5eda3814096701466fa73642994303ce4e666fb314ab843c18dcfa1845c
diff --git a/app-forensics/lynis/lynis-3.0.3.ebuild b/app-forensics/lynis/lynis-3.0.3.ebuild
deleted file mode 100644
index f8eca98da98e..000000000000
--- a/app-forensics/lynis/lynis-3.0.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit bash-completion-r1
-
-DESCRIPTION="Security and system auditing tool"
-HOMEPAGE="https://cisofy.com/lynis/"
-SRC_URI="https://cisofy.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	doman lynis.8
-	dodoc FAQ README
-	newdoc CHANGELOG.md CHANGELOG
-
-	# Remove the old one during the next stabilize progress
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/lynis.cron-new lynis
-
-	dobashcomp extras/bash_completion.d/lynis
-
-	# stricter default perms - bug 507436
-	diropts -m0700
-	insopts -m0600
-
-	insinto /usr/share/${PN}
-	doins -r db/ include/ plugins/
-
-	dosbin lynis
-
-	insinto /etc/${PN}
-	doins default.prf
-}
-
-pkg_postinst() {
-	einfo
-	einfo "A cron script has been installed to ${ROOT}/etc/cron.daily/lynis."
-	einfo
-}
diff --git a/app-forensics/lynis/lynis-3.0.3-r2.ebuild b/app-forensics/lynis/lynis-3.0.4.ebuild
index 0de67b2421e8..0de67b2421e8 100644
--- a/app-forensics/lynis/lynis-3.0.3-r2.ebuild
+++ b/app-forensics/lynis/lynis-3.0.4.ebuild