1 |
commit: 33023fe1deaee024ccc1134c8f21cc7f80a4de0e |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 20 15:38:04 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 20 15:38:04 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33023fe1 |
7 |
|
8 |
dev-libs/oniguruma: new upstream release |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
dev-libs/oniguruma/Manifest | 1 + |
13 |
.../oniguruma-combination-explosion-check.patch | 13 ++++++ |
14 |
dev-libs/oniguruma/files/oniguruma-gentoo.patch | 49 ++++++++++++++++++++++ |
15 |
dev-libs/oniguruma/oniguruma-6.4.0.ebuild | 42 +++++++++++++++++++ |
16 |
4 files changed, 105 insertions(+) |
17 |
|
18 |
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest |
19 |
index 5c16708829e..39cbc5282fa 100644 |
20 |
--- a/dev-libs/oniguruma/Manifest |
21 |
+++ b/dev-libs/oniguruma/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST onig-5.9.5.tar.gz 587874 SHA256 9f49ae7819a5f47e25449d0e4b010d479f7868a24a7b9884b47041b49a76438a SHA512 3ba3c94c5e52c80c680ebf1d19be53fa5a94a11d622e0282184c7a9c8cc6676f1926b97d12aafc66514071e65cd7de2bd4632afb053c69b01ddb8b581e878252 WHIRLPOOL 4f8a52fc682c15a96660049159e98ddd9f68170e2cba3948f73f3105a266bce8b4c42329b4dc0d6f94472fd9139bbd9a8ebbf3f7351a95c868e78999ce276ece |
24 |
DIST onig-5.9.6_p1.tar.gz 605920 SHA256 ac34ae0624296b59ff9ad9a2e93f2b1cdd775ca87057a42d27e551b7a76ff7b4 SHA512 5c874a92acab19e7b228e855cee2d8c55648d3c0c25213127e67bba7f510ec68cb5d64999cf629ffa509745e1b0bd13dd80afbdcef3ba1d4bb8f3d0ee3616f48 WHIRLPOOL be0f030469cbaef0f196190a18725eb4f516b3b78c1a3484fe602462df1ada48fa848fc59f619f0089a352293825f809034c18e5964802fc964032d94e10f03b |
25 |
+DIST onig-6.4.0.tar.gz 900425 SHA256 cf43ddc5167aea260c4297c76b0dd5e1e6d67aa39319db667347d4d0706ff695 SHA512 476f2110f09eae9b27e0da4b995fa9db46fe6f98f5ef8700b9f1966f9b4bf6db680c6e9e67e1d8d81e759fd8d1787af39c4b38d6681ee4b6405a970c18d583fa WHIRLPOOL bc89b0217a89c70234d2b167fbe68e7588104c812d4df18e64964511cf764786d53a50e87561438d317f435ab30f179990202fc8892b8ab4e85d1cbf8b21c6b9 |
26 |
|
27 |
diff --git a/dev-libs/oniguruma/files/oniguruma-combination-explosion-check.patch b/dev-libs/oniguruma/files/oniguruma-combination-explosion-check.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..cfc758d2a08 |
30 |
--- /dev/null |
31 |
+++ b/dev-libs/oniguruma/files/oniguruma-combination-explosion-check.patch |
32 |
@@ -0,0 +1,13 @@ |
33 |
+--- a/src/regcomp.c |
34 |
++++ b/src/regcomp.c |
35 |
+@@ -3619,8 +3619,8 @@ |
36 |
+ switch (en->type) { |
37 |
+ case ENCLOSURE_MEMORY: |
38 |
+ { |
39 |
+- if (env->curr_max_regnum < en->regnum) |
40 |
+- env->curr_max_regnum = en->regnum; |
41 |
++ if (env->curr_max_regnum < en->m.regnum) |
42 |
++ env->curr_max_regnum = en->m.regnum; |
43 |
+ |
44 |
+ r = setup_comb_exp_check(NODE_ENCLOSURE_BODY(en), state, env); |
45 |
+ } |
46 |
|
47 |
diff --git a/dev-libs/oniguruma/files/oniguruma-gentoo.patch b/dev-libs/oniguruma/files/oniguruma-gentoo.patch |
48 |
new file mode 100644 |
49 |
index 00000000000..5661cea03b5 |
50 |
--- /dev/null |
51 |
+++ b/dev-libs/oniguruma/files/oniguruma-gentoo.patch |
52 |
@@ -0,0 +1,49 @@ |
53 |
+--- a/configure.ac |
54 |
++++ b/configure.ac |
55 |
+@@ -18,7 +18,7 @@ |
56 |
+ AC_ARG_ENABLE(combination-explosion-check, |
57 |
+ [ --enable-combination-explosion-check enable combination explosion check], |
58 |
+ [comb_expl_check=$enableval]) |
59 |
+-if test "${comb_expl_check}" = yes; then |
60 |
++if test "x${comb_expl_check}" = xyes; then |
61 |
+ AC_DEFINE(USE_COMBINATION_EXPLOSION_CHECK,1,[Define if combination explosion check]) |
62 |
+ fi |
63 |
+ |
64 |
+@@ -26,7 +26,7 @@ |
65 |
+ AC_ARG_ENABLE(crnl-as-line-terminator, |
66 |
+ [ --enable-crnl-as-line-terminator enable CR+NL as line terminator], |
67 |
+ [crnl_as_line_terminator=$enableval]) |
68 |
+-if test "${crnl_as_line_terminator}" = yes; then |
69 |
++if test "x${crnl_as_line_terminator}" = xyes; then |
70 |
+ AC_DEFINE(USE_CRNL_AS_LINE_TERMINATOR,1,[Define if enable CR+NL as line terminator]) |
71 |
+ fi |
72 |
+ |
73 |
+--- a/sample/Makefile.am |
74 |
++++ b/sample/Makefile.am |
75 |
+@@ -1,10 +1,10 @@ |
76 |
+ #noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl |
77 |
+ |
78 |
+-lib_onig = ../src/libonig.la |
79 |
++lib_onig = $(top_builddir)/src/libonig.la |
80 |
+ LDADD = $(lib_onig) |
81 |
+ |
82 |
+ AM_LDFLAGS = -L$(prefix)/lib |
83 |
+-AM_CPPFLAGS = -I../src -I$(includedir) |
84 |
++AM_CPPFLAGS = -I$(top_srcdir)/src |
85 |
+ |
86 |
+ TESTS = encode listcap names posix simple sql syntax user_property bug_fix |
87 |
+ |
88 |
+--- a/test/Makefile.am |
89 |
++++ b/test/Makefile.am |
90 |
+@@ -1,9 +1,9 @@ |
91 |
+ ## Makefile.am for Oniguruma |
92 |
+-lib_onig = ../src/libonig.la |
93 |
++lib_onig = $(top_builddir)/src/libonig.la |
94 |
+ |
95 |
+ AM_LDFLAGS = -L$(prefix)/lib |
96 |
+ AM_CFLAGS = |
97 |
+-AM_CPPFLAGS = -I../src -I$(includedir) |
98 |
++AM_CPPFLAGS = -I$(top_srcdir)/src |
99 |
+ |
100 |
+ TESTS = testc testp testcu |
101 |
+ |
102 |
|
103 |
diff --git a/dev-libs/oniguruma/oniguruma-6.4.0.ebuild b/dev-libs/oniguruma/oniguruma-6.4.0.ebuild |
104 |
new file mode 100644 |
105 |
index 00000000000..9453f68b71c |
106 |
--- /dev/null |
107 |
+++ b/dev-libs/oniguruma/oniguruma-6.4.0.ebuild |
108 |
@@ -0,0 +1,42 @@ |
109 |
+# Copyright 1999-2017 Gentoo Foundation |
110 |
+# Distributed under the terms of the GNU General Public License v2 |
111 |
+ |
112 |
+EAPI="6" |
113 |
+ |
114 |
+inherit autotools ltprune multilib-minimal |
115 |
+ |
116 |
+MY_P="onig-${PV}" |
117 |
+ |
118 |
+DESCRIPTION="a regular expression library for different character encodings" |
119 |
+HOMEPAGE="https://github.com/kkos/oniguruma" |
120 |
+SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz" |
121 |
+ |
122 |
+LICENSE="BSD-2" |
123 |
+SLOT="0" |
124 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" |
125 |
+IUSE="combination-explosion-check crnl-as-line-terminator static-libs" |
126 |
+ |
127 |
+S="${WORKDIR}/${MY_P}" |
128 |
+ |
129 |
+PATCHES=( |
130 |
+ "${FILESDIR}"/${PN}-gentoo.patch |
131 |
+ "${FILESDIR}"/${PN}-combination-explosion-check.patch |
132 |
+) |
133 |
+DOCS=( AUTHORS HISTORY README{,.ja} doc/. ) |
134 |
+ |
135 |
+src_prepare() { |
136 |
+ default |
137 |
+ eautoreconf |
138 |
+} |
139 |
+ |
140 |
+multilib_src_configure() { |
141 |
+ ECONF_SOURCE="${S}" econf \ |
142 |
+ $(use_enable combination-explosion-check) \ |
143 |
+ $(use_enable crnl-as-line-terminator) \ |
144 |
+ $(use_enable static-libs static) |
145 |
+} |
146 |
+ |
147 |
+multilib_src_install_all() { |
148 |
+ einstalldocs |
149 |
+ prune_libtool_files |
150 |
+} |