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: Tue, 20 Aug 2019 21:30:33
Message-Id: 1566336610.6c4b00bfe61a267620feb76689c9715b37265427.williamh@gentoo
1 commit: 6c4b00bfe61a267620feb76689c9715b37265427
2 Author: William Hubbs <william.hubbs <AT> sony <DOT> com>
3 AuthorDate: Tue Aug 20 21:29:10 2019 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 20 21:30:10 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c4b00bf
7
8 sys-apps/openrc: 0.42.1 bump for clang
9
10 Copyright: Sony Interactive Entertainment Inc.
11 Package-Manager: Portage-2.3.69, Repoman-2.3.16
12 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
13
14 sys-apps/openrc/Manifest | 1 +
15 sys-apps/openrc/openrc-0.42.1.ebuild | 211 +++++++++++++++++++++++++++++++++++
16 2 files changed, 212 insertions(+)
17
18 diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
19 index ada9e54501b..2f4db701205 100644
20 --- a/sys-apps/openrc/Manifest
21 +++ b/sys-apps/openrc/Manifest
22 @@ -1,2 +1,3 @@
23 DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d25e90d0239325be05561e5802f22c47013fde82650f5ce08cf99f16f5f479d8617c254647b8c40cec9609d0b6b SHA512 ebfa691cae4704bb3023ea0508a712a45b8c20809828729dfa5292e96f3fd1b309813d80d7c286d0c09680bf5378aba40cfd994f27951f43a3ffb1fd0d69a58b
24 +DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
25 DIST openrc-0.42.tar.gz 242670 BLAKE2B df3c1594cb441228dd9c5f16e0758bd3a62cd51c8797ce57b6c290b0b8d80307eb5e43a4a6107da8d6911777524deac48cea48f6b96a5d4eab4e5c81fa11a835 SHA512 200f3f0054e766accce332bc86941367f99f0c6a0b00bf1faad877ff9ac7cfa36a90a60432361483c0d2a778bed0d811130ad692aea64b2e2d34c5b95940b68a
26
27 diff --git a/sys-apps/openrc/openrc-0.42.1.ebuild b/sys-apps/openrc/openrc-0.42.1.ebuild
28 new file mode 100644
29 index 00000000000..dea79c65bd1
30 --- /dev/null
31 +++ b/sys-apps/openrc/openrc-0.42.1.ebuild
32 @@ -0,0 +1,211 @@
33 +# Copyright 1999-2019 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +inherit flag-o-matic pam toolchain-funcs usr-ldscript
39 +
40 +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
41 +HOMEPAGE="https://github.com/openrc/openrc/"
42 +
43 +if [[ ${PV} == "9999" ]]; then
44 + EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
45 + inherit git-r3
46 +else
47 + SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
48 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
49 +fi
50 +
51 +LICENSE="BSD-2"
52 +SLOT="0"
53 +IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
54 + sysv-utils unicode kernel_linux kernel_FreeBSD"
55 +
56 +COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
57 + ncurses? ( sys-libs/ncurses:0= )
58 + pam? (
59 + sys-auth/pambase
60 + virtual/pam
61 + )
62 + audit? ( sys-process/audit )
63 + kernel_linux? (
64 + sys-process/psmisc
65 + !<sys-process/procps-3.3.9-r2
66 + )
67 + selinux? (
68 + sys-apps/policycoreutils
69 + >=sys-libs/libselinux-2.6
70 + )
71 + !<sys-apps/baselayout-2.1-r1
72 + !<sys-fs/udev-init-scripts-27"
73 +DEPEND="${COMMON_DEPEND}
74 + virtual/os-headers
75 + ncurses? ( virtual/pkgconfig )"
76 +RDEPEND="${COMMON_DEPEND}
77 + bash? ( app-shells/bash )
78 + !prefix? (
79 + kernel_linux? (
80 + sysv-utils? ( !sys-apps/sysvinit )
81 + !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
82 + virtual/tmpfiles
83 + )
84 + kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
85 + )
86 + selinux? (
87 + >=sec-policy/selinux-base-policy-2.20170204-r4
88 + >=sec-policy/selinux-openrc-2.20170204-r4
89 + )
90 + !<app-shells/gentoo-bashcomp-20180302
91 + !<app-shells/gentoo-zsh-completions-20180228
92 +"
93 +
94 +PDEPEND="netifrc? ( net-misc/netifrc )"
95 +
96 +src_prepare() {
97 + default
98 + if [[ ${PV} == "9999" ]] ; then
99 + local ver="git-${EGIT_VERSION:0:6}"
100 + sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
101 + fi
102 +}
103 +
104 +src_compile() {
105 + unset LIBDIR #266688
106 +
107 + MAKE_ARGS="${MAKE_ARGS}
108 + LIBNAME=$(get_libdir)
109 + LIBEXECDIR=${EPREFIX}/lib/rc
110 + MKBASHCOMP=yes
111 + MKNET=$(usex newnet)
112 + MKSELINUX=$(usex selinux)
113 + MKSYSVINIT=$(usex sysv-utils)
114 + MKAUDIT=$(usex audit)
115 + MKPAM=$(usev pam)
116 + MKSTATICLIBS=$(usex static-libs)
117 + MKZSHCOMP=yes
118 + SH=$(usex bash /bin/bash /bin/sh)"
119 +
120 + local brand="Unknown"
121 + if use kernel_linux ; then
122 + MAKE_ARGS="${MAKE_ARGS} OS=Linux"
123 + brand="Linux"
124 + elif use kernel_FreeBSD ; then
125 + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
126 + brand="FreeBSD"
127 + fi
128 + export BRANDING="Gentoo ${brand}"
129 + use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
130 + export DEBUG=$(usev debug)
131 + export MKTERMCAP=$(usev ncurses)
132 +
133 + tc-export CC AR RANLIB
134 + emake ${MAKE_ARGS}
135 +}
136 +
137 +# set_config <file> <option name> <yes value> <no value> test
138 +# a value of "#" will just comment out the option
139 +set_config() {
140 + local file="${ED}/$1" var=$2 val com
141 + eval "${@:5}" && val=$3 || val=$4
142 + [[ ${val} == "#" ]] && com="#" && val='\2'
143 + sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
144 +}
145 +
146 +set_config_yes_no() {
147 + set_config "$1" "$2" YES NO "${@:3}"
148 +}
149 +
150 +src_install() {
151 + emake ${MAKE_ARGS} DESTDIR="${D}" install
152 +
153 + # move the shared libs back to /usr so ldscript can install
154 + # more of a minimal set of files
155 + # disabled for now due to #270646
156 + #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
157 + #gen_usr_ldscript -a einfo rc
158 + gen_usr_ldscript libeinfo.so
159 + gen_usr_ldscript librc.so
160 +
161 + if ! use kernel_linux; then
162 + keepdir /lib/rc/init.d
163 + fi
164 + keepdir /lib/rc/tmp
165 +
166 + # Setup unicode defaults for silly unicode users
167 + set_config_yes_no /etc/rc.conf unicode use unicode
168 +
169 + # Cater to the norm
170 + set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
171 +
172 + # On HPPA, do not run consolefont by default (bug #222889)
173 + if use hppa; then
174 + rm -f "${ED}"/etc/runlevels/boot/consolefont
175 + fi
176 +
177 + # Support for logfile rotation
178 + insinto /etc/logrotate.d
179 + newins "${FILESDIR}"/openrc.logrotate openrc
180 +
181 + # install gentoo pam.d files
182 + newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
183 + newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
184 +
185 + # install documentation
186 + dodoc ChangeLog *.md
187 + if use newnet; then
188 + dodoc README.newnet
189 + fi
190 +}
191 +
192 +pkg_preinst() {
193 + # avoid default thrashing in conf.d files when possible #295406
194 + if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
195 + (
196 + unset hostname HOSTNAME
197 + source "${EROOT}"/etc/conf.d/hostname
198 + : ${hostname:=${HOSTNAME}}
199 + [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
200 + )
201 + fi
202 +
203 + # set default interactive shell to sulogin if it exists
204 + set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
205 + return 0
206 +}
207 +
208 +pkg_postinst() {
209 + if use hppa; then
210 + elog "Setting the console font does not work on all HPPA consoles."
211 + elog "You can still enable it by running:"
212 + elog "# rc-update add consolefont boot"
213 + fi
214 +
215 + # Added for 0.35.
216 + if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
217 + if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
218 + cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
219 + fi
220 + elif ! use kernel_linux; then
221 + if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
222 + cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
223 + fi
224 + fi
225 +
226 + if ! use newnet && ! use netifrc; then
227 + ewarn "You have emerged OpenRc without network support. This"
228 + ewarn "means you need to SET UP a network manager such as"
229 + ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
230 + ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
231 + ewarn "Or, you have the option of emerging openrc with the newnet"
232 + ewarn "use flag and configuring /etc/conf.d/network and"
233 + ewarn "/etc/conf.d/staticroute if you only use static interfaces."
234 + ewarn
235 + fi
236 +
237 + if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
238 + ewarn "Please add the network service to your boot runlevel"
239 + ewarn "as soon as possible. Not doing so could leave you with a system"
240 + ewarn "without networking."
241 + ewarn
242 + fi
243 +}