| 1 |
commit: b2a5a2d6805cf74fb85755a9f8cf43db2e9fcdf8 |
| 2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 19 23:24:28 2017 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 21 08:22:00 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2a5a2d6 |
| 7 |
|
| 8 |
sys-freebsd/freebsd-usbin: tidy up ebuilds. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
| 11 |
|
| 12 |
sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild | 14 +++++++------- |
| 13 |
sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild | 14 +++++++------- |
| 14 |
sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild | 12 ++++++------ |
| 15 |
3 files changed, 20 insertions(+), 20 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild |
| 18 |
index 13fcabab5a4..54be148462f 100644 |
| 19 |
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild |
| 20 |
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2016 Gentoo Foundation |
| 23 |
+# Copyright 1999-2017 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=5 |
| 27 |
@@ -130,9 +130,9 @@ src_install() { |
| 28 |
|
| 29 |
# Most of these now come from openrc. |
| 30 |
for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do |
| 31 |
- newinitd "${FILESDIR}/"${util}.initd ${util} || die |
| 32 |
+ newinitd "${FILESDIR}/"${util}.initd ${util} |
| 33 |
if [[ -e "${FILESDIR}"/${util}.confd ]]; then \ |
| 34 |
- newconfd "${FILESDIR}"/${util}.confd ${util} || die |
| 35 |
+ newconfd "${FILESDIR}"/${util}.confd ${util} |
| 36 |
fi |
| 37 |
done |
| 38 |
|
| 39 |
@@ -147,17 +147,17 @@ EOS |
| 40 |
|
| 41 |
# Install the pw.conf file to let pw use Gentoo's skel location |
| 42 |
insinto /etc |
| 43 |
- doins "${FILESDIR}/pw.conf" || die |
| 44 |
+ doins "${FILESDIR}/pw.conf" |
| 45 |
|
| 46 |
cd "${WORKDIR}/etc" || die |
| 47 |
- doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die |
| 48 |
+ doins apmd.conf syslog.conf newsyslog.conf nscd.conf |
| 49 |
|
| 50 |
insinto /etc/ppp |
| 51 |
- doins ppp/ppp.conf || die |
| 52 |
+ doins ppp/ppp.conf |
| 53 |
|
| 54 |
if use bluetooth; then |
| 55 |
insinto /etc/bluetooth |
| 56 |
- doins bluetooth/* || die |
| 57 |
+ doins bluetooth/* |
| 58 |
rm -f "${D}"/etc/bluetooth/Makefile |
| 59 |
fi |
| 60 |
|
| 61 |
|
| 62 |
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild |
| 63 |
index 4050a75bdf5..a43897c528f 100644 |
| 64 |
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild |
| 65 |
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild |
| 66 |
@@ -1,4 +1,4 @@ |
| 67 |
-# Copyright 1999-2016 Gentoo Foundation |
| 68 |
+# Copyright 1999-2017 Gentoo Foundation |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
|
| 71 |
EAPI=5 |
| 72 |
@@ -128,9 +128,9 @@ src_install() { |
| 73 |
|
| 74 |
# Most of these now come from openrc. |
| 75 |
for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do |
| 76 |
- newinitd "${FILESDIR}/"${util}.initd ${util} || die |
| 77 |
+ newinitd "${FILESDIR}/"${util}.initd ${util} |
| 78 |
if [[ -e "${FILESDIR}"/${util}.confd ]]; then \ |
| 79 |
- newconfd "${FILESDIR}"/${util}.confd ${util} || die |
| 80 |
+ newconfd "${FILESDIR}"/${util}.confd ${util} |
| 81 |
fi |
| 82 |
done |
| 83 |
|
| 84 |
@@ -145,20 +145,20 @@ EOS |
| 85 |
|
| 86 |
# Install the pw.conf file to let pw use Gentoo's skel location |
| 87 |
insinto /etc |
| 88 |
- doins "${FILESDIR}/pw.conf" || die |
| 89 |
+ doins "${FILESDIR}/pw.conf" |
| 90 |
|
| 91 |
cd "${WORKDIR}/etc" || die |
| 92 |
- doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die |
| 93 |
+ doins apmd.conf syslog.conf newsyslog.conf nscd.conf |
| 94 |
|
| 95 |
if use bluetooth; then |
| 96 |
insinto /etc/bluetooth |
| 97 |
- doins bluetooth/* || die |
| 98 |
+ doins bluetooth/* |
| 99 |
rm -f "${D}"/etc/bluetooth/Makefile |
| 100 |
fi |
| 101 |
|
| 102 |
cd "${S}"/ppp || die |
| 103 |
insinto /etc/ppp |
| 104 |
- doins ppp.conf || die |
| 105 |
+ doins ppp.conf |
| 106 |
|
| 107 |
# Install the periodic stuff (needs probably to be ported in a more |
| 108 |
# gentooish way) |
| 109 |
|
| 110 |
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild |
| 111 |
index 522032984c5..36367a5e496 100644 |
| 112 |
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild |
| 113 |
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild |
| 114 |
@@ -129,9 +129,9 @@ src_install() { |
| 115 |
|
| 116 |
# Most of these now come from openrc. |
| 117 |
for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do |
| 118 |
- newinitd "${FILESDIR}/"${util}.initd ${util} || die |
| 119 |
+ newinitd "${FILESDIR}/"${util}.initd ${util} |
| 120 |
if [[ -e "${FILESDIR}"/${util}.confd ]]; then \ |
| 121 |
- newconfd "${FILESDIR}"/${util}.confd ${util} || die |
| 122 |
+ newconfd "${FILESDIR}"/${util}.confd ${util} |
| 123 |
fi |
| 124 |
done |
| 125 |
|
| 126 |
@@ -146,20 +146,20 @@ EOS |
| 127 |
|
| 128 |
# Install the pw.conf file to let pw use Gentoo's skel location |
| 129 |
insinto /etc |
| 130 |
- doins "${FILESDIR}/pw.conf" || die |
| 131 |
+ doins "${FILESDIR}/pw.conf" |
| 132 |
|
| 133 |
cd "${WORKDIR}/etc" || die |
| 134 |
- doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die |
| 135 |
+ doins apmd.conf syslog.conf newsyslog.conf nscd.conf |
| 136 |
|
| 137 |
if use bluetooth; then |
| 138 |
insinto /etc/bluetooth |
| 139 |
- doins bluetooth/* || die |
| 140 |
+ doins bluetooth/* |
| 141 |
rm -f "${D}"/etc/bluetooth/Makefile |
| 142 |
fi |
| 143 |
|
| 144 |
cd "${S}"/ppp || die |
| 145 |
insinto /etc/ppp |
| 146 |
- doins ppp.conf || die |
| 147 |
+ doins ppp.conf |
| 148 |
|
| 149 |
# Install the periodic stuff (needs probably to be ported in a more |
| 150 |
# gentooish way) |
Archives