Bump to Lion version 10.7

Package-Manager: portage-2.2.01.19120-prefix/cvs/Darwin i386

diff --git a/sys-apps/darwin-miscutils/ChangeLog b/sys-apps/darwin-miscutils/ChangeLog
index 2a4b37dcaf963026518b5c649e4d034ae96fd0f1..e6113a81cc744d0de8fe90f88deb2143781a102f 100644 (file)
--- a/sys-apps/darwin-miscutils/ChangeLog
+++ b/sys-apps/darwin-miscutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/darwin-miscutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/ChangeLog,v 1.8 2011/06/26 12:30:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/ChangeLog,v 1.9 2011/09/03 10:44:37 grobian Exp $
+
+*darwin-miscutils-9 (03 Sep 2011)
+
+  03 Sep 2011; Fabian Groffen <grobian@gentoo.org> +darwin-miscutils-9.ebuild:
+  Bump to Lion version 10.7
 
   26 Jun 2011; Fabian Groffen <grobian@gentoo.org> darwin-miscutils-8.ebuild:
   (Try to) resolve naming conflict on OSX Lion, bug #372751

diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest
index da27a411a3cb978eb1faa1c23bcf868648e10d2b..38e6c87665630ed026dc39b8fe4b8485a20230cd 100644 (file)
--- a/sys-apps/darwin-miscutils/Manifest
+++ b/sys-apps/darwin-miscutils/Manifest
@@ -10,23 +10,27 @@ DIST developer_cmds-48.tar.gz 161783 RMD160 992b192602e4a6a6174d0f7da64827fd4d0d
 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 developer_cmds-53.1.tar.gz 139637 RMD160 bf1548cac247bdaaf8c5e97f416d9a9b1d7e9d77 SHA1 322dfa510b1bdd9056d7e6faa34f08a685d8d94e SHA256 f3f6cc44336fae506a5c7ca1e71aeaa00da89b4337298fcd4d13953bbfa6edb8
+DIST developer_cmds-55.tar.gz 139664 RMD160 480d8e05c406c02059c1c751463cfa34ab836700 SHA1 f4f70ff9b1dd3e0f3c7e51fa44d7be11ff81dd91 SHA256 1760a430552057304ecc2c20bb0acd3683a3a0325f29a1e27065818d2515e91a
 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 misc_cmds-31.tar.gz 121187 RMD160 fdea3d5fbb5baa2fef010a58cfb8f36abaf201b8 SHA1 065227b9a6aa8bad1210f3357d468e5317b8691a SHA256 1e0cdf2af9b28245af40168fc48e010e260b62fd48ddbcb95e62851d2765f37c
 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-162.tar.gz 179189 RMD160 c3bb0b0f2c7eac734b6b089ebb5a5922edadea47 SHA1 bb8ffc2241c490d53517d51933c9275627fb3a19 SHA256 42d5ad4fbcaca83620a3ab709a41b21a18224589c844c716223489418e04e3d6
 DIST shell_cmds-81.tar.gz 154516 RMD160 033ccf7330d8b05f3b5d7d47c2de824990975c57 SHA1 d90b586e27a3778b5d61077c1fc4777b545a7c35 SHA256 64f0e01de9e13b9a1518ccd2cf45486b6159a5fdc562e7d0725e835d495cea81
 EBUILD darwin-miscutils-4-r1.ebuild 3147 RMD160 2576ccfcbdffb9568d43aafb7a885b1563948c6b SHA1 ed0fff91acd6f83e6690587103ab0c5b9465d5b7 SHA256 ca1f4f8cc44748c11b1cd0d38410d4ba042b962723c7a328dd3c75c49fed7d90
 EBUILD darwin-miscutils-5-r1.ebuild 4349 RMD160 a65cbe1ee6739be94a123421a670c3b6d05ce7fc SHA1 f0c44570eb26b14b43eeabab4694e7a7b01aeeea SHA256 debdbc3ccc0148c43237017913497c38dd4ea4ea2aa01217f8a8e320c7b4e74f
 EBUILD darwin-miscutils-6-r1.ebuild 4413 RMD160 321d15d1cc99b0747900877c619d6fe331d0c60e SHA1 bd2fc8ba088c53f2286abb1888b866cd12805a93 SHA256 e27449491437aaa64673c7650eea04b77062989e536812da4b17d9b78739feb9
 EBUILD darwin-miscutils-7.ebuild 4301 RMD160 67f0f5847af7f47bac35c532443b650bbfd192e0 SHA1 2142789b21412994edb502960263b34c9a05ef61 SHA256 25c01bd12e8187920523a6068a388163dc4ee65010347d1e23344404a6eabc7d
 EBUILD darwin-miscutils-8.ebuild 4198 RMD160 6f03c754416784718d571b44877853156ff2adf0 SHA1 d875098256dc7796d0bb30628ee76cc643594823 SHA256 bffb30bb2e4a99868596c3a8acf4c6a863d58afab7cbcc19e812cdf880a4a309
-MISC ChangeLog 2991 RMD160 c5346c62f66d8f4e4791b401e7a7e58736555c4c SHA1 ac9b0fdc90d6e4b9c2740fabc67bee1da7d9c272 SHA256 67a4516a668ab45bf17ed9c8e52799a5c2c6e2ddf8811a117c2558b68723c992
+EBUILD darwin-miscutils-9.ebuild 4068 RMD160 4ffc78efcdc118bab6396412bc682614526dbe5d SHA1 497fe366dd7b7f3dab5e17b1d9a7aab4cd1ffbc8 SHA256 d8a057c0995b33ea19015a35ca014b346730a58085f147c852445dce3f28f999
+MISC ChangeLog 3134 RMD160 a9feabcdd31d163de71715f13e77485ac0574e7c SHA1 9bd56f78f13d46a9d57a8a23437bcc77bffe2a56 SHA256 60b00151cc398d03305da50324049c41d47718f290efc86a4a06672802391d57
 MISC metadata.xml 160 RMD160 baab82f4bc435813cfde4796d42840882a9a4f8f SHA1 144e248704973cfad031c92a930aad01a62a2fda SHA256 27667dd7db1d188c12342624ec5ff2155717821d646e442aef9a691c65539ac4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (Darwin)
+Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk4HJl8ACgkQX3X2B8XHTokS5QCcD2TDRfWaxpGTDWfiAx3s0mZN
-+04AoI/GNLINKoBS452Z9S8YneRI1JJt
-=vo9/
+iEYEARECAAYFAk5iBRsACgkQX3X2B8XHTok6VQCcDVG0tAiYAQ/FRjLifYcAZOLh
+WEsAn1ox7GmRdUBIxV5+SUORAXJIIK0N
+=Hcj8
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
new file mode 100644 (file)
index 0000000..91f1332
--- /dev/null
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild,v 1.1 2011/09/03 10:44:37 grobian Exp $
+
+EAPI="3"
+
+inherit toolchain-funcs eutils
+
+MISC_VER=31
+SHELL_VER=162
+DEV_VER=55
+
+DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Lion 10.7"
+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 killall \
+               lastcomm renice script 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
+       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 Snow Leopard version)
+       for t in asa hexdump unifdef what ; do
+               echo "in ${TS}/${t}:"
+               cd "${TS}/${t}" || die
+               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 hexdump unifdef what ; do
+               cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
+               doman "${TS}/${t}/${t}.1"
+       done
+}