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

[Lars Wendler]

commit:     10de0ebe904e51a4fa17305480c9f74803cd1bc0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 16:33:47 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Nov 28 16:33:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10de0ebe

app-admin/sysklogd: Removed old

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

 app-admin/sysklogd/Manifest                        |   1 -
 .../files/sysklogd-2.0-optional_logger.patch       | 101 ---------------------
 app-admin/sysklogd/sysklogd-2.0-r1.ebuild          |  81 -----------------
 3 files changed, 183 deletions(-)

diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 3743cb2733e..4c02a5f8dcd 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.1.tar.gz 461158 BLAKE2B 2c56ea1b5edb11f6ce75cb34d7cb5778516fbf3cb64986a7dd6063f830e9e8040430a0deb0ac68aeb389435319ede89202b2aa31cb480fe9bd9518ad503ca6ee SHA512 24d82a2db8d7d8fbdf291964d3d42717cf3b62129d1d503986b17a8005ca414eb824c39ed787d73bac966dad5a7cc9b439efce58e218aebed72b765e07134a83
 DIST sysklogd-2.0.2.tar.gz 465933 BLAKE2B bc0181e43ca5996cfbf8a8a35d083f332e15f5c83215ec60b406cefc7817bb742d0ce094d6c0d9fe708d345db630a73ce408992d9aade18e5b69414ca4e2b2a6 SHA512 1e5e30162b1091c37801542ae44df3e5d1da09ead02dd74f81e1e35ebb2fea99bab372f00eca621340ca306a41629ccdfb3caa0d46db0fecf46e3030da932473
-DIST sysklogd-2.0.tar.gz 465822 BLAKE2B 030ce2e65287d215d376937aec590715abcac06dffef735038c31ee102eb00d5c616bfd2f3d378e53ef6ae4aa062e9802aaaca84a6f5598b43da35ee722d37ac SHA512 25b55b8ea47280c11959e03d5a8c592e1b02764b4aeb722ef9782d84116475f1bbba96d6db8c291b694d99c7970e2e7615e7cd48b8fef6dff4f9ae825e18d030
 DIST sysklogd_1.5-6.diff.gz 25677 BLAKE2B 3cb1f596490998b6002d4656a2321a500ce9941a37737c0b9d4702bbb87d7bc9ba21b68e06d175e3c1714a701adc6b3312e18a556ebc9ef395d8968762830cb5 SHA512 816961a835a43057569f62fd20d9f7b5e0bfcfcb173b68947457708504db3ce47e635956c8a9564f9bd577d8f3c49dfc725d321dfd3370b2de918363c30f838e

diff --git a/app-admin/sysklogd/files/sysklogd-2.0-optional_logger.patch b/app-admin/sysklogd/files/sysklogd-2.0-optional_logger.patch
deleted file mode 100644
index 4e5580b0422..00000000000
--- a/app-admin/sysklogd/files/sysklogd-2.0-optional_logger.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 227008ec0f59eecf3a962ebd9fbc27a0e475a4df Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@g.o>
-Date: Mon, 18 Nov 2019 12:08:26 +0100
-Subject: [PATCH] build: make logger and its man page optional
-
-There are other packages that provide a logger program like util-linux
-We should respekt that
-
-Signed-off-by: Lars Wendler <polynomial-c@g.o>
----
- configure.ac    | 10 ++++++++++
- man/Makefile.am |  6 +++++-
- src/Makefile.am |  8 +++++++-
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 37c0bd4..e7acad7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -65,6 +65,10 @@ AC_ARG_WITH(systemd,
-      [AS_HELP_STRING([--with-systemd=DIR], [Directory for systemd service files])],,
-      [with_systemd=auto])
- 
-+AC_ARG_WITH(logger,
-+     AS_HELP_STRING([--without-logger], [Do not build/install logger binary and man page, default: enabled]),
-+     [logger=$withval], [logger='yes'])
-+
- AS_IF([test "x$klogd" != "xno"],
-         with_klogd="yes"
- 	AC_DEFINE(KLOGD, 1, [Build with klogd, default: built-in /dev/kmsg support in syslogd]),
-@@ -97,6 +101,12 @@ AS_IF([test "x$with_systemd" != "xno"],
-      [AC_SUBST([systemddir], [$with_systemd])])
- AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemd" != "xno"])
- 
-+AS_IF([test "x$logger" != "xno"], [
-+	with_logger="yes"
-+	AC_DEFINE(LOGGER, 1, [Build with logger])],
-+	with_logger="no")
-+AM_CONDITIONAL([ENABLE_LOGGER], [test "x$with_logger" != "xno"])
-+
- # Expand $sbindir early, into $SBINDIR, for systemd unit file
- # NOTE: This does *not* take prefix/exec_prefix override at "make
- #       install" into account, unfortunately.
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 8ee7064..8ccad31 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,4 +1,4 @@
--dist_man1_MANS  = logger.1
-+dist_man1_MANS  =
- dist_man3_MANS	= syslogp.3
- dist_man5_MANS	= syslog.conf.5
- dist_man8_MANS	= syslogd.8
-@@ -6,3 +6,7 @@ dist_man8_MANS	= syslogd.8
- if ENABLE_KLOGD
- dist_man8_MANS += klogd.8
- endif
-+
-+if ENABLE_LOGGER
-+dist_man1_MANS += logger.1
-+endif
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 85f747b..849e49b 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -16,7 +16,7 @@
- # with this program; if not, write to the Free Software Foundation, Inc.,
- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--bin_PROGRAMS          = logger
-+bin_PROGRAMS          =
- sbin_PROGRAMS         = syslogd
- lib_LTLIBRARIES       = libsyslog.la
- noinst_LTLIBRARIES    = libcompat.la
-@@ -25,6 +25,10 @@ if ENABLE_KLOGD
- sbin_PROGRAMS        += klogd
- endif
- 
-+if ENABLE_LOGGER
-+bin_PROGRAMS	     += logger
-+endif
-+
- AM_CFLAGS             = -W -Wall -Wextra
- AM_CFLAGS            += -Wno-unused-result -Wno-unused-parameter -fno-strict-aliasing
- AM_CPPFLAGS           = -DSYSCONFDIR=\"@sysconfdir@\" -DLOCALSTATEDIR=\"@localstatedir@\"
-@@ -39,10 +43,12 @@ klogd_CPPFLAGS        = $(AM_CPPFLAGS)
- klogd_LDADD           = $(LIBS) $(LIBOBJS)
- klogd_LDADD          += libsyslog.la
- 
-+if ENABLE_LOGGER
- logger_SOURCES        = logger.c syslog.h
- logger_CPPFLAGS       = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600
- logger_LDADD          = $(LIBS) $(LIBOBJS)
- logger_LDADD         += libsyslog.la
-+endif
- 
- # Convenience library for libsyslog instead of linking with $(LTLIBOBJS),
- # which would pull in pidfile() and other (strong) symbols as well.
--- 
-2.24.0
-

diff --git a/app-admin/sysklogd/sysklogd-2.0-r1.ebuild b/app-admin/sysklogd/sysklogd-2.0-r1.ebuild
deleted file mode 100644
index d7a07507988..00000000000
--- a/app-admin/sysklogd/sysklogd-2.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools 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$(ver_cut 1-2)/${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 )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0-optional_logger.patch"
-)
-
-pkg_setup() {
-	append-lfs-flags
-	tc-export CC
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		# Required for correct pid file location. (bug #701048)
-		# syslogd appends "/run/syslogd.pid" to the localstatedir
-		# path, and tries to write to that file even when being
-		# started in foreground. So we need to pin this to /
-		--localstatedir="${EPREFIX}"/
-		$(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
-}