7 files changed, 31 insertions, 57 deletions
diff --git a/app-shells/dash/ChangeLog b/app-shells/dash/ChangeLog
index 475730cc52d6..42af2ebcb2b8 100644
--- a/app-shells/dash/ChangeLog
+++ b/app-shells/dash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/dash
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.17 2005/03/30 16:11:49 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.18 2005/04/02 16:22:26 ka0ttic Exp $
+
+*dash-0.5.2.3 (02 Apr 2005)
+
+  02 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> -dash-0.5.1.1.ebuild,
+  -dash-0.5.1.3-r1.ebuild, +dash-0.5.2.3.ebuild:
+  New patch revision from debian. Tidy'd old ebuilds.
 
   30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> dash-0.5.2.1.ebuild:
   Stable on ppc.
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 4f8b423316dd..72b1777e3411 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,10 +1,18 @@
-MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 ab5a04fcdad3f58ff4ccdbf0d3e056cd dash-0.5.1.1.ebuild 878
-MD5 e5208879b0a614dad665c06ea43b4140 ChangeLog 2552
-MD5 985945e745208c96da71e06d64ca4c70 dash-0.5.1.3-r1.ebuild 1185
-MD5 1b14ec97375cdebb74506feac7c885c2 dash-0.5.2.1.ebuild 1178
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 e69317986be0d440b9cbc268998bfbc7 dash-0.5.2.2.ebuild 1181
-MD5 115b4f38170f7c82c6c9e3259c55108c files/digest-dash-0.5.1.1 131
-MD5 62cd384479c8aa7f4f6470c9e33c813b files/digest-dash-0.5.2.2 131
+MD5 1b14ec97375cdebb74506feac7c885c2 dash-0.5.2.1.ebuild 1178
+MD5 3776bde77d25365b8760dfb26aaa22f9 dash-0.5.2.3.ebuild 1181
+MD5 90fe13baa67c7013a254a5b24991619e ChangeLog 2757
+MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
 MD5 f5e57aa40830691e81633f1bd244801c files/digest-dash-0.5.2.1 131
-MD5 789070e5451f8e3151926438cfb4744b files/digest-dash-0.5.1.3-r1 131
+MD5 62cd384479c8aa7f4f6470c9e33c813b files/digest-dash-0.5.2.2 131
+MD5 e59afdb878e45e78521df9aa5fd8cdfc files/digest-dash-0.5.2.3 131
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCTsbbEZCkKN40op4RAsRbAJ0WfQG+ABFIG10NLsTSjjLRC+KjvACfa2PN
+2wTc74aWuIE712ULEuGs4bA=
+=/i6n
+-----END PGP SIGNATURE-----
diff --git a/app-shells/dash/dash-0.5.1.1.ebuild b/app-shells/dash/dash-0.5.1.1.ebuild
deleted file mode 100644
index a129b93d72cd..000000000000
--- a/app-shells/dash/dash-0.5.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.1.1.ebuild,v 1.5 2005/01/01 15:57:57 eradicator Exp $
-
-inherit eutils
-
-IUSE=""
-
-MY_P=${P%.*}
-MY_P2=${MY_P/-/_}
-DEB_P=${PN}_${PV%.*}-${PV##*.}
-
-S=${WORKDIR}/${MY_P}
-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"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 ppc"
-
-DEPEND="sys-apps/sed
-	dev-util/yacc"
-
-src_compile() {
-	epatch ${WORKDIR}/${DEB_P}.diff
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	exeinto /bin
-	newexe src/dash dash
-
-	newman src/dash.1 dash.1
-
-	dodoc COPYING debian/changelog
-}
diff --git a/app-shells/dash/dash-0.5.1.3-r1.ebuild b/app-shells/dash/dash-0.5.2.3.ebuild
index 0869f5c4b391..5c97ebcdb4b4 100644
--- a/app-shells/dash/dash-0.5.1.3-r1.ebuild
+++ b/app-shells/dash/dash-0.5.2.3.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.1.3-r1.ebuild,v 1.4 2005/02/05 11:23:14 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.2.3.ebuild,v 1.1 2005/04/02 16:22:26 ka0ttic Exp $
 
 inherit eutils versionator flag-o-matic toolchain-funcs
 
 DEB_P="${PN}_$(replace_version_separator 3 '-')"
 MY_P2="${DEB_P%-*}"
-MY_P=${MY_P2/_/-}
+MY_P="${MY_P2/_/-}"
 
-S=${WORKDIR}/${MY_P}
 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 \
@@ -16,7 +15,7 @@ SRC_URI="mirror://debian/pool/main/d/dash/${MY_P2}.orig.tar.gz \
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~x86 ~ppc"
 IUSE="diet static"
 
 RDEPEND="diet? ( dev-libs/dietlibc )
@@ -25,6 +24,8 @@ DEPEND="${RDEPEND}
 	sys-apps/sed
 	dev-util/yacc"
 
+S="${WORKDIR}/${MY_P}"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -45,5 +46,5 @@ src_install() {
 	exeinto /bin
 	newexe src/dash dash
 	newman src/dash.1 dash.1
-	dodoc COPYING debian/changelog
+	dodoc COPYING ChangeLog
 }
diff --git a/app-shells/dash/files/digest-dash-0.5.1.1 b/app-shells/dash/files/digest-dash-0.5.1.1
deleted file mode 100644
index ac73233e1e5a..000000000000
--- a/app-shells/dash/files/digest-dash-0.5.1.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8bcc29c879d053fcb9301ccf6fe373ac dash_0.5.1.orig.tar.gz 227723
-MD5 4ca2524524fabf8a301d0d72f0a4cba7 dash_0.5.1-1.diff.gz 19450
diff --git a/app-shells/dash/files/digest-dash-0.5.1.3-r1 b/app-shells/dash/files/digest-dash-0.5.1.3-r1
deleted file mode 100644
index d50e49379717..000000000000
--- a/app-shells/dash/files/digest-dash-0.5.1.3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8bcc29c879d053fcb9301ccf6fe373ac dash_0.5.1.orig.tar.gz 227723
-MD5 9e9616bb238475bff3cccd6b1f3e5a26 dash_0.5.1-3.diff.gz 20029
diff --git a/app-shells/dash/files/digest-dash-0.5.2.3 b/app-shells/dash/files/digest-dash-0.5.2.3
new file mode 100644
index 000000000000..05266abb81c6
--- /dev/null
+++ b/app-shells/dash/files/digest-dash-0.5.2.3
@@ -0,0 +1,2 @@
+MD5 9f75e13d99fee819522ac05c64d3112e dash_0.5.2.orig.tar.gz 207048
+MD5 873aac89be7659ff7e7bde2874a96754 dash_0.5.2-3.diff.gz 20433