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

(Portage version: 2.2.00.14183-prefix/cvs/Darwin powerpc)

5 files changed, 147 insertions, 7 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/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
+}