Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/
Date: Fri, 20 Aug 2021 23:33:07
Message-Id: 1629502360.0ec56ba59e53634b8887cefe2e943a8e8ec6af67.williamh@gentoo
1 commit: 0ec56ba59e53634b8887cefe2e943a8e8ec6af67
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 20 23:32:10 2021 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 20 23:32:40 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ec56ba5
7
8 sys-apps/openrc: remove unstable versions
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
12
13 sys-apps/openrc/Manifest | 2 -
14 sys-apps/openrc/openrc-0.43.3.ebuild | 187 -----------------------------------
15 sys-apps/openrc/openrc-0.43.4.ebuild | 184 ----------------------------------
16 3 files changed, 373 deletions(-)
17
18 diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
19 index 42c7dce4725..e5204e76026 100644
20 --- a/sys-apps/openrc/Manifest
21 +++ b/sys-apps/openrc/Manifest
22 @@ -1,4 +1,2 @@
23 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
24 -DIST openrc-0.43.3.tar.gz 240431 BLAKE2B 4e7326e2cb87fbb9101b616f0ad5a955f38f387e9d940a0ae1d00a8b48e7733411b3f0a4bb70bfc6a63cb4769354d7836cb4accd695b73f601d9b6bab8b8a8ea SHA512 a6b0a3b7eba7624ed00cb33253cec71059b9af194f3828eb7417f9faba551ecdff7c1e1b5132772969a9c868ff60a92378b28e56e54edfe8e0f4e143aa43b8c5
25 -DIST openrc-0.43.4.tar.gz 241876 BLAKE2B c50cefb079a63c9a682f37244f84ea96e8428d6ddbfd5af7f6e03b5abf206158426d2b7af2b0e9354cf50178f59b6179a8698826b3b9af9086904c17f88bee56 SHA512 705ecb458ffbfcf143d53c17e7f01e0e2cd5450d43b7b0ddf1460f9ef684114d4bcd6ba50ef1510920db89c1cdbf13f954b744ef16a0e881650377ff7a254b55
26 DIST openrc-0.43.5.tar.gz 242146 BLAKE2B 993d3895588e8f1383049006834f944faaae0f889d3afcae5bff697db9f26383712f18aba52ce07d835f1d2bbe8ef19ef116ad60141d1eb0650767430d1d9967 SHA512 680c1549a8a37eb3a719f3e026888d045d26c98357d6e6eaf09069a23a001272deaca8cac4a9b8fd79f489c4cfb4fe2c7b5d481d1469798a8f5ec470d0cadbe3
27
28 diff --git a/sys-apps/openrc/openrc-0.43.3.ebuild b/sys-apps/openrc/openrc-0.43.3.ebuild
29 deleted file mode 100644
30 index f6eaa2172d2..00000000000
31 --- a/sys-apps/openrc/openrc-0.43.3.ebuild
32 +++ /dev/null
33 @@ -1,187 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -inherit flag-o-matic pam toolchain-funcs
40 -
41 -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
42 -HOMEPAGE="https://github.com/openrc/openrc/"
43 -
44 -if [[ ${PV} == "9999" ]]; then
45 - EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
46 - inherit git-r3
47 -else
48 - SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
49 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
50 -fi
51 -
52 -LICENSE="BSD-2"
53 -SLOT="0"
54 -IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode"
55 -
56 -COMMON_DEPEND="
57 - ncurses? ( sys-libs/ncurses:0= )
58 - pam? (
59 - sys-auth/pambase
60 - sys-libs/pam
61 - )
62 - audit? ( sys-process/audit )
63 - sys-process/psmisc
64 - !<sys-process/procps-3.3.9-r2
65 - selinux? (
66 - sys-apps/policycoreutils
67 - >=sys-libs/libselinux-2.6
68 - )
69 - !<sys-apps/baselayout-2.1-r1
70 - !<sys-fs/udev-init-scripts-27"
71 -DEPEND="${COMMON_DEPEND}
72 - virtual/os-headers
73 - ncurses? ( virtual/pkgconfig )"
74 -RDEPEND="${COMMON_DEPEND}
75 - bash? ( app-shells/bash )
76 - !prefix? (
77 - sysv-utils? (
78 - !sys-apps/systemd[sysv-utils(-)]
79 - !sys-apps/sysvinit
80 - )
81 - !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
82 - virtual/tmpfiles
83 - )
84 - selinux? (
85 - >=sec-policy/selinux-base-policy-2.20170204-r4
86 - >=sec-policy/selinux-openrc-2.20170204-r4
87 - )
88 - !<app-shells/gentoo-bashcomp-20180302
89 - !<app-shells/gentoo-zsh-completions-20180228
90 -"
91 -
92 -PDEPEND="netifrc? ( net-misc/netifrc )"
93 -
94 -src_prepare() {
95 - default
96 - if [[ ${PV} == "9999" ]] ; then
97 - local ver="git-${EGIT_VERSION:0:6}"
98 - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
99 - fi
100 -}
101 -
102 -src_compile() {
103 - MAKE_ARGS="${MAKE_ARGS}
104 - LIBNAME=$(get_libdir)
105 - LIBDIR=${EPREFIX}/$(get_libdir)
106 - LIBEXECDIR=${EPREFIX}/lib/rc
107 - MKBASHCOMP=yes
108 - MKNET=$(usex newnet)
109 - MKSELINUX=$(usex selinux)
110 - MKSYSVINIT=$(usex sysv-utils)
111 - MKAUDIT=$(usex audit)
112 - MKPAM=$(usev pam)
113 - MKSTATICLIBS=no
114 - MKZSHCOMP=yes
115 - OS=Linux
116 - SH=$(usex bash /bin/bash /bin/sh)"
117 -
118 - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
119 -export BRANDING="Gentoo Linux"
120 - export DEBUG=$(usev debug)
121 - export MKTERMCAP=$(usev ncurses)
122 -
123 - tc-export CC AR RANLIB
124 - emake ${MAKE_ARGS}
125 -}
126 -
127 -# set_config <file> <option name> <yes value> <no value> test
128 -# a value of "#" will just comment out the option
129 -set_config() {
130 - local file="${ED}/$1" var=$2 val com
131 - eval "${@:5}" && val=$3 || val=$4
132 - [[ ${val} == "#" ]] && com="#" && val='\2'
133 - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
134 -}
135 -
136 -set_config_yes_no() {
137 - set_config "$1" "$2" YES NO "${@:3}"
138 -}
139 -
140 -src_install() {
141 - emake ${MAKE_ARGS} DESTDIR="${D}" install
142 -
143 - keepdir /lib/rc/tmp
144 -
145 - # Setup unicode defaults for silly unicode users
146 - set_config_yes_no /etc/rc.conf unicode use unicode
147 -
148 - # Cater to the norm
149 - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
150 -
151 - # On HPPA, do not run consolefont by default (bug #222889)
152 - if use hppa; then
153 - rm -f "${ED}"/etc/runlevels/boot/consolefont
154 - fi
155 -
156 - # Support for logfile rotation
157 - insinto /etc/logrotate.d
158 - newins "${FILESDIR}"/openrc.logrotate openrc
159 -
160 - if use pam; then
161 - # install gentoo pam.d files
162 - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
163 - newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
164 - fi
165 -
166 - # install documentation
167 - dodoc ChangeLog *.md
168 - if use newnet; then
169 - dodoc README.newnet
170 - fi
171 -}
172 -
173 -pkg_preinst() {
174 - # avoid default thrashing in conf.d files when possible #295406
175 - if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
176 - (
177 - unset hostname HOSTNAME
178 - source "${EROOT}"/etc/conf.d/hostname
179 - : ${hostname:=${HOSTNAME}}
180 - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
181 - )
182 - fi
183 -
184 - # set default interactive shell to sulogin if it exists
185 - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
186 - return 0
187 -}
188 -
189 -pkg_postinst() {
190 - if use hppa; then
191 - elog "Setting the console font does not work on all HPPA consoles."
192 - elog "You can still enable it by running:"
193 - elog "# rc-update add consolefont boot"
194 - fi
195 -
196 - # Added for 0.35.
197 - if [[ ! -h "${EROOT}"/lib ]]; then
198 - if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
199 - cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
200 - fi
201 - fi
202 -
203 - if ! use newnet && ! use netifrc; then
204 - ewarn "You have emerged OpenRc without network support. This"
205 - ewarn "means you need to SET UP a network manager such as"
206 - ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
207 - ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
208 - ewarn "Or, you have the option of emerging openrc with the newnet"
209 - ewarn "use flag and configuring /etc/conf.d/network and"
210 - ewarn "/etc/conf.d/staticroute if you only use static interfaces."
211 - ewarn
212 - fi
213 -
214 - if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
215 - ewarn "Please add the network service to your boot runlevel"
216 - ewarn "as soon as possible. Not doing so could leave you with a system"
217 - ewarn "without networking."
218 - ewarn
219 - fi
220 -}
221
222 diff --git a/sys-apps/openrc/openrc-0.43.4.ebuild b/sys-apps/openrc/openrc-0.43.4.ebuild
223 deleted file mode 100644
224 index 1b2b297f302..00000000000
225 --- a/sys-apps/openrc/openrc-0.43.4.ebuild
226 +++ /dev/null
227 @@ -1,184 +0,0 @@
228 -# Copyright 1999-2021 Gentoo Authors
229 -# Distributed under the terms of the GNU General Public License v2
230 -
231 -EAPI=7
232 -
233 -inherit flag-o-matic pam toolchain-funcs
234 -
235 -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
236 -HOMEPAGE="https://github.com/openrc/openrc/"
237 -
238 -if [[ ${PV} == "9999" ]]; then
239 - EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
240 - inherit git-r3
241 -else
242 - SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
243 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
244 -fi
245 -
246 -LICENSE="BSD-2"
247 -SLOT="0"
248 -IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode"
249 -
250 -COMMON_DEPEND="
251 - ncurses? ( sys-libs/ncurses:0= )
252 - pam? ( sys-libs/pam )
253 - audit? ( sys-process/audit )
254 - sys-process/psmisc
255 - !<sys-process/procps-3.3.9-r2
256 - selinux? (
257 - sys-apps/policycoreutils
258 - >=sys-libs/libselinux-2.6
259 - )
260 - !<sys-apps/baselayout-2.1-r1
261 - !<sys-fs/udev-init-scripts-27"
262 -DEPEND="${COMMON_DEPEND}
263 - virtual/os-headers
264 - ncurses? ( virtual/pkgconfig )"
265 -RDEPEND="${COMMON_DEPEND}
266 - bash? ( app-shells/bash )
267 - !prefix? (
268 - sysv-utils? (
269 - !sys-apps/systemd[sysv-utils(-)]
270 - !sys-apps/sysvinit
271 - )
272 - !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
273 - virtual/tmpfiles
274 - )
275 - selinux? (
276 - >=sec-policy/selinux-base-policy-2.20170204-r4
277 - >=sec-policy/selinux-openrc-2.20170204-r4
278 - )
279 - !<app-shells/gentoo-bashcomp-20180302
280 - !<app-shells/gentoo-zsh-completions-20180228
281 -"
282 -
283 -PDEPEND="netifrc? ( net-misc/netifrc )"
284 -
285 -src_prepare() {
286 - default
287 - if [[ ${PV} == "9999" ]] ; then
288 - local ver="git-${EGIT_VERSION:0:6}"
289 - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
290 - fi
291 -}
292 -
293 -src_compile() {
294 - MAKE_ARGS="${MAKE_ARGS}
295 - LIBNAME=$(get_libdir)
296 - LIBDIR=${EPREFIX}/$(get_libdir)
297 - LIBEXECDIR=${EPREFIX}/lib/rc
298 - MKBASHCOMP=yes
299 - MKNET=$(usex newnet)
300 - MKSELINUX=$(usex selinux)
301 - MKSYSVINIT=$(usex sysv-utils)
302 - MKAUDIT=$(usex audit)
303 - MKPAM=$(usev pam)
304 - MKSTATICLIBS=no
305 - MKZSHCOMP=yes
306 - OS=Linux
307 - SH=$(usex bash /bin/bash /bin/sh)"
308 -
309 - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
310 -export BRANDING="Gentoo Linux"
311 - export DEBUG=$(usev debug)
312 - export MKTERMCAP=$(usev ncurses)
313 -
314 - tc-export CC AR RANLIB
315 - emake ${MAKE_ARGS}
316 -}
317 -
318 -# set_config <file> <option name> <yes value> <no value> test
319 -# a value of "#" will just comment out the option
320 -set_config() {
321 - local file="${ED}/$1" var=$2 val com
322 - eval "${@:5}" && val=$3 || val=$4
323 - [[ ${val} == "#" ]] && com="#" && val='\2'
324 - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
325 -}
326 -
327 -set_config_yes_no() {
328 - set_config "$1" "$2" YES NO "${@:3}"
329 -}
330 -
331 -src_install() {
332 - emake ${MAKE_ARGS} DESTDIR="${D}" install
333 -
334 - keepdir /lib/rc/tmp
335 -
336 - # Setup unicode defaults for silly unicode users
337 - set_config_yes_no /etc/rc.conf unicode use unicode
338 -
339 - # Cater to the norm
340 - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
341 -
342 - # On HPPA, do not run consolefont by default (bug #222889)
343 - if use hppa; then
344 - rm -f "${ED}"/etc/runlevels/boot/consolefont
345 - fi
346 -
347 - # Support for logfile rotation
348 - insinto /etc/logrotate.d
349 - newins "${FILESDIR}"/openrc.logrotate openrc
350 -
351 - if use pam; then
352 - # install gentoo pam.d files
353 - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
354 - newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
355 - fi
356 -
357 - # install documentation
358 - dodoc ChangeLog *.md
359 - if use newnet; then
360 - dodoc README.newnet
361 - fi
362 -}
363 -
364 -pkg_preinst() {
365 - # avoid default thrashing in conf.d files when possible #295406
366 - if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
367 - (
368 - unset hostname HOSTNAME
369 - source "${EROOT}"/etc/conf.d/hostname
370 - : ${hostname:=${HOSTNAME}}
371 - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
372 - )
373 - fi
374 -
375 - # set default interactive shell to sulogin if it exists
376 - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
377 - return 0
378 -}
379 -
380 -pkg_postinst() {
381 - if use hppa; then
382 - elog "Setting the console font does not work on all HPPA consoles."
383 - elog "You can still enable it by running:"
384 - elog "# rc-update add consolefont boot"
385 - fi
386 -
387 - # Added for 0.35.
388 - if [[ ! -h "${EROOT}"/lib ]]; then
389 - if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
390 - cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
391 - fi
392 - fi
393 -
394 - if ! use newnet && ! use netifrc; then
395 - ewarn "You have emerged OpenRc without network support. This"
396 - ewarn "means you need to SET UP a network manager such as"
397 - ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
398 - ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
399 - ewarn "Or, you have the option of emerging openrc with the newnet"
400 - ewarn "use flag and configuring /etc/conf.d/network and"
401 - ewarn "/etc/conf.d/staticroute if you only use static interfaces."
402 - ewarn
403 - fi
404 -
405 - if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
406 - ewarn "Please add the network service to your boot runlevel"
407 - ewarn "as soon as possible. Not doing so could leave you with a system"
408 - ewarn "without networking."
409 - ewarn
410 - fi
411 -}