From 68b674d3521a1e08d57b51270de888bfff0beeac Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 31 Oct 2016 10:36:48 -0400 Subject: app-shells/dash: make dumb-echo patch optional ACKed by Lars (polynomial-c). Bug: https://bugs.gentoo.org/590696 Package-Manager: portage-2.3.2_p1 --- app-shells/dash/dash-0.5.9.1-r1.ebuild | 74 ++++++++++++++++++++++++++++++++++ app-shells/dash/dash-0.5.9.1.ebuild | 72 --------------------------------- app-shells/dash/metadata.xml | 3 ++ 3 files changed, 77 insertions(+), 72 deletions(-) create mode 100644 app-shells/dash/dash-0.5.9.1-r1.ebuild delete mode 100644 app-shells/dash/dash-0.5.9.1.ebuild (limited to 'app-shells/dash') diff --git a/app-shells/dash/dash-0.5.9.1-r1.ebuild b/app-shells/dash/dash-0.5.9.1-r1.ebuild new file mode 100644 index 00000000000..4942b9dca72 --- /dev/null +++ b/app-shells/dash/dash-0.5.9.1-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils flag-o-matic toolchain-funcs versionator + +#MY_PV="$(get_version_component_range 1-3)" +DEB_PATCH="" #$(get_version_component_range 4) +#MY_P="${PN}-${MY_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/${P}.tar.gz" +if [[ -n "${DEB_PATCH}" ]] ; then + DEB_PF="${PN}_${MY_PV}-${DEB_PATCH}" + SRC_URI+=" mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz" +fi + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="dumb-echo libedit static" + +RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" +DEPEND="${RDEPEND} + virtual/pkgconfig + libedit? ( static? ( dev-libs/libedit[static-libs] ) )" + +#S=${WORKDIR}/${MY_P} + +PATCHES=( + "${FILESDIR}"/${PN}-0.5.8.1-eval-warnx.patch +) + +src_prepare() { + if [[ -n "${DEB_PATCH}" ]] ; then + epatch "${WORKDIR}"/${DEB_PF}.diff + epatch */debian/diff/* + fi + epatch "${PATCHES[@]}" + + #337329 #527848 + use dumb-echo && epatch "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch + + # Fix the invalid sort + sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins + + # Use pkg-config for libedit linkage + sed -i \ + -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \ + configure || die +} + +src_configure() { + append-cppflags -DJOBS=$(usex libedit 1 0) + use static && append-ldflags -static + # Do not pass --enable-glob due to #443552. + # Autotools use $LINENO as a proxy for extended debug support + # (i.e. they're running bash), so disable that. #527644 + econf \ + --bindir="${EPREFIX}"/bin \ + --enable-fnmatch \ + --disable-lineno \ + $(use_with libedit) +} + +src_install() { + default + if [[ -n "${DEB_PATCH}" ]] ; then + dodoc */debian/changelog + fi +} diff --git a/app-shells/dash/dash-0.5.9.1.ebuild b/app-shells/dash/dash-0.5.9.1.ebuild deleted file mode 100644 index 39d1f83baaa..00000000000 --- a/app-shells/dash/dash-0.5.9.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs versionator - -#MY_PV="$(get_version_component_range 1-3)" -DEB_PATCH="" #$(get_version_component_range 4) -#MY_P="${PN}-${MY_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/${P}.tar.gz" -if [[ -n "${DEB_PATCH}" ]] ; then - DEB_PF="${PN}_${MY_PV}-${DEB_PATCH}" - SRC_URI+=" mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz" -fi - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="libedit static" - -RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" -DEPEND="${RDEPEND} - virtual/pkgconfig - libedit? ( static? ( dev-libs/libedit[static-libs] ) )" - -#S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch #337329 #527848 - "${FILESDIR}"/${PN}-0.5.8.1-eval-warnx.patch -) - -src_prepare() { - if [[ -n "${DEB_PATCH}" ]] ; then - epatch "${WORKDIR}"/${DEB_PF}.diff - epatch */debian/diff/* - fi - epatch "${PATCHES[@]}" - - # Fix the invalid sort - sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins - - # Use pkg-config for libedit linkage - sed -i \ - -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \ - configure || die -} - -src_configure() { - append-cppflags -DJOBS=$(usex libedit 1 0) - use static && append-ldflags -static - # Do not pass --enable-glob due to #443552. - # Autotools use $LINENO as a proxy for extended debug support - # (i.e. they're running bash), so disable that. #527644 - econf \ - --bindir="${EPREFIX}"/bin \ - --enable-fnmatch \ - --disable-lineno \ - $(use_with libedit) -} - -src_install() { - default - if [[ -n "${DEB_PATCH}" ]] ; then - dodoc */debian/changelog - fi -} diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml index ce044cc2418..0a565e1c2ab 100644 --- a/app-shells/dash/metadata.xml +++ b/app-shells/dash/metadata.xml @@ -8,4 +8,7 @@ cpe:/a:dash:dash + + Disable echo -n for added fun + -- cgit v1.2.1