sys-freebsd/freebsd-usbin: tidy up ebuilds.

Package-Manager: Portage-2.3.13, Repoman-2.3.4

diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild
index 13fcabab5a41ca405e51806d714a3a76fcd223b4..54be148462f587c45d4db4dedcc809caee1a3545 100644 (file)
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -130,9 +130,9 @@ src_install() {
 
        # Most of these now come from openrc.
        for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do
-               newinitd "${FILESDIR}/"${util}.initd ${util} || die
+               newinitd "${FILESDIR}/"${util}.initd ${util}
                if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-                       newconfd "${FILESDIR}"/${util}.confd ${util} || die
+                       newconfd "${FILESDIR}"/${util}.confd ${util}
                fi
        done
 
@@ -147,17 +147,17 @@ EOS
 
        # Install the pw.conf file to let pw use Gentoo's skel location
        insinto /etc
-       doins "${FILESDIR}/pw.conf" || die
+       doins "${FILESDIR}/pw.conf"
 
        cd "${WORKDIR}/etc" || die
-       doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
+       doins apmd.conf syslog.conf newsyslog.conf nscd.conf
 
        insinto /etc/ppp
-       doins ppp/ppp.conf || die
+       doins ppp/ppp.conf
 
        if use bluetooth; then
                insinto /etc/bluetooth
-               doins bluetooth/* || die
+               doins bluetooth/*
                rm -f "${D}"/etc/bluetooth/Makefile
        fi
 

diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild
index 4050a75bdf599bcca8d02a68aedfc13b5511de3f..a43897c528f51d78ba25a09ca3ce0a22b8bac7aa 100644 (file)
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -128,9 +128,9 @@ src_install() {
 
        # Most of these now come from openrc.
        for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do
-               newinitd "${FILESDIR}/"${util}.initd ${util} || die
+               newinitd "${FILESDIR}/"${util}.initd ${util}
                if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-                       newconfd "${FILESDIR}"/${util}.confd ${util} || die
+                       newconfd "${FILESDIR}"/${util}.confd ${util}
                fi
        done
 
@@ -145,20 +145,20 @@ EOS
 
        # Install the pw.conf file to let pw use Gentoo's skel location
        insinto /etc
-       doins "${FILESDIR}/pw.conf" || die
+       doins "${FILESDIR}/pw.conf"
 
        cd "${WORKDIR}/etc" || die
-       doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
+       doins apmd.conf syslog.conf newsyslog.conf nscd.conf
 
        if use bluetooth; then
                insinto /etc/bluetooth
-               doins bluetooth/* || die
+               doins bluetooth/*
                rm -f "${D}"/etc/bluetooth/Makefile
        fi
 
        cd "${S}"/ppp || die
        insinto /etc/ppp
-       doins ppp.conf || die
+       doins ppp.conf
 
        # Install the periodic stuff (needs probably to be ported in a more
        # gentooish way)

diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild
index 522032984c5f1d4801c40c5512a5fe268ebc8151..36367a5e496d942dff7a937c2414d6ec5e9dab01 100644 (file)
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild
@@ -129,9 +129,9 @@ src_install() {
 
        # Most of these now come from openrc.
        for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do
-               newinitd "${FILESDIR}/"${util}.initd ${util} || die
+               newinitd "${FILESDIR}/"${util}.initd ${util}
                if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-                       newconfd "${FILESDIR}"/${util}.confd ${util} || die
+                       newconfd "${FILESDIR}"/${util}.confd ${util}
                fi
        done
 
@@ -146,20 +146,20 @@ EOS
 
        # Install the pw.conf file to let pw use Gentoo's skel location
        insinto /etc
-       doins "${FILESDIR}/pw.conf" || die
+       doins "${FILESDIR}/pw.conf"
 
        cd "${WORKDIR}/etc" || die
-       doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
+       doins apmd.conf syslog.conf newsyslog.conf nscd.conf
 
        if use bluetooth; then
                insinto /etc/bluetooth
-               doins bluetooth/* || die
+               doins bluetooth/*
                rm -f "${D}"/etc/bluetooth/Makefile
        fi
 
        cd "${S}"/ppp || die
        insinto /etc/ppp
-       doins ppp.conf || die
+       doins ppp.conf
 
        # Install the periodic stuff (needs probably to be ported in a more
        # gentooish way)