sys-apps/darwin-miscutils: cleanup bump ebuilds to EAPI=6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

9 files changed, 20 insertions, 410 deletions

diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest
index 5db6f64d9d9b..771e6305010e 100644
--- a/sys-apps/darwin-miscutils/Manifest
+++ b/sys-apps/darwin-miscutils/Manifest
@@ -1,13 +1,9 @@
 DIST adv_cmds-md-147.1 3623 SHA256 6283a00e52ef6d278afb1fa4d0e8bc7bce8bebff3e6b3da71812fcfdb415592f SHA512 459beb2b7c92b8718c76d744bbabf631bf8c329feb65c9434ce8a023c73ceac2d207c95e39c4b90b095a4724a74096a3d1bed9122883eb54e5311dfc64ffc718 WHIRLPOOL 79ebe5d5a73443665ba8804ff8867f1ad045d8b5df104b1396f00ca8ba4819d1e82ae5b31dffbf26d648748f8bccf5e01be5aba553d7955bbde13cc04be6104b
 DIST adv_cmds-md-147.c 25945 SHA256 089a4ad849da2c1a2b23fbc18dbc6860b26a367f528972d99ea361245a06c882 SHA512 93e70f7d8697652b5a3c661975d21b51545d2eb07de64fd40524fcf0d5016dae9ae1dc63c4a85cb5ad455c8d1c246b7f5f2eac38226dcefbf4cab12b0b1c7592 WHIRLPOOL 4299250fe3d0b475798d139fffcb83e17ab88283099a4d6d0669ee86e58b861b3a5409535aa9310d6729f086334a7a0d703df5b5d81b8816933fb67b6152df89
-DIST developer_cmds-39.tar.gz 155831 SHA256 37d58d783c44694bf869ef8906ea866a7d1798154f3206a1880b8adc154d6d81 SHA512 1c9fcd7933d7264e8f3f537fc7bd9545121b15e2784f23d1bf6c1419adb3a77c175170cab62a44286897aadd3d44ecd799c69424de058c1b3b13b01b5caba44c WHIRLPOOL 954b2f3d4ec3bb792947d398e1c948abaa7a0dca82fd56f08b65b57d7f17c2117597417740a81b443428a3808d55f9b3a77c20cea692ed093bbb5b81e6f7ecc1
-DIST developer_cmds-48.tar.gz 161783 SHA256 212b1102580452576dcaa38c053aa1809ede046ce5712a4c268d964be71a287d SHA512 1c6f6cd918aa895f71a44be5b456b93420054d36c0968ac4333f1947d6ca9679358394d7475df666d919cbd3da841af91b42cdda5815ec4ec1acc019a294a4d5 WHIRLPOOL 3b42a6b22c788cdbad0ef91955fdde1b33cce29950d4154e47d86460e37d1c323d8b14650966d14020541fd025db3ed0cd81b1bbc158f27b00dadf2ac03aef68
 DIST developer_cmds-49.tar.gz 307753 SHA256 db0f2611c8efb0ec781cb8f03878958c589c8953ba9002e051afa4fc3bb6a762 SHA512 3750374c891f6d681829986291d887cacf2c5b1c7a5de94f12c92ded0b3456157b85e57653c6061526d1f6626a7be8a9e6db9c1df09e2bb3e40c7fa20b9b4103 WHIRLPOOL f167e2a95ab2f8325130fe3f418771d9aee09e268e9649bf6230601586ec41d940c52fb4a02b938a30d5059541eccf20845044ef07bef64afdbd5635c15e2073
-DIST developer_cmds-52.1.tar.gz 310160 SHA256 3deb187d7ee6269680f2f9678aa1e7bab3f3911a59b44e99870abb687ccba095 SHA512 280c15f9a48ae650bd8df63792920e557c192bab61e0f314b24f8baa5c0e1feecead8274aa28e0f358b8a99708bcaef8115b4b2439a50e009f6547d23613007a WHIRLPOOL 0c76d6809da42d3ff55d3c1111a0b4de4d1d302a79fd1f70bd77c4f89448b78aab321e686d9aa3203c6170d80bf9af96bfb3f6c7d598807b51d157e12ce8469b
 DIST developer_cmds-53.1.tar.gz 139637 SHA256 f3f6cc44336fae506a5c7ca1e71aeaa00da89b4337298fcd4d13953bbfa6edb8 SHA512 ac15b499d0642332e8deae2f498e5ffb0c64502e2d877bbdfe0fac4118e17fe525b169f3b015cfe8c9f40e2688bd30df4b050fe50eaa706b21a2e62ca9dd4b80 WHIRLPOOL ee747b3f8c56091f77735c2a59e0ef3d9486b5af32c44c2ed382324bf71e7f29f7ac9c8426247f7fdfa63a667acca99f6af1fcc29548fdd73b51706ba41e923e
 DIST developer_cmds-55.tar.gz 139664 SHA256 1760a430552057304ecc2c20bb0acd3683a3a0325f29a1e27065818d2515e91a SHA512 062e4c4a2b1ba4cffe7e850d07f4351c736988958450735f9f653936d64defa3347c9dac7b5fea3dcd25f8efe076133dc9ac3edb4a3e512387d6842bd177c35e WHIRLPOOL cae216847b8e6075fa8051d6d260cc91fff259f81717d19a988ada30e42c8b9728b6ce3330cbcef403639fbf5c52230d20a2272bc1154f3bcf18e3c3f4123ac7
 DIST developer_cmds-63.tar.gz 110662 SHA256 d4bc4a4b1045377f814da08fba8b7bfcd515ef1faec12bbb694de7defe9a5c0d SHA512 4f672835f0290feaf54c7c268b31774282325448f30c02e4f12ead84c41e15083784fac4c9c4916c098953bc61aa8f29bea24a7b51312428aa87448595be50a1 WHIRLPOOL 0b4835a8d3b97817baed0d78b5f636b6dafdd31874838e792764373a91026bda44241daf3e575db659bf14434654e763832bb85864972e98d19d52c5c89e5b6c
-DIST misc_cmds-18.tar.gz 96635 SHA256 dcc4b199cdb4d40cabd1dd58cc3498878751d9746ad736ada0177a86236d187e SHA512 2f0a7b298179e44a67125a271d9ba62b618d9bd852320fa3f1d1fa724787554d3a1e6cc08845caa2f70214fdf90cc7afdbe08fae648fe94cf8a0fe24ca673f6c WHIRLPOOL 1fc15f192f51f79c0d83234185a7193a3b93d6a09cf65b69cdfc3b3c6aecb54b045886d86bb6ca76c1bb763c46a34d46f0ae1884fba587a00fac92ef0b93711c
 DIST misc_cmds-23.tar.gz 114747 SHA256 150c74e3041db4cb02b1aabddfedb998c152bfba616ed6e24b2b98d025fef785 SHA512 0e02a939c308f4483cf11cb8b21face84f442589e3774b1827ed0ab5064ee2b433a4468ac634051fa0817919f5d39ac1ed56c67b1f5b011b83388a3806ed33c8 WHIRLPOOL 586a091fc6ead5c5398a05e3af1137cf67314e458cb44dc0f60a2099e65f53e4b569dd045c17e0f455f1cc0b4248c94b358cb5b08cf54033dc883f356a058d49
 DIST misc_cmds-27.tar.gz 116351 SHA256 29d1b32dfceaa3364e81d50e10b8ce7721448cb0c8218ecb90491666a00efca4 SHA512 594560b179f7dafc651d3a336d33bcb7075f2199cf4964e95d63164faf19bd50ef3a6095124f0e4f91c50d1bceeb831fcd81ceecf740e2696a8e7445c1a690d2 WHIRLPOOL 6bca894b7ab1c7de9b3453e075060ec4bd35019713641c9527dd562f253eda0cc35f3b9b631bd197c3fc38ffda575701843671e3fae263fa4655455e80e73cd2
 DIST misc_cmds-31.tar.gz 121187 SHA256 1e0cdf2af9b28245af40168fc48e010e260b62fd48ddbcb95e62851d2765f37c SHA512 d49bb8a49c23aa7efaa7db1958676390b4d5ef1b2e57f80b0bea0f10b8b29a6c3ec6d2d7a1248d3af77d382c5113fb3cbf9d3632ca92bb51c01d8c286fd9f25f WHIRLPOOL 1b3d060418ccf353d975696cd7d19354ca2b0b8795f91e185cc467fc2e9fa7683a20e6ce6e70109310e8cfff69b027efbf6e25c159e41102d62bffc36b2754d5
@@ -17,4 +13,3 @@ DIST shell_cmds-149.tar.gz 173740 SHA256 87263d7fc8626da3e12f8ebae458293da7c4b12
 DIST shell_cmds-162.tar.gz 179189 SHA256 42d5ad4fbcaca83620a3ab709a41b21a18224589c844c716223489418e04e3d6 SHA512 784b6b8b3a90967d79f5a60a23e7f31f7bc92712dac9cdb625770f92b58bd6902669aa19bb59997cc654fcc0e27ddd45f60b1990e7da95d0e6c90fd7f2434f95 WHIRLPOOL cd06c734a1f1ba1169ed72ec99f8072dd0e7b608ad0764857873622c6ea0d9a99fdabd6b2ef2fc87f036dbe34e2caebfd5c6927e2440cb35375ea9c77e40c44e
 DIST shell_cmds-170.tar.gz 212954 SHA256 3f2849de051ae51e7b6cec56d90443f9168a9f9a7b9002cb4b51ece9a817b81c SHA512 b267a9b5e922c9952451ca05e5f9e328504dc46b5776e1a8405f8e41a604d7f184d70742cb6fa6646875bc1789082097c74eabcc151ac5568ba26ed858269ce7 WHIRLPOOL c036eba542fdf07843cd9ef9e781db379c90e95264918596c71f99cff2547ac877e5c3619b53d25e65e0c67a0fb42a3d32755efc6d9f4235b7d714e90047d8b5
 DIST shell_cmds-198.tar.gz 411088 SHA256 70404d7b51b4de6ed5ec0e02d52bd5a41f17e23a624dad162615625884a5238d SHA512 6e3a43f0cd9b1e3799d1ba79f4fcc4c3bb9be178c35cba2bef9227ecc259ca52c39b4d0e39c71d9af689e07f48dbeee6806bd623286f116f7d3ee3889dc7c71f WHIRLPOOL f84ba1cb0b21897faa5dd3c2674649ea3686c73557b894af478c9460bf29d2f548488a699ec8bbdb8154c031d5067f44d1ebdf87c77e75935e507a1a101a63f7
-DIST shell_cmds-81.tar.gz 154516 SHA256 64f0e01de9e13b9a1518ccd2cf45486b6159a5fdc562e7d0725e835d495cea81 SHA512 ebb506331a283771d4b4f51769fece93af7703a2a0e118271bd453327db6981d197aebd93e675d019c05c6cff58ed0a0fe58e8fc26eb581ab26cb76c3271d505 WHIRLPOOL 81b668528344155ae4537894de241ff72e19e6a6f50201533a7d8e84a54684b933aa4b0492b11bb62ad78e8bced6bd652acbe029cb17fdd1423edd70ddd6ddc6
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild
index 8438cd004f06..67fe14641673 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="4"
+EAPI="6"
 
 inherit toolchain-funcs eutils
 
@@ -38,6 +37,8 @@ src_prepare() {
 		"${S}"/adv_cmds-${MD_VER}/md/md.c || die
 	cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.1 \
 		"${S}"/adv_cmds-${MD_VER}/md/md.1 || die
+
+	eapply_user
 }
 
 src_compile() {
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild
index 3c2869b16b46..82bea18938fe 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="6"
 
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-4-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-4-r1.ebuild
deleted file mode 100644
index a3f3d356e778..000000000000
--- a/sys-apps/darwin-miscutils/darwin-miscutils-4-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit toolchain-funcs
-
-MISC_VER=18
-SHELL_VER=81
-DEV_VER=39
-
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Tiger"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-${MISC_VER}.tar.gz
-	http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-${SHELL_VER}.tar.gz
-	http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-${DEV_VER}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_compile() {
-	local TS=${S}/misc_cmds-${MISC_VER}
-	# tsort is provided by coreutils
-	for t in cal leave lock units calendar; do
-		cd "${TS}/${t}"
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) -o ${t}" *.c
-		$(tc-getCC) -o ${t} *.c || die "failed to compile $t"
-	done
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	# only pick those tools not provided by coreutils, findutils
-	for t in \
-		alias apply getopt hostname jot kill killall \
-		lastcomm renice script shlock time whereis;
-	do
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) -o ${t} ${t}.c"
-		cd "${TS}/${t}"
-		$(tc-getCC) -o ${t} ${t}.c || die "failed to compile $t"
-	done
-	cd "${TS}/su"
-	echo "in ${TS}/su:"
-	echo "$(tc-getCC) -lpam -o su su.c"
-	$(tc-getCC) -lpam -o su su.c || die "failed to compile su"
-	cd "${TS}/w"
-	echo "in ${TS}/w:"
-	echo "$(tc-getCC) -DSUCKAGE -lresolv -o w w.c pr_time.c proc_compare.c"
-	$(tc-getCC) -DSUCKAGE -lresolv -o w w.c pr_time.c proc_compare.c \
-		|| die "failed to compile w"
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	# only pick those tools that do not conflict (no ctags and indent)
-	# do not install lorder, mkdep and vgrind as they are a non-prefix-aware
-	# shell scripts
-	# don't install rpcgen, as it is heavily related to the OS it runs
-	# on (and this is the Tiger version)
-	for t in asa error hexdump unifdef what ; do
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) -o ${t}" *.c
-		cd "${TS}/${t}"
-		sed -i -e '/^__FBSDID/d' *.c
-		$(tc-getCC) -o ${t} *.c || die "failed to compile $t"
-	done
-}
-
-src_install() {
-	mkdir -p "${ED}"/bin
-	mkdir -p "${ED}"/usr/bin
-
-	local TS=${S}/misc_cmds-${MISC_VER}
-	for t in cal leave lock units calendar ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	for t in \
-		alias apply getopt jot killall lastcomm \
-		renice script shlock su time w whereis;
-	do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		[[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
-		[[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
-	done
-	cp "${TS}/w/w" "${ED}"/usr/bin/uptime
-	doman "${TS}/w/uptime.1"
-	for t in hostname kill; do
-		cp "${TS}/${t}/${t}" "${ED}"/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	for t in asa error hexdump unifdef what ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-5-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-5-r1.ebuild
deleted file mode 100644
index 3a200e7d8250..000000000000
--- a/sys-apps/darwin-miscutils/darwin-miscutils-5-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit toolchain-funcs eutils
-
-MISC_VER=23
-SHELL_VER=118
-DEV_VER=48
-
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Leopard"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-${MISC_VER}.tar.gz
-	http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-${SHELL_VER}.tar.gz
-	http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-${DEV_VER}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-w.patch
-	epatch "${FILESDIR}"/${P}-error.patch
-	epatch "${FILESDIR}"/${P}-stdlib.patch
-}
-
-src_compile() {
-	local TS=${S}/misc_cmds-${MISC_VER}
-	# tsort is provided by coreutils
-	for t in leave units calendar; do
-		cd "${TS}/${t}"
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) -o ${t}" *.c
-		$(tc-getCC) -o ${t} *.c || die "failed to compile $t"
-	done
-	# compile cal separately
-	cd "${TS}/ncal"
-	echo "in ${TS}/ncal:"
-	local flags
-	flags[0]=-I.
-	flags[1]=-D__FBSDID=__RCSID
-	flags[2]=-Wsystem-headers
-	echo "$(tc-getCC) ${flags[@]} -c calendar.c"
-	$(tc-getCC) ${flags[@]} -c calendar.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -c easter.c"
-	$(tc-getCC) ${flags[@]} -c easter.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -c ncal.c"
-	$(tc-getCC) ${flags[@]} -c ncal.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o"
-	$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	# only pick those tools not provided by coreutils, findutils
-	for t in \
-		alias apply getopt hostname jot kill \
-		lastcomm renice shlock time whereis;
-	do
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) -o ${t} ${t}.c"
-		cd "${TS}/${t}"
-		$(tc-getCC) -o ${t} ${t}.c || die "failed to compile $t"
-	done
-	# script and killall need additonal flags
-	for t in \
-		killall script
-	do
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) -D__FBSDID=__RCSID -o ${t} ${t}.c"
-		cd "${TS}/${t}"
-		$(tc-getCC) -D__FBSDID=__RCSID -o ${t} ${t}.c || die "failed to compile $t"
-	done
-	cd "${TS}/su"
-	echo "in ${TS}/su:"
-	echo "$(tc-getCC) -lpam -o su su.c"
-	$(tc-getCC) -lpam -o su su.c || die "failed to compile su"
-	cd "${TS}/w"
-	echo "in ${TS}/w:"
-	echo "$(tc-getCC) -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c"
-	$(tc-getCC) -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c \
-		|| die "failed to compile w"
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	# only pick those tools that do not conflict (no ctags and indent)
-	# do not install lorder, mkdep and vgrind as they are a non-prefix-aware
-	# shell scripts
-	# don't install rpcgen, as it is heavily related to the OS it runs
-	# on (and this is the Leopard version)
-	for t in asa error hexdump unifdef what ; do
-		echo "in ${TS}/${t}:"
-		cd "${TS}/${t}"
-		sed -i -e '/^__FBSDID/d' *.c
-		echo "$(tc-getCC) -o ${t}" *.c
-		$(tc-getCC) -o ${t} *.c || die "failed to compile $t"
-	done
-}
-
-src_install() {
-	mkdir -p "${ED}"/bin
-	mkdir -p "${ED}"/usr/bin
-
-	local TS=${S}/misc_cmds-${MISC_VER}
-	for t in leave units calendar ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-	# copy cal separately
-	cp "${TS}/ncal/cal" "${ED}"/usr/bin/
-	dosym /usr/bin/cal /usr/bin/ncal
-	doman "${TS}/ncal/ncal.1"
-	dosym /usr/share/man/man1/ncal.1 /usr/share/man/man1/cal.1
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	for t in \
-		alias apply getopt jot killall lastcomm \
-		renice script shlock su time w whereis;
-	do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		[[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
-		[[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
-	done
-	cp "${TS}/w/w" "${ED}"/usr/bin/uptime
-	doman "${TS}/w/uptime.1"
-	for t in hostname kill; do
-		cp "${TS}/${t}/${t}" "${ED}"/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	for t in asa error hexdump unifdef what ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
index 83e7ddcfac58..b0b7099617b7 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="3"
+EAPI="6"
 
 inherit toolchain-funcs eutils
 
@@ -29,6 +28,10 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-6-w64.patch
 	cd "${S}"/developer_cmds-${DEV_VER}
 	epatch "${FILESDIR}"/${PN}-5-error.patch
+	# deal with OSX Lion and above
+	sed -i -e 's/getline/ugetline/g' unifdef/unifdef.c || die
+
+	eapply_user
 }
 
 src_compile() {
@@ -76,10 +79,6 @@ src_compile() {
 		cd "${TS}/${t}"
 		$(tc-getCC) -D__FBSDID=__RCSID -o ${t} ${t}.c || die "failed to compile $t"
 	done
-	cd "${TS}/su"
-	echo "in ${TS}/su:"
-	echo "$(tc-getCC) -lpam -o su su.c"
-	$(tc-getCC) -lpam -o su su.c || die "failed to compile su"
 	cd "${TS}/w"
 	echo "in ${TS}/w:"
 	echo "$(tc-getCC) -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c"
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-7.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-7.ebuild
deleted file mode 100644
index 90c34c5df906..000000000000
--- a/sys-apps/darwin-miscutils/darwin-miscutils-7.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit toolchain-funcs eutils
-
-MISC_VER=27
-SHELL_VER=149
-DEV_VER=52.1
-
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Snow Leopard"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-${MISC_VER}.tar.gz
-	http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-${SHELL_VER}.tar.gz
-	http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-${DEV_VER}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/shell_cmds-${SHELL_VER}
-	epatch "${FILESDIR}"/${PN}-6-w64.patch
-}
-
-src_compile() {
-	local flags=(
-		${CFLAGS}
-		-I.
-		-D__FBSDID=__RCSID
-		-Wsystem-headers
-		-Du_int=uint32_t
-		-include stdint.h
-		${LDFLAGS}
-	)
-
-	local TS=${S}/misc_cmds-${MISC_VER}
-	# tsort is provided by coreutils
-	for t in leave units calendar; do
-		cd "${TS}/${t}"
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
-		$(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
-	done
-	# compile cal separately
-	cd "${TS}/ncal"
-	echo "in ${TS}/ncal:"
-	echo "$(tc-getCC) ${flags[@]} -c calendar.c"
-	$(tc-getCC) ${flags[@]} -c calendar.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -c easter.c"
-	$(tc-getCC) ${flags[@]} -c easter.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -c ncal.c"
-	$(tc-getCC) ${flags[@]} -c ncal.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o"
-	$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	# only pick those tools not provided by coreutils, findutils
-	for t in \
-		alias apply getopt hostname jot kill \
-		lastcomm renice shlock time whereis;
-	do
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) ${flags[@]} -o ${t} ${t}.c"
-		cd "${TS}/${t}"
-		$(tc-getCC) ${flags[@]} -o ${t} ${t}.c || die "failed to compile $t"
-	done
-	# script and killall need additonal flags
-	for t in \
-		killall script
-	do
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) ${flags[@]} -o ${t} ${t}.c"
-		cd "${TS}/${t}"
-		$(tc-getCC) ${flags[@]} -o ${t} ${t}.c || die "failed to compile $t"
-	done
-	cd "${TS}/w"
-	sed -i -e '/#include <libutil.h>/d' w.c || die
-	echo "in ${TS}/w:"
-	echo "$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c"
-	$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c \
-		|| die "failed to compile w"
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	# only pick those tools that do not conflict (no ctags and indent)
-	# do not install lorder, mkdep and vgrind as they are a non-prefix-aware
-	# shell scripts
-	# don't install rpcgen, as it is heavily related to the OS it runs
-	# on (and this is the Leopard version)
-	for t in asa error hexdump unifdef what ; do
-		echo "in ${TS}/${t}:"
-		cd "${TS}/${t}"
-		echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
-		$(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
-	done
-}
-
-src_install() {
-	mkdir -p "${ED}"/bin
-	mkdir -p "${ED}"/usr/bin
-
-	local TS=${S}/misc_cmds-${MISC_VER}
-	for t in leave units calendar ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-	# copy cal separately
-	cp "${TS}/ncal/cal" "${ED}"/usr/bin/
-	dosym /usr/bin/cal /usr/bin/ncal
-	doman "${TS}/ncal/ncal.1"
-	dosym /usr/share/man/man1/ncal.1 /usr/share/man/man1/cal.1
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	for t in \
-		alias apply getopt jot killall lastcomm \
-		renice script shlock time w whereis;
-	do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		[[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
-		[[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
-	done
-	cp "${TS}/w/w" "${ED}"/usr/bin/uptime
-	doman "${TS}/w/uptime.1"
-	for t in hostname kill; do
-		cp "${TS}/${t}/${t}" "${ED}"/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	for t in asa error hexdump unifdef what ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
index 2d0ac4fd0d00..adbde8fb92e2 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="3"
+EAPI="6"
 
 inherit toolchain-funcs eutils
 
@@ -26,9 +25,11 @@ S=${WORKDIR}
 src_prepare() {
 	cd "${S}"/shell_cmds-${SHELL_VER}
 	epatch "${FILESDIR}"/${PN}-6-w64.patch
-	# deal with OSX Lion
+	# deal with OSX Lion and above
 	cd "${S}"/developer_cmds-${DEV_VER}
 	sed -i -e 's/getline/ugetline/g' unifdef/unifdef.c || die
+
+	eapply_user
 }
 
 src_compile() {
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
index b641f648e384..d0467ed79845 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="3"
+EAPI="6"
 
 inherit toolchain-funcs eutils
 
@@ -26,6 +25,8 @@ S=${WORKDIR}
 src_prepare() {
 	cd "${S}"/shell_cmds-${SHELL_VER}
 	epatch "${FILESDIR}"/${PN}-6-w64.patch
+
+	eapply_user
 }
 
 src_compile() {