Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sysklogd/
Date: Wed, 03 Aug 2022 02:54:25
Message-Id: 1659493881.d421cf8279d94342a6c298f130fda84c9720c0e9.sam@gentoo
1 commit: d421cf8279d94342a6c298f130fda84c9720c0e9
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 3 02:31:21 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 3 02:31:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d421cf82
7
8 app-admin/sysklogd: add 2.4.2
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 app-admin/sysklogd/Manifest | 1 +
13 ...{sysklogd-9999.ebuild => sysklogd-2.4.2.ebuild} | 22 ++++++++++++----------
14 app-admin/sysklogd/sysklogd-9999.ebuild | 22 ++++++++++++----------
15 3 files changed, 25 insertions(+), 20 deletions(-)
16
17 diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
18 index 6649296a48b4..e9ee012e497b 100644
19 --- a/app-admin/sysklogd/Manifest
20 +++ b/app-admin/sysklogd/Manifest
21 @@ -1,2 +1,3 @@
22 DIST sysklogd-2.3.0.tar.gz 441168 BLAKE2B fa2ec9975d51bcb26d7acc88ab02e211453fc7e6d722ec6d38543a20833ae9c49b9a274d323e7a32deb82ca9c38025947e25b15424084a0ce345410a2e686a4d SHA512 7a16dd3f45a71015ad055e64aa62f4f94b0a8aa739f407c03376241cbc16ff764a768a698362cb428d150b169934798b774622b330903b287f9af5dd846775fc
23 DIST sysklogd-2.4.0.tar.gz 450757 BLAKE2B 65f7174ebad122d17032e0095c65df80110a992a40b41a3ecddb1f813605094ce59c1313f5d4f35ae33d0cb7557392a176fc9c2f0f69162b74cb69d531be0a09 SHA512 0f9c4498b3677636abd636a80a8256095798b09f43b6febbcb386b3bce7faae23c44aebc54234462a7aa53fb8e5bf821e89081bdbdba0f72218ac8481365029c
24 +DIST sysklogd-2.4.2.tar.gz 451760 BLAKE2B 35f59f3343e66be33cd6c0277e53a49dd94f593da9dbe0af685f513de9e3c5c4103d79530aba48b9515222556a3d5751a86c89be04aa6983b94b02d21db855be SHA512 5d17bfd25248f8ddc0938f00c9c11c5d7cfa559904b984bf6c6fc50bcddf0ac0263ff175cc05e039b8635012c097207b84bf9270df5c5bf0a9d6532d01b0a9ec
25
26 diff --git a/app-admin/sysklogd/sysklogd-9999.ebuild b/app-admin/sysklogd/sysklogd-2.4.2.ebuild
27 similarity index 92%
28 copy from app-admin/sysklogd/sysklogd-9999.ebuild
29 copy to app-admin/sysklogd/sysklogd-2.4.2.ebuild
30 index 53e3b031b00b..b823887c4367 100644
31 --- a/app-admin/sysklogd/sysklogd-9999.ebuild
32 +++ b/app-admin/sysklogd/sysklogd-2.4.2.ebuild
33 @@ -1,7 +1,7 @@
34 # Copyright 1999-2022 Gentoo Authors
35 # Distributed under the terms of the GNU General Public License v2
36
37 -EAPI=7
38 +EAPI=8
39
40 inherit flag-o-matic systemd toolchain-funcs
41
42 @@ -18,7 +18,7 @@ fi
43
44 LICENSE="BSD"
45 SLOT="0"
46 -IUSE="logger logrotate systemd"
47 +IUSE="logger logrotate"
48 # Needs network access
49 RESTRICT="test"
50
51 @@ -28,16 +28,13 @@ DEPEND="
52 !>=sys-apps/util-linux-2.34-r3[logger]
53 )
54 "
55 -RDEPEND="${DEPEND}
56 - logrotate? ( app-admin/logrotate )"
57 +RDEPEND="
58 + ${DEPEND}
59 + logrotate? ( app-admin/logrotate )
60 +"
61
62 DOCS=( ChangeLog.md README.md )
63
64 -pkg_setup() {
65 - append-lfs-flags
66 - tc-export CC
67 -}
68 -
69 src_prepare() {
70 default
71
72 @@ -45,12 +42,16 @@ src_prepare() {
73 }
74
75 src_configure() {
76 + append-lfs-flags
77 + tc-export CC
78 +
79 local myeconfargs=(
80 --disable-static
81 --runstatedir="${EPREFIX}"/run
82 + --with-systemd=$(systemd_get_systemunitdir)
83 $(use_with logger)
84 - $(use_with systemd systemd $(systemd_get_systemunitdir))
85 )
86 +
87 econf "${myeconfargs[@]}"
88 }
89
90 @@ -79,6 +80,7 @@ pkg_postinst() {
91 elog "functionality that does no longer require a running cron daemon."
92 elog "So we no longer install any log rotation cron files for sysklogd."
93 fi
94 +
95 if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
96 elog "Starting with version 2.1 sysklogd no longer provides klogd."
97 elog "syslogd now also logs kernel messages."
98
99 diff --git a/app-admin/sysklogd/sysklogd-9999.ebuild b/app-admin/sysklogd/sysklogd-9999.ebuild
100 index 53e3b031b00b..b823887c4367 100644
101 --- a/app-admin/sysklogd/sysklogd-9999.ebuild
102 +++ b/app-admin/sysklogd/sysklogd-9999.ebuild
103 @@ -1,7 +1,7 @@
104 # Copyright 1999-2022 Gentoo Authors
105 # Distributed under the terms of the GNU General Public License v2
106
107 -EAPI=7
108 +EAPI=8
109
110 inherit flag-o-matic systemd toolchain-funcs
111
112 @@ -18,7 +18,7 @@ fi
113
114 LICENSE="BSD"
115 SLOT="0"
116 -IUSE="logger logrotate systemd"
117 +IUSE="logger logrotate"
118 # Needs network access
119 RESTRICT="test"
120
121 @@ -28,16 +28,13 @@ DEPEND="
122 !>=sys-apps/util-linux-2.34-r3[logger]
123 )
124 "
125 -RDEPEND="${DEPEND}
126 - logrotate? ( app-admin/logrotate )"
127 +RDEPEND="
128 + ${DEPEND}
129 + logrotate? ( app-admin/logrotate )
130 +"
131
132 DOCS=( ChangeLog.md README.md )
133
134 -pkg_setup() {
135 - append-lfs-flags
136 - tc-export CC
137 -}
138 -
139 src_prepare() {
140 default
141
142 @@ -45,12 +42,16 @@ src_prepare() {
143 }
144
145 src_configure() {
146 + append-lfs-flags
147 + tc-export CC
148 +
149 local myeconfargs=(
150 --disable-static
151 --runstatedir="${EPREFIX}"/run
152 + --with-systemd=$(systemd_get_systemunitdir)
153 $(use_with logger)
154 - $(use_with systemd systemd $(systemd_get_systemunitdir))
155 )
156 +
157 econf "${myeconfargs[@]}"
158 }
159
160 @@ -79,6 +80,7 @@ pkg_postinst() {
161 elog "functionality that does no longer require a running cron daemon."
162 elog "So we no longer install any log rotation cron files for sysklogd."
163 fi
164 +
165 if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
166 elog "Starting with version 2.1 sysklogd no longer provides klogd."
167 elog "syslogd now also logs kernel messages."