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