3 files changed, 16 insertions, 66 deletions
diff --git a/app-shells/dash/ChangeLog b/app-shells/dash/ChangeLog
index 8870747ab8a1..2f0caec3c906 100644
--- a/app-shells/dash/ChangeLog
+++ b/app-shells/dash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/dash
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.113 2014/01/18 02:27:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.114 2014/02/18 12:03:40 polynomial-c Exp $
+
+*dash-0.5.7.4 (18 Feb 2014)
+
+  18 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> -dash-0.5.5.1.2.ebuild,
+  -dash-0.5.5.1.7.ebuild, +dash-0.5.7.4.ebuild:
+  Version bump. Removed old.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> dash-0.5.7.3-r1.ebuild:
   Add arm64 love.
diff --git a/app-shells/dash/dash-0.5.5.1.2.ebuild b/app-shells/dash/dash-0.5.5.1.2.ebuild
deleted file mode 100644
index 972d1ead1bdc..000000000000
--- a/app-shells/dash/dash-0.5.5.1.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.5.1.2.ebuild,v 1.8 2010/07/25 17:36:53 armin76 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 sparc 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/dash-0.5.5.1.7.ebuild b/app-shells/dash/dash-0.5.7.4.ebuild
index e1d9590ade41..025cf5165c48 100644
--- a/app-shells/dash/dash-0.5.5.1.7.ebuild
+++ b/app-shells/dash/dash-0.5.7.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.5.1.7.ebuild,v 1.10 2012/05/02 20:29:50 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.7.4.ebuild,v 1.1 2014/02/18 12:03:40 polynomial-c Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit autotools eutils flag-o-matic toolchain-funcs
 
@@ -18,7 +18,7 @@ SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${PN}-${DEB_PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="libedit static"
 
 RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
@@ -37,7 +37,7 @@ src_prepare() {
 	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
 
 	# Use pkg-config for libedit linkage
-	sed -i "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(use static && echo --static)\`:" configure.ac
+	sed -i "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" configure.ac
 
 	# May as well, as the debian patches force this anyway
 	eautoreconf
@@ -45,12 +45,14 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
+	# Do not pass --enable-glob due to #443552.
 	econf \
 		--bindir=/bin \
+		--enable-fnmatch \
 		$(use_with libedit)
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog */debian/changelog
+	default
+	dodoc */debian/changelog
 }