1 |
commit: e57cd89dc7ec98ef47421f4d22bf0f6a0e560923 |
2 |
Author: Martin Väth <martin <AT> mvath <DOT> de> |
3 |
AuthorDate: Sun Jun 25 18:10:17 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 26 09:21:36 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e57cd89d |
7 |
|
8 |
app-text/xindy: Fix building with perl-5.26, #622702 |
9 |
|
10 |
app-text/xindy/files/xindy-2.4-perl5.26.patch | 11 +++++++++++ |
11 |
app-text/xindy/xindy-2.4-r1.ebuild | 3 ++- |
12 |
2 files changed, 13 insertions(+), 1 deletion(-) |
13 |
|
14 |
diff --git a/app-text/xindy/files/xindy-2.4-perl5.26.patch b/app-text/xindy/files/xindy-2.4-perl5.26.patch |
15 |
new file mode 100644 |
16 |
index 00000000000..657b5e94c36 |
17 |
--- /dev/null |
18 |
+++ b/app-text/xindy/files/xindy-2.4-perl5.26.patch |
19 |
@@ -0,0 +1,11 @@ |
20 |
+--- xindy-2.4/make-rules/inputenc/make-inp-rules.pl |
21 |
++++ xindy-2.4/make-rules/inputenc/make-inp-rules.pl |
22 |
+@@ -8,7 +8,7 @@ |
23 |
+ |
24 |
+ |
25 |
+ while (<STDIN>) { |
26 |
+- if (/\\indexentry{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) { |
27 |
++ if (/\\indexentry\{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) { |
28 |
+ if (!($1 =~ /inputenc Error/)) { |
29 |
+ $i = hex($2); |
30 |
+ $macro = $1; |
31 |
|
32 |
diff --git a/app-text/xindy/xindy-2.4-r1.ebuild b/app-text/xindy/xindy-2.4-r1.ebuild |
33 |
index d85f229fad3..4575091c563 100644 |
34 |
--- a/app-text/xindy/xindy-2.4-r1.ebuild |
35 |
+++ b/app-text/xindy/xindy-2.4-r1.ebuild |
36 |
@@ -24,7 +24,8 @@ DEPEND="${RDEPEND} |
37 |
|
38 |
PATCHES=("${FILESDIR}"/${P}-configure.patch |
39 |
"${FILESDIR}"/${P}-locale.patch |
40 |
- "${FILESDIR}"/${P}-nogrep.patch) |
41 |
+ "${FILESDIR}"/${P}-nogrep.patch |
42 |
+ "${FILESDIR}"/${P}-perl5.26.patch) |
43 |
DOCS=(AUTHORS ChangeLog.Gour NEWS README) |
44 |
|
45 |
src_prepare() { |