The Debian patch to fix the sort locale issue doesn't work.

  Bumped with a simple sed call to fix.
Package-Manager: portage-2.1.3_rc5

4 files changed, 91 insertions, 5 deletions

diff --git a/app-shells/dash/ChangeLog b/app-shells/dash/ChangeLog
index f75afc9eba6e..977b1db037ce 100644
--- a/app-shells/dash/ChangeLog
+++ b/app-shells/dash/ChangeLog
@@ -1,6 +1,12 @@
 # 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.43 2007/06/26 16:52:05 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.44 2007/06/26 17:36:12 uberlord Exp $
+
+*dash-0.5.3.8-r1 (26 Jun 2007)
+
+  26 Jun 2007; Roy Marples <uberlord@gentoo.org> +dash-0.5.3.8-r1.ebuild:
+  The Debian patch to fix the sort locale issue doesn't work.
+  Bumped with a simple sed call to fix.
 
 *dash-0.5.3.8 (26 Jun 2007)
 
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 403c8b2b781b..580144bfffea 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -42,14 +42,18 @@ EBUILD dash-0.5.3.7.ebuild 1230 RMD160 d9d973b11b38ddbeb29cdb463c82c33a0e8f6534
 MD5 b9f21e4963bafc797dc3bd18f3845fc7 dash-0.5.3.7.ebuild 1230
 RMD160 d9d973b11b38ddbeb29cdb463c82c33a0e8f6534 dash-0.5.3.7.ebuild 1230
 SHA256 a5ae13b2005b90bfd0ab6271ec1142b1073c7b21b434b4732df06a99005145e0 dash-0.5.3.7.ebuild 1230
+EBUILD dash-0.5.3.8-r1.ebuild 1775 RMD160 327b3a6208d11d1a539e4886467e0f80d8140583 SHA1 90ce78db44a3ef9eab9d646a10065f0922947768 SHA256 1111103d27e16d6c12327dcda59acf947f9b7bef592c7a7446091f1c63aca028
+MD5 97dc24600d7c8092fa41831fb356a665 dash-0.5.3.8-r1.ebuild 1775
+RMD160 327b3a6208d11d1a539e4886467e0f80d8140583 dash-0.5.3.8-r1.ebuild 1775
+SHA256 1111103d27e16d6c12327dcda59acf947f9b7bef592c7a7446091f1c63aca028 dash-0.5.3.8-r1.ebuild 1775
 EBUILD dash-0.5.3.8.ebuild 1693 RMD160 838900954029fb8d9d21eb2896dd2054faa805e4 SHA1 4437b02ec08bfae1477cbc825dfc56a0860d4e02 SHA256 2520901e3e4a12f0283847a42030393a4dbc731ca6bc555779eb03ce552cd7d3
 MD5 80765ee1d0fd9044baa51008804dd0b3 dash-0.5.3.8.ebuild 1693
 RMD160 838900954029fb8d9d21eb2896dd2054faa805e4 dash-0.5.3.8.ebuild 1693
 SHA256 2520901e3e4a12f0283847a42030393a4dbc731ca6bc555779eb03ce552cd7d3 dash-0.5.3.8.ebuild 1693
-MISC ChangeLog 6248 RMD160 9d65baad41ff384f7a94db4c5ed9b7d6887c902e SHA1 b7889acc2515e995d61d66d23efc1c5d395c249d SHA256 7b721f621ca1cbba96f4fc0e654a4c8cc2ba808d833a33cc4af29dc1b0f91753
-MD5 c3f35cd435aad3b9769aac51f09be328 ChangeLog 6248
-RMD160 9d65baad41ff384f7a94db4c5ed9b7d6887c902e ChangeLog 6248
-SHA256 7b721f621ca1cbba96f4fc0e654a4c8cc2ba808d833a33cc4af29dc1b0f91753 ChangeLog 6248
+MISC ChangeLog 6457 RMD160 643015a921d25716157a7204bc50fb6b209a3d38 SHA1 cf5c22aec7ae4728bf514270dfdbaaeb5382f0b1 SHA256 472b58a2ce7611dd707b3ea89e3811c7751e26c23934b8c46be8df95b4eccf6e
+MD5 24bc7be913517f2ea8a34323474fe236 ChangeLog 6457
+RMD160 643015a921d25716157a7204bc50fb6b209a3d38 ChangeLog 6457
+SHA256 472b58a2ce7611dd707b3ea89e3811c7751e26c23934b8c46be8df95b4eccf6e ChangeLog 6457
 MISC metadata.xml 258 RMD160 e7b127d711ee0b16caa139b012afebf6f7de5678 SHA1 217134894bc43bed379c823c1abaa6d3f3d7adcc SHA256 ea9f5f0425c3cefc3f50cf2a2792634bf47b9a373948f04c524d0407f6e8d1d6
 MD5 50ddf6de7cdf5ef045d0189c47e4e452 metadata.xml 258
 RMD160 e7b127d711ee0b16caa139b012afebf6f7de5678 metadata.xml 258
@@ -75,3 +79,6 @@ SHA256 35ebcc6ba04a11f1247c32524bedfb5e8478789fcd17b7f9bf114ef1f32f0b4f files/di
 MD5 ffb52d12629c4676b199ed555b47b169 files/digest-dash-0.5.3.8 470
 RMD160 d932c45e59cd47118b2e5a83db92a12b9c02f9a7 files/digest-dash-0.5.3.8 470
 SHA256 58a60dc19570313f9aa1af7bda80b177b0caf97ecf4a8fe3d3053d1413e3dce3 files/digest-dash-0.5.3.8 470
+MD5 ffb52d12629c4676b199ed555b47b169 files/digest-dash-0.5.3.8-r1 470
+RMD160 d932c45e59cd47118b2e5a83db92a12b9c02f9a7 files/digest-dash-0.5.3.8-r1 470
+SHA256 58a60dc19570313f9aa1af7bda80b177b0caf97ecf4a8fe3d3053d1413e3dce3 files/digest-dash-0.5.3.8-r1 470
diff --git a/app-shells/dash/dash-0.5.3.8-r1.ebuild b/app-shells/dash/dash-0.5.3.8-r1.ebuild
new file mode 100644
index 000000000000..c311d57995a0
--- /dev/null
+++ b/app-shells/dash/dash-0.5.3.8-r1.ebuild
@@ -0,0 +1,67 @@
+# 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.8-r1.ebuild,v 1.1 2007/06/26 17:36:12 uberlord Exp $
+
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+DEB_PV=${PV%.*}
+DEB_PATCH=${PV##*.}
+DEB_PF="${PN}_${DEB_PV}-${DEB_PATCH}"
+MY_P="${PN}-${DEB_PV}"
+
+DESCRIPTION="DASH is a direct descendant of the NetBSD version of ash (the
+Almquist SHell) and is POSIX compliant"
+HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
+SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${PN}-${DEB_PV}.tar.gz
+		mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="libedit static"
+
+DEPEND="libedit? ( dev-libs/libedit )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${WORKDIR}/${DEB_PF}".diff
+
+	cd "${S}"
+	epatch debian/diff/*
+
+	# Fix reading of long lines
+	epatch "${FILESDIR}/${MY_P}"-read-length.patch
+
+	# Fix the invalid sort
+	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
+
+	# Always statically link libedit in to ensure we always boot if it changes
+	# which it has done in the past.
+	local s="s/-ledit/-Wl,-Bstatic -ledit -Wl,-Bdynamic -lcurses/g"
+	use static && s="s/-ledit/-ledit -lcurses/g"
+	sed -i -e "${s}" configure.ac || die "Failed to sed configure.ac"
+
+	# May as well, as the debian patches force this anyway
+	eautoreconf
+}
+
+src_compile() {
+	local myconf=
+
+	use static && append-ldflags -static
+	use libedit && myconf="${myconf} --with-libedit"
+	export CC="$(tc-getCC)"
+
+	econf ${myconf} || 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/digest-dash-0.5.3.8-r1 b/app-shells/dash/files/digest-dash-0.5.3.8-r1
new file mode 100644
index 000000000000..1850f55b5deb
--- /dev/null
+++ b/app-shells/dash/files/digest-dash-0.5.3.8-r1
@@ -0,0 +1,6 @@
+MD5 1a3cd6669459be4344ec55ec9d4914f8 dash-0.5.3.tar.gz 207201
+RMD160 fd445535708868fe206852320eece58c3c2bbbaf dash-0.5.3.tar.gz 207201
+SHA256 82aab2ff63e5fac4bff35c91222f735ec67551db86b5c3b3455ecc10e8889e53 dash-0.5.3.tar.gz 207201
+MD5 3337f54d71d5a1d8b46f3d2e5ca5e5b1 dash_0.5.3-8.diff.gz 65454
+RMD160 30cf2615e88ab885c4e0c1a8644b87b07fdda52d dash_0.5.3-8.diff.gz 65454
+SHA256 f9a785c7bb72deaa24eb81a918e3c85d3062121ad06874b501ba330e5c53d80a dash_0.5.3-8.diff.gz 65454