summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <martin@mvath.de>2016-08-08 18:52:00 +0200
committerMartin Väth <martin@mvath.de>2016-08-08 18:52:00 +0200
commitf437832edda61e0f355bf6b8165ca8e49cbe5fbc (patch)
tree698af1e569cba00efb84c46b0b8ccb3b2c036716
parentdev-util/mv_perl: Version bump (diff)
downloadmv-f437832edda61e0f355bf6b8165ca8e49cbe5fbc.tar.gz
mv-f437832edda61e0f355bf6b8165ca8e49cbe5fbc.tar.bz2
mv-f437832edda61e0f355bf6b8165ca8e49cbe5fbc.zip
app-shells/schily-tools: Version bump. Remove unneeded -DNO_PIPE_PARENT
-rw-r--r--app-shells/schily-tools/Manifest2
-rw-r--r--app-shells/schily-tools/files/testt.patch21
-rw-r--r--app-shells/schily-tools/schily-tools-2016.08.08.ebuild (renamed from app-shells/schily-tools/schily-tools-2016.08.01-r1.ebuild)3
3 files changed, 2 insertions, 24 deletions
diff --git a/app-shells/schily-tools/Manifest b/app-shells/schily-tools/Manifest
index bf6b545f..3a2b47ad 100644
--- a/app-shells/schily-tools/Manifest
+++ b/app-shells/schily-tools/Manifest
@@ -1 +1 @@
-DIST schily-2016-08-01.tar.bz2 3786547 SHA256 bb78b3b309d70abd39f89b4489d3b849728a01892c77c8aa64f788bb64e7822f
+DIST schily-2016-08-08.tar.bz2 3790219 SHA256 a9828c26f0732141951a08a4e63b4d4b3cfd142cd1fde523c367af632f958cb8
diff --git a/app-shells/schily-tools/files/testt.patch b/app-shells/schily-tools/files/testt.patch
deleted file mode 100644
index dbd31f50..00000000
--- a/app-shells/schily-tools/files/testt.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# Fix [ a = a -a -t 0 ]
---- 1/sh/test.c
-+++ 1/sh/test.c
-@@ -416,12 +416,14 @@
- ap--;
- if ((p2 == 0) || (!eq(p2, "=") && !eq(p2, "!="))) {
- if (eq(a, "-t")) {
-+ unsigned char *na;
-+
- if (ap >= ac) /* no args */
- return (isatty(1));
-- else if (eq((a = nxtarg(0)), "-a") || eq(a, "-o")) {
-- ap--;
-+ na = nxtarg(0);
-+ ap--;
-+ if (eq(na, "-a") || eq(na, "-o"))
- return (isatty(1));
-- }
- }
- if (a[0] == '-' && a[2] == '\0' &&
- strchr(test_unops, a[1]))
diff --git a/app-shells/schily-tools/schily-tools-2016.08.01-r1.ebuild b/app-shells/schily-tools/schily-tools-2016.08.08.ebuild
index 0f5c4cea..40802f3d 100644
--- a/app-shells/schily-tools/schily-tools-2016.08.01-r1.ebuild
+++ b/app-shells/schily-tools/schily-tools-2016.08.08.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="acl caps +posix static-libs system-libschily system-star xattr"
#PATCHES=(-p0 "$DISTDIR"/${MY_P}.patch)
-PATCHES=("$FILESDIR"/{testt,pipe}.patch)
+PATCHES=("$FILESDIR"/pipe.patch)
add_iuse_expand() {
local i j
@@ -166,7 +166,6 @@ src_prepare() {
sed -ie '1s!man1/sh\.1!man1/bosh.1!' -- "${S}/sh/"{jsh,pfsh}.1 || die
sed -ie '/[+][=] -DPOSIX_BOSH_PATH/iCPPOPTS += -DPOSIX_BOSH_PATH=\\"'"${EPREFIX}"'/bin/sh\\"' \
-- "${S}/sh/"Makefile || die
- CFLAGS='-DNO_PIPE_PARENT '${CFLAGS:+\ }${CFLAGS-}
! use posix || sed -ie 's/^\#ifdef[ ]*DO_POSIX_PATH$/flags2 |= posixflg;\n\#if 0/' \
-- "${S}/sh/"main.c || die
mkdir UNUSED_TARGETS || die