| 1 |
commit: 90fec4c639c41d18e1da04ce35e36a019f5762c2 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 27 22:49:47 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 27 22:49:47 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90fec4c6 |
| 7 |
|
| 8 |
app-shells/zsh: Revbump to fix inifinite recursion. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
.../zsh/files/zsh-5.7-fix_infinite_recursion.patch | 35 ++++++++++++++++++++++ |
| 14 |
.../zsh/{zsh-5.7.ebuild => zsh-5.7-r1.ebuild} | 6 +++- |
| 15 |
2 files changed, 40 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch b/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..042b948b23d |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch |
| 22 |
@@ -0,0 +1,35 @@ |
| 23 |
+From b70919e0d9dadc93893e9d18bc3ef13b88756ecf Mon Sep 17 00:00:00 2001 |
| 24 |
+From: dana <dana@××××.is> |
| 25 |
+Date: Sun, 27 Jan 2019 00:26:31 -0600 |
| 26 |
+Subject: [PATCH] 44020: VCS_INFO_detect_p4: Fix infinite recursion |
| 27 |
+ |
| 28 |
+--- |
| 29 |
+ ChangeLog | 5 +++++ |
| 30 |
+ Functions/VCS_Info/Backends/VCS_INFO_detect_p4 | 1 - |
| 31 |
+ 2 files changed, 5 insertions(+), 1 deletion(-) |
| 32 |
+ |
| 33 |
+diff --git a/ChangeLog b/ChangeLog |
| 34 |
+index 81668ccc9..be243c1b8 100644 |
| 35 |
+--- a/ChangeLog |
| 36 |
++++ b/ChangeLog |
| 37 |
+@@ -1,3 +1,8 @@ |
| 38 |
++2018-01-27 dana <dana@××××.is> |
| 39 |
++ |
| 40 |
++ * 44020: Functions/VCS_Info/Backends/VCS_INFO_detect_p4: Fix |
| 41 |
++ infinite recursion |
| 42 |
++ |
| 43 |
+ 2018-01-24 dana <dana@××××.is> |
| 44 |
+ |
| 45 |
+ * unposted: Config/version.mk: Post-release version bump |
| 46 |
+diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 |
| 47 |
+index d171c68ee..5ec21da9f 100644 |
| 48 |
+--- a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 |
| 49 |
++++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 |
| 50 |
+@@ -44,7 +44,6 @@ VCS_INFO_p4_get_server() { |
| 51 |
+ } |
| 52 |
+ |
| 53 |
+ |
| 54 |
+-(( ${+functions[VCS_INFO_detect_p4]} )) || |
| 55 |
+ VCS_INFO_detect_p4() { |
| 56 |
+ local serverport p4where |
| 57 |
+ |
| 58 |
|
| 59 |
diff --git a/app-shells/zsh/zsh-5.7.ebuild b/app-shells/zsh/zsh-5.7-r1.ebuild |
| 60 |
similarity index 98% |
| 61 |
rename from app-shells/zsh/zsh-5.7.ebuild |
| 62 |
rename to app-shells/zsh/zsh-5.7-r1.ebuild |
| 63 |
index a0de20264a8..113f397ad17 100644 |
| 64 |
--- a/app-shells/zsh/zsh-5.7.ebuild |
| 65 |
+++ b/app-shells/zsh/zsh-5.7-r1.ebuild |
| 66 |
@@ -51,6 +51,10 @@ if [[ ${PV} == 9999* ]] ; then |
| 67 |
)" |
| 68 |
fi |
| 69 |
|
| 70 |
+PATCHES=( |
| 71 |
+ "${FILESDIR}"/${P}-fix_infinite_recursion.patch |
| 72 |
+) |
| 73 |
+ |
| 74 |
src_prepare() { |
| 75 |
if [[ ${PV} != 9999* ]]; then |
| 76 |
# fix zshall problem with soelim |
| 77 |
@@ -62,7 +66,7 @@ src_prepare() { |
| 78 |
eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff |
| 79 |
fi |
| 80 |
|
| 81 |
- eapply_user |
| 82 |
+ default |
| 83 |
|
| 84 |
if [[ ${PV} == 9999* ]] ; then |
| 85 |
sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die |
Archives