commit: 3fc79e80f4844cd86efe37912340e8e127e24cae Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue May 8 11:33:59 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue May 8 11:33:59 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc79e80
app-shells/dash: Removed old. Package-Manager: Portage-2.3.36, Repoman-2.3.9 app-shells/dash/Manifest | 2 - app-shells/dash/dash-0.5.8.2.ebuild | 61 ------------ app-shells/dash/dash-0.5.9.1-r1.ebuild | 73 -------------- app-shells/dash/dash-0.5.9.1-r2.ebuild | 73 -------------- app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch | 105 --------------------- .../dash/files/dash-0.5.8.1-eval-warnx.patch | 12 --- 6 files changed, 326 deletions(-) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index 770bc40b76e..ee7a784a8a9 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,4 +1,2 @@ DIST dash-0.5.10.tar.gz 225242 BLAKE2B c21b04aea58599c4a487ec7325bc1ffac2fb4b9be911e07cb0da3fd62eb15b5eb8d30857fad6cbc01fa36a948ac5e5e226566b42d4f9507f709e4d6636cf84f6 SHA512 47383284faf2cbdf65471b72196bdcea46efb8b01041fdc7685a811ae125ba77e5af653939255bda20bd3d56a13f838d85e0003549dcede6b75a37625816cb30 -DIST dash-0.5.8.tar.gz 223028 BLAKE2B f1db15fc23e089c2f2efe1c86e3f027c454b02d31528527040b51f28f22ba969ac35c2b88430e44c5f822c2607bdb5a35ec3d6b026dd32afcce2c0444eda31d2 SHA512 3dc42d3503b33c50b62c0f9104c0e41c4e8fa7490ba72bc09213fcc894d6fd92b9688c58389acf8b538b08f8e9cc179f0bf5572e22175d1960f04554594237b8 DIST dash-0.5.9.1.tar.gz 225217 BLAKE2B a80aa00ea5418d00b03c9ded21ef5c3a28d599059d1ac2f20082867b71ece6afac2f0bce9bc09946450c7618ad2c7f95df63b3d519a7f56552a291d09e44a71b SHA512 d56a043b8fab4693d3f70cceb531c37174e7ded4acd5549e53048d7ce29125ff21d7e758f51a4a73e06250d051e246467039989275838c19a2579edea3f72b7d -DIST dash_0.5.8-2.diff.gz 41715 BLAKE2B d396eab85bd86b18cc532da192c8034da990e9e4a822840635042e2810e32164502ec44c9a1b4f52701e9bc2acd1859a446a36383805527121dd1ef2e14c8010 SHA512 f067ca162cc463a60b5bcd7926bd6ab1f6cb1757e9cd7894cbf7ba5849b6d9af5381b8ec7264c503db544242690db067b6c034041e262ff93d237f1c06e50e56 diff --git a/app-shells/dash/dash-0.5.8.2.ebuild b/app-shells/dash/dash-0.5.8.2.ebuild deleted file mode 100644 index 31bc5f3be81..00000000000 --- a/app-shells/dash/dash-0.5.8.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs - -DEB_PV=${PV%.*} -DEB_PATCH=${PV##*.} -DEB_PF="${PN}_${DEB_PV}-${DEB_PATCH}" -MY_P="${PN}-${DEB_PV}" - -DESCRIPTION="Debian Almquist Shell" -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 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} - -src_prepare() { - epatch "${WORKDIR}"/${DEB_PF}.diff - epatch */debian/diff/* - epatch "${FILESDIR}"/${PN}-0.5.8.1-dumb-echo.patch #337329 #527848 - epatch "${FILESDIR}"/${PN}-0.5.8.1-eval-warnx.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 - dodoc */debian/changelog -} diff --git a/app-shells/dash/dash-0.5.9.1-r1.ebuild b/app-shells/dash/dash-0.5.9.1-r1.ebuild deleted file mode 100644 index d2edb4b7565..00000000000 --- a/app-shells/dash/dash-0.5.9.1-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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="Debian Almquist Shell" -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 vanilla" - -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 vanilla || 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-r2.ebuild b/app-shells/dash/dash-0.5.9.1-r2.ebuild deleted file mode 100644 index d775db54f94..00000000000 --- a/app-shells/dash/dash-0.5.9.1-r2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit 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="Debian Almquist Shell" -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="libedit static vanilla" - -RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" -DEPEND="${RDEPEND} - virtual/pkgconfig - libedit? ( static? ( dev-libs/libedit[static-libs] ) )" - -src_prepare() { - if [[ -n "${DEB_PATCH}" ]] ; then - eapply "${WORKDIR}"/${DEB_PF}.diff - eapply */debian/diff/* - fi - default - - #337329 #527848 - use vanilla || eapply "${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() { - # don't redefine stat on Solaris - if [[ ${CHOST} == *-solaris* ]] ; then - export ac_cv_func_stat64=yes - fi - 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 - local myeconfargs=( - --bindir="${EPREFIX}"/bin - --enable-fnmatch - --disable-lineno - $(use_with libedit) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - if [[ -n "${DEB_PATCH}" ]] ; then - dodoc */debian/changelog - fi -} diff --git a/app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch b/app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch deleted file mode 100644 index 4059a80e330..00000000000 --- a/app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch +++ /dev/null @@ -1,105 +0,0 @@ -http://bugs.gentoo.org/337329 -http://bugs.gentoo.org/527848 - -there's no requirement for `echo` to support escape sequences. bash, by default, -does not, while dash always does. POSIX permits either behavior: -http://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html - -however, since the behavior is not portable, no one should be relying on echo -having any specific behavior. they should use `printf` when they want an escape -sequence. it also makes dash smaller & faster to disable this logic entirely. - ---- a/src/bltin/printf.c -+++ b/src/bltin/printf.c -@@ -439,34 +444,12 @@ - int - echocmd(int argc, char **argv) - { -- int nonl = 0; -- struct output *outs = out1; -- -- if (!*++argv) -- goto end; -- if (equal(*argv, "-n")) { -- nonl = ~nonl; -- if (!*++argv) -- goto end; -+ int i; -+ for (i = 1; i < argc; ++i) { -+ outstr(argv[i], out1); -+ if (i < argc - 1) -+ outc(' ', out1); - } -- -- do { -- int c; -- -- nonl += conv_escape_str(*argv); -- outstr(stackblock(), outs); -- if (nonl > 0) -- break; -- -- c = ' '; -- if (!*++argv) { --end: -- if (nonl) { -- break; -- } -- c = '\n'; -- } -- outc(c, outs); -- } while (*argv); -+ outc('\n', out1); - return 0; - } ---- a/src/dash.1 -+++ b/src/dash.1 -@@ -1180,43 +1180,15 @@ - option turns off the effect of any preceding - .Fl P - options. --.It Xo echo Op Fl n -+.It Xo echo - .Ar args... - .Xc - Print the arguments on the standard output, separated by spaces. --Unless the --.Fl n --option is present, a newline is output following the arguments. --.Pp --If any of the following sequences of characters is encountered during --output, the sequence is not output. Instead, the specified action is --performed: --.Bl -tag -width indent --.It Li \eb --A backspace character is output. --.It Li \ec --Subsequent output is suppressed. This is normally used at the end of the --last argument to suppress the trailing newline that --.Ic echo --would otherwise output. --.It Li \ef --Output a form feed. --.It Li \en --Output a newline character. --.It Li \er --Output a carriage return. --.It Li \et --Output a (horizontal) tab character. --.It Li \ev --Output a vertical tab. --.It Li \e0 Ns Ar digits --Output the character whose value is given by zero to three octal digits. --If there are zero digits, a nul character is output. --.It Li \e\e --Output a backslash. --.El - .Pp --All other backslash sequences elicit undefined behaviour. -+No arguments or backslash sequences are supported as they are not portable. -+They will be printed out exactly as passed in. -+.Pp -+You can replace `echo -n ...` with the portable `printf %s ...` construct. - .It eval Ar string ... - Concatenate all the arguments with spaces. - Then re-parse and execute the command. diff --git a/app-shells/dash/files/dash-0.5.8.1-eval-warnx.patch b/app-shells/dash/files/dash-0.5.8.1-eval-warnx.patch deleted file mode 100644 index 51530bfdaf5..00000000000 --- a/app-shells/dash/files/dash-0.5.8.1-eval-warnx.patch +++ /dev/null @@ -1,12 +0,0 @@ -fix one of the Debian patches -- it uses warnx but doesn't include err.h. - ---- a/src/eval.c -+++ b/src/eval.c -@@ -36,6 +36,7 @@ - #include <signal.h> - #include <unistd.h> - #include <sys/types.h> -+#include <err.h> - - /* - * Evaluate a command.