Bump to Snow Lepard versions, drop installation of 'su', as it isn't of much use without setuid. Closes bug #283519

Package-Manager: portage-2.2.00.14183-prefix/cvs/Darwin powerpc

6 files changed, 155 insertions, 11 deletions

diff --git a/sys-apps/darwin-miscutils/ChangeLog b/sys-apps/darwin-miscutils/ChangeLog
index 05a0eaf8ddc0..4bff1769e77f 100644
--- a/sys-apps/darwin-miscutils/ChangeLog
+++ b/sys-apps/darwin-miscutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/darwin-miscutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/ChangeLog,v 1.2 2009/06/24 09:24:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/ChangeLog,v 1.3 2009/09/04 20:11:25 grobian Exp $
+
+*darwin-miscutils-7 (04 Sep 2009)
+
+  04 Sep 2009; Fabian Groffen <grobian@gentoo.org>
+  darwin-miscutils-4-r1.ebuild, darwin-miscutils-5-r1.ebuild,
+  darwin-miscutils-6-r1.ebuild, +darwin-miscutils-7.ebuild:
+  Bump to Snow Lepard versions, drop installation of 'su', as it isn't of
+  much use without setuid. Closes bug #283519
 
 *darwin-miscutils-6-r1 (24 Jun 2009)
 
diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest
index 6b6a15335a35..ca24e0b3e4f0 100644
--- a/sys-apps/darwin-miscutils/Manifest
+++ b/sys-apps/darwin-miscutils/Manifest
@@ -5,12 +5,16 @@ AUX darwin-miscutils-6-w64.patch 584 RMD160 8515af22daea0f3213232dfbf174b4c21f57
 DIST developer_cmds-39.tar.gz 155831 RMD160 9be72d4c6f4650006c8bd150916d9595f3f0e365 SHA1 e2953aea50f8738a1735a8fc8b0d4d18b96541f8 SHA256 37d58d783c44694bf869ef8906ea866a7d1798154f3206a1880b8adc154d6d81
 DIST developer_cmds-48.tar.gz 161783 RMD160 992b192602e4a6a6174d0f7da64827fd4d0d9d9a SHA1 f17050f76d7f9b010996e0e6afd0f6246dc32572 SHA256 212b1102580452576dcaa38c053aa1809ede046ce5712a4c268d964be71a287d
 DIST developer_cmds-49.tar.gz 307753 RMD160 470890b959984563883c93ad7b14d475551d9e5b SHA1 34a11d147fa158459b5080fb18903ebc0e7dd954 SHA256 db0f2611c8efb0ec781cb8f03878958c589c8953ba9002e051afa4fc3bb6a762
+DIST developer_cmds-52.1.tar.gz 310160 RMD160 b9f760d1f699a1d5db1eb67769b892d1b02f39a7 SHA1 4adab252635d6c65102808680fa7b2c9ca487bab SHA256 3deb187d7ee6269680f2f9678aa1e7bab3f3911a59b44e99870abb687ccba095
 DIST misc_cmds-18.tar.gz 96635 RMD160 54683cf6a50d0aaf2aa9d920c5b592d995633e5c SHA1 55a0e3428b881100cd06d8d4263c2a8f30ad0f11 SHA256 dcc4b199cdb4d40cabd1dd58cc3498878751d9746ad736ada0177a86236d187e
 DIST misc_cmds-23.tar.gz 114747 RMD160 b5a4d10cb8c2113360c50a1dc9771cd72f1778b8 SHA1 7402f45ef9fa344ec8225cc93af49d94be95ff4b SHA256 150c74e3041db4cb02b1aabddfedb998c152bfba616ed6e24b2b98d025fef785
+DIST misc_cmds-27.tar.gz 116351 RMD160 5e3567ec4ac429fde19f927fc3b53e6c3a2fa151 SHA1 0c2f087b652ca6abc24cec439286be9c20e939a9 SHA256 29d1b32dfceaa3364e81d50e10b8ce7721448cb0c8218ecb90491666a00efca4
 DIST shell_cmds-118.tar.gz 162145 RMD160 dae6c52e8f25797d1eb84a7d2b9bd91686cfd50d SHA1 808156dddef207d904cc83e50b7cbf451824fc5f SHA256 c4628a25407d940717f3e062e48e31bf3de2ce07e006bf909d69f927af92adb4
+DIST shell_cmds-149.tar.gz 173740 RMD160 e3e60de50e267274a31324f563d1b4ac325d361e SHA1 97739f0ddeaf046f2491b178926a5cfbe466e368 SHA256 87263d7fc8626da3e12f8ebae458293da7c4b12a0ce591dcf93b638e6519ff43
 DIST shell_cmds-81.tar.gz 154516 RMD160 033ccf7330d8b05f3b5d7d47c2de824990975c57 SHA1 d90b586e27a3778b5d61077c1fc4777b545a7c35 SHA256 64f0e01de9e13b9a1518ccd2cf45486b6159a5fdc562e7d0725e835d495cea81
-EBUILD darwin-miscutils-4-r1.ebuild 3141 RMD160 8ff59aff00c116a8a2a25c835a71b432414e6778 SHA1 a66348097c2f65393aadaa02b1f32639d7118fb3 SHA256 4e7c25cc37b03dec882b87eeb422d596a65c077d00c82f44583cb130d24d9784
-EBUILD darwin-miscutils-5-r1.ebuild 4364 RMD160 be45d9daec02ac4503589ea4b6e2605a70bb2c87 SHA1 21654bb3afa307777748bf214be75504b0b34131 SHA256 968ba64a1aba3406343023fe179069969de8311a1f6e69e1582314e20e4d7127
-EBUILD darwin-miscutils-6-r1.ebuild 4439 RMD160 0c0e85bd47c90c8fd51e7ba94b0319557a2690ce SHA1 8e3ebe87723906f827a47034512cce88b5d725f4 SHA256 478ba04aee4626f6b577660a04ccba61eb1a224da9439e6915490ba4127727c8
-MISC ChangeLog 2044 RMD160 080e8ce1a13007c112103ca8f8dbd5c242fa3be9 SHA1 ca800d99f126d9b1f2a536105baaab8a78d53223 SHA256 0cf667f07693b646d21ebbe12d76f2c0d5b64b4c983874e24d34e27560f5b263
+EBUILD darwin-miscutils-4-r1.ebuild 3148 RMD160 e40e105262cf8bd964f3c3a4c32bd3cc7beea089 SHA1 33d49967e8f6bb443d3cad0510030c05a83091ed SHA256 64e66d2445fd372c7ca02ba11af430cf4e149597751a9fc683ea03cba8d40004
+EBUILD darwin-miscutils-5-r1.ebuild 4373 RMD160 6efcaeec6ee23bf25ae682c924000dc5d05e31ad SHA1 b82bd8ba2411f65e40321c06a0f98f24498b5369 SHA256 2fcdd1d232b723ed900eb77c3de2be94c92f9b4ddb7b284e01403df63f6c03de
+EBUILD darwin-miscutils-6-r1.ebuild 4448 RMD160 f844c4007fc2f15503e410301fdc0d6987245c4b SHA1 649b692065b037677766ef585c0d32ca429972bb SHA256 88fa6cd0fedfe821e961c3e67e709bf1cd77524d173aa5dc930be21d5731ff12
+EBUILD darwin-miscutils-7.ebuild 4195 RMD160 977980703197d51034c536d71e0e5ab8a4752a5a SHA1 37cdf1bd6b9cd3fcd87cb1880dcd210785478c8b SHA256 655c4b8f15c5ccfbbcb9d20ac963a4f8d88dff6f4a2af8fae319243f410935c2
+MISC ChangeLog 2373 RMD160 9125b714820d96cb2247c33924ddcf61cedc2b82 SHA1 d3fa57eacb284e2ab3e4a60603bf10f5c8d0ab36 SHA256 9776297b5230d80882273a23f18c953551a63b06091532c1e95b751cfb84147c
 MISC metadata.xml 160 RMD160 baab82f4bc435813cfde4796d42840882a9a4f8f SHA1 144e248704973cfad031c92a930aad01a62a2fda SHA256 27667dd7db1d188c12342624ec5ff2155717821d646e442aef9a691c65539ac4
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-4-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-4-r1.ebuild
index de5d41ef25c2..dea9180b5d0a 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-4-r1.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/darwin-miscutils-4-r1.ebuild,v 1.1 2009/06/21 13:31:36 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/darwin-miscutils-4-r1.ebuild,v 1.2 2009/09/04 20:11:25 grobian Exp $
 
 inherit toolchain-funcs
 
@@ -8,7 +8,7 @@ MISC_VER=18
 SHELL_VER=81
 DEV_VER=39
 
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems"
+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
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-5-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-5-r1.ebuild
index 4ab483bdc7f8..be6da01af8b3 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-5-r1.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/darwin-miscutils-5-r1.ebuild,v 1.1 2009/06/21 13:31:36 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/darwin-miscutils-5-r1.ebuild,v 1.2 2009/09/04 20:11:25 grobian Exp $
 
 inherit toolchain-funcs eutils
 
@@ -8,7 +8,7 @@ MISC_VER=23
 SHELL_VER=118
 DEV_VER=48
 
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems"
+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
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
index f4b56d3f5b92..04ff60135d2e 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild,v 1.1 2009/06/24 09:24:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild,v 1.2 2009/09/04 20:11:25 grobian Exp $
 
 inherit toolchain-funcs eutils
 
@@ -8,7 +8,7 @@ MISC_VER=23
 SHELL_VER=118
 DEV_VER=49
 
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems"
+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
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-7.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-7.ebuild
new file mode 100644
index 000000000000..adff65685fd0
--- /dev/null
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-7.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/darwin-miscutils-7.ebuild,v 1.1 2009/09/04 20:11:25 grobian Exp $
+
+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_compile() {
+	local flags=(
+		${CFLAGS}
+		-I.
+		-D__FBSDID=__RCSID
+		-Wsystem-headers
+		${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() {
+	[[ -z ${ED} ]] && local ED=${D}
+
+	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
+}