Version bump; fixed deps.

Package-Manager: portage-2.0.51-r15

6 files changed, 51 insertions, 23 deletions

diff --git a/app-shells/dash/ChangeLog b/app-shells/dash/ChangeLog
index 07d192eb1efe..972faf0bd622 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.14 2005/01/01 15:57:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.15 2005/02/05 11:23:14 ka0ttic Exp $
+
+*dash-0.5.2.1 (05 Feb 2005)
+
+  05 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> dash-0.5.1.3-r1.ebuild,
+  -dash-0.5.1.3.ebuild, +dash-0.5.2.1.ebuild:
+  Version bump; fixed deps.
 
   10 Dec 2004; Aaron Walker <ka0ttic@gentoo.org> dash-0.5.1.3-r1.ebuild:
   Marked stable on x86.
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 2a85a77cff6a..e0ff00e7e3b8 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,8 +1,18 @@
-MD5 a8078e1e497bc8828a05cf768e58d281 ChangeLog 2101
-MD5 fed0454f156e4413f85699a7f0780747 dash-0.5.1.3-r1.ebuild 1167
-MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 985945e745208c96da71e06d64ca4c70 dash-0.5.1.3-r1.ebuild 1185
 MD5 ab5a04fcdad3f58ff4ccdbf0d3e056cd dash-0.5.1.1.ebuild 878
-MD5 67e26c4fddaa5f85310c8d7f77c0e780 dash-0.5.1.3.ebuild 879
-MD5 789070e5451f8e3151926438cfb4744b files/digest-dash-0.5.1.3-r1 131
+MD5 47f24368e1de19fb05044eeb60592c89 dash-0.5.2.1.ebuild 1181
+MD5 9bd62b3092bc630c89641839736ae1e5 ChangeLog 2275
+MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
 MD5 115b4f38170f7c82c6c9e3259c55108c files/digest-dash-0.5.1.1 131
-MD5 789070e5451f8e3151926438cfb4744b files/digest-dash-0.5.1.3 131
+MD5 f5e57aa40830691e81633f1bd244801c files/digest-dash-0.5.2.1 131
+MD5 789070e5451f8e3151926438cfb4744b files/digest-dash-0.5.1.3-r1 131
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCBK0VEZCkKN40op4RAnrRAJ90F5df2fhJsSAYfZXhfNm7RqQT6ACgmg7L
++eoYRUow6rECWWAh2N5ahKE=
+=w44n
+-----END PGP SIGNATURE-----
diff --git a/app-shells/dash/dash-0.5.1.3-r1.ebuild b/app-shells/dash/dash-0.5.1.3-r1.ebuild
index 24d3f4f8210a..0869f5c4b391 100644
--- a/app-shells/dash/dash-0.5.1.3-r1.ebuild
+++ b/app-shells/dash/dash-0.5.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2005/01/01 15:57:57 eradicator Exp $
+# $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 $
 
 inherit eutils versionator flag-o-matic toolchain-funcs
 
@@ -19,8 +19,9 @@ LICENSE="BSD"
 KEYWORDS="x86 ~ppc"
 IUSE="diet static"
 
-DEPEND="diet? ( dev-libs/dietlibc )
-	!diet? ( virtual/libc )
+RDEPEND="diet? ( dev-libs/dietlibc )
+	!diet? ( virtual/libc )"
+DEPEND="${RDEPEND}
 	sys-apps/sed
 	dev-util/yacc"
 
diff --git a/app-shells/dash/dash-0.5.1.3.ebuild b/app-shells/dash/dash-0.5.2.1.ebuild
index a8d8b17180b1..d7c3593ac4e8 100644
--- a/app-shells/dash/dash-0.5.1.3.ebuild
+++ b/app-shells/dash/dash-0.5.2.1.ebuild
@@ -1,16 +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.ebuild,v 1.4 2005/01/01 15:57:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.2.1.ebuild,v 1.1 2005/02/05 11:23:14 ka0ttic Exp $
 
-inherit eutils versionator
-
-IUSE=""
+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 \
@@ -18,22 +15,36 @@ 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"
 
-DEPEND="sys-apps/sed
+RDEPEND="diet? ( dev-libs/dietlibc )
+	!diet? ( virtual/libc )"
+DEPEND="${RDEPEND}
+	sys-apps/sed
 	dev-util/yacc"
 
+S="${WORKDIR}/${MY_P}"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${WORKDIR}/${DEB_P}.diff
 }
 
+src_compile() {
+	use static && append-ldflags -static
+
+	CC="$(tc-getCC)"
+	use diet && CC="diet ${CC}"
+
+	econf CC="${CC}" || 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 debian/changelog
+	dodoc COPYING ChangeLog
 }
diff --git a/app-shells/dash/files/digest-dash-0.5.1.3 b/app-shells/dash/files/digest-dash-0.5.1.3
deleted file mode 100644
index d50e49379717..000000000000
--- a/app-shells/dash/files/digest-dash-0.5.1.3
+++ /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.1 b/app-shells/dash/files/digest-dash-0.5.2.1
new file mode 100644
index 000000000000..eec9beabc086
--- /dev/null
+++ b/app-shells/dash/files/digest-dash-0.5.2.1
@@ -0,0 +1,2 @@
+MD5 9f75e13d99fee819522ac05c64d3112e dash_0.5.2.orig.tar.gz 207048
+MD5 1d4a24467f18e694fde61611ecaf2790 dash_0.5.2-1.diff.gz 19432