4 files changed, 17 insertions, 1 deletions
diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 53ede34c..85869f3a 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zsh-5.0.7-r3 (30 Apr 2015)
+
+  30 Apr 2015; Martin Väth <martin@mvath.de>:
+  Add patch to fix compilation with gcc-5. Remove old ebuilds
+
 *zsh-5.0.7-r2 (02 Jan 2015)
 
   02 Jan 2015; Martin Väth <martin@mvath.de>:
diff --git a/app-shells/zsh/files/zsh-5.0.7-gcc-5.patch b/app-shells/zsh/files/zsh-5.0.7-gcc-5.patch
new file mode 100644
index 00000000..c59c3cd2
--- /dev/null
+++ b/app-shells/zsh/files/zsh-5.0.7-gcc-5.patch
@@ -0,0 +1,11 @@
+--- a/Src/zsh.mdd
++++ b/Src/zsh.mdd
+@@ -24,7 +24,7 @@ hdrdeps="zshcurses.h zshterm.h"
+ 
+ signames.c: signames1.awk signames2.awk ../config.h @SIGNAL_H@
+ 	$(AWK) -f $(sdir)/signames1.awk @SIGNAL_H@ >sigtmp.c
+-	$(CPP) sigtmp.c >sigtmp.out
++	$(CPP) -P sigtmp.c >sigtmp.out
+ 	$(AWK) -f $(sdir)/signames2.awk sigtmp.out > $@
+ 	rm -f sigtmp.c sigtmp.out
+ 
diff --git a/app-shells/zsh/zsh-5.0.7-r2.ebuild b/app-shells/zsh/zsh-5.0.7-r3.ebuild
index d1f584e8..84367953 100644
--- a/app-shells/zsh/zsh-5.0.7-r2.ebuild
+++ b/app-shells/zsh/zsh-5.0.7-r3.ebuild
@@ -126,6 +126,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
 	epatch "${FILESDIR}"/${P}-fix-cvs-completion.patch
 	epatch "${FILESDIR}"/${P}-pid-ns.patch
+	epatch "${FILESDIR}"/${P}-gcc-5.patch
 
 	cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
 	eprefixify "${T}"/zprofile || die
diff --git a/app-shells/zsh/zsh-5.0.7.ebuild b/app-shells/zsh/zsh-5.0.7.ebuild
deleted file mode 120000
index 993de82c..00000000
--- a/app-shells/zsh/zsh-5.0.7.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-zsh-99999999.ebuild
-\ No newline at end of file