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

["Sam James" <sam@gentoo.org>]

commit:     d421cf8279d94342a6c298f130fda84c9720c0e9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 02:31:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 02:31:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d421cf82

app-admin/sysklogd: add 2.4.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/sysklogd/Manifest                        |  1 +
 ...{sysklogd-9999.ebuild => sysklogd-2.4.2.ebuild} | 22 ++++++++++++----------
 app-admin/sysklogd/sysklogd-9999.ebuild            | 22 ++++++++++++----------
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 6649296a48b4..e9ee012e497b 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/app-admin/sysklogd/sysklogd-9999.ebuild b/app-admin/sysklogd/sysklogd-2.4.2.ebuild
similarity index 92%
copy from app-admin/sysklogd/sysklogd-9999.ebuild
copy to app-admin/sysklogd/sysklogd-2.4.2.ebuild
index 53e3b031b00b..b823887c4367 100644
--- a/app-admin/sysklogd/sysklogd-9999.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.4.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic systemd toolchain-funcs
 
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="logger logrotate systemd"
+IUSE="logger logrotate"
 # Needs network access
 RESTRICT="test"
 
@@ -28,16 +28,13 @@ 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
 
@@ -45,12 +42,16 @@ 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[@]}"
 }
 
@@ -79,6 +80,7 @@ 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."

diff --git a/app-admin/sysklogd/sysklogd-9999.ebuild b/app-admin/sysklogd/sysklogd-9999.ebuild
index 53e3b031b00b..b823887c4367 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=7
+EAPI=8
 
 inherit flag-o-matic systemd toolchain-funcs
 
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="logger logrotate systemd"
+IUSE="logger logrotate"
 # Needs network access
 RESTRICT="test"
 
@@ -28,16 +28,13 @@ 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
 
@@ -45,12 +42,16 @@ 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[@]}"
 }
 
@@ -79,6 +80,7 @@ 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."