1 |
commit: 1e364d0f415a534c318b979fccd737da3df629a0 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 26 16:11:04 2017 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 26 16:11:20 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e364d0f |
7 |
|
8 |
sys-apps/darwin-miscutils: cleanup bump ebuilds to EAPI=6 |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
sys-apps/darwin-miscutils/Manifest | 5 - |
13 |
.../darwin-miscutils/darwin-miscutils-10.ebuild | 7 +- |
14 |
.../darwin-miscutils/darwin-miscutils-11.ebuild | 3 +- |
15 |
.../darwin-miscutils/darwin-miscutils-4-r1.ebuild | 106 ---------------- |
16 |
.../darwin-miscutils/darwin-miscutils-5-r1.ebuild | 141 --------------------- |
17 |
.../darwin-miscutils/darwin-miscutils-6-r1.ebuild | 13 +- |
18 |
.../darwin-miscutils/darwin-miscutils-7.ebuild | 139 -------------------- |
19 |
.../darwin-miscutils/darwin-miscutils-8.ebuild | 9 +- |
20 |
.../darwin-miscutils/darwin-miscutils-9.ebuild | 7 +- |
21 |
9 files changed, 20 insertions(+), 410 deletions(-) |
22 |
|
23 |
diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest |
24 |
index 5db6f64d9d..771e630501 100644 |
25 |
--- a/sys-apps/darwin-miscutils/Manifest |
26 |
+++ b/sys-apps/darwin-miscutils/Manifest |
27 |
@@ -1,13 +1,9 @@ |
28 |
DIST adv_cmds-md-147.1 3623 SHA256 6283a00e52ef6d278afb1fa4d0e8bc7bce8bebff3e6b3da71812fcfdb415592f SHA512 459beb2b7c92b8718c76d744bbabf631bf8c329feb65c9434ce8a023c73ceac2d207c95e39c4b90b095a4724a74096a3d1bed9122883eb54e5311dfc64ffc718 WHIRLPOOL 79ebe5d5a73443665ba8804ff8867f1ad045d8b5df104b1396f00ca8ba4819d1e82ae5b31dffbf26d648748f8bccf5e01be5aba553d7955bbde13cc04be6104b |
29 |
DIST adv_cmds-md-147.c 25945 SHA256 089a4ad849da2c1a2b23fbc18dbc6860b26a367f528972d99ea361245a06c882 SHA512 93e70f7d8697652b5a3c661975d21b51545d2eb07de64fd40524fcf0d5016dae9ae1dc63c4a85cb5ad455c8d1c246b7f5f2eac38226dcefbf4cab12b0b1c7592 WHIRLPOOL 4299250fe3d0b475798d139fffcb83e17ab88283099a4d6d0669ee86e58b861b3a5409535aa9310d6729f086334a7a0d703df5b5d81b8816933fb67b6152df89 |
30 |
-DIST developer_cmds-39.tar.gz 155831 SHA256 37d58d783c44694bf869ef8906ea866a7d1798154f3206a1880b8adc154d6d81 SHA512 1c9fcd7933d7264e8f3f537fc7bd9545121b15e2784f23d1bf6c1419adb3a77c175170cab62a44286897aadd3d44ecd799c69424de058c1b3b13b01b5caba44c WHIRLPOOL 954b2f3d4ec3bb792947d398e1c948abaa7a0dca82fd56f08b65b57d7f17c2117597417740a81b443428a3808d55f9b3a77c20cea692ed093bbb5b81e6f7ecc1 |
31 |
-DIST developer_cmds-48.tar.gz 161783 SHA256 212b1102580452576dcaa38c053aa1809ede046ce5712a4c268d964be71a287d SHA512 1c6f6cd918aa895f71a44be5b456b93420054d36c0968ac4333f1947d6ca9679358394d7475df666d919cbd3da841af91b42cdda5815ec4ec1acc019a294a4d5 WHIRLPOOL 3b42a6b22c788cdbad0ef91955fdde1b33cce29950d4154e47d86460e37d1c323d8b14650966d14020541fd025db3ed0cd81b1bbc158f27b00dadf2ac03aef68 |
32 |
DIST developer_cmds-49.tar.gz 307753 SHA256 db0f2611c8efb0ec781cb8f03878958c589c8953ba9002e051afa4fc3bb6a762 SHA512 3750374c891f6d681829986291d887cacf2c5b1c7a5de94f12c92ded0b3456157b85e57653c6061526d1f6626a7be8a9e6db9c1df09e2bb3e40c7fa20b9b4103 WHIRLPOOL f167e2a95ab2f8325130fe3f418771d9aee09e268e9649bf6230601586ec41d940c52fb4a02b938a30d5059541eccf20845044ef07bef64afdbd5635c15e2073 |
33 |
-DIST developer_cmds-52.1.tar.gz 310160 SHA256 3deb187d7ee6269680f2f9678aa1e7bab3f3911a59b44e99870abb687ccba095 SHA512 280c15f9a48ae650bd8df63792920e557c192bab61e0f314b24f8baa5c0e1feecead8274aa28e0f358b8a99708bcaef8115b4b2439a50e009f6547d23613007a WHIRLPOOL 0c76d6809da42d3ff55d3c1111a0b4de4d1d302a79fd1f70bd77c4f89448b78aab321e686d9aa3203c6170d80bf9af96bfb3f6c7d598807b51d157e12ce8469b |
34 |
DIST developer_cmds-53.1.tar.gz 139637 SHA256 f3f6cc44336fae506a5c7ca1e71aeaa00da89b4337298fcd4d13953bbfa6edb8 SHA512 ac15b499d0642332e8deae2f498e5ffb0c64502e2d877bbdfe0fac4118e17fe525b169f3b015cfe8c9f40e2688bd30df4b050fe50eaa706b21a2e62ca9dd4b80 WHIRLPOOL ee747b3f8c56091f77735c2a59e0ef3d9486b5af32c44c2ed382324bf71e7f29f7ac9c8426247f7fdfa63a667acca99f6af1fcc29548fdd73b51706ba41e923e |
35 |
DIST developer_cmds-55.tar.gz 139664 SHA256 1760a430552057304ecc2c20bb0acd3683a3a0325f29a1e27065818d2515e91a SHA512 062e4c4a2b1ba4cffe7e850d07f4351c736988958450735f9f653936d64defa3347c9dac7b5fea3dcd25f8efe076133dc9ac3edb4a3e512387d6842bd177c35e WHIRLPOOL cae216847b8e6075fa8051d6d260cc91fff259f81717d19a988ada30e42c8b9728b6ce3330cbcef403639fbf5c52230d20a2272bc1154f3bcf18e3c3f4123ac7 |
36 |
DIST developer_cmds-63.tar.gz 110662 SHA256 d4bc4a4b1045377f814da08fba8b7bfcd515ef1faec12bbb694de7defe9a5c0d SHA512 4f672835f0290feaf54c7c268b31774282325448f30c02e4f12ead84c41e15083784fac4c9c4916c098953bc61aa8f29bea24a7b51312428aa87448595be50a1 WHIRLPOOL 0b4835a8d3b97817baed0d78b5f636b6dafdd31874838e792764373a91026bda44241daf3e575db659bf14434654e763832bb85864972e98d19d52c5c89e5b6c |
37 |
-DIST misc_cmds-18.tar.gz 96635 SHA256 dcc4b199cdb4d40cabd1dd58cc3498878751d9746ad736ada0177a86236d187e SHA512 2f0a7b298179e44a67125a271d9ba62b618d9bd852320fa3f1d1fa724787554d3a1e6cc08845caa2f70214fdf90cc7afdbe08fae648fe94cf8a0fe24ca673f6c WHIRLPOOL 1fc15f192f51f79c0d83234185a7193a3b93d6a09cf65b69cdfc3b3c6aecb54b045886d86bb6ca76c1bb763c46a34d46f0ae1884fba587a00fac92ef0b93711c |
38 |
DIST misc_cmds-23.tar.gz 114747 SHA256 150c74e3041db4cb02b1aabddfedb998c152bfba616ed6e24b2b98d025fef785 SHA512 0e02a939c308f4483cf11cb8b21face84f442589e3774b1827ed0ab5064ee2b433a4468ac634051fa0817919f5d39ac1ed56c67b1f5b011b83388a3806ed33c8 WHIRLPOOL 586a091fc6ead5c5398a05e3af1137cf67314e458cb44dc0f60a2099e65f53e4b569dd045c17e0f455f1cc0b4248c94b358cb5b08cf54033dc883f356a058d49 |
39 |
DIST misc_cmds-27.tar.gz 116351 SHA256 29d1b32dfceaa3364e81d50e10b8ce7721448cb0c8218ecb90491666a00efca4 SHA512 594560b179f7dafc651d3a336d33bcb7075f2199cf4964e95d63164faf19bd50ef3a6095124f0e4f91c50d1bceeb831fcd81ceecf740e2696a8e7445c1a690d2 WHIRLPOOL 6bca894b7ab1c7de9b3453e075060ec4bd35019713641c9527dd562f253eda0cc35f3b9b631bd197c3fc38ffda575701843671e3fae263fa4655455e80e73cd2 |
40 |
DIST misc_cmds-31.tar.gz 121187 SHA256 1e0cdf2af9b28245af40168fc48e010e260b62fd48ddbcb95e62851d2765f37c SHA512 d49bb8a49c23aa7efaa7db1958676390b4d5ef1b2e57f80b0bea0f10b8b29a6c3ec6d2d7a1248d3af77d382c5113fb3cbf9d3632ca92bb51c01d8c286fd9f25f WHIRLPOOL 1b3d060418ccf353d975696cd7d19354ca2b0b8795f91e185cc467fc2e9fa7683a20e6ce6e70109310e8cfff69b027efbf6e25c159e41102d62bffc36b2754d5 |
41 |
@@ -17,4 +13,3 @@ DIST shell_cmds-149.tar.gz 173740 SHA256 87263d7fc8626da3e12f8ebae458293da7c4b12 |
42 |
DIST shell_cmds-162.tar.gz 179189 SHA256 42d5ad4fbcaca83620a3ab709a41b21a18224589c844c716223489418e04e3d6 SHA512 784b6b8b3a90967d79f5a60a23e7f31f7bc92712dac9cdb625770f92b58bd6902669aa19bb59997cc654fcc0e27ddd45f60b1990e7da95d0e6c90fd7f2434f95 WHIRLPOOL cd06c734a1f1ba1169ed72ec99f8072dd0e7b608ad0764857873622c6ea0d9a99fdabd6b2ef2fc87f036dbe34e2caebfd5c6927e2440cb35375ea9c77e40c44e |
43 |
DIST shell_cmds-170.tar.gz 212954 SHA256 3f2849de051ae51e7b6cec56d90443f9168a9f9a7b9002cb4b51ece9a817b81c SHA512 b267a9b5e922c9952451ca05e5f9e328504dc46b5776e1a8405f8e41a604d7f184d70742cb6fa6646875bc1789082097c74eabcc151ac5568ba26ed858269ce7 WHIRLPOOL c036eba542fdf07843cd9ef9e781db379c90e95264918596c71f99cff2547ac877e5c3619b53d25e65e0c67a0fb42a3d32755efc6d9f4235b7d714e90047d8b5 |
44 |
DIST shell_cmds-198.tar.gz 411088 SHA256 70404d7b51b4de6ed5ec0e02d52bd5a41f17e23a624dad162615625884a5238d SHA512 6e3a43f0cd9b1e3799d1ba79f4fcc4c3bb9be178c35cba2bef9227ecc259ca52c39b4d0e39c71d9af689e07f48dbeee6806bd623286f116f7d3ee3889dc7c71f WHIRLPOOL f84ba1cb0b21897faa5dd3c2674649ea3686c73557b894af478c9460bf29d2f548488a699ec8bbdb8154c031d5067f44d1ebdf87c77e75935e507a1a101a63f7 |
45 |
-DIST shell_cmds-81.tar.gz 154516 SHA256 64f0e01de9e13b9a1518ccd2cf45486b6159a5fdc562e7d0725e835d495cea81 SHA512 ebb506331a283771d4b4f51769fece93af7703a2a0e118271bd453327db6981d197aebd93e675d019c05c6cff58ed0a0fe58e8fc26eb581ab26cb76c3271d505 WHIRLPOOL 81b668528344155ae4537894de241ff72e19e6a6f50201533a7d8e84a54684b933aa4b0492b11bb62ad78e8bced6bd652acbe029cb17fdd1423edd70ddd6ddc6 |
46 |
|
47 |
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild |
48 |
index 8438cd004f..67fe146416 100644 |
49 |
--- a/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild |
50 |
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild |
51 |
@@ -1,8 +1,7 @@ |
52 |
-# Copyright 1999-2012 Gentoo Foundation |
53 |
+# Copyright 1999-2017 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Id$ |
56 |
|
57 |
-EAPI="4" |
58 |
+EAPI="6" |
59 |
|
60 |
inherit toolchain-funcs eutils |
61 |
|
62 |
@@ -38,6 +37,8 @@ src_prepare() { |
63 |
"${S}"/adv_cmds-${MD_VER}/md/md.c || die |
64 |
cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.1 \ |
65 |
"${S}"/adv_cmds-${MD_VER}/md/md.1 || die |
66 |
+ |
67 |
+ eapply_user |
68 |
} |
69 |
|
70 |
src_compile() { |
71 |
|
72 |
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild |
73 |
index 3c2869b16b..82bea18938 100644 |
74 |
--- a/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild |
75 |
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild |
76 |
@@ -1,6 +1,5 @@ |
77 |
-# Copyright 1999-2016 Gentoo Foundation |
78 |
+# Copyright 1999-2017 Gentoo Foundation |
79 |
# Distributed under the terms of the GNU General Public License v2 |
80 |
-# $Id$ |
81 |
|
82 |
EAPI="6" |
83 |
|
84 |
|
85 |
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-4-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-4-r1.ebuild |
86 |
deleted file mode 100644 |
87 |
index a3f3d356e7..0000000000 |
88 |
--- a/sys-apps/darwin-miscutils/darwin-miscutils-4-r1.ebuild |
89 |
+++ /dev/null |
90 |
@@ -1,106 +0,0 @@ |
91 |
-# Copyright 1999-2010 Gentoo Foundation |
92 |
-# Distributed under the terms of the GNU General Public License v2 |
93 |
-# $Id$ |
94 |
- |
95 |
-EAPI="3" |
96 |
- |
97 |
-inherit toolchain-funcs |
98 |
- |
99 |
-MISC_VER=18 |
100 |
-SHELL_VER=81 |
101 |
-DEV_VER=39 |
102 |
- |
103 |
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Tiger" |
104 |
-HOMEPAGE="http://www.opensource.apple.com/" |
105 |
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-${MISC_VER}.tar.gz |
106 |
- http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-${SHELL_VER}.tar.gz |
107 |
- http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-${DEV_VER}.tar.gz" |
108 |
- |
109 |
-LICENSE="BSD" |
110 |
-SLOT="0" |
111 |
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" |
112 |
-IUSE="" |
113 |
- |
114 |
-DEPEND="" |
115 |
-RDEPEND="" |
116 |
- |
117 |
-S=${WORKDIR} |
118 |
- |
119 |
-src_compile() { |
120 |
- local TS=${S}/misc_cmds-${MISC_VER} |
121 |
- # tsort is provided by coreutils |
122 |
- for t in cal leave lock units calendar; do |
123 |
- cd "${TS}/${t}" |
124 |
- echo "in ${TS}/${t}:" |
125 |
- echo "$(tc-getCC) -o ${t}" *.c |
126 |
- $(tc-getCC) -o ${t} *.c || die "failed to compile $t" |
127 |
- done |
128 |
- |
129 |
- TS=${S}/shell_cmds-${SHELL_VER} |
130 |
- # only pick those tools not provided by coreutils, findutils |
131 |
- for t in \ |
132 |
- alias apply getopt hostname jot kill killall \ |
133 |
- lastcomm renice script shlock time whereis; |
134 |
- do |
135 |
- echo "in ${TS}/${t}:" |
136 |
- echo "$(tc-getCC) -o ${t} ${t}.c" |
137 |
- cd "${TS}/${t}" |
138 |
- $(tc-getCC) -o ${t} ${t}.c || die "failed to compile $t" |
139 |
- done |
140 |
- cd "${TS}/su" |
141 |
- echo "in ${TS}/su:" |
142 |
- echo "$(tc-getCC) -lpam -o su su.c" |
143 |
- $(tc-getCC) -lpam -o su su.c || die "failed to compile su" |
144 |
- cd "${TS}/w" |
145 |
- echo "in ${TS}/w:" |
146 |
- echo "$(tc-getCC) -DSUCKAGE -lresolv -o w w.c pr_time.c proc_compare.c" |
147 |
- $(tc-getCC) -DSUCKAGE -lresolv -o w w.c pr_time.c proc_compare.c \ |
148 |
- || die "failed to compile w" |
149 |
- |
150 |
- TS=${S}/developer_cmds-${DEV_VER} |
151 |
- # only pick those tools that do not conflict (no ctags and indent) |
152 |
- # do not install lorder, mkdep and vgrind as they are a non-prefix-aware |
153 |
- # shell scripts |
154 |
- # don't install rpcgen, as it is heavily related to the OS it runs |
155 |
- # on (and this is the Tiger version) |
156 |
- for t in asa error hexdump unifdef what ; do |
157 |
- echo "in ${TS}/${t}:" |
158 |
- echo "$(tc-getCC) -o ${t}" *.c |
159 |
- cd "${TS}/${t}" |
160 |
- sed -i -e '/^__FBSDID/d' *.c |
161 |
- $(tc-getCC) -o ${t} *.c || die "failed to compile $t" |
162 |
- done |
163 |
-} |
164 |
- |
165 |
-src_install() { |
166 |
- mkdir -p "${ED}"/bin |
167 |
- mkdir -p "${ED}"/usr/bin |
168 |
- |
169 |
- local TS=${S}/misc_cmds-${MISC_VER} |
170 |
- for t in cal leave lock units calendar ; do |
171 |
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ |
172 |
- doman "${TS}/${t}/${t}.1" |
173 |
- done |
174 |
- |
175 |
- TS=${S}/shell_cmds-${SHELL_VER} |
176 |
- for t in \ |
177 |
- alias apply getopt jot killall lastcomm \ |
178 |
- renice script shlock su time w whereis; |
179 |
- do |
180 |
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ |
181 |
- [[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1" |
182 |
- [[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8" |
183 |
- done |
184 |
- cp "${TS}/w/w" "${ED}"/usr/bin/uptime |
185 |
- doman "${TS}/w/uptime.1" |
186 |
- for t in hostname kill; do |
187 |
- cp "${TS}/${t}/${t}" "${ED}"/bin/ |
188 |
- doman "${TS}/${t}/${t}.1" |
189 |
- done |
190 |
- |
191 |
- TS=${S}/developer_cmds-${DEV_VER} |
192 |
- for t in asa error hexdump unifdef what ; do |
193 |
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ |
194 |
- doman "${TS}/${t}/${t}.1" |
195 |
- done |
196 |
-} |
197 |
|
198 |
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-5-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-5-r1.ebuild |
199 |
deleted file mode 100644 |
200 |
index 3a200e7d82..0000000000 |
201 |
--- a/sys-apps/darwin-miscutils/darwin-miscutils-5-r1.ebuild |
202 |
+++ /dev/null |
203 |
@@ -1,141 +0,0 @@ |
204 |
-# Copyright 1999-2010 Gentoo Foundation |
205 |
-# Distributed under the terms of the GNU General Public License v2 |
206 |
-# $Id$ |
207 |
- |
208 |
-EAPI="3" |
209 |
- |
210 |
-inherit toolchain-funcs eutils |
211 |
- |
212 |
-MISC_VER=23 |
213 |
-SHELL_VER=118 |
214 |
-DEV_VER=48 |
215 |
- |
216 |
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Leopard" |
217 |
-HOMEPAGE="http://www.opensource.apple.com/" |
218 |
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-${MISC_VER}.tar.gz |
219 |
- http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-${SHELL_VER}.tar.gz |
220 |
- http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-${DEV_VER}.tar.gz" |
221 |
- |
222 |
-LICENSE="BSD" |
223 |
-SLOT="0" |
224 |
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" |
225 |
-IUSE="" |
226 |
- |
227 |
-DEPEND="" |
228 |
-RDEPEND="" |
229 |
- |
230 |
-S=${WORKDIR} |
231 |
- |
232 |
-src_prepare() { |
233 |
- epatch "${FILESDIR}"/${P}-w.patch |
234 |
- epatch "${FILESDIR}"/${P}-error.patch |
235 |
- epatch "${FILESDIR}"/${P}-stdlib.patch |
236 |
-} |
237 |
- |
238 |
-src_compile() { |
239 |
- local TS=${S}/misc_cmds-${MISC_VER} |
240 |
- # tsort is provided by coreutils |
241 |
- for t in leave units calendar; do |
242 |
- cd "${TS}/${t}" |
243 |
- echo "in ${TS}/${t}:" |
244 |
- echo "$(tc-getCC) -o ${t}" *.c |
245 |
- $(tc-getCC) -o ${t} *.c || die "failed to compile $t" |
246 |
- done |
247 |
- # compile cal separately |
248 |
- cd "${TS}/ncal" |
249 |
- echo "in ${TS}/ncal:" |
250 |
- local flags |
251 |
- flags[0]=-I. |
252 |
- flags[1]=-D__FBSDID=__RCSID |
253 |
- flags[2]=-Wsystem-headers |
254 |
- echo "$(tc-getCC) ${flags[@]} -c calendar.c" |
255 |
- $(tc-getCC) ${flags[@]} -c calendar.c || die "failed to compile cal" |
256 |
- echo "$(tc-getCC) ${flags[@]} -c easter.c" |
257 |
- $(tc-getCC) ${flags[@]} -c easter.c || die "failed to compile cal" |
258 |
- echo "$(tc-getCC) ${flags[@]} -c ncal.c" |
259 |
- $(tc-getCC) ${flags[@]} -c ncal.c || die "failed to compile cal" |
260 |
- echo "$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o" |
261 |
- $(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal" |
262 |
- |
263 |
- TS=${S}/shell_cmds-${SHELL_VER} |
264 |
- # only pick those tools not provided by coreutils, findutils |
265 |
- for t in \ |
266 |
- alias apply getopt hostname jot kill \ |
267 |
- lastcomm renice shlock time whereis; |
268 |
- do |
269 |
- echo "in ${TS}/${t}:" |
270 |
- echo "$(tc-getCC) -o ${t} ${t}.c" |
271 |
- cd "${TS}/${t}" |
272 |
- $(tc-getCC) -o ${t} ${t}.c || die "failed to compile $t" |
273 |
- done |
274 |
- # script and killall need additonal flags |
275 |
- for t in \ |
276 |
- killall script |
277 |
- do |
278 |
- echo "in ${TS}/${t}:" |
279 |
- echo "$(tc-getCC) -D__FBSDID=__RCSID -o ${t} ${t}.c" |
280 |
- cd "${TS}/${t}" |
281 |
- $(tc-getCC) -D__FBSDID=__RCSID -o ${t} ${t}.c || die "failed to compile $t" |
282 |
- done |
283 |
- cd "${TS}/su" |
284 |
- echo "in ${TS}/su:" |
285 |
- echo "$(tc-getCC) -lpam -o su su.c" |
286 |
- $(tc-getCC) -lpam -o su su.c || die "failed to compile su" |
287 |
- cd "${TS}/w" |
288 |
- echo "in ${TS}/w:" |
289 |
- echo "$(tc-getCC) -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c" |
290 |
- $(tc-getCC) -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c \ |
291 |
- || die "failed to compile w" |
292 |
- |
293 |
- TS=${S}/developer_cmds-${DEV_VER} |
294 |
- # only pick those tools that do not conflict (no ctags and indent) |
295 |
- # do not install lorder, mkdep and vgrind as they are a non-prefix-aware |
296 |
- # shell scripts |
297 |
- # don't install rpcgen, as it is heavily related to the OS it runs |
298 |
- # on (and this is the Leopard version) |
299 |
- for t in asa error hexdump unifdef what ; do |
300 |
- echo "in ${TS}/${t}:" |
301 |
- cd "${TS}/${t}" |
302 |
- sed -i -e '/^__FBSDID/d' *.c |
303 |
- echo "$(tc-getCC) -o ${t}" *.c |
304 |
- $(tc-getCC) -o ${t} *.c || die "failed to compile $t" |
305 |
- done |
306 |
-} |
307 |
- |
308 |
-src_install() { |
309 |
- mkdir -p "${ED}"/bin |
310 |
- mkdir -p "${ED}"/usr/bin |
311 |
- |
312 |
- local TS=${S}/misc_cmds-${MISC_VER} |
313 |
- for t in leave units calendar ; do |
314 |
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ |
315 |
- doman "${TS}/${t}/${t}.1" |
316 |
- done |
317 |
- # copy cal separately |
318 |
- cp "${TS}/ncal/cal" "${ED}"/usr/bin/ |
319 |
- dosym /usr/bin/cal /usr/bin/ncal |
320 |
- doman "${TS}/ncal/ncal.1" |
321 |
- dosym /usr/share/man/man1/ncal.1 /usr/share/man/man1/cal.1 |
322 |
- |
323 |
- TS=${S}/shell_cmds-${SHELL_VER} |
324 |
- for t in \ |
325 |
- alias apply getopt jot killall lastcomm \ |
326 |
- renice script shlock su time w whereis; |
327 |
- do |
328 |
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ |
329 |
- [[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1" |
330 |
- [[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8" |
331 |
- done |
332 |
- cp "${TS}/w/w" "${ED}"/usr/bin/uptime |
333 |
- doman "${TS}/w/uptime.1" |
334 |
- for t in hostname kill; do |
335 |
- cp "${TS}/${t}/${t}" "${ED}"/bin/ |
336 |
- doman "${TS}/${t}/${t}.1" |
337 |
- done |
338 |
- |
339 |
- TS=${S}/developer_cmds-${DEV_VER} |
340 |
- for t in asa error hexdump unifdef what ; do |
341 |
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ |
342 |
- doman "${TS}/${t}/${t}.1" |
343 |
- done |
344 |
-} |
345 |
|
346 |
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild |
347 |
index 83e7ddcfac..b0b7099617 100644 |
348 |
--- a/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild |
349 |
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild |
350 |
@@ -1,8 +1,7 @@ |
351 |
-# Copyright 1999-2010 Gentoo Foundation |
352 |
+# Copyright 1999-2017 Gentoo Foundation |
353 |
# Distributed under the terms of the GNU General Public License v2 |
354 |
-# $Id$ |
355 |
|
356 |
-EAPI="3" |
357 |
+EAPI="6" |
358 |
|
359 |
inherit toolchain-funcs eutils |
360 |
|
361 |
@@ -29,6 +28,10 @@ src_prepare() { |
362 |
epatch "${FILESDIR}"/${PN}-6-w64.patch |
363 |
cd "${S}"/developer_cmds-${DEV_VER} |
364 |
epatch "${FILESDIR}"/${PN}-5-error.patch |
365 |
+ # deal with OSX Lion and above |
366 |
+ sed -i -e 's/getline/ugetline/g' unifdef/unifdef.c || die |
367 |
+ |
368 |
+ eapply_user |
369 |
} |
370 |
|
371 |
src_compile() { |
372 |
@@ -76,10 +79,6 @@ src_compile() { |
373 |
cd "${TS}/${t}" |
374 |
$(tc-getCC) -D__FBSDID=__RCSID -o ${t} ${t}.c || die "failed to compile $t" |
375 |
done |
376 |
- cd "${TS}/su" |
377 |
- echo "in ${TS}/su:" |
378 |
- echo "$(tc-getCC) -lpam -o su su.c" |
379 |
- $(tc-getCC) -lpam -o su su.c || die "failed to compile su" |
380 |
cd "${TS}/w" |
381 |
echo "in ${TS}/w:" |
382 |
echo "$(tc-getCC) -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c" |
383 |
|
384 |
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-7.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-7.ebuild |
385 |
deleted file mode 100644 |
386 |
index 90c34c5df9..0000000000 |
387 |
--- a/sys-apps/darwin-miscutils/darwin-miscutils-7.ebuild |
388 |
+++ /dev/null |
389 |
@@ -1,139 +0,0 @@ |
390 |
-# Copyright 1999-2010 Gentoo Foundation |
391 |
-# Distributed under the terms of the GNU General Public License v2 |
392 |
-# $Id$ |
393 |
- |
394 |
-EAPI="3" |
395 |
- |
396 |
-inherit toolchain-funcs eutils |
397 |
- |
398 |
-MISC_VER=27 |
399 |
-SHELL_VER=149 |
400 |
-DEV_VER=52.1 |
401 |
- |
402 |
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Snow Leopard" |
403 |
-HOMEPAGE="http://www.opensource.apple.com/" |
404 |
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-${MISC_VER}.tar.gz |
405 |
- http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-${SHELL_VER}.tar.gz |
406 |
- http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-${DEV_VER}.tar.gz" |
407 |
- |
408 |
-LICENSE="BSD" |
409 |
-SLOT="0" |
410 |
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" |
411 |
-IUSE="" |
412 |
- |
413 |
-S=${WORKDIR} |
414 |
- |
415 |
-src_prepare() { |
416 |
- cd "${S}"/shell_cmds-${SHELL_VER} |
417 |
- epatch "${FILESDIR}"/${PN}-6-w64.patch |
418 |
-} |
419 |
- |
420 |
-src_compile() { |
421 |
- local flags=( |
422 |
- ${CFLAGS} |
423 |
- -I. |
424 |
- -D__FBSDID=__RCSID |
425 |
- -Wsystem-headers |
426 |
- -Du_int=uint32_t |
427 |
- -include stdint.h |
428 |
- ${LDFLAGS} |
429 |
- ) |
430 |
- |
431 |
- local TS=${S}/misc_cmds-${MISC_VER} |
432 |
- # tsort is provided by coreutils |
433 |
- for t in leave units calendar; do |
434 |
- cd "${TS}/${t}" |
435 |
- echo "in ${TS}/${t}:" |
436 |
- echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c |
437 |
- $(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t" |
438 |
- done |
439 |
- # compile cal separately |
440 |
- cd "${TS}/ncal" |
441 |
- echo "in ${TS}/ncal:" |
442 |
- echo "$(tc-getCC) ${flags[@]} -c calendar.c" |
443 |
- $(tc-getCC) ${flags[@]} -c calendar.c || die "failed to compile cal" |
444 |
- echo "$(tc-getCC) ${flags[@]} -c easter.c" |
445 |
- $(tc-getCC) ${flags[@]} -c easter.c || die "failed to compile cal" |
446 |
- echo "$(tc-getCC) ${flags[@]} -c ncal.c" |
447 |
- $(tc-getCC) ${flags[@]} -c ncal.c || die "failed to compile cal" |
448 |
- echo "$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o" |
449 |
- $(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal" |
450 |
- |
451 |
- TS=${S}/shell_cmds-${SHELL_VER} |
452 |
- # only pick those tools not provided by coreutils, findutils |
453 |
- for t in \ |
454 |
- alias apply getopt hostname jot kill \ |
455 |
- lastcomm renice shlock time whereis; |
456 |
- do |
457 |
- echo "in ${TS}/${t}:" |
458 |
- echo "$(tc-getCC) ${flags[@]} -o ${t} ${t}.c" |
459 |
- cd "${TS}/${t}" |
460 |
- $(tc-getCC) ${flags[@]} -o ${t} ${t}.c || die "failed to compile $t" |
461 |
- done |
462 |
- # script and killall need additonal flags |
463 |
- for t in \ |
464 |
- killall script |
465 |
- do |
466 |
- echo "in ${TS}/${t}:" |
467 |
- echo "$(tc-getCC) ${flags[@]} -o ${t} ${t}.c" |
468 |
- cd "${TS}/${t}" |
469 |
- $(tc-getCC) ${flags[@]} -o ${t} ${t}.c || die "failed to compile $t" |
470 |
- done |
471 |
- cd "${TS}/w" |
472 |
- sed -i -e '/#include <libutil.h>/d' w.c || die |
473 |
- echo "in ${TS}/w:" |
474 |
- echo "$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c" |
475 |
- $(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c \ |
476 |
- || die "failed to compile w" |
477 |
- |
478 |
- TS=${S}/developer_cmds-${DEV_VER} |
479 |
- # only pick those tools that do not conflict (no ctags and indent) |
480 |
- # do not install lorder, mkdep and vgrind as they are a non-prefix-aware |
481 |
- # shell scripts |
482 |
- # don't install rpcgen, as it is heavily related to the OS it runs |
483 |
- # on (and this is the Leopard version) |
484 |
- for t in asa error hexdump unifdef what ; do |
485 |
- echo "in ${TS}/${t}:" |
486 |
- cd "${TS}/${t}" |
487 |
- echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c |
488 |
- $(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t" |
489 |
- done |
490 |
-} |
491 |
- |
492 |
-src_install() { |
493 |
- mkdir -p "${ED}"/bin |
494 |
- mkdir -p "${ED}"/usr/bin |
495 |
- |
496 |
- local TS=${S}/misc_cmds-${MISC_VER} |
497 |
- for t in leave units calendar ; do |
498 |
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ |
499 |
- doman "${TS}/${t}/${t}.1" |
500 |
- done |
501 |
- # copy cal separately |
502 |
- cp "${TS}/ncal/cal" "${ED}"/usr/bin/ |
503 |
- dosym /usr/bin/cal /usr/bin/ncal |
504 |
- doman "${TS}/ncal/ncal.1" |
505 |
- dosym /usr/share/man/man1/ncal.1 /usr/share/man/man1/cal.1 |
506 |
- |
507 |
- TS=${S}/shell_cmds-${SHELL_VER} |
508 |
- for t in \ |
509 |
- alias apply getopt jot killall lastcomm \ |
510 |
- renice script shlock time w whereis; |
511 |
- do |
512 |
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ |
513 |
- [[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1" |
514 |
- [[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8" |
515 |
- done |
516 |
- cp "${TS}/w/w" "${ED}"/usr/bin/uptime |
517 |
- doman "${TS}/w/uptime.1" |
518 |
- for t in hostname kill; do |
519 |
- cp "${TS}/${t}/${t}" "${ED}"/bin/ |
520 |
- doman "${TS}/${t}/${t}.1" |
521 |
- done |
522 |
- |
523 |
- TS=${S}/developer_cmds-${DEV_VER} |
524 |
- for t in asa error hexdump unifdef what ; do |
525 |
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ |
526 |
- doman "${TS}/${t}/${t}.1" |
527 |
- done |
528 |
-} |
529 |
|
530 |
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild |
531 |
index 2d0ac4fd0d..adbde8fb92 100644 |
532 |
--- a/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild |
533 |
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild |
534 |
@@ -1,8 +1,7 @@ |
535 |
-# Copyright 1999-2011 Gentoo Foundation |
536 |
+# Copyright 1999-2017 Gentoo Foundation |
537 |
# Distributed under the terms of the GNU General Public License v2 |
538 |
-# $Id$ |
539 |
|
540 |
-EAPI="3" |
541 |
+EAPI="6" |
542 |
|
543 |
inherit toolchain-funcs eutils |
544 |
|
545 |
@@ -26,9 +25,11 @@ S=${WORKDIR} |
546 |
src_prepare() { |
547 |
cd "${S}"/shell_cmds-${SHELL_VER} |
548 |
epatch "${FILESDIR}"/${PN}-6-w64.patch |
549 |
- # deal with OSX Lion |
550 |
+ # deal with OSX Lion and above |
551 |
cd "${S}"/developer_cmds-${DEV_VER} |
552 |
sed -i -e 's/getline/ugetline/g' unifdef/unifdef.c || die |
553 |
+ |
554 |
+ eapply_user |
555 |
} |
556 |
|
557 |
src_compile() { |
558 |
|
559 |
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild |
560 |
index b641f648e3..d0467ed798 100644 |
561 |
--- a/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild |
562 |
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild |
563 |
@@ -1,8 +1,7 @@ |
564 |
-# Copyright 1999-2011 Gentoo Foundation |
565 |
+# Copyright 1999-2017 Gentoo Foundation |
566 |
# Distributed under the terms of the GNU General Public License v2 |
567 |
-# $Id$ |
568 |
|
569 |
-EAPI="3" |
570 |
+EAPI="6" |
571 |
|
572 |
inherit toolchain-funcs eutils |
573 |
|
574 |
@@ -26,6 +25,8 @@ S=${WORKDIR} |
575 |
src_prepare() { |
576 |
cd "${S}"/shell_cmds-${SHELL_VER} |
577 |
epatch "${FILESDIR}"/${PN}-6-w64.patch |
578 |
+ |
579 |
+ eapply_user |
580 |
} |
581 |
|
582 |
src_compile() { |