[gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/

[William Hubbs]

commit:     fdb1ab241ff0a0b96c723a9b5b68ff8fb0e251ce
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 18:11:41 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 18:12:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb1ab24

sys-apps/openrc: set libexecdir to lib for bug #645240

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/openrc/openrc-9999.ebuild | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/sys-apps/openrc/openrc-9999.ebuild 
b/sys-apps/openrc/openrc-9999.ebuild
index dc6f3b58eab..50d119646c7 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -73,7 +73,7 @@ src_compile() {
 
        MAKE_ARGS="${MAKE_ARGS}
                LIBNAME=$(get_libdir)
-               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+               LIBEXECDIR=${EPREFIX}/lib/rc
                MKBASHCOMP=yes
                MKNET=$(usex newnet)
                MKSELINUX=$(usex selinux)
@@ -124,9 +124,9 @@ src_install() {
        gen_usr_ldscript librc.so
 
        if ! use kernel_linux; then
-               keepdir /$(get_libdir)/rc/init.d
+               keepdir /lib/rc/init.d
        fi
-       keepdir /$(get_libdir)/rc/tmp
+       keepdir /lib/rc/tmp
 
        # Backup our default runlevels
        dodir /usr/share/"${PN}"
@@ -295,24 +295,15 @@ pkg_postinst() {
                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."
+       # Added for 0.35.
+       if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
+               if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+                       cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
                fi
        fi
 
        # update the dependency tree after touching all files #224171
-       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+       [[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
 
        if ! use newnet && ! use netifrc; then
                ewarn "You have emerged OpenRc without network support. This"