[gentoo-commits] repo/gentoo:master commit in: app-admin/sysklogd/files/, app-admin/sysklogd/

[Lars Wendler]

commit:     634ea4fe59e85f2dab3c0aa470248f514da8c5e2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 13:17:30 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 13:17:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=634ea4fe

app-admin/sysklogd: Removed old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-admin/sysklogd/Manifest              |  1 -
 app-admin/sysklogd/files/sysklogd.rc8    | 94 --------------------------------
 app-admin/sysklogd/sysklogd-2.0.2.ebuild | 68 -----------------------
 3 files changed, 163 deletions(-)

diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 638df43817e..d6db6b9b5ce 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -1,5 +1,4 @@
 DIST sysklogd-1.5.1.tar.gz 90011 BLAKE2B c40bd8d5769f7d3d4141d602c74ac41e05a140743d18c4923d9368da7ba193ccb89a6837173994f0b7a9c290cc23f64513040434d7ab8df81b5d09b73b0263ad SHA512 a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7
-DIST sysklogd-2.0.2.tar.gz 465933 BLAKE2B bc0181e43ca5996cfbf8a8a35d083f332e15f5c83215ec60b406cefc7817bb742d0ce094d6c0d9fe708d345db630a73ce408992d9aade18e5b69414ca4e2b2a6 SHA512 1e5e30162b1091c37801542ae44df3e5d1da09ead02dd74f81e1e35ebb2fea99bab372f00eca621340ca306a41629ccdfb3caa0d46db0fecf46e3030da932473
 DIST sysklogd-2.0.3.tar.gz 466919 BLAKE2B d9ada06dadb5a43ca7102cb24eaffa0494af2743f4714bab7d362cf480835ea9c3fc51ee171e4eb3b90380d63abe78c759bdfc5d946ec4d5bf8fce748cd916b9 SHA512 95ed0465e37b438d624b0a78d74c1194c57d117890492b5773c9ccefa7aa2c1f54ed510e54a29019fb2d7274200370031fe822a9316c154e64a2a01cb912d7a8
 DIST sysklogd-2.1.tar.gz 560611 BLAKE2B 727f78a639d88fd67b5fe6106534a10f9b37717b0675772346b07691481d7d5297963d54d3e36eae7cf14431e8429eaf0da1c551970c7a916f4e6c891c7ad70c SHA512 48fa0eed0013a9ff0a8bae0fe35bb82f46e012d3754da424bce0bcd339b4e016a1cbc93b134c02342f8da6e42721cdcdb3d28c3c71c571748d77a234460cb0c7
 DIST sysklogd_1.5-6.diff.gz 25677 BLAKE2B 3cb1f596490998b6002d4656a2321a500ce9941a37737c0b9d4702bbb87d7bc9ba21b68e06d175e3c1714a701adc6b3312e18a556ebc9ef395d8968762830cb5 SHA512 816961a835a43057569f62fd20d9f7b5e0bfcfcb173b68947457708504db3ce47e635956c8a9564f9bd577d8f3c49dfc725d321dfd3370b2de918363c30f838e

diff --git a/app-admin/sysklogd/files/sysklogd.rc8 b/app-admin/sysklogd/files/sysklogd.rc8
deleted file mode 100644
index 920ab963326..00000000000
--- a/app-admin/sysklogd/files/sysklogd.rc8
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-depend() {
-	need clock hostname
-	provide logger
-}
-
-has_klogd() {
-	[ -x "/usr/sbin/klogd" ]
-}
-
-start_daemon() {
-	local retval=0
-	local daemon="$1"
-	local options="$2"
-	local fg_opt=""
-
-	case "${daemon}" in
-		syslogd)
-			fg_opt="-F"
-		;;
-		klogd)
-			fgopt="-n"
-		;;
-		*)
-			return 1
-		;;
-	esac
-
-	ebegin "sysklogd -> start: ${daemon}"
-	start-stop-daemon --start --exec /usr/sbin/"${daemon}" \
-		-b -m --pidfile /var/run/"${daemon}".pid \
-		-- ${options} ${fg_opt}
-	retval=$?
-	eend ${retval} "Failed to start ${daemon}"
-
-	return ${retval}
-}
-
-stop_daemon() {
-	local retval=0
-	local daemon="$1"
-
-	[ -z "${daemon}" ] && return 1
-	
-	ebegin "sysklogd -> stop: ${daemon}"
-	# syslogd can be stubborn some times (--retry 15)...
-	start-stop-daemon --stop --retry 15 --quiet --pidfile /var/run/"${daemon}".pid
-	retval=$?
-	eend ${retval} "Failed to stop ${daemon}"
-
-	return ${retval}
-}
-
-start() {
-	start_daemon "syslogd" "${SYSLOGD}" || return 1
-
-	# klogd do not always start proper if started too early
-	sleep 1
-
-	if has_klogd && ! start_daemon "klogd" "${KLOGD}" ; then
-		stop_daemon "syslogd"
-		return 1
-	fi
-
-	return 0
-}
-
-stop() {
-	if has_klogd ; then
-		stop_daemon "klogd" || return 1
-	fi
-	stop_daemon "syslogd" || return 1 
-	return 0
-}
-
-reload() {
-	local ret=0
-
-	ebegin "Reloading configuration"
-
-	start-stop-daemon --signal HUP --pidfile /var/run/syslogd.pid
-	ret=$((${ret} + $?))
-	if has_klogd ; then
-		start-stop-daemon --signal USR1 --pidfile /var/run/klogd.pid
-		ret=$((${ret} + $?))
-	fi
-
-	eend ${ret}
-}

diff --git a/app-admin/sysklogd/sysklogd-2.0.2.ebuild b/app-admin/sysklogd/sysklogd-2.0.2.ebuild
deleted file mode 100644
index e9298b83532..00000000000
--- a/app-admin/sysklogd/sysklogd-2.0.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Standard log daemons"
-HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
-SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="klogd logger logrotate systemd"
-RESTRICT="test"
-
-DEPEND="
-	logger? (
-		!<sys-apps/util-linux-2.34-r3
-		!>=sys-apps/util-linux-2.34-r3[logger]
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog.md README.md )
-
-pkg_setup() {
-	append-lfs-flags
-	tc-export CC
-}
-
-src_configure() {
-	local myeconfargs=(
-		--runstatedir="${EPREFIX}"/run
-		$(use_with klogd)
-		$(use_with logger)
-		$(use_with systemd systemd $(systemd_get_systemunitdir))
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins syslog.conf
-	keepdir /etc/syslog.d
-
-	newinitd "${FILESDIR}"/sysklogd.rc8 sysklogd
-	newconfd "${FILESDIR}"/sysklogd.confd2 sysklogd
-
-	if use logrotate ; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
-		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
-	fi
-
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_postinst() {
-	if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
-		elog "Starting with version 2.0 syslogd has built in log rotation"
-		elog "functionality that does no longer require a running cron daemon."
-		elog "So we no longer install any log rotation cron files for sysklogd."
-	fi
-}