sys-apps/openrc: repoman fixes: remove FreeBSD support

The freebsd packages and profiles are gone, so stop repoman from
complaining about the FreeBSD dependencies.

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: William Hubbs <williamh@gentoo.org>

diff --git a/sys-apps/openrc/openrc-0.41.2.ebuild b/sys-apps/openrc/openrc-0.41.2.ebuild
index 029b236f6ad9a46e433d6c9a53d05a8df9727e66..81bb6c4a741f36242b37fe5c9929cc092e02571f 100644 (file)
--- a/sys-apps/openrc/openrc-0.41.2.ebuild
+++ b/sys-apps/openrc/openrc-0.41.2.ebuild
@@ -19,19 +19,17 @@ fi
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
-       unicode kernel_linux kernel_FreeBSD"
+       unicode"
 
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+COMMON_DEPEND="
        ncurses? ( sys-libs/ncurses:0= )
        pam? (
                sys-auth/pambase
                sys-libs/pam
        )
        audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
+       sys-process/psmisc
+       !<sys-process/procps-3.3.9-r2
        selinux? (
                sys-apps/policycoreutils
                >=sys-libs/libselinux-2.6
@@ -44,11 +42,8 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
        bash? ( app-shells/bash )
        !prefix? (
-               kernel_linux? (
-                       >=sys-apps/sysvinit-2.86-r6[selinux?]
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+               >=sys-apps/sysvinit-2.86-r6[selinux?]
+               virtual/tmpfiles
        )
        selinux? (
                >=sec-policy/selinux-base-policy-2.20170204-r4
@@ -84,13 +79,8 @@ src_compile() {
                SH=$(usex bash /bin/bash /bin/sh)"
 
        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
+       MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+       brand="Linux"
        export BRANDING="Gentoo ${brand}"
        use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
        export DEBUG=$(usev debug)
@@ -124,9 +114,6 @@ src_install() {
        gen_usr_ldscript libeinfo.so
        gen_usr_ldscript librc.so
 
-       if ! use kernel_linux; then
-               keepdir /lib/rc/init.d
-       fi
        keepdir /lib/rc/tmp
 
        # Setup unicode defaults for silly unicode users
@@ -179,11 +166,7 @@ pkg_postinst() {
        fi
 
        # 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
-       elif ! use kernel_linux; then
+       if [[ ! -h "${EROOT}"/lib ]]; then
                if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
                        cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
                fi

diff --git a/sys-apps/openrc/openrc-0.42.1.ebuild b/sys-apps/openrc/openrc-0.42.1.ebuild
index 9bb3ff7fbb387528e24d70a61f8c9da5f019924d..3e6f63ea18b9b3a68c79298b9a6aa79e09758fc3 100644 (file)
--- a/sys-apps/openrc/openrc-0.42.1.ebuild
+++ b/sys-apps/openrc/openrc-0.42.1.ebuild
@@ -19,19 +19,17 @@ fi
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
-       sysv-utils unicode kernel_linux kernel_FreeBSD"
+       sysv-utils unicode"
 
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+COMMON_DEPEND="
        ncurses? ( sys-libs/ncurses:0= )
        pam? (
                sys-auth/pambase
                sys-libs/pam
        )
        audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
+       sys-process/psmisc
+       !<sys-process/procps-3.3.9-r2
        selinux? (
                sys-apps/policycoreutils
                >=sys-libs/libselinux-2.6
@@ -44,12 +42,9 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
        bash? ( app-shells/bash )
        !prefix? (
-               kernel_linux? (
                sysv-utils? ( !sys-apps/sysvinit )
                !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+               virtual/tmpfiles
        )
        selinux? (
                >=sec-policy/selinux-base-policy-2.20170204-r4
@@ -86,13 +81,8 @@ src_compile() {
                SH=$(usex bash /bin/bash /bin/sh)"
 
        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
+       MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+       brand="Linux"
        export BRANDING="Gentoo ${brand}"
        use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
        export DEBUG=$(usev debug)
@@ -126,9 +116,6 @@ src_install() {
        gen_usr_ldscript libeinfo.so
        gen_usr_ldscript librc.so
 
-       if ! use kernel_linux; then
-               keepdir /lib/rc/init.d
-       fi
        keepdir /lib/rc/tmp
 
        # Setup unicode defaults for silly unicode users
@@ -181,11 +168,7 @@ pkg_postinst() {
        fi
 
        # 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
-       elif ! use kernel_linux; then
+       if [[ ! -h "${EROOT}"/lib ]]; then
                if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
                        cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
                fi

diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 9bb3ff7fbb387528e24d70a61f8c9da5f019924d..3e6f63ea18b9b3a68c79298b9a6aa79e09758fc3 100644 (file)
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -19,19 +19,17 @@ fi
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
-       sysv-utils unicode kernel_linux kernel_FreeBSD"
+       sysv-utils unicode"
 
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+COMMON_DEPEND="
        ncurses? ( sys-libs/ncurses:0= )
        pam? (
                sys-auth/pambase
                sys-libs/pam
        )
        audit? ( sys-process/audit )
-       kernel_linux? (
-               sys-process/psmisc
-               !<sys-process/procps-3.3.9-r2
-       )
+       sys-process/psmisc
+       !<sys-process/procps-3.3.9-r2
        selinux? (
                sys-apps/policycoreutils
                >=sys-libs/libselinux-2.6
@@ -44,12 +42,9 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
        bash? ( app-shells/bash )
        !prefix? (
-               kernel_linux? (
                sysv-utils? ( !sys-apps/sysvinit )
                !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
-                       virtual/tmpfiles
-               )
-               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+               virtual/tmpfiles
        )
        selinux? (
                >=sec-policy/selinux-base-policy-2.20170204-r4
@@ -86,13 +81,8 @@ src_compile() {
                SH=$(usex bash /bin/bash /bin/sh)"
 
        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
+       MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+       brand="Linux"
        export BRANDING="Gentoo ${brand}"
        use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
        export DEBUG=$(usev debug)
@@ -126,9 +116,6 @@ src_install() {
        gen_usr_ldscript libeinfo.so
        gen_usr_ldscript librc.so
 
-       if ! use kernel_linux; then
-               keepdir /lib/rc/init.d
-       fi
        keepdir /lib/rc/tmp
 
        # Setup unicode defaults for silly unicode users
@@ -181,11 +168,7 @@ pkg_postinst() {
        fi
 
        # 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
-       elif ! use kernel_linux; then
+       if [[ ! -h "${EROOT}"/lib ]]; then
                if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
                        cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
                fi