gentoo auto-resync : 03:08:2022 - 13:50:40

3 files changed, 11 insertions, 103 deletions

diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 6de83d6203d7..6e68714bb75e 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -3,9 +3,7 @@ AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659
 AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6ebc087963f7667dc3dcef6d2d90c0602da753fb77fdd063a1bae5907798c47e7c0e92feb9a884c SHA512 274642e7555badc2395e4a08684b07e4b5be91cfe92f5f2e47903263dde1ccb67c9a5932864eb623d11d97a3ad429b28a8ab7a8d93177e949a2f8dec9a1aaea4
 DIST sysklogd-2.3.0.tar.gz 441168 BLAKE2B fa2ec9975d51bcb26d7acc88ab02e211453fc7e6d722ec6d38543a20833ae9c49b9a274d323e7a32deb82ca9c38025947e25b15424084a0ce345410a2e686a4d SHA512 7a16dd3f45a71015ad055e64aa62f4f94b0a8aa739f407c03376241cbc16ff764a768a698362cb428d150b169934798b774622b330903b287f9af5dd846775fc
 DIST sysklogd-2.4.0.tar.gz 450757 BLAKE2B 65f7174ebad122d17032e0095c65df80110a992a40b41a3ecddb1f813605094ce59c1313f5d4f35ae33d0cb7557392a176fc9c2f0f69162b74cb69d531be0a09 SHA512 0f9c4498b3677636abd636a80a8256095798b09f43b6febbcb386b3bce7faae23c44aebc54234462a7aa53fb8e5bf821e89081bdbdba0f72218ac8481365029c
-DIST sysklogd-2.4.2.tar.gz 451760 BLAKE2B 35f59f3343e66be33cd6c0277e53a49dd94f593da9dbe0af685f513de9e3c5c4103d79530aba48b9515222556a3d5751a86c89be04aa6983b94b02d21db855be SHA512 5d17bfd25248f8ddc0938f00c9c11c5d7cfa559904b984bf6c6fc50bcddf0ac0263ff175cc05e039b8635012c097207b84bf9270df5c5bf0a9d6532d01b0a9ec
 EBUILD sysklogd-2.3.0.ebuild 2112 BLAKE2B 1f8cb90a6f5ab144eaebc6625b6ab1bffe003a1e3a1ce8e182da214f9bb77ddcfd2a59b95192f8b68230a2315003792bafd68aa9470b7e8412d3e735de32fd55 SHA512 0c2ab19307e93aee1773fd759c734de47869b555b2abe968e3db5ebfb6ad9bbc01c94d2be128fe7e1553a584bd69bbdb59919cd495a6d272022f49ddb486c39b
 EBUILD sysklogd-2.4.0.ebuild 2138 BLAKE2B 0888ef036055107e8d2c3351ae9a4c3f5fbb05d09e28dfeb37bf639374ffe501e59a2d0b5f18894c1fa55a55aef2cea17f930bab25e638b2558e74998449efc2 SHA512 dc9b32d23ba04caeaef35cd519a238bc2a607d3f03cc77f1237b434acc76c989008ad3fc55ebb93f989cd652d9b667c5f891e7f2c2aa7e51e0715b217a3b42c2
-EBUILD sysklogd-2.4.2.ebuild 2106 BLAKE2B a8385ac39db7d3a9b2b92d338f4aab266f2773d6f53ef8fe479417477172fa25330cc61e95a51d7e640edf2488f5c3229161cfc8f5067c4cfa2d8034cef3da37 SHA512 b7e2e4f7b55e9d55ee01d4bc6541f87a8f9e4ab5c57d9a7686a9cfd4ec4591b6183e7f8b6a4574586c88e65c2abea60292d284ca44086fbe57ae0f1a70aacab6
-EBUILD sysklogd-9999.ebuild 2106 BLAKE2B a8385ac39db7d3a9b2b92d338f4aab266f2773d6f53ef8fe479417477172fa25330cc61e95a51d7e640edf2488f5c3229161cfc8f5067c4cfa2d8034cef3da37 SHA512 b7e2e4f7b55e9d55ee01d4bc6541f87a8f9e4ab5c57d9a7686a9cfd4ec4591b6183e7f8b6a4574586c88e65c2abea60292d284ca44086fbe57ae0f1a70aacab6
+EBUILD sysklogd-9999.ebuild 2138 BLAKE2B 0888ef036055107e8d2c3351ae9a4c3f5fbb05d09e28dfeb37bf639374ffe501e59a2d0b5f18894c1fa55a55aef2cea17f930bab25e638b2558e74998449efc2 SHA512 dc9b32d23ba04caeaef35cd519a238bc2a607d3f03cc77f1237b434acc76c989008ad3fc55ebb93f989cd652d9b667c5f891e7f2c2aa7e51e0715b217a3b42c2
 MISC metadata.xml 433 BLAKE2B b1b1737ea499d650246868d4b0fa748dfa8d72b0f974fc45481a43c20fe7165d8d24ad57731a014cf68ea465641109e66edada5d8f3a6c8896fe0e3d684b5905 SHA512 1bbbe31ecb193b016d57fc59d3d0faa1431c13de0040786a7ce96134c303df741092bae99c5230b7108462d898a5fafa09a631333b8d9dcb2dc13ab1ba930b3b
diff --git a/app-admin/sysklogd/sysklogd-2.4.2.ebuild b/app-admin/sysklogd/sysklogd-2.4.2.ebuild
deleted file mode 100644
index b823887c4367..000000000000
--- a/app-admin/sysklogd/sysklogd-2.4.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Standard log daemons"
-HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
-else
-	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="logger logrotate"
-# Needs network access
-RESTRICT="test"
-
-DEPEND="
-	logger? (
-		!<sys-apps/util-linux-2.34-r3
-		!>=sys-apps/util-linux-2.34-r3[logger]
-	)
-"
-RDEPEND="
-	${DEPEND}
-	logrotate? ( app-admin/logrotate )
-"
-
-DOCS=( ChangeLog.md README.md )
-
-src_prepare() {
-	default
-
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	append-lfs-flags
-	tc-export CC
-
-	local myeconfargs=(
-		--disable-static
-		--runstatedir="${EPREFIX}"/run
-		--with-systemd=$(systemd_get_systemunitdir)
-		$(use_with logger)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins syslog.conf
-	keepdir /etc/syslog.d
-
-	newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
-	newconfd "${FILESDIR}"/sysklogd.confd3 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 "*.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
-
-	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
-		elog "Starting with version 2.1 sysklogd no longer provides klogd."
-		elog "syslogd now also logs kernel messages."
-	fi
-}
diff --git a/app-admin/sysklogd/sysklogd-9999.ebuild b/app-admin/sysklogd/sysklogd-9999.ebuild
index b823887c4367..53e3b031b00b 100644
--- a/app-admin/sysklogd/sysklogd-9999.ebuild
+++ b/app-admin/sysklogd/sysklogd-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
 inherit flag-o-matic systemd toolchain-funcs
 
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="logger logrotate"
+IUSE="logger logrotate systemd"
 # Needs network access
 RESTRICT="test"
 
@@ -28,13 +28,16 @@ DEPEND="
 		!>=sys-apps/util-linux-2.34-r3[logger]
 	)
 "
-RDEPEND="
-	${DEPEND}
-	logrotate? ( app-admin/logrotate )
-"
+RDEPEND="${DEPEND}
+	logrotate? ( app-admin/logrotate )"
 
 DOCS=( ChangeLog.md README.md )
 
+pkg_setup() {
+	append-lfs-flags
+	tc-export CC
+}
+
 src_prepare() {
 	default
 
@@ -42,16 +45,12 @@ src_prepare() {
 }
 
 src_configure() {
-	append-lfs-flags
-	tc-export CC
-
 	local myeconfargs=(
 		--disable-static
 		--runstatedir="${EPREFIX}"/run
-		--with-systemd=$(systemd_get_systemunitdir)
 		$(use_with logger)
+		$(use_with systemd systemd $(systemd_get_systemunitdir))
 	)
-
 	econf "${myeconfargs[@]}"
 }
 
@@ -80,7 +79,6 @@ pkg_postinst() {
 		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
-
 	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
 		elog "Starting with version 2.1 sysklogd no longer provides klogd."
 		elog "syslogd now also logs kernel messages."