From 0f436a8d90defdea8c69773f794ba1f21cdbd3a4 Mon Sep 17 00:00:00 2001
From: Leorize <alaviss@users.noreply.github.com>
Date: Mon, 9 Apr 2018 14:44:33 +0000
Subject: [PATCH] zsh: bump to 5.5.

---
 .../{zsh-5.4.2.patchset => zsh-5.5.patchset}  | 22 +++++++++----------
 .../zsh/{zsh-5.4.2.recipe => zsh-5.5.recipe}  |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)
 rename app-shells/zsh/patches/{zsh-5.4.2.patchset => zsh-5.5.patchset} (93%)
 rename app-shells/zsh/{zsh-5.4.2.recipe => zsh-5.5.recipe} (93%)

diff --git a/app-shells/zsh/patches/zsh-5.4.2.patchset b/app-shells/zsh/patches/zsh-5.5.patchset
similarity index 93%
rename from app-shells/zsh/patches/zsh-5.4.2.patchset
rename to app-shells/zsh/patches/zsh-5.5.patchset
index 4d146b52b..d9dccfb9a 100644
--- a/app-shells/zsh/patches/zsh-5.4.2.patchset
+++ b/app-shells/zsh/patches/zsh-5.5.patchset
@@ -26,10 +26,10 @@ index 86416c5..b8e7c18 100644
  	case PM_SCALAR:
  	    gsu->g = (void *)(pm->gsu.s);
 diff --git a/Src/Zle/textobjects.c b/Src/Zle/textobjects.c
-index bf83906..180e3fb 100644
+index c93777b..ce91995 100644
 --- a/Src/Zle/textobjects.c
 +++ b/Src/Zle/textobjects.c
-@@ -68,8 +68,9 @@ selectword(UNUSED(char **args))
+@@ -61,8 +61,9 @@ selectword(UNUSED(char **args))
  	}
  	/* similarly scan forward over characters of the same class */
  	while (zlecs < zlell) {
@@ -76,10 +76,10 @@ index e0923db..ec66f6a 100644
  	    selectlocalmap(km);
  	/* Now we need to execute the movement command, to see where it *
 diff --git a/Src/params.c b/Src/params.c
-index 6fbee88..451105a 100644
+index 36f5f06..c7d04db 100644
 --- a/Src/params.c
 +++ b/Src/params.c
-@@ -4846,7 +4846,7 @@ arrfixenv(char *s, char **t)
+@@ -5021,7 +5021,7 @@ arrfixenv(char *s, char **t)
  int
  zputenv(char *str)
  {
@@ -89,7 +89,7 @@ index 6fbee88..451105a 100644
      /*
       * If we are using unsetenv() to remove values from the
 diff --git a/configure.ac b/configure.ac
-index ec0bdae..bad78f9 100644
+index 1a498f8..75069c2 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -874,7 +874,7 @@ if test x$enable_cap = xyes; then
@@ -102,7 +102,7 @@ index ec0bdae..bad78f9 100644
  
  case $LIBS in
 -- 
-2.14.1
+2.17.0
 
 
 From ae08f42563fc3b3e4831da9de566e0f496544aba Mon Sep 17 00:00:00 2001
@@ -112,10 +112,10 @@ Subject: Haiku rusage fix
 
 
 diff --git a/Src/jobs.c b/Src/jobs.c
-index 66dfb5a..47b0a64 100644
+index 330ee6b..aa2d314 100644
 --- a/Src/jobs.c
 +++ b/Src/jobs.c
-@@ -940,7 +940,7 @@ should_report_time(Job j)
+@@ -977,7 +977,7 @@ should_report_time(Job j)
  #endif
      }
  
@@ -125,7 +125,7 @@ index 66dfb5a..47b0a64 100644
  	j->procs->ti.ru_maxrss / 1024 > reportmemory)
  	return 1;
 -- 
-2.14.1
+2.17.0
 
 
 From b02514e4def8ad607e2d19d36a013dadb285430d Mon Sep 17 00:00:00 2001
@@ -135,7 +135,7 @@ Subject: Enable dynamic modules on Haiku
 
 
 diff --git a/configure.ac b/configure.ac
-index bad78f9..ae3b215 100644
+index 75069c2..7dc785d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -868,6 +868,7 @@ fi
@@ -157,5 +157,5 @@ index bad78f9..ae3b215 100644
        if test x$zsh_cv_sys_elf = xyes; then
  	DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}"
 -- 
-2.14.1
+2.17.0
 
diff --git a/app-shells/zsh/zsh-5.4.2.recipe b/app-shells/zsh/zsh-5.5.recipe
similarity index 93%
rename from app-shells/zsh/zsh-5.4.2.recipe
rename to app-shells/zsh/zsh-5.5.recipe
index dba02a294..4f36d3036 100644
--- a/app-shells/zsh/zsh-5.4.2.recipe
+++ b/app-shells/zsh/zsh-5.5.recipe
@@ -4,12 +4,12 @@ is also a powerful scripting language. Many of the useful features of \
 bash, ksh, and tcsh were incorporated into zsh; plenty original features \
 were added."
 HOMEPAGE="https://zsh.org/"
-COPYRIGHT="1992-2017 Paul Falstad, Richard Coleman, Zoltán Hidvégi, \
+COPYRIGHT="1992-2018 Paul Falstad, Richard Coleman, Zoltán Hidvégi, \
 Andrew Main, Peter Stephenson, Sven Wishnowsky, and others"
 LICENSE="ZSH"
 REVISION="1"
 SOURCE_URI="https://downloads.sf.net/zsh/zsh-$portVersion.tar.xz"
-CHECKSUM_SHA256="a80b187b6b770f092ea1f53e89021d06c03d8bbe6a5e996bcca3267de14c5e52"
+CHECKSUM_SHA256="a8359b81d090425d497c6f3c724a7c21a81c614b03e7662ed347705d86958e53"
 PATCHES="zsh-$portVersion.patchset"
 
 ARCHITECTURES="?x86_gcc2 x86 x86_64"