gentoo resync : 22.05.2021

4 files changed, 2 insertions, 93 deletions

diff --git a/app-admin/logsurfer+/Manifest b/app-admin/logsurfer+/Manifest
index 18dc82d1095d..e80ed093105e 100644
--- a/app-admin/logsurfer+/Manifest
+++ b/app-admin/logsurfer+/Manifest
@@ -1,7 +1,5 @@
-AUX logsurfer-1.8.initd 1049 BLAKE2B 00fa6b696561805d014586679f3d1f36a98a006aa8759855f35505cb30f4cb6e9ff110e4e89d731ac203ace4190bec1f1854b98fbb7b7f4dbaa43c32c466ad6d SHA512 c7fa4f0bf37125562ba3bd6594a84121f4ac47b71f33a73cf1856ba6c0e728523fa9d29dc778f3f613c477b640143d0c8ee608096aabfc0d11046cc4e838fa03
 AUX logsurfer-1.8.initd-r1 785 BLAKE2B c221acc6d565c6bef69e2b0e107d1d7e5b2fd03d7a645cbcf72b04ec903d3dd4fd031f3ba1f310b8cb0b6f1f8c936a1d3c605602a65682d09a3c4b86ced98f22 SHA512 dc02f6f317437adfe216992a0095912e73f9ad5abcbd2912bb4cdf0d71c4e0653eaeb14f3ff7164d20f1dee168c7b5352a3db96b9520a711e5f7ef04eca9e800
 AUX logsurfer.confd 106 BLAKE2B 3b43cc5e0782c3b34dca3ae607cf38db2128d09a11770efc013501368483134a4e6741c14533dfd59b05cce06e5498ba3a1321c330fe43915f588c5fef4bd3d1 SHA512 872004ae1aedc3adb550da30ebc544ccbf11af5ad399bb9788a4db336138c3f5ec03c3704eaaa2cecb0559de6a2bcab9e96da062e6af9a6daa22afdec709a43a
 DIST logsurfer-1.8.tar.gz 197507 BLAKE2B caa824ef486d8f48f39e6e1309d2dbccace4e91910b94267d50ab9dc022371bade87c251d87c4818d900ce2a72141f2ac4d0b4cccf4b2850e594951c77df2c0e SHA512 975b1353d067cee3a47fb555013ad86cf404863bcd044a46a7b8314670613b89720e4c21ac9c1389f930be964e4694ee6863ce72e289054ffacf9c62565ffa30
-EBUILD logsurfer+-1.8-r3.ebuild 806 BLAKE2B 68e9677be2f8e88b90bd2919c02b3ae0ab7aac3b3d263b864130c25d8c40399108f6b298ee4e0c522ab4b2e384495b85716a21b2f715c1e670fa61f3ce9bc4fa SHA512 324eecf181f83cafac5874dfbf7753fc95fea5cce31f458ae1ec3e3c02b3ca139efece2275b84c90effe6aba696905fbac549281a8117f7669479fab21cff55a
-EBUILD logsurfer+-1.8-r4.ebuild 817 BLAKE2B 7ff4705ec7bd1cc0ebab3db6ef9e06e386f5c0647f0943c69a0e44261be7feb9b330f23a2873dc4ae31dba0e6af0f481c3c03523b7ee9d35ac82fc3b82080657 SHA512 63e31c67eea23e55b4b40ff2fd91e1e6248fcfbbca214a2845a55c95d4795d9f73bd39ccdad94f1660f5237d22412b1e7fcc51c21408c46766d7334a55f850f0
+EBUILD logsurfer+-1.8-r4.ebuild 815 BLAKE2B 90a95aacad1bb0bf32a91bd3f480e5f82efb810918c631350580d51b0107f3ec022b2c1bf0fa279ba5936da7777cc6eecfc3fe410fdadc5f68a9c55f9ea1cf53 SHA512 f9dfd7c817452a3f71541cc9a1ac7699a1c6cd15d0556f46f74c9da9becdb6ae1f221489084905237198450e2eb9d4e390eecdb3de7385cdfae73fbe576047b6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/logsurfer+/files/logsurfer-1.8.initd b/app-admin/logsurfer+/files/logsurfer-1.8.initd
deleted file mode 100644
index 9ef420cfad30..000000000000
--- a/app-admin/logsurfer+/files/logsurfer-1.8.initd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/var/run/logsurfer.pid"
-command="/usr/bin/logsurfer"
-command_args="-D -p ${pidfile} ${LOGSURFER_OPTS}"
-extra_started_commands="reload dump"
-
-conffile="/etc/logsurfer.conf"
-
-depend() {
-	use logger
-}
-
-checkconfig() {
-	if [ ! -f /etc/logsurfer.conf ] ; then
-		eerror "Please create /etc/logsurfer.conf"
-		return 1
-	fi
-	return 0
-}
-
-start_pre() {
-	checkconfig || return $?
-
-	checkpath --file --owner logsurfer --mode 0644 "${pidfile}"
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon \
-		--start \
-		--user logsurfer \
-		--exec ${command} \
-		-- ${command_args}
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $? "Failed to reload ${SVCNAME}"
-}
-
-dump() {
-	ebegin "Dumping ${SVCNAME} internal state"
-	start-stop-daemon --signal USR1 --pidfile "${pidfile}"
-	eend $? "Failed to dump ${SVCNAME} internal state"
-}
diff --git a/app-admin/logsurfer+/logsurfer+-1.8-r3.ebuild b/app-admin/logsurfer+/logsurfer+-1.8-r3.ebuild
deleted file mode 100644
index 6bd3a96d4632..000000000000
--- a/app-admin/logsurfer+/logsurfer+-1.8-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs user
-
-MY_P="logsurfer-${PV}"
-DESCRIPTION="Real Time Log Monitoring and Alerting"
-HOMEPAGE="https://www.crypt.gen.nz/logsurfer/"
-SRC_URI="mirror://sourceforge/logsurfer/${MY_P}.tar.gz"
-
-LICENSE="freedist GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="bindist" #444330
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf --with-etcdir=/etc
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin src/logsurfer
-	doman man/logsurfer.1 man/logsurfer.conf.4
-
-	newinitd "${FILESDIR}"/logsurfer-1.8.initd-r1 logsurfer
-	newconfd "${FILESDIR}"/logsurfer.confd logsurfer
-	dodoc ChangeLog README TODO
-}
-
-pkg_postinst() {
-	enewuser logsurfer -1 -1 -1 daemon
-}
diff --git a/app-admin/logsurfer+/logsurfer+-1.8-r4.ebuild b/app-admin/logsurfer+/logsurfer+-1.8-r4.ebuild
index 2e8aeb9f6464..5d651c2a12d2 100644
--- a/app-admin/logsurfer+/logsurfer+-1.8-r4.ebuild
+++ b/app-admin/logsurfer+/logsurfer+-1.8-r4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="freedist GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="bindist" #444330
 
 RDEPEND="