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: Wed, 12 Dec 2018 18:36:53
Message-Id: 1544639600.42caccbcc9f53bb6478cd517b2e0ac46fa8fe4d6.williamh@gentoo
1 commit: 42caccbcc9f53bb6478cd517b2e0ac46fa8fe4d6
2 Author: William Hubbs <william.hubbs <AT> sony <DOT> com>
3 AuthorDate: Wed Dec 12 18:31:06 2018 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 12 18:33:20 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42caccbc
7
8 sys-apps/openrc: remove unstable 0.39.x
9
10 Copyright: Sony Interactive Entertainment Inc.
11 Package-Manager: Portage-2.3.51, Repoman-2.3.12
12 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
13
14 sys-apps/openrc/Manifest | 1 -
15 sys-apps/openrc/openrc-0.39.2.ebuild | 326 -----------------------------------
16 2 files changed, 327 deletions(-)
17
18 diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
19 index 331c8714aa2..c54b69aa748 100644
20 --- a/sys-apps/openrc/Manifest
21 +++ b/sys-apps/openrc/Manifest
22 @@ -3,5 +3,4 @@ DIST openrc-0.35.5.tar.gz 241784 BLAKE2B 6f63dcf30c430949f25108b0ca808f2317b2e58
23 DIST openrc-0.36.tar.gz 240179 BLAKE2B 1361d22782d6063e7fce61a98ef1e1f754d0208ec58de02ae60a0950531d248ac6e65e1ed45b412c89288103f6848b24aa51dd66232aa46e7900b339cac21a57 SHA512 f4730489e595a9ac4477c2b410e034b4eea2b8111c12c2695916aa04102020f8c84cb24220d3aa552709898035aa196e2fd48cba9b12a71dff1f5c2b03c3d424
24 DIST openrc-0.37.tar.gz 240928 BLAKE2B b802260a3bd71e6d8e6d54b21007024481d42a4f179eff824a39fb91f5b1cd4f7a2fd52d9e7f23b1077965b57d319a99a5b39b8cd2d7f66dfe272b4497d53a22 SHA512 16235774ad28a66308dd1ea00238b4025a4d26c9c0bb6cdb032f28d00479520c4c5fdb349f82d33a535eee3d491d0349b5871b15cae30ef296ec476883965b83
25 DIST openrc-0.38.3.tar.gz 238031 BLAKE2B 87d1546e21d581feda4064cd64bf43f762203becdcc4b002bf868f17403bd42770cb1106a8bc383c8d69e19ad66ad2bedaa7090c95206597e8a9b6e2ba481dcc SHA512 6bb42ccdab5fb24b11f5042bf19850f440d3494b6bd1d7b8db31b592f051fcd26feac1c8d9ef515238c53c6f5bf98a8c367a48471c178ae829e05c56bd24cfde
26 -DIST openrc-0.39.2.tar.gz 242417 BLAKE2B 076834890b084b1dcf33f78e190f8f7163161d99d185d5cb7043dbc33c6ff0861bc4965ccbf63e2f1b173185d4d017d9269066d35cd75cb7c5a090d39be9b833 SHA512 ea1f23bb479085eea406bebe304a531d061e47955f7c98da21aa4f01694b5c6f23cb1bb9764aa7b27fd4c8c5a7602eb2a16baef63eb96660fab58c063ff88129
27 DIST openrc-0.40.2.tar.gz 245006 BLAKE2B 9e0aab4d42121296cb9bcc47e9222e0e99df80ab686636a8060c6271d30ff7c0d999f851d0e24dfab9e7a6532b56a6a1974cfa4514e88e6b82ec5fbbc192d76c SHA512 746e238f792113397486b9abb6e41c8179e51fe823c82c8e8942d71329a806b9c398628f835e2626ed0e8735c05b0dcd1b82bf9b5111f420105eeae6b0b0e3f2
28
29 diff --git a/sys-apps/openrc/openrc-0.39.2.ebuild b/sys-apps/openrc/openrc-0.39.2.ebuild
30 deleted file mode 100644
31 index 78e08b97990..00000000000
32 --- a/sys-apps/openrc/openrc-0.39.2.ebuild
33 +++ /dev/null
34 @@ -1,326 +0,0 @@
35 -# Copyright 1999-2018 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -
40 -inherit flag-o-matic pam toolchain-funcs
41 -
42 -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
43 -HOMEPAGE="https://github.com/openrc/openrc/"
44 -
45 -if [[ ${PV} == "9999" ]]; then
46 - EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
47 - inherit git-r3
48 -else
49 - SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
50 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
51 -fi
52 -
53 -LICENSE="BSD-2"
54 -SLOT="0"
55 -IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
56 - unicode kernel_linux kernel_FreeBSD"
57 -
58 -COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
59 - ncurses? ( sys-libs/ncurses:0= )
60 - pam? (
61 - sys-auth/pambase
62 - virtual/pam
63 - )
64 - audit? ( sys-process/audit )
65 - kernel_linux? (
66 - sys-process/psmisc
67 - !<sys-process/procps-3.3.9-r2
68 - )
69 - selinux? (
70 - sys-apps/policycoreutils
71 - >=sys-libs/libselinux-2.6
72 - )
73 - !<sys-apps/baselayout-2.1-r1
74 - !<sys-fs/udev-init-scripts-27"
75 -DEPEND="${COMMON_DEPEND}
76 - virtual/os-headers
77 - ncurses? ( virtual/pkgconfig )"
78 -RDEPEND="${COMMON_DEPEND}
79 - !prefix? (
80 - kernel_linux? (
81 - >=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 - MKAUDIT=$(usex audit)
114 - MKPAM=$(usev pam)
115 - MKSTATICLIBS=$(usex static-libs)
116 - MKZSHCOMP=yes"
117 -
118 - local brand="Unknown"
119 - if use kernel_linux ; then
120 - MAKE_ARGS="${MAKE_ARGS} OS=Linux"
121 - brand="Linux"
122 - elif use kernel_FreeBSD ; then
123 - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
124 - brand="FreeBSD"
125 - fi
126 - export BRANDING="Gentoo ${brand}"
127 - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
128 - export DEBUG=$(usev debug)
129 - export MKTERMCAP=$(usev ncurses)
130 -
131 - tc-export CC AR RANLIB
132 - emake ${MAKE_ARGS}
133 -}
134 -
135 -# set_config <file> <option name> <yes value> <no value> test
136 -# a value of "#" will just comment out the option
137 -set_config() {
138 - local file="${ED}/$1" var=$2 val com
139 - eval "${@:5}" && val=$3 || val=$4
140 - [[ ${val} == "#" ]] && com="#" && val='\2'
141 - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
142 -}
143 -
144 -set_config_yes_no() {
145 - set_config "$1" "$2" YES NO "${@:3}"
146 -}
147 -
148 -src_install() {
149 - emake ${MAKE_ARGS} DESTDIR="${D}" install
150 -
151 - # move the shared libs back to /usr so ldscript can install
152 - # more of a minimal set of files
153 - # disabled for now due to #270646
154 - #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
155 - #gen_usr_ldscript -a einfo rc
156 - gen_usr_ldscript libeinfo.so
157 - gen_usr_ldscript librc.so
158 -
159 - if ! use kernel_linux; then
160 - keepdir /lib/rc/init.d
161 - fi
162 - keepdir /lib/rc/tmp
163 -
164 - # Backup our default runlevels
165 - dodir /usr/share/"${PN}"
166 - cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
167 - rm -rf "${ED}"/etc/runlevels
168 -
169 - # Setup unicode defaults for silly unicode users
170 - set_config_yes_no /etc/rc.conf unicode use unicode
171 -
172 - # Cater to the norm
173 - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
174 -
175 - # On HPPA, do not run consolefont by default (bug #222889)
176 - if use hppa; then
177 - rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
178 - fi
179 -
180 - # Support for logfile rotation
181 - insinto /etc/logrotate.d
182 - newins "${FILESDIR}"/openrc.logrotate openrc
183 -
184 - # install gentoo pam.d files
185 - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
186 - newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
187 -
188 - # install documentation
189 - dodoc ChangeLog *.md
190 - if use newnet; then
191 - dodoc README.newnet
192 - fi
193 -}
194 -
195 -add_boot_init() {
196 - local initd=$1
197 - local runlevel=${2:-boot}
198 - # if the initscript is not going to be installed and is not
199 - # currently installed, return
200 - [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
201 - || return
202 - [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
203 -
204 - # if runlevels dont exist just yet, then create it but still flag
205 - # to pkg_postinst that it needs real setup #277323
206 - if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
207 - mkdir -p "${EROOT}"etc/runlevels/${runlevel}
208 - touch "${EROOT}"etc/runlevels/.add_boot_init.created
209 - fi
210 -
211 - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
212 - ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
213 -}
214 -add_boot_init_mit_config() {
215 - local config=$1 initd=$2
216 - if [[ -e ${EROOT}${config} ]] ; then
217 - if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
218 - add_boot_init ${initd}
219 - fi
220 - fi
221 -}
222 -
223 -pkg_preinst() {
224 - local f LIBDIR=$(get_libdir)
225 -
226 - # avoid default thrashing in conf.d files when possible #295406
227 - if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
228 - (
229 - unset hostname HOSTNAME
230 - source "${EROOT}"etc/conf.d/hostname
231 - : ${hostname:=${HOSTNAME}}
232 - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
233 - )
234 - fi
235 -
236 - # set default interactive shell to sulogin if it exists
237 - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
238 -
239 - # termencoding was added in 0.2.1 and needed in boot
240 - has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
241 -
242 - # swapfiles was added in 0.9.9 and needed in boot (february 2012)
243 - has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
244 -
245 - if ! has_version ">=sys-apps/openrc-0.11"; then
246 - add_boot_init sysfs sysinit
247 - fi
248 -
249 - if ! has_version ">=sys-apps/openrc-0.11.3" ; then
250 - migrate_udev_mount_script
251 - fi
252 -
253 - # these were added in 0.12.
254 - if ! has_version ">=sys-apps/openrc-0.12"; then
255 - add_boot_init loopback
256 -
257 - # ensure existing /etc/conf.d/net is not removed
258 - # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
259 - # this needs to stay in openrc ebuilds for a long time. :(
260 - # Added in 0.12.
261 - if [[ -f "${EROOT}"etc/conf.d/net ]]; then
262 - einfo "Modifying conf.d/net to keep it from being removed"
263 - cat <<-EOF >>"${EROOT}"etc/conf.d/net
264 -
265 -# The network scripts are now part of net-misc/netifrc
266 -# In order to avoid sys-apps/${P} from removing this file, this comment was
267 -# added; you can safely remove this comment. Please see
268 -# /usr/share/doc/netifrc*/README* for more information.
269 -EOF
270 - fi
271 - fi
272 - has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
273 -
274 - if ! has_version ">=sys-apps/openrc-0.18.3"; then
275 - add_boot_init mtab
276 - if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
277 - ewarn "${EROOT}etc/mtab will be replaced with a"
278 - ewarn "symbolic link to /proc/self/mounts on the next"
279 - ewarn "reboot."
280 - ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
281 - ewarn "if you do not want this to happen."
282 - fi
283 - fi
284 -
285 - has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
286 -
287 -}
288 -
289 -# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
290 -migrate_udev_mount_script() {
291 - if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
292 - ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
293 - add_boot_init udev-mount sysinit
294 - fi
295 - return 0
296 -}
297 -
298 -pkg_postinst() {
299 - local LIBDIR=$(get_libdir)
300 -
301 - # Make our runlevels if they don't exist
302 - if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
303 - einfo "Copying across default runlevels"
304 - cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
305 - rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
306 - else
307 - if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
308 - mkdir -p "${EROOT}"etc/runlevels/sysinit
309 - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
310 - "${EROOT}"etc/runlevels/sysinit
311 - fi
312 - if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
313 - mkdir -p "${EROOT}"etc/runlevels/shutdown
314 - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
315 - "${EROOT}"etc/runlevels/shutdown
316 - fi
317 - if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
318 - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
319 - "${EROOT}"etc/runlevels
320 - fi
321 - fi
322 -
323 - if use hppa; then
324 - elog "Setting the console font does not work on all HPPA consoles."
325 - elog "You can still enable it by running:"
326 - elog "# rc-update add consolefont boot"
327 - fi
328 -
329 - # Added for 0.35.
330 - if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
331 - if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
332 - cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
333 - fi
334 - elif ! use kernel_linux; then
335 - if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
336 - cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
337 - fi
338 - fi
339 -
340 - # update the dependency tree after touching all files #224171
341 - [[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
342 -
343 - if ! use newnet && ! use netifrc; then
344 - ewarn "You have emerged OpenRc without network support. This"
345 - ewarn "means you need to SET UP a network manager such as"
346 - ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
347 - ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
348 - ewarn "Or, you have the option of emerging openrc with the newnet"
349 - ewarn "use flag and configuring /etc/conf.d/network and"
350 - ewarn "/etc/conf.d/staticroute if you only use static interfaces."
351 - ewarn
352 - fi
353 -
354 - if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
355 - ewarn "Please add the network service to your boot runlevel"
356 - ewarn "as soon as possible. Not doing so could leave you with a system"
357 - ewarn "without networking."
358 - ewarn
359 - fi
360 -}