From 3622b570222b8d2da4ea42d2f25b6a7c1e7e23d9 Mon Sep 17 00:00:00 2001
From: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
Date: Sat, 15 May 2021 10:06:19 +0200
Subject: [PATCH] [app-forensics/lynis] Version bump to lynis-3.0.4

---
 app-forensics/lynis/Manifest                  |  2 +-
 ...{lynis-2.7.3.ebuild => lynis-3.0.4.ebuild} | 24 +++++++------------
 2 files changed, 10 insertions(+), 16 deletions(-)
 rename app-forensics/lynis/{lynis-2.7.3.ebuild => lynis-3.0.4.ebuild} (58%)

diff --git a/app-forensics/lynis/Manifest b/app-forensics/lynis/Manifest
index b91538b1..b81b3669 100644
--- a/app-forensics/lynis/Manifest
+++ b/app-forensics/lynis/Manifest
@@ -1 +1 @@
-DIST lynis-2.7.3.tar.gz 282609 BLAKE2B 68dcb9d1fc9f81007c15a5f1074d9f42b6f558f7bc62dfba134adffb7b6d858604a10e188abea298eb51e82f8ec1ea5f270563d16a87a68de25dab8e13a1f1c1 SHA512 eb50d5d1769f0276a8383a5c6c664b390ced75248678edd80b00a7c344e8567d9c5fcc7a1f4a1a0e20a26c03bb3648d3b81f165266b3654e75bbec5061ab3837
+DIST lynis-3.0.4.tar.gz 332004 BLAKE2B a68d85d679aae19304edc2ea7a982686d03897d806a7b44ca4c5318d8aa753a8b41b5ec2d80fbcda4bf69d35b5a6a0497b42d9b68c869763b09bfcb4922f5f83 SHA512 0e31cab00302678019d4a3d617e376fa1e8ca981b5eeb5dd22ce6f821f33957db351a4cd81a06f44eb0a8ca5094b1a5c062021c637b37e848ed0451de0f6c7c4
diff --git a/app-forensics/lynis/lynis-2.7.3.ebuild b/app-forensics/lynis/lynis-3.0.4.ebuild
similarity index 58%
rename from app-forensics/lynis/lynis-2.7.3.ebuild
rename to app-forensics/lynis/lynis-3.0.4.ebuild
index 9e70a197..00bd8958 100644
--- a/app-forensics/lynis/lynis-2.7.3.ebuild
+++ b/app-forensics/lynis/lynis-3.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit eutils bash-completion-r1 systemd
+inherit bash-completion-r1 systemd
 
 DESCRIPTION="Security and system auditing tool"
 HOMEPAGE="https://cisofy.com/lynis/"
@@ -11,7 +11,7 @@ SRC_URI="https://cisofy.com/files/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND=""
@@ -19,22 +19,13 @@ RDEPEND="app-shells/bash"
 
 S="${WORKDIR}/${PN}"
 
-src_prepare() {
-	default
-
-	# Fix script path
-	sed -i 's|/path/to/lynis|/usr/sbin/lynis|' extras/systemd/lynis.service
-}
-
 src_install() {
 	doman lynis.8
-	dodoc CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md CONTRIBUTORS.md FAQ README
+	dodoc FAQ README
+	newdoc CHANGELOG.md CHANGELOG
 
 	dobashcomp extras/bash_completion.d/lynis
 
-	systemd_dounit extras/systemd/lynis.service
-	systemd_dounit extras/systemd/lynis.timer
-
 	# stricter default perms - bug 507436
 	diropts -m0700
 	insopts -m0600
@@ -46,4 +37,7 @@ src_install() {
 
 	insinto /etc/${PN}
 	doins default.prf
+	sed -i -e 's/\/path\/to\///' "${S}/extras/systemd/${PN}.service" || die "Sed Failed!"
+	systemd_dounit "${S}/extras/systemd/${PN}.service" || die "Sed Failed!"
+	systemd_dounit "${S}/extras/systemd/${PN}.timer"
 }