Make sure we install into /bin #207942 by Martin.

Package-Manager: portage-2.1.4

4 files changed, 83 insertions, 14 deletions

diff --git a/app-shells/dash/ChangeLog b/app-shells/dash/ChangeLog
index d02ccbac3bd4..fe6e6f21cf4c 100644
--- a/app-shells/dash/ChangeLog
+++ b/app-shells/dash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/dash
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 
+*dash-0.5.4.6-r1 (28 Jan 2008)
+
+  28 Jan 2008; Mike Frysinger <vapier@gentoo.org> +dash-0.5.4.6-r1.ebuild:
+  Make sure we install into /bin #207942 by Martin.
+
 *dash-0.5.4.6 (28 Jan 2008)
 
   28 Jan 2008; Mike Frysinger <vapier@gentoo.org> +dash-0.5.4.6.ebuild:
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index dbeffe97b147..798d3f1a2f11 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -26,14 +26,14 @@ EBUILD dash-0.5.4.1-r2.ebuild 1887 RMD160 9fb40273aae0712e694e4f9d5e070fcdbef37c
 MD5 49ec36158e5c3179248e8db80d23d3a1 dash-0.5.4.1-r2.ebuild 1887
 RMD160 9fb40273aae0712e694e4f9d5e070fcdbef37cc2 dash-0.5.4.1-r2.ebuild 1887
 SHA256 4bde2f3d44cac2fc5b581001ec58c55cff4c4fa879a383962bf66f7d777d124c dash-0.5.4.1-r2.ebuild 1887
-EBUILD dash-0.5.4.6.ebuild 1583 RMD160 0c130a745bdb84b2ba303532b1b3eb5df74772dc SHA1 c164ef8705e1f461882007f65f8c1b386b85873d SHA256 855e1763bca768ba2c1d99b89cd11ab2b84563f6afaf59d404bb44c3a459d30e
-MD5 c03aa5d5c03947150bf9151b664b1ce2 dash-0.5.4.6.ebuild 1583
-RMD160 0c130a745bdb84b2ba303532b1b3eb5df74772dc dash-0.5.4.6.ebuild 1583
-SHA256 855e1763bca768ba2c1d99b89cd11ab2b84563f6afaf59d404bb44c3a459d30e dash-0.5.4.6.ebuild 1583
-MISC ChangeLog 7251 RMD160 0da9431d2acab415161efe511c28c61eff7e70f7 SHA1 9f1862fe022754e89e7e70a29869cd7c5dab1b96 SHA256 01b86dbab12cb1e788f11b4c16e49b3e01ea8786640fcb936287bb1307aa7732
-MD5 3df1616e1a18b7a95a05f106a6c387a6 ChangeLog 7251
-RMD160 0da9431d2acab415161efe511c28c61eff7e70f7 ChangeLog 7251
-SHA256 01b86dbab12cb1e788f11b4c16e49b3e01ea8786640fcb936287bb1307aa7732 ChangeLog 7251
+EBUILD dash-0.5.4.6-r1.ebuild 1612 RMD160 f6935d53998abbca67a3031021b9fa3bc15e4b74 SHA1 16e2e8d2106d4918b04bad9078057e1dad2981e8 SHA256 05d76dc9e54b5d7954c5a7c693d337a62ce3be4fe992ccf91b1d268cfe1307ab
+MD5 d27126b9fad481d7cdd99abe5c31a02b dash-0.5.4.6-r1.ebuild 1612
+RMD160 f6935d53998abbca67a3031021b9fa3bc15e4b74 dash-0.5.4.6-r1.ebuild 1612
+SHA256 05d76dc9e54b5d7954c5a7c693d337a62ce3be4fe992ccf91b1d268cfe1307ab dash-0.5.4.6-r1.ebuild 1612
+MISC ChangeLog 7411 RMD160 a94178aa28619caaf1ea367af775b662bb8006d1 SHA1 ed19fc8e4bf09a1f9fca7846f7727e95ed4d39f9 SHA256 77536adfd8c32ab53e95383ea84a1455cf780ed01056485b528932400e612471
+MD5 96a13e8fd98b534f1c595eaea23762bd ChangeLog 7411
+RMD160 a94178aa28619caaf1ea367af775b662bb8006d1 ChangeLog 7411
+SHA256 77536adfd8c32ab53e95383ea84a1455cf780ed01056485b528932400e612471 ChangeLog 7411
 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a
 MD5 6fe58567b648100d4ff11902921b6889 metadata.xml 165
 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 metadata.xml 165
@@ -44,13 +44,13 @@ SHA256 35ebcc6ba04a11f1247c32524bedfb5e8478789fcd17b7f9bf114ef1f32f0b4f files/di
 MD5 5c4d6e6415be734e6f9f0682f4d9de17 files/digest-dash-0.5.4.1-r2 470
 RMD160 b0ef32c8dff676e07df68e5325bb1baebcb6927e files/digest-dash-0.5.4.1-r2 470
 SHA256 bf509cd4bc36aadc510110dd0de43daa00365a6f287a178ea7db889ee5ce2130 files/digest-dash-0.5.4.1-r2 470
-MD5 b199b1acd44f85a1e2d230b160681cee files/digest-dash-0.5.4.6 473
-RMD160 c8b92a4fbf0ea7731f3a5183ea3cdc1d5b61f786 files/digest-dash-0.5.4.6 473
-SHA256 a90d460714bdff0ace92f685369825e6935cfce142cecd3439a0415275bdc603 files/digest-dash-0.5.4.6 473
+MD5 b199b1acd44f85a1e2d230b160681cee files/digest-dash-0.5.4.6-r1 473
+RMD160 c8b92a4fbf0ea7731f3a5183ea3cdc1d5b61f786 files/digest-dash-0.5.4.6-r1 473
+SHA256 a90d460714bdff0ace92f685369825e6935cfce142cecd3439a0415275bdc603 files/digest-dash-0.5.4.6-r1 473
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHnfbCj9hvisErhMIRAgrHAKDptOMIL8egz2qH1nd0H0jcYDx+TgCcDeUF
-cGmud6wWZIh4CirjHW2G+Fg=
-=VDWj
+iD8DBQFHniMJj9hvisErhMIRAuUtAJ43jiTuBYdjNZbo9EdvsqJqcYEx8gCfUWFk
+jY/J7MVHj8d0FUJ3FQxg6CE=
+=v2fh
 -----END PGP SIGNATURE-----
diff --git a/app-shells/dash/dash-0.5.4.6-r1.ebuild b/app-shells/dash/dash-0.5.4.6-r1.ebuild
new file mode 100644
index 000000000000..04b6a77a53c4
--- /dev/null
+++ b/app-shells/dash/dash-0.5.4.6-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.4.6-r1.ebuild,v 1.1 2008/01/28 18:46:26 vapier Exp $
+
+inherit autotools eutils flag-o-matic
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~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 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() {
+	use static && append-ldflags -static
+	econf \
+		--bindir=/bin \
+		$(use_with libedit) \
+		|| die "econf failed"
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog debian/changelog
+}
diff --git a/app-shells/dash/files/digest-dash-0.5.4.6-r1 b/app-shells/dash/files/digest-dash-0.5.4.6-r1
new file mode 100644
index 000000000000..211e8cc74e23
--- /dev/null
+++ b/app-shells/dash/files/digest-dash-0.5.4.6-r1
@@ -0,0 +1,6 @@
+MD5 bc457e490a589d2f87f2333616b67931 dash-0.5.4.tar.gz 212145
+RMD160 322fc2fffc5fddf4223d39c57eaeb9b4222303fa dash-0.5.4.tar.gz 212145
+SHA256 a9dc8f0237f632dd2c1bfeff80b1052e75fafaef0d767e3beab0bd8becced623 dash-0.5.4.tar.gz 212145
+MD5 1cf4a88f7b2686f38e8fa03cd5e8f2cd dash_0.5.4-6.diff.gz 124115
+RMD160 2901a9ab59cc804c656201ce3cfca0129ff3ca24 dash_0.5.4-6.diff.gz 124115
+SHA256 2f3c32162b36703a6af9a357822a645bbb86e29f2af6544f102707de1aa8bba6 dash_0.5.4-6.diff.gz 124115