From: Roy Marples Date: Thu, 15 Mar 2007 22:01:18 +0000 (+0000) Subject: ka0ttic and exg are retired. I will take this over. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a4f6601d0f4320b5a5f83d000d0b29dbc3852977;p=gentoo.git ka0ttic and exg are retired. I will take this over. Update to debian patchset 7. Add patch to build correctly when LC_ALL isn't C. Package-Manager: portage-2.1.2.2 --- diff --git a/app-shells/dash/ChangeLog b/app-shells/dash/ChangeLog index b1ecd9f2d4e6..f7ebd8c80f34 100644 --- a/app-shells/dash/ChangeLog +++ b/app-shells/dash/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-shells/dash # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.35 2007/02/21 23:08:31 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.36 2007/03/15 22:01:18 uberlord Exp $ + +*dash-0.5.3.7 (15 Mar 2007) + + 15 Mar 2007; Roy Marples + +files/dash-0.5.3-sort-locale.patch, metadata.xml, +dash-0.5.3.7.ebuild: + ka0ttic and exg are retired. I will take this over. + Update to debian patchset 7. + Add patch to build correctly when LC_ALL isn't C. 21 Feb 2007; Piotr Jaroszyński ChangeLog: Transition to Manifest2. diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index 10ec33f7ed11..3f47d822c6eb 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,3 +1,7 @@ +AUX dash-0.5.3-sort-locale.patch 373 RMD160 dae12b02478c2757c1750534d386814d1ae600e5 SHA1 3f82e31d3e4ebfdf9366a7e27d5006a4f7d49f24 SHA256 e9c0a059934d9a7c11faebdb8ad69829616ddf2416b07b5e55d68ab1b997f9a4 +MD5 5061b06c660b45c0ae443c18e9ef4cda files/dash-0.5.3-sort-locale.patch 373 +RMD160 dae12b02478c2757c1750534d386814d1ae600e5 files/dash-0.5.3-sort-locale.patch 373 +SHA256 e9c0a059934d9a7c11faebdb8ad69829616ddf2416b07b5e55d68ab1b997f9a4 files/dash-0.5.3-sort-locale.patch 373 AUX dash-0.5.3.3-non-matching-charclass.patch 319 RMD160 69b2be07621d1afd6d1f4a4aa3afa59dff6c3961 SHA1 3ebb40b4453909c717c00ee5362896dc8f038c1f SHA256 93e8d1bed9edfc6d990ff2883ff1099dcbe6fc5b18931f9a80035733709469df MD5 cd2d7a116c5f98acc393655313913271 files/dash-0.5.3.3-non-matching-charclass.patch 319 RMD160 69b2be07621d1afd6d1f4a4aa3afa59dff6c3961 files/dash-0.5.3.3-non-matching-charclass.patch 319 @@ -6,6 +10,7 @@ DIST dash_0.5.2-7.diff.gz 21640 RMD160 442496fe93010412812e5a55ffd09b7a4f06f0ef DIST dash_0.5.2-8.diff.gz 22023 RMD160 e34617aaa7fe484a8910966f77a7f043a71bee86 SHA1 9971b012fb56768062df98d6e9307fc9be541aa6 SHA256 49591d20cb48848a5798166e64c33c7bfad3b8b8103f615adf2a1352c39598c7 DIST dash_0.5.2.orig.tar.gz 207048 RMD160 5d3e9e88ad963d80b2d1a18881ee4969a4064570 SHA1 a46e75c99c4e9de67259a503e59d03da8ac5362f SHA256 c13f16cf7d8bfd1a24211131530981c4884af0d6ad89fd707de5ab2f270b350a DIST dash_0.5.3-3.diff.gz 26636 RMD160 35609c510d0b4bcf0a4c9101ad97d1100711b10d SHA1 d73ea0256d0897fe4051510caa373349b003d3a3 SHA256 8f70dfec8f1f1c72da38cec2f94b2ad6f9af825cd6ff3d945369a98fbd89eb07 +DIST dash_0.5.3-7.diff.gz 33290 RMD160 b2d8263d16aa8500bab2b6d0c24598ebe6c4956d SHA1 7a6118ab4944af9876c8112d6fdf24ee2c3bfc45 SHA256 b0abe3a4ea9afc3136bad62b4b7f68fc6de961db46b7dc77a0c272cbe6c61477 DIST dash_0.5.3.orig.tar.gz 207201 RMD160 fd445535708868fe206852320eece58c3c2bbbaf SHA1 4707b147d5d727712a87e754d1010e7ee25c514d SHA256 82aab2ff63e5fac4bff35c91222f735ec67551db86b5c3b3455ecc10e8889e53 EBUILD dash-0.5.2.7.ebuild 1087 RMD160 c5ccb030e78c24f8fe3612466e6544a098fe24f9 SHA1 049941452edb6dec56c7d3433ee2f4226618fc34 SHA256 df03f3ec836ea4f045b7958d3ea28c565931ea6b5ff32de5b79604c48df30edc MD5 5c4dbd7df696a393315c155453517026 dash-0.5.2.7.ebuild 1087 @@ -23,14 +28,18 @@ EBUILD dash-0.5.3.3.ebuild 1099 RMD160 8bb384391ceeb2d7fbaa80b2dc8e7c855d669d7e MD5 a65294aad870440d0f30eb87b11f27e7 dash-0.5.3.3.ebuild 1099 RMD160 8bb384391ceeb2d7fbaa80b2dc8e7c855d669d7e dash-0.5.3.3.ebuild 1099 SHA256 127bc18ab2e3cd02dac31013f7dd82efc79bb0f85b63d35387d6b88356f9a93a dash-0.5.3.3.ebuild 1099 -MISC ChangeLog 4974 RMD160 6cb69cddd65ab184605ebbfd7351e5d30c7d6bce SHA1 74cc66825de9f3ba67b7301490dc121fdb8500eb SHA256 2d1d4be752c714b25318b9534d344b70aad4293254095e3fe59081c399389255 -MD5 5cd9fb7a4fe3b60ab981f57ebc07de11 ChangeLog 4974 -RMD160 6cb69cddd65ab184605ebbfd7351e5d30c7d6bce ChangeLog 4974 -SHA256 2d1d4be752c714b25318b9534d344b70aad4293254095e3fe59081c399389255 ChangeLog 4974 -MISC metadata.xml 349 RMD160 3b887434c64c0c016fc55398182fd5a37b46b926 SHA1 81d5e7827098a7383d493f9c5c768cbfbd3d63ec SHA256 15f4f4163d6ba0988748dc165fc6a92779940f12f8c8491355e7778daa12f8a0 -MD5 951238ca1b4bd05f26ffbe6cbec17fcc metadata.xml 349 -RMD160 3b887434c64c0c016fc55398182fd5a37b46b926 metadata.xml 349 -SHA256 15f4f4163d6ba0988748dc165fc6a92779940f12f8c8491355e7778daa12f8a0 metadata.xml 349 +EBUILD dash-0.5.3.7.ebuild 1113 RMD160 58dfea7e2063fec8537bf196063c156cfc2a865c SHA1 fcb497bf20ff27ab7cade22d196f9b5c33a6fd60 SHA256 e7718efe3052928cff8e797258f9aaae702c74c5c08e31e25e68554f07cc962a +MD5 6f97d47b34aa233c70c49fb20a6be7c0 dash-0.5.3.7.ebuild 1113 +RMD160 58dfea7e2063fec8537bf196063c156cfc2a865c dash-0.5.3.7.ebuild 1113 +SHA256 e7718efe3052928cff8e797258f9aaae702c74c5c08e31e25e68554f07cc962a dash-0.5.3.7.ebuild 1113 +MISC ChangeLog 5268 RMD160 77e74611d5a9ae65afe57760c9c934761987fe8d SHA1 43d4e01d9514df247476eb049fdfaf881b86a8be SHA256 7badb25bcbe15884f6f813f87bfe58c431f5df2556bf5243f98cf2ff1230a7a6 +MD5 c2766155f2d766f08d77fba3eab41595 ChangeLog 5268 +RMD160 77e74611d5a9ae65afe57760c9c934761987fe8d ChangeLog 5268 +SHA256 7badb25bcbe15884f6f813f87bfe58c431f5df2556bf5243f98cf2ff1230a7a6 ChangeLog 5268 +MISC metadata.xml 258 RMD160 e7b127d711ee0b16caa139b012afebf6f7de5678 SHA1 217134894bc43bed379c823c1abaa6d3f3d7adcc SHA256 ea9f5f0425c3cefc3f50cf2a2792634bf47b9a373948f04c524d0407f6e8d1d6 +MD5 50ddf6de7cdf5ef045d0189c47e4e452 metadata.xml 258 +RMD160 e7b127d711ee0b16caa139b012afebf6f7de5678 metadata.xml 258 +SHA256 ea9f5f0425c3cefc3f50cf2a2792634bf47b9a373948f04c524d0407f6e8d1d6 metadata.xml 258 MD5 a7179a982dcc4a7bf0405aee856d9c5e files/digest-dash-0.5.2.7 485 RMD160 7aed9ce9ab38bfc485a2247a7378e9c4a507b32a files/digest-dash-0.5.2.7 485 SHA256 3523b71aa5c694b97c5ab9644b7af96d38633908d50d969106dc31151edee3d3 files/digest-dash-0.5.2.7 485 @@ -43,3 +52,6 @@ SHA256 5fec3792109f640e50c379a0cc344a2fd7aa5fae3fc5c6fdf10ba1aea2705108 files/di MD5 da97a6aca7956dfb13c791e6d1ecbf29 files/digest-dash-0.5.3.3-r1 485 RMD160 88c3a796b1a5ccbbae45c3588c50a209e7d21329 files/digest-dash-0.5.3.3-r1 485 SHA256 5fec3792109f640e50c379a0cc344a2fd7aa5fae3fc5c6fdf10ba1aea2705108 files/digest-dash-0.5.3.3-r1 485 +MD5 08f4345d307ceb3e3eb2ef80b6a7cbb4 files/digest-dash-0.5.3.7 485 +RMD160 ce298d4b6c96520de7bc99eab83465271aad7e04 files/digest-dash-0.5.3.7 485 +SHA256 f885c2f724851816af7e021113b65d03078900c14fa8d36c177f732ff0e162fd files/digest-dash-0.5.3.7 485 diff --git a/app-shells/dash/dash-0.5.3.7.ebuild b/app-shells/dash/dash-0.5.3.7.ebuild new file mode 100644 index 000000000000..1a9f04a41c46 --- /dev/null +++ b/app-shells/dash/dash-0.5.3.7.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.3.7.ebuild,v 1.1 2007/03/15 22:01:18 uberlord Exp $ + +inherit eutils versionator flag-o-matic toolchain-funcs + +DEB_P="${PN}_$(replace_version_separator 3 '-')" +MY_P2="${DEB_P%-*}" +MY_P="${MY_P2/_/-}" + +DESCRIPTION="Debian-version of NetBSD's lightweight bourne shell" +HOMEPAGE="http://ftp.debian.org/debian/pool/main/d/dash/" +SRC_URI="mirror://debian/pool/main/d/dash/${MY_P2}.orig.tar.gz \ + mirror://debian/pool/main/d/dash/${DEB_P}.diff.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="static" + +DEPEND="dev-util/yacc" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${WORKDIR}/${DEB_P}".diff + epatch "${FILESDIR}/${MY_P}"-sort-locale.patch +} + +src_compile() { + use static && append-ldflags -static + + export CC="$(tc-getCC)" + econf || die "econf failed" + emake CFLAGS="${CFLAGS}" || die "emake failed" +} + +src_install() { + exeinto /bin + newexe src/dash dash + newman src/dash.1 dash.1 + dodoc COPYING ChangeLog +} diff --git a/app-shells/dash/files/dash-0.5.3-sort-locale.patch b/app-shells/dash/files/dash-0.5.3-sort-locale.patch new file mode 100644 index 000000000000..2494240e1df4 --- /dev/null +++ b/app-shells/dash/files/dash-0.5.3-sort-locale.patch @@ -0,0 +1,11 @@ +--- dash-0.5.3.orig/src/mkbuiltins 2005-11-26 03:17:55.000000000 +0000 ++++ dash-0.5.3/src/mkbuiltins 2007-03-15 21:23:51.448422603 +0000 +@@ -65,7 +65,7 @@ + if ($i ~ /^-/) + line = $(++i) "\t" line + print line +- }}' $temp | sort -k 1,1 | tee $temp2 | awk '{ ++ }}' $temp | LC_ALL=C sort -k 1,1 | tee $temp2 | awk '{ + opt = "" + if (NF > 2) { + opt = substr($2, 2) diff --git a/app-shells/dash/files/digest-dash-0.5.3.7 b/app-shells/dash/files/digest-dash-0.5.3.7 new file mode 100644 index 000000000000..c26d0fc023e9 --- /dev/null +++ b/app-shells/dash/files/digest-dash-0.5.3.7 @@ -0,0 +1,6 @@ +MD5 6bcc0930804b790ab236af438f68475c dash_0.5.3-7.diff.gz 33290 +RMD160 b2d8263d16aa8500bab2b6d0c24598ebe6c4956d dash_0.5.3-7.diff.gz 33290 +SHA256 b0abe3a4ea9afc3136bad62b4b7f68fc6de961db46b7dc77a0c272cbe6c61477 dash_0.5.3-7.diff.gz 33290 +MD5 1a3cd6669459be4344ec55ec9d4914f8 dash_0.5.3.orig.tar.gz 207201 +RMD160 fd445535708868fe206852320eece58c3c2bbbaf dash_0.5.3.orig.tar.gz 207201 +SHA256 82aab2ff63e5fac4bff35c91222f735ec67551db86b5c3b3455ecc10e8889e53 dash_0.5.3.orig.tar.gz 207201 diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml index 8881475f99a8..18949c79c267 100644 --- a/app-shells/dash/metadata.xml +++ b/app-shells/dash/metadata.xml @@ -1,13 +1,9 @@ - no-herd + base-system - ka0ttic@gentoo.org - Aaron Walker - - - exg@gentoo.org - Emanuele Giaquinta + uberlord@gentoo.org + Roy Marples