sys-apps/openrc: remove multiple unstable versions
authorWilliam Hubbs <williamh@gentoo.org>
Tue, 28 Nov 2017 18:58:00 +0000 (12:58 -0600)
committerWilliam Hubbs <williamh@gentoo.org>
Tue, 28 Nov 2017 18:58:26 +0000 (12:58 -0600)
Package-Manager: Portage-2.3.13, Repoman-2.3.3

20 files changed:
sys-apps/openrc/Manifest
sys-apps/openrc/openrc-0.27.2.ebuild [deleted file]
sys-apps/openrc/openrc-0.29.ebuild [deleted file]
sys-apps/openrc/openrc-0.30.ebuild [deleted file]
sys-apps/openrc/openrc-0.31.1.ebuild [deleted file]
sys-apps/openrc/openrc-0.31.2.ebuild [deleted file]
sys-apps/openrc/openrc-0.31.ebuild [deleted file]
sys-apps/openrc/openrc-0.32.ebuild [deleted file]
sys-apps/openrc/openrc-0.33.1.ebuild [deleted file]
sys-apps/openrc/openrc-0.33.ebuild [deleted file]
sys-apps/openrc/openrc-0.34.1.ebuild [deleted file]
sys-apps/openrc/openrc-0.34.2.ebuild [deleted file]
sys-apps/openrc/openrc-0.34.3.ebuild [deleted file]
sys-apps/openrc/openrc-0.34.4.ebuild [deleted file]
sys-apps/openrc/openrc-0.34.5.ebuild [deleted file]
sys-apps/openrc/openrc-0.34.6.ebuild [deleted file]
sys-apps/openrc/openrc-0.34.7.ebuild [deleted file]
sys-apps/openrc/openrc-0.34.8.ebuild [deleted file]
sys-apps/openrc/openrc-0.34.9.ebuild [deleted file]
sys-apps/openrc/openrc-0.34.ebuild [deleted file]

index b5ce61a81a07e04d225697435555503c10723dde..ab733857b4969c61e8ea9d7302a5b393cae1e0ec 100644 (file)
@@ -1,22 +1,3 @@
-DIST openrc-0.27.2.tar.gz 223572 BLAKE2B 41351ec87f45413b9e7785e62f5caa3ff09eee76c574d1e5ca6f2c3cf3375628c5921be10efbbcb89a49bc99219341f89a0268be657d60abc00d16cda2059bb5 SHA512 a3f3ed8f6dbd188065fc4ed0af1e4ca0d203dbad092bc67405bea182be359bf37c9c94cb97d898c0d34befef92e9d8a2f6a8b4bafe7e95fcaa291b5d0aabed22
 DIST openrc-0.28.tar.gz 224228 BLAKE2B 6f4693003aba77148bb5ed3516c1372e3ca67364a25d866fce418ba6a287a8cc0c33534cbe1edcdab32a869f8f8dc72819fb2dffc46375bca1e053fb3acf415b SHA512 a10c293bf4287bcc4ffb9c996cbc1294f979483ea9fb2efb0dd1becee193f49ff114530c078850e8c11cf2c0a812be2e74801352fdbfe313b90cd9af5b8ccf93
-DIST openrc-0.29.tar.gz 223275 BLAKE2B 80a114204ffdf646ea0f0974a95ba7e88cac008b0b849d7471265b9a879653123738972a573bcecd474a3705f7ed1beba42210d010d253cb256ca7beed7106fd SHA512 1accc52c3e729432fee433395eb7551fa7913004999c595f6485a0505b7916338df6d9e7d95304e865adf67df54378525a758b34bb67beefe240a90700e4f7d8
-DIST openrc-0.30.tar.gz 222383 BLAKE2B 69c9e388441994428efa1e8614db2129c5d1410d657fa895d9e43bbf0d5195d646a1f2cda016ac7e7930d5a110cacfff9f5377849bc7778ee09e6edea1486db1 SHA512 d1893adc776184cdb9a7ab884250d29357d1e4855f5f1f93577e6ca2ff30f3233d263d237672395caaff6e479bcba5e52c31c9089e8904ed70b40a29f10864cb
-DIST openrc-0.31.1.tar.gz 224059 BLAKE2B b5ef4a91e1ff4c50ac13dafca5547ef49b0aaad124e3c583c70966464e4abdb7165af66a7ada299bf9e062fd44ffc72a5733ce41847228351c2ae20409a2e998 SHA512 98001e05896d113e20fad27ba100e2db5588262cb9c0b52c2800b38fd320b9baf4a99302044ef4045ba3a746d685d0cc27f8fdb42dccbc0574e32c6db9e6d3d2
-DIST openrc-0.31.2.tar.gz 224891 BLAKE2B 0788122892fda26a4fce20b3a748282062411b26ac6b23e99d5e2cb8115d04ab9e82ed624815dd04cf8115e7e65f7dc3791d30878f23db6ed22726cff5e72fd5 SHA512 c7a43eddd0652b8b9a62914d7aebcb6eab5fbd8f041a25f95c68f15c97eab3d27802a335da3703ce1e9828bd9a4fdc7e7c311075b875164af024c82a181b10df
-DIST openrc-0.31.tar.gz 223966 BLAKE2B 4b104483438bc9a6e8a84c6701bfafa46b4119ddb68fdd39f8c8a0160ce136bf9096dbafc99551932a7d918d91d864f0dfe09f16e6e3f0c5148fccdc8cab3421 SHA512 2c28daa5b2bfd3c31a2b87b08a7b39dc078ab0224c713a2b738e991f968f07d4761770a813fb449df551d6e3db58ed997ac8bbe210d1fb17b4c88ead859eba7b
 DIST openrc-0.32.1.tar.gz 223808 BLAKE2B 4aadd36e371de56d5c2b59597ab04c1b004be73e370fa00560b77ab0587ba49fb4a49608aba4ad85ed7279eadf54e023961e25784e3078edeed4891956995f38 SHA512 9cd48978fcd69a6d80b474a06b56550cc8c538d6d7a1cb6f88b90087593eebb8185ee5192ec05be2f87f61de53dbe6ded9058aee7ae8f806bb0d7d7da70f62d8
-DIST openrc-0.32.tar.gz 223935 BLAKE2B a5b3426feb6ba6599662ecfb4975208658ac2a6a0a222478199c5aee71f20a3fef35508ac552f67caeaace3a18b0d4f9775ca4ff655d9901482cae04289943dd SHA512 a355ba31d50b1c58f724d446449a8e31bb6f4c13b2da886880579e2666bcefe612a4eae64732f3ef7549fbfc84f3e088c4ca98e6be30108adfbf0a6d648d2635
-DIST openrc-0.33.1.tar.gz 224256 BLAKE2B cd8c4fa21e6a1341ad16a0cdf7289af63fbcccc7c35e0858b66e3b7f4030de6c420465c04a7886931679b7c094e345076e9a0e34fd58a54f7e0d75897b0a2015 SHA512 87388e96e2e4a1100699ed816a4bd71307d237b9e8013d48ecaaf453170cdb27bf642a6a227a3f934580e1f1f5985337fab50164b69b28489ee7f2813802f883
-DIST openrc-0.33.tar.gz 224148 BLAKE2B 8982423f45f170d5a447806aba5d0da33796eb9bb0325bf3b684e5460770020324d48690fb7094c267d1e14fbcf87871e7c377a23ac23fb0bef37f38eb73666a SHA512 6c4b27f3c433f418ae205074214697697b8e124110db2985200a698b4123bac468aa962026ca638c2c1b71e5b3121bfe5280a34d7a954a0aa1ede0b79dfab18e
-DIST openrc-0.34.1.tar.gz 225744 BLAKE2B 66669b6fe1532410bdd25114d77add711fcbc03dbfca1de83eaaad49efc26d41c75776b93898bc658a27955eca1f1d70a2c0ae7593069cde6ad174748c4d915d SHA512 dbb6fd3af5c3020a16b010c7b242c7506390ad53dc961c32339149b89cca597c34c632d0ad71b450034e2466221653bed29b3e1e6c6da15987d04c6981c0392d
 DIST openrc-0.34.10.tar.gz 227909 BLAKE2B 7f9ca169d03c785d7629d227023f947dd3a70a420ff8043ece075924ea5a7d803c78572cef1e5310dbda44c1b905a681301493785137acb9bdbd8a21ccf44093 SHA512 7df66a9e7aeeecb9109e4231e4be4e42cca8e9ad77486cace3a4969af1e4d0bac2522cf832a40990e81e0022598732cd12f07e55f21e576af07144fae538df6f
-DIST openrc-0.34.2.tar.gz 226006 BLAKE2B d4916b5f005f331be2bf359f2707540d8a3b9ccecfb9ae0e03cbc8aef17043d4800d0c1d28a7adccad0fdf28a5f73548c7ef8b5b2889cfe584f16fef71c863d4 SHA512 67a26babf5e0026aaebed45eab1ac667531c347f2ba76ad6d3fb60731d95880b831a330f4ac8996188264bdf563b583b6cdcb0002d7ace8327928b78226a29a1
-DIST openrc-0.34.3.tar.gz 226693 BLAKE2B 76a2785a015102f75ea86c28f1b7e574f2717097b7a3451b8c0d6f8526096a941ce79032118a1ec54f1ef74ecffcda2f1a0a140bd4ab3c3504b34fa1a9506e70 SHA512 516849d20fba93cf560aaeb51b29fa495265b317b37fc48e193876b131f770665235560fcb2e64e7c7a8046699daafee170887cdb19144938cbf669724505f3b
-DIST openrc-0.34.4.tar.gz 227129 BLAKE2B 1cf3c1522d17fdcda27b26ea94d1b12366d0f4715fd30f79ab068653798aba85eb2076d3062b8278dba5014f91d8ac13629b000f4415435a6112accfd4915032 SHA512 f502a8411929d153d4d2e5e4f4052691c6ff85432eb0b8a5534c7880d9b58b3ac919f04af1f1be38c76cd8dec3740bc718b486c06f06f08ba41d311d963250ec
-DIST openrc-0.34.5.tar.gz 227278 BLAKE2B f4e1a1bd8231c12e4b9b3444366eb21e888c3cd96b3c53e5241c1cbcc55bbdcb657fad05c7a5b7b805eaf21907270cc1325ca65fd86968333236beb365e5821a SHA512 2e743b7d8f287bab8c74e9cac46935a7895483fd181d969a8e3a6709ccd6d222255b509730b9165f191626774fc372e426049678796d72e4d43541b8232674c7
-DIST openrc-0.34.6.tar.gz 227096 BLAKE2B 622f81216c4b0493362afaf8d9a61808c49efefd32deef6aaec598aae583e5a97286b76cdfb169c7f58f1c668e3a93fb505bd306b3c364ed4d0367f48b155819 SHA512 2e17fbc628c0753f4459678764911d787b8d40f309f978ddbdfdc4dfc5d3033a2ac35be00fb9ad558030249d215b9494a0e5eb43e41d3123aeca032032c82541
-DIST openrc-0.34.7.tar.gz 227270 BLAKE2B a2fc2e3bacd2e82122f134f67d9206f94b987316dcada6ea41e80d34f93e7ac3dda2c5a68554fafe545ba764f8af11926e41f19dbceb42662a55fbcfc7540d6c SHA512 2cc8feb18a57418227aebf08224f23561b161766bdacc956c1a8e9b054272538de3ab3ec5245b7b8adba80f242019d56bcb94c390ed1a483015d7720fe3f4f73
-DIST openrc-0.34.8.tar.gz 227636 BLAKE2B 1a917b7e8a04e1bed0190c195c6829020450a99cbe19e8d32503210da34fd77eb5ef6043128859f70b03392a67b6f6e997b0a73a541bc58a68e141d09b4c6fb6 SHA512 2309e0d330c35467dd6008f1458ac9680207a4c783d4f4e6008a84a313088cfe796dd134dfec79699b8f9c90002b0ae621bb78a9925b987ae98fbd8ad75b947a
-DIST openrc-0.34.9.tar.gz 227686 BLAKE2B c73d2eaf92e54930e22ceb79a6307b2c30f14ff105a38015e34f482fb7c56fe89d67967a4413566a40cbf84b2bbfa2ba3420c8f89f233a173bcf4f60230242e5 SHA512 861113e357a7a662b8995fedd8aa5ba50fdae8890a4dee5413062b7c81305e8a8345a99b12cf8c2faa24966cddd9943ab2e499274ad1ddb5c79538c5d55a4fb1
-DIST openrc-0.34.tar.gz 225678 BLAKE2B 81aff0ba0af6eaf63742bf2f9b26be6911bf3795bb514b371286155f70898d8639f230bcf1b11c2d8070a52a4c0874380c0776023456bcf60eadc35046c76b4a SHA512 8ff0e3234db06ddeb7c930251f13ec9e4488e4c9776dfe46bb0c1af09835cb34655084bebb6638eb07e47a7f5ef95c1aaed9d06dfa3eaef9e36e9b7a7910f820
diff --git a/sys-apps/openrc/openrc-0.27.2.ebuild b/sys-apps/openrc/openrc-0.27.2.ebuild
deleted file mode 100644 (file)
index 278de48..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               sys-libs/libselinux
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               sec-policy/selinux-base-policy
-               sec-policy/selinux-openrc
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.29.ebuild b/sys-apps/openrc/openrc-0.29.ebuild
deleted file mode 100644 (file)
index 278de48..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               sys-libs/libselinux
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               sec-policy/selinux-base-policy
-               sec-policy/selinux-openrc
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.30.ebuild b/sys-apps/openrc/openrc-0.30.ebuild
deleted file mode 100644 (file)
index 278de48..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               sys-libs/libselinux
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               sec-policy/selinux-base-policy
-               sec-policy/selinux-openrc
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.31.1.ebuild b/sys-apps/openrc/openrc-0.31.1.ebuild
deleted file mode 100644 (file)
index 278de48..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               sys-libs/libselinux
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               sec-policy/selinux-base-policy
-               sec-policy/selinux-openrc
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.31.2.ebuild b/sys-apps/openrc/openrc-0.31.2.ebuild
deleted file mode 100644 (file)
index 1537677..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               >=sys-libs/libselinux-2.6
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               >=sec-policy/selinux-base-policy-2.20170204-r4
-               >=sec-policy/selinux-openrc-2.20170204-r4
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.31.ebuild b/sys-apps/openrc/openrc-0.31.ebuild
deleted file mode 100644 (file)
index 278de48..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               sys-libs/libselinux
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               sec-policy/selinux-base-policy
-               sec-policy/selinux-openrc
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.32.ebuild b/sys-apps/openrc/openrc-0.32.ebuild
deleted file mode 100644 (file)
index 1537677..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               >=sys-libs/libselinux-2.6
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               >=sec-policy/selinux-base-policy-2.20170204-r4
-               >=sec-policy/selinux-openrc-2.20170204-r4
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.33.1.ebuild b/sys-apps/openrc/openrc-0.33.1.ebuild
deleted file mode 100644 (file)
index 1537677..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               >=sys-libs/libselinux-2.6
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               >=sec-policy/selinux-base-policy-2.20170204-r4
-               >=sec-policy/selinux-openrc-2.20170204-r4
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.33.ebuild b/sys-apps/openrc/openrc-0.33.ebuild
deleted file mode 100644 (file)
index 1537677..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               >=sys-libs/libselinux-2.6
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               >=sec-policy/selinux-base-policy-2.20170204-r4
-               >=sec-policy/selinux-openrc-2.20170204-r4
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.34.1.ebuild b/sys-apps/openrc/openrc-0.34.1.ebuild
deleted file mode 100644 (file)
index 1537677..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               >=sys-libs/libselinux-2.6
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               >=sec-policy/selinux-base-policy-2.20170204-r4
-               >=sec-policy/selinux-openrc-2.20170204-r4
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.34.2.ebuild b/sys-apps/openrc/openrc-0.34.2.ebuild
deleted file mode 100644 (file)
index 1537677..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               >=sys-libs/libselinux-2.6
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               >=sec-policy/selinux-base-policy-2.20170204-r4
-               >=sec-policy/selinux-openrc-2.20170204-r4
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.34.3.ebuild b/sys-apps/openrc/openrc-0.34.3.ebuild
deleted file mode 100644 (file)
index 1537677..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               >=sys-libs/libselinux-2.6
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               >=sec-policy/selinux-base-policy-2.20170204-r4
-               >=sec-policy/selinux-openrc-2.20170204-r4
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.34.4.ebuild b/sys-apps/openrc/openrc-0.34.4.ebuild
deleted file mode 100644 (file)
index 1537677..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               >=sys-libs/libselinux-2.6
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               >=sec-policy/selinux-base-policy-2.20170204-r4
-               >=sec-policy/selinux-openrc-2.20170204-r4
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.34.5.ebuild b/sys-apps/openrc/openrc-0.34.5.ebuild
deleted file mode 100644 (file)
index 1537677..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               >=sys-libs/libselinux-2.6
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               >=sec-policy/selinux-base-policy-2.20170204-r4
-               >=sec-policy/selinux-openrc-2.20170204-r4
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.34.6.ebuild b/sys-apps/openrc/openrc-0.34.6.ebuild
deleted file mode 100644 (file)
index 1537677..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               >=sys-libs/libselinux-2.6
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               >=sec-policy/selinux-base-policy-2.20170204-r4
-               >=sec-policy/selinux-openrc-2.20170204-r4
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.34.7.ebuild b/sys-apps/openrc/openrc-0.34.7.ebuild
deleted file mode 100644 (file)
index f54f45f..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               >=sys-libs/libselinux-2.6
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               >=sec-policy/selinux-base-policy-2.20170204-r4
-               >=sec-policy/selinux-openrc-2.20170204-r4
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.34.8.ebuild b/sys-apps/openrc/openrc-0.34.8.ebuild
deleted file mode 100644 (file)
index 7c2ce70..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               >=sys-libs/libselinux-2.6
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               >=sec-policy/selinux-base-policy-2.20170204-r4
-               >=sec-policy/selinux-openrc-2.20170204-r4
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.34.9.ebuild b/sys-apps/openrc/openrc-0.34.9.ebuild
deleted file mode 100644 (file)
index f54f45f..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               >=sys-libs/libselinux-2.6
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               >=sec-policy/selinux-base-policy-2.20170204-r4
-               >=sec-policy/selinux-openrc-2.20170204-r4
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}
diff --git a/sys-apps/openrc/openrc-0.34.ebuild b/sys-apps/openrc/openrc-0.34.ebuild
deleted file mode 100644 (file)
index 1537677..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-       ncurses? ( sys-libs/ncurses:0= )
-       pam? (
-               sys-auth/pambase
-               virtual/pam
-       )
-       audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
-       selinux? (
-               sys-apps/policycoreutils
-               >=sys-libs/libselinux-2.6
-       )
-       !<sys-apps/baselayout-2.1-r1
-       !<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-       virtual/os-headers
-       ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-       !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-       )
-       selinux? (
-               >=sec-policy/selinux-base-policy-2.20170204-r4
-               >=sec-policy/selinux-openrc-2.20170204-r4
-       )
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-       default
-
-       sed -i 's:0444:0644:' mk/sys.mk || die
-
-       if [[ ${PV} == "9999" ]] ; then
-               local ver="git-${EGIT_VERSION:0:6}"
-               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-       fi
-}
-
-src_compile() {
-       unset LIBDIR #266688
-
-       MAKE_ARGS="${MAKE_ARGS}
-               LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-               MKNET=$(usex newnet)
-               MKSELINUX=$(usex selinux)
-               MKAUDIT=$(usex audit)
-               MKPAM=$(usev pam)
-               MKSTATICLIBS=$(usex static-libs)"
-
-       local brand="Unknown"
-       if use kernel_linux ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-               brand="Linux"
-       elif use kernel_FreeBSD ; then
-               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-               brand="FreeBSD"
-       fi
-       export BRANDING="Gentoo ${brand}"
-       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-       export DEBUG=$(usev debug)
-       export MKTERMCAP=$(usev ncurses)
-
-       tc-export CC AR RANLIB
-       emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-       local file="${ED}/$1" var=$2 val com
-       eval "${@:5}" && val=$3 || val=$4
-       [[ ${val} == "#" ]] && com="#" && val='\2'
-       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-       set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-       emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-       # move the shared libs back to /usr so ldscript can install
-       # more of a minimal set of files
-       # disabled for now due to #270646
-       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-       #gen_usr_ldscript -a einfo rc
-       gen_usr_ldscript libeinfo.so
-       gen_usr_ldscript librc.so
-
-       if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
-       fi
-       keepdir /$(get_libdir)/rc/tmp
-
-       # Backup our default runlevels
-       dodir /usr/share/"${PN}"
-       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-       rm -rf "${ED}"/etc/runlevels
-
-       # Setup unicode defaults for silly unicode users
-       set_config_yes_no /etc/rc.conf unicode use unicode
-
-       # Cater to the norm
-       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-       # On HPPA, do not run consolefont by default (bug #222889)
-       if use hppa; then
-               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-       fi
-
-       # Support for logfile rotation
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/openrc.logrotate openrc
-
-       # install gentoo pam.d files
-       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-       # install documentation
-       dodoc ChangeLog *.md
-       if use newnet; then
-               dodoc README.newnet
-       fi
-}
-
-add_boot_init() {
-       local initd=$1
-       local runlevel=${2:-boot}
-       # if the initscript is not going to be installed and is not
-       # currently installed, return
-       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-               || return
-       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-       # if runlevels dont exist just yet, then create it but still flag
-       # to pkg_postinst that it needs real setup #277323
-       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-               touch "${EROOT}"etc/runlevels/.add_boot_init.created
-       fi
-
-       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-       local config=$1 initd=$2
-       if [[ -e ${EROOT}${config} ]] ; then
-               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-                       add_boot_init ${initd}
-               fi
-       fi
-}
-
-pkg_preinst() {
-       local f LIBDIR=$(get_libdir)
-
-       # avoid default thrashing in conf.d files when possible #295406
-       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-               (
-               unset hostname HOSTNAME
-               source "${EROOT}"etc/conf.d/hostname
-               : ${hostname:=${HOSTNAME}}
-               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-               )
-       fi
-
-       # set default interactive shell to sulogin if it exists
-       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-       # termencoding was added in 0.2.1 and needed in boot
-       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
-       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-       if ! has_version ">=sys-apps/openrc-0.11"; then
-               add_boot_init sysfs sysinit
-       fi
-
-       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-               migrate_udev_mount_script
-               add_boot_init tmpfiles.setup boot
-       fi
-
-       # these were added in 0.12.
-       if ! has_version ">=sys-apps/openrc-0.12"; then
-               add_boot_init loopback
-               add_boot_init tmpfiles.dev sysinit
-
-               # ensure existing /etc/conf.d/net is not removed
-               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-               # this needs to stay in openrc ebuilds for a long time. :(
-               # Added in 0.12.
-               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-                       einfo "Modifying conf.d/net to keep it from being removed"
-                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-               fi
-       fi
-       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-       if ! has_version ">=sys-apps/openrc-0.18.3"; then
-               add_boot_init mtab
-               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-                       ewarn "${EROOT}etc/mtab will be replaced with a"
-                       ewarn "symbolic link to /proc/self/mounts on the next"
-                       ewarn "reboot."
-                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-                       ewarn "if you do not want this to happen."
-               fi
-       fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-               add_boot_init udev-mount sysinit
-       fi
-       return 0
-}
-
-pkg_postinst() {
-       local LIBDIR=$(get_libdir)
-
-       # Make our runlevels if they don't exist
-       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-               einfo "Copying across default runlevels"
-               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-       else
-               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/sysinit
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-                               "${EROOT}"etc/runlevels/sysinit
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-                       mkdir -p "${EROOT}"etc/runlevels/shutdown
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-                               "${EROOT}"etc/runlevels/shutdown
-               fi
-               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-                               "${EROOT}"etc/runlevels
-               fi
-       fi
-
-       if use hppa; then
-               elog "Setting the console font does not work on all HPPA consoles."
-               elog "You can still enable it by running:"
-               elog "# rc-update add consolefont boot"
-       fi
-
-       # Handle the conf.d/local.{start,stop} -> local.d transition
-       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-               elog "files to ${EROOT}etc/local.d"
-               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-               chmod +x "${EROOT}"etc/local.d/*{start,stop}
-       fi
-
-       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-                       ewarn "The dependency data could not be migrated to /run/openrc."
-                       ewarn "This means you need to reboot your system."
-               fi
-       fi
-
-       # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-       if ! use newnet && ! use netifrc; then
-               ewarn "You have emerged OpenRc without network support. This"
-               ewarn "means you need to SET UP a network manager such as"
-               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-               ewarn "Or, you have the option of emerging openrc with the newnet"
-               ewarn "use flag and configuring /etc/conf.d/network and"
-               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-               ewarn
-       fi
-
-       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-               ewarn "Please add the network service to your boot runlevel"
-               ewarn "as soon as possible. Not doing so could leave you with a system"
-               ewarn "without networking."
-               ewarn
-       fi
-}