Gentoo Archives: gentoo-commits

From: "Vadim A. Misbakh-Soloviov" <mva@×××.name>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/lua:master commit in: dev-lua/resty-websocket/, dev-lua/resty-string/, dev-lua/resty-dns/, ...
Date: Sat, 04 Oct 2014 18:07:26
Message-Id: 1408206257.9e846359d2ccb770d254a939f17bfdcf04153339.mva@gentoo
1 commit: 9e846359d2ccb770d254a939f17bfdcf04153339
2 Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
3 AuthorDate: Sat Aug 16 16:24:17 2014 +0000
4 Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
5 CommitDate: Sat Aug 16 16:24:17 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=9e846359
7
8 [dev-lua/resty*] OpenResty fixes (patching)
9
10 Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
11
12 ---
13 dev-lua/rds-parser/rds-parser-9999.ebuild | 6 +++---
14 dev-lua/redis-parser/redis-parser-9999.ebuild | 6 +++---
15 dev-lua/resty-core/resty-core-9999.ebuild | 6 +++---
16 dev-lua/resty-dns/resty-dns-9999.ebuild | 6 +++---
17 dev-lua/resty-lock/resty-lock-9999.ebuild | 6 +++---
18 dev-lua/resty-memcached/resty-memcached-9999.ebuild | 6 +++---
19 dev-lua/resty-mysql/resty-mysql-9999.ebuild | 6 +++---
20 dev-lua/resty-redis/resty-redis-9999.ebuild | 6 +++---
21 dev-lua/resty-string/resty-string-9999.ebuild | 6 +++---
22 dev-lua/resty-upload/resty-upload-9999.ebuild | 6 +++---
23 .../resty-upstream-healthcheck-9999.ebuild | 6 +++---
24 dev-lua/resty-websocket/resty-websocket-9999.ebuild | 6 +++---
25 12 files changed, 36 insertions(+), 36 deletions(-)
26
27 diff --git a/dev-lua/rds-parser/rds-parser-9999.ebuild b/dev-lua/rds-parser/rds-parser-9999.ebuild
28 index 738f672..30db1bc 100644
29 --- a/dev-lua/rds-parser/rds-parser-9999.ebuild
30 +++ b/dev-lua/rds-parser/rds-parser-9999.ebuild
31 @@ -31,8 +31,8 @@ src_prepare() {
32 use luajit && lua=luajit;
33
34 sed -r \
35 - -e "1,6s#(PREFIX).*#\1=/usr#" \
36 - -e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
37 - -e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
38 + -e "s#^(PREFIX).*#\1=/usr#" \
39 + -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
40 + -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
41 -i Makefile
42 }
43
44 diff --git a/dev-lua/redis-parser/redis-parser-9999.ebuild b/dev-lua/redis-parser/redis-parser-9999.ebuild
45 index 315c46f..a3425ee 100644
46 --- a/dev-lua/redis-parser/redis-parser-9999.ebuild
47 +++ b/dev-lua/redis-parser/redis-parser-9999.ebuild
48 @@ -31,8 +31,8 @@ src_prepare() {
49 use luajit && lua=luajit;
50
51 sed -r \
52 - -e "1,6s#(PREFIX).*#\1=/usr#" \
53 - -e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
54 - -e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
55 + -e "s#^(PREFIX).*#\1=/usr#" \
56 + -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
57 + -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
58 -i Makefile
59 }
60
61 diff --git a/dev-lua/resty-core/resty-core-9999.ebuild b/dev-lua/resty-core/resty-core-9999.ebuild
62 index d43e3e3..d497145 100644
63 --- a/dev-lua/resty-core/resty-core-9999.ebuild
64 +++ b/dev-lua/resty-core/resty-core-9999.ebuild
65 @@ -31,8 +31,8 @@ src_prepare() {
66 local lua=luajit;
67
68 sed -r \
69 - -e "1,6s#(PREFIX).*#\1=/usr#" \
70 - -e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
71 - -e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
72 + -e "s#^(PREFIX).*#\1=/usr#" \
73 + -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
74 + -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
75 -i Makefile
76 }
77
78 diff --git a/dev-lua/resty-dns/resty-dns-9999.ebuild b/dev-lua/resty-dns/resty-dns-9999.ebuild
79 index 3867656..2a30450 100644
80 --- a/dev-lua/resty-dns/resty-dns-9999.ebuild
81 +++ b/dev-lua/resty-dns/resty-dns-9999.ebuild
82 @@ -32,8 +32,8 @@ src_prepare() {
83 use luajit && lua=luajit;
84
85 sed -r \
86 - -e "1,6s#(PREFIX).*#\1=/usr#" \
87 - -e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
88 - -e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
89 + -e "s#^(PREFIX).*#\1=/usr#" \
90 + -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
91 + -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
92 -i Makefile
93 }
94
95 diff --git a/dev-lua/resty-lock/resty-lock-9999.ebuild b/dev-lua/resty-lock/resty-lock-9999.ebuild
96 index ff89a43..8fe96fb 100644
97 --- a/dev-lua/resty-lock/resty-lock-9999.ebuild
98 +++ b/dev-lua/resty-lock/resty-lock-9999.ebuild
99 @@ -30,8 +30,8 @@ src_prepare() {
100 local lua=luajit;
101
102 sed -r \
103 - -e "1,6s#(PREFIX).*#\1=/usr#" \
104 - -e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
105 - -e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
106 + -e "s#^(PREFIX).*#\1=/usr#" \
107 + -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
108 + -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
109 -i Makefile
110 }
111
112 diff --git a/dev-lua/resty-memcached/resty-memcached-9999.ebuild b/dev-lua/resty-memcached/resty-memcached-9999.ebuild
113 index c1814cd..2dfc1fd 100644
114 --- a/dev-lua/resty-memcached/resty-memcached-9999.ebuild
115 +++ b/dev-lua/resty-memcached/resty-memcached-9999.ebuild
116 @@ -32,8 +32,8 @@ src_prepare() {
117 use luajit && lua=luajit;
118
119 sed -r \
120 - -e "1,6s#(PREFIX).*#\1=/usr#" \
121 - -e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
122 - -e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
123 + -e "s#^(PREFIX).*#\1=/usr#" \
124 + -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
125 + -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
126 -i Makefile
127 }
128
129 diff --git a/dev-lua/resty-mysql/resty-mysql-9999.ebuild b/dev-lua/resty-mysql/resty-mysql-9999.ebuild
130 index c857cb1..ffd4da0 100644
131 --- a/dev-lua/resty-mysql/resty-mysql-9999.ebuild
132 +++ b/dev-lua/resty-mysql/resty-mysql-9999.ebuild
133 @@ -32,8 +32,8 @@ src_prepare() {
134 use luajit && lua=luajit;
135
136 sed -r \
137 - -e "1,6s#(PREFIX).*#\1=/usr#" \
138 - -e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
139 - -e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
140 + -e "s#^(PREFIX).*#\1=/usr#" \
141 + -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
142 + -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
143 -i Makefile
144 }
145
146 diff --git a/dev-lua/resty-redis/resty-redis-9999.ebuild b/dev-lua/resty-redis/resty-redis-9999.ebuild
147 index 86a079b..87feee2 100644
148 --- a/dev-lua/resty-redis/resty-redis-9999.ebuild
149 +++ b/dev-lua/resty-redis/resty-redis-9999.ebuild
150 @@ -32,8 +32,8 @@ src_prepare() {
151 use luajit && lua=luajit;
152
153 sed -r \
154 - -e "1,6s#(PREFIX).*#\1=/usr#" \
155 - -e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
156 - -e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
157 + -e "s#^(PREFIX).*#\1=/usr#" \
158 + -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
159 + -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
160 -i Makefile
161 }
162
163 diff --git a/dev-lua/resty-string/resty-string-9999.ebuild b/dev-lua/resty-string/resty-string-9999.ebuild
164 index 540ffc7..9f318dc 100644
165 --- a/dev-lua/resty-string/resty-string-9999.ebuild
166 +++ b/dev-lua/resty-string/resty-string-9999.ebuild
167 @@ -31,8 +31,8 @@ src_prepare() {
168 local lua=luajit;
169
170 sed -r \
171 - -e "1,6s#(PREFIX).*#\1=/usr#" \
172 - -e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
173 - -e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
174 + -e "s#^(PREFIX).*#\1=/usr#" \
175 + -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
176 + -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
177 -i Makefile
178 }
179
180 diff --git a/dev-lua/resty-upload/resty-upload-9999.ebuild b/dev-lua/resty-upload/resty-upload-9999.ebuild
181 index 2b7d2a1..2e48f9e 100644
182 --- a/dev-lua/resty-upload/resty-upload-9999.ebuild
183 +++ b/dev-lua/resty-upload/resty-upload-9999.ebuild
184 @@ -32,8 +32,8 @@ src_prepare() {
185 use luajit && lua=luajit;
186
187 sed -r \
188 - -e "1,6s#(PREFIX).*#\1=/usr#" \
189 - -e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
190 - -e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
191 + -e "s#^(PREFIX).*#\1=/usr#" \
192 + -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
193 + -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
194 -i Makefile
195 }
196
197 diff --git a/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild b/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild
198 index 1a802f4..61f1aa7 100644
199 --- a/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild
200 +++ b/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild
201 @@ -29,8 +29,8 @@ src_prepare() {
202 local lua=luajit;
203
204 sed -r \
205 - -e "1,6s#(PREFIX).*#\1=/usr#" \
206 - -e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
207 - -e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
208 + -e "s#^(PREFIX).*#\1=/usr#" \
209 + -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
210 + -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
211 -i Makefile
212 }
213
214 diff --git a/dev-lua/resty-websocket/resty-websocket-9999.ebuild b/dev-lua/resty-websocket/resty-websocket-9999.ebuild
215 index 27a273d..3b03baf 100644
216 --- a/dev-lua/resty-websocket/resty-websocket-9999.ebuild
217 +++ b/dev-lua/resty-websocket/resty-websocket-9999.ebuild
218 @@ -32,8 +32,8 @@ src_prepare() {
219 use luajit && lua=luajit;
220
221 sed -r \
222 - -e "1,6s#(PREFIX).*#\1=/usr#" \
223 - -e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
224 - -e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
225 + -e "s#^(PREFIX).*#\1=/usr#" \
226 + -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
227 + -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
228 -i Makefile
229 }