Fix zsh with gcc-5. Bump classic-theme-restorer, shumway

10 files changed, 29 insertions, 3 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
diff --git a/www-plugins/classic-theme-restorer/ChangeLog b/www-plugins/classic-theme-restorer/ChangeLog
index a442cf67..e1606752 100644
--- a/www-plugins/classic-theme-restorer/ChangeLog
+++ b/www-plugins/classic-theme-restorer/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*classic-theme-restorer-1.3.1.1 (30 Apr 2015)
+
+  30 Apr 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
 *classic-theme-restorer-1.3.0 (01 Apr 2015)
 
   01 Apr 2015; Martin Väth <martin@mvath.de>:
diff --git a/www-plugins/classic-theme-restorer/Manifest b/www-plugins/classic-theme-restorer/Manifest
index 0698cb02..9058ea40 100644
--- a/www-plugins/classic-theme-restorer/Manifest
+++ b/www-plugins/classic-theme-restorer/Manifest
@@ -1 +1 @@
-DIST classic_theme_restorer_customize_ui-1.3.0-fx.xpi 479543 SHA256 9aa2446b3f2db9b93aee2e3cc1a6eb947370717f6abe3e8e071d5e04f812e23f SHA512 7541623af61c053943fe45f57ed5b89e892f9079bc448c203dfb403417406d3ff9a9893d8682b94066a9f4fad1d333df8ac55c64adbeacedfd8cd5d481c98218 WHIRLPOOL 0d69c0d7642fa0338686fb8eb8d0c45d86732d6f0fcb3b01e5da72015fba47f188f1c5ab781a52c54a7791855f6bdeedd80e7f134da6130e349549a54f4b1d60
+DIST classic_theme_restorer_customize_ui-1.3.1.1-fx.xpi 488459 SHA256 a71a9c4e47fc32a4eb8d065aeacebd95a4e4a0014554cac4e1756848e44d6cb9 SHA512 af8b425163a5a64ee55689335b22975eb473756f694f8db974c5b1166f15a096aaa9ae88cacb2c8d2ce25748a4f47bca599286a07b609ccbb6d66476026a31ee WHIRLPOOL f2a0c4e1680c965c67edf9faf62e972440c8d892bca1877d20c5c837bf24c94b617cf59a75566be3397beb6567d4195980bc26a822d41410ec7401742457790a
diff --git a/www-plugins/classic-theme-restorer/classic-theme-restorer-1.3.0.ebuild b/www-plugins/classic-theme-restorer/classic-theme-restorer-1.3.1.1.ebuild
index 6bb4d8de..6bb4d8de 100644
--- a/www-plugins/classic-theme-restorer/classic-theme-restorer-1.3.0.ebuild
+++ b/www-plugins/classic-theme-restorer/classic-theme-restorer-1.3.1.1.ebuild
diff --git a/www-plugins/shumway/ChangeLog b/www-plugins/shumway/ChangeLog
index 946d4c4f..dfa56e91 100644
--- a/www-plugins/shumway/ChangeLog
+++ b/www-plugins/shumway/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*shumway-0.11.116 (30 Apr 2015)
+
+  30 Apr 2015; Martin Väth <martin@mvath.de>:
+  Version bump. Remove old ebuild
+
 *shumway-0.10.337 (01 Apr 2015)
 
   01 Apr 2015; Martin Väth <martin@mvath.de>:
diff --git a/www-plugins/shumway/Manifest b/www-plugins/shumway/Manifest
index 4e0f0825..cf538c66 100644
--- a/www-plugins/shumway/Manifest
+++ b/www-plugins/shumway/Manifest
@@ -1 +1 @@
-DIST shumway-0.10.337.xpi 678135 SHA256 21091631f714307f46182d82f2d755e76b232bcfe0eb3948d8c2c16edea12f20 SHA512 c20be1f4605545ea1b90a7d6e2c51632ddbc55d515124f54498608aafa452f436e0f457ee9674dccae888f8d7e17d383d4508a687fe1056e307c9cf44a841cb2 WHIRLPOOL c08826977d52444a876fde97b953c5555aed5676ca6474db1c86495ccd7d133ff1bf70d5d2b82a3ae8cb53bde0041ad76923eb64a01068d0a85428f0062d095f
+DIST shumway-0.11.116.xpi 649236 SHA256 5ce29ce3a4427365e4dd9c386fee4a12533c5cd44b12806926dca55dc8df5c7d SHA512 3f6587d25bafa59d1a8d704cf487e494097ea1f6712f6ba543c8276fa28aea84757faf0b55508f3f447438dce0c88decb3db7520a6b5f561f6512b80f603924e WHIRLPOOL 153c5f758cc6aa3dcb3bee33cff9f4a6c66af23e3247df35bdb5197e4f430310c2975b56324747f6f396f4d750c2d7af9c5036b54ca6883b429e4a29bc5fbca6
diff --git a/www-plugins/shumway/shumway-0.10.337.ebuild b/www-plugins/shumway/shumway-0.11.116.ebuild
index c6485ab3..c6485ab3 100644
--- a/www-plugins/shumway/shumway-0.10.337.ebuild
+++ b/www-plugins/shumway/shumway-0.11.116.ebuild