commit: 03ba955ceeadeb4447878dc9007560b4ad521428
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 12:51:27 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 12:51:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=03ba955c
app-shells/dash: migrated to gx86
app-shells/dash/Manifest | 1 -
app-shells/dash/dash-0.5.9.1-r1.ebuild | 72 -----------------
.../dash/files/dash-0.5.8.1-eval-warnx.patch | 12 ---
app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch | 92 ----------------------
app-shells/dash/metadata.xml | 18 -----
5 files changed, 195 deletions(-)
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
deleted file mode 100644
index b0230c8526..0000000000
--- a/app-shells/dash/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dash-0.5.9.1.tar.gz 225217 SHA256
5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659 SHA512
d56a043b8fab4693d3f70cceb531c37174e7ded4acd5549e53048d7ce29125ff21d7e758f51a4a73e06250d051e246467039989275838c19a2579edea3f72b7d
WHIRLPOOL
233ced314d1091a7a27fc9a0f86a3d87f9a08d067a8b171ead7294a12b573071e9d63a5607424eb6d4f7a0c193f374a461cd94b205412928b93341d4b75a9095
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 efac2eac4c..0000000000
--- a/app-shells/dash/dash-0.5.9.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 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="~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] ) )"
-
-#S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- if [[ -n "${DEB_PATCH}" ]] ; then
- epatch "${WORKDIR}"/${DEB_PF}.diff
- epatch */debian/diff/*
- fi
-
- #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() {
- # 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
- 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/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 51530bfdaf..0000000000
--- 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.
diff --git a/app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch
b/app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch
deleted file mode 100644
index cbf5febafd..0000000000
--- a/app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch
+++ /dev/null
@@ -1,92 +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.
-
---- dash-0.5.9.1/src/bltin/printf.c
-+++ dash-0.5.9.1/src/bltin/printf.c
-@@ -449,21 +449,12 @@
- int
- echocmd(int argc, char **argv)
- {
-- int nonl;
--
-- nonl = *++argv ? equal(*argv, "-n") : 0;
-- argv += nonl;
--
-- do {
-- int c;
--
-- if (likely(*argv))
-- nonl += print_escape_str("%s", NULL, NULL, *argv++);
-- if (likely((nonl + !*argv) > 1))
-- break;
--
-- c = *argv ? ' ' : '\n';
-- out1c(c);
-- } while (*argv);
-+ int i;
-+ for (i = 1; i < argc; ++i) {
-+ outstr(argv[i], out1);
-+ if (i < argc - 1)
-+ outc(' ', out1);
-+ }
-+ outc('\n', out1);
- return 0;
- }
---- dash-0.5.9.1/src/dash.1
-+++ dash-0.5.9.1/src/dash.1
-@@ -1182,43 +1182,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
-+No arguments or backslash sequences are supported as they are not portable.
-+They will be printed out exactly as passed in.
- .Pp
--All other backslash sequences elicit undefined behaviour.
-+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/metadata.xml b/app-shells/dash/metadata.xml
deleted file mode 100644
index 0d01a34d50..0000000000
--- a/app-shells/dash/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>[email protected]</email>
- <name>Gentoo Base System</name>
- </maintainer>
- <upstream>
- <remote-id type="cpe">cpe:/a:dash:dash</remote-id>
- </upstream>
- <use>
- <flag name="vanilla">Support echo -n, and enable echo -e all
the time (unsupported)</flag>
- </use>
- <longdescription lang="en">
- DASH is a direct descendant of the NetBSD version of ash (the
Almquist SHell)
- and is POSIX compliant.
- </longdescription>
-</pkgmetadata>
