public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/lua:master commit in: dev-lua/redis-parser/, dev-lua/resty-websocket/, dev-lua/resty-redis/, ...
  2014-10-04 18:06 [gentoo-commits] proj/lua:master commit in: dev-lua/resty-websocket/, dev-lua/resty-string/, dev-lua/resty-dns/, Vadim A. Misbakh-Soloviov
@ 2014-08-16 16:25 ` Vadim A. Misbakh-Soloviov
  0 siblings, 0 replies; 2+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2014-08-16 16:25 UTC (permalink / raw
  To: gentoo-commits

commit:     9e846359d2ccb770d254a939f17bfdcf04153339
Author:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Sat Aug 16 16:24:17 2014 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sat Aug 16 16:24:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=9e846359

[dev-lua/resty*] OpenResty fixes (patching)

Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>

---
 dev-lua/rds-parser/rds-parser-9999.ebuild                           | 6 +++---
 dev-lua/redis-parser/redis-parser-9999.ebuild                       | 6 +++---
 dev-lua/resty-core/resty-core-9999.ebuild                           | 6 +++---
 dev-lua/resty-dns/resty-dns-9999.ebuild                             | 6 +++---
 dev-lua/resty-lock/resty-lock-9999.ebuild                           | 6 +++---
 dev-lua/resty-memcached/resty-memcached-9999.ebuild                 | 6 +++---
 dev-lua/resty-mysql/resty-mysql-9999.ebuild                         | 6 +++---
 dev-lua/resty-redis/resty-redis-9999.ebuild                         | 6 +++---
 dev-lua/resty-string/resty-string-9999.ebuild                       | 6 +++---
 dev-lua/resty-upload/resty-upload-9999.ebuild                       | 6 +++---
 .../resty-upstream-healthcheck-9999.ebuild                          | 6 +++---
 dev-lua/resty-websocket/resty-websocket-9999.ebuild                 | 6 +++---
 12 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/dev-lua/rds-parser/rds-parser-9999.ebuild b/dev-lua/rds-parser/rds-parser-9999.ebuild
index 738f672..30db1bc 100644
--- a/dev-lua/rds-parser/rds-parser-9999.ebuild
+++ b/dev-lua/rds-parser/rds-parser-9999.ebuild
@@ -31,8 +31,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/redis-parser/redis-parser-9999.ebuild b/dev-lua/redis-parser/redis-parser-9999.ebuild
index 315c46f..a3425ee 100644
--- a/dev-lua/redis-parser/redis-parser-9999.ebuild
+++ b/dev-lua/redis-parser/redis-parser-9999.ebuild
@@ -31,8 +31,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-core/resty-core-9999.ebuild b/dev-lua/resty-core/resty-core-9999.ebuild
index d43e3e3..d497145 100644
--- a/dev-lua/resty-core/resty-core-9999.ebuild
+++ b/dev-lua/resty-core/resty-core-9999.ebuild
@@ -31,8 +31,8 @@ src_prepare() {
 	local lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-dns/resty-dns-9999.ebuild b/dev-lua/resty-dns/resty-dns-9999.ebuild
index 3867656..2a30450 100644
--- a/dev-lua/resty-dns/resty-dns-9999.ebuild
+++ b/dev-lua/resty-dns/resty-dns-9999.ebuild
@@ -32,8 +32,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-lock/resty-lock-9999.ebuild b/dev-lua/resty-lock/resty-lock-9999.ebuild
index ff89a43..8fe96fb 100644
--- a/dev-lua/resty-lock/resty-lock-9999.ebuild
+++ b/dev-lua/resty-lock/resty-lock-9999.ebuild
@@ -30,8 +30,8 @@ src_prepare() {
 	local lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-memcached/resty-memcached-9999.ebuild b/dev-lua/resty-memcached/resty-memcached-9999.ebuild
index c1814cd..2dfc1fd 100644
--- a/dev-lua/resty-memcached/resty-memcached-9999.ebuild
+++ b/dev-lua/resty-memcached/resty-memcached-9999.ebuild
@@ -32,8 +32,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-mysql/resty-mysql-9999.ebuild b/dev-lua/resty-mysql/resty-mysql-9999.ebuild
index c857cb1..ffd4da0 100644
--- a/dev-lua/resty-mysql/resty-mysql-9999.ebuild
+++ b/dev-lua/resty-mysql/resty-mysql-9999.ebuild
@@ -32,8 +32,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-redis/resty-redis-9999.ebuild b/dev-lua/resty-redis/resty-redis-9999.ebuild
index 86a079b..87feee2 100644
--- a/dev-lua/resty-redis/resty-redis-9999.ebuild
+++ b/dev-lua/resty-redis/resty-redis-9999.ebuild
@@ -32,8 +32,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-string/resty-string-9999.ebuild b/dev-lua/resty-string/resty-string-9999.ebuild
index 540ffc7..9f318dc 100644
--- a/dev-lua/resty-string/resty-string-9999.ebuild
+++ b/dev-lua/resty-string/resty-string-9999.ebuild
@@ -31,8 +31,8 @@ src_prepare() {
 	local lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-upload/resty-upload-9999.ebuild b/dev-lua/resty-upload/resty-upload-9999.ebuild
index 2b7d2a1..2e48f9e 100644
--- a/dev-lua/resty-upload/resty-upload-9999.ebuild
+++ b/dev-lua/resty-upload/resty-upload-9999.ebuild
@@ -32,8 +32,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild b/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild
index 1a802f4..61f1aa7 100644
--- a/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild
+++ b/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild
@@ -29,8 +29,8 @@ src_prepare() {
 	local lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-websocket/resty-websocket-9999.ebuild b/dev-lua/resty-websocket/resty-websocket-9999.ebuild
index 27a273d..3b03baf 100644
--- a/dev-lua/resty-websocket/resty-websocket-9999.ebuild
+++ b/dev-lua/resty-websocket/resty-websocket-9999.ebuild
@@ -32,8 +32,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lua/resty-websocket/, dev-lua/resty-string/, dev-lua/resty-dns/, ...
@ 2014-10-04 18:06 Vadim A. Misbakh-Soloviov
  2014-08-16 16:25 ` [gentoo-commits] proj/lua:master commit in: dev-lua/redis-parser/, dev-lua/resty-websocket/, dev-lua/resty-redis/, Vadim A. Misbakh-Soloviov
  0 siblings, 1 reply; 2+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2014-10-04 18:06 UTC (permalink / raw
  To: gentoo-commits

commit:     9e846359d2ccb770d254a939f17bfdcf04153339
Author:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Sat Aug 16 16:24:17 2014 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sat Aug 16 16:24:17 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=9e846359

[dev-lua/resty*] OpenResty fixes (patching)

Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>

---
 dev-lua/rds-parser/rds-parser-9999.ebuild                           | 6 +++---
 dev-lua/redis-parser/redis-parser-9999.ebuild                       | 6 +++---
 dev-lua/resty-core/resty-core-9999.ebuild                           | 6 +++---
 dev-lua/resty-dns/resty-dns-9999.ebuild                             | 6 +++---
 dev-lua/resty-lock/resty-lock-9999.ebuild                           | 6 +++---
 dev-lua/resty-memcached/resty-memcached-9999.ebuild                 | 6 +++---
 dev-lua/resty-mysql/resty-mysql-9999.ebuild                         | 6 +++---
 dev-lua/resty-redis/resty-redis-9999.ebuild                         | 6 +++---
 dev-lua/resty-string/resty-string-9999.ebuild                       | 6 +++---
 dev-lua/resty-upload/resty-upload-9999.ebuild                       | 6 +++---
 .../resty-upstream-healthcheck-9999.ebuild                          | 6 +++---
 dev-lua/resty-websocket/resty-websocket-9999.ebuild                 | 6 +++---
 12 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/dev-lua/rds-parser/rds-parser-9999.ebuild b/dev-lua/rds-parser/rds-parser-9999.ebuild
index 738f672..30db1bc 100644
--- a/dev-lua/rds-parser/rds-parser-9999.ebuild
+++ b/dev-lua/rds-parser/rds-parser-9999.ebuild
@@ -31,8 +31,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/redis-parser/redis-parser-9999.ebuild b/dev-lua/redis-parser/redis-parser-9999.ebuild
index 315c46f..a3425ee 100644
--- a/dev-lua/redis-parser/redis-parser-9999.ebuild
+++ b/dev-lua/redis-parser/redis-parser-9999.ebuild
@@ -31,8 +31,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-core/resty-core-9999.ebuild b/dev-lua/resty-core/resty-core-9999.ebuild
index d43e3e3..d497145 100644
--- a/dev-lua/resty-core/resty-core-9999.ebuild
+++ b/dev-lua/resty-core/resty-core-9999.ebuild
@@ -31,8 +31,8 @@ src_prepare() {
 	local lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-dns/resty-dns-9999.ebuild b/dev-lua/resty-dns/resty-dns-9999.ebuild
index 3867656..2a30450 100644
--- a/dev-lua/resty-dns/resty-dns-9999.ebuild
+++ b/dev-lua/resty-dns/resty-dns-9999.ebuild
@@ -32,8 +32,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-lock/resty-lock-9999.ebuild b/dev-lua/resty-lock/resty-lock-9999.ebuild
index ff89a43..8fe96fb 100644
--- a/dev-lua/resty-lock/resty-lock-9999.ebuild
+++ b/dev-lua/resty-lock/resty-lock-9999.ebuild
@@ -30,8 +30,8 @@ src_prepare() {
 	local lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-memcached/resty-memcached-9999.ebuild b/dev-lua/resty-memcached/resty-memcached-9999.ebuild
index c1814cd..2dfc1fd 100644
--- a/dev-lua/resty-memcached/resty-memcached-9999.ebuild
+++ b/dev-lua/resty-memcached/resty-memcached-9999.ebuild
@@ -32,8 +32,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-mysql/resty-mysql-9999.ebuild b/dev-lua/resty-mysql/resty-mysql-9999.ebuild
index c857cb1..ffd4da0 100644
--- a/dev-lua/resty-mysql/resty-mysql-9999.ebuild
+++ b/dev-lua/resty-mysql/resty-mysql-9999.ebuild
@@ -32,8 +32,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-redis/resty-redis-9999.ebuild b/dev-lua/resty-redis/resty-redis-9999.ebuild
index 86a079b..87feee2 100644
--- a/dev-lua/resty-redis/resty-redis-9999.ebuild
+++ b/dev-lua/resty-redis/resty-redis-9999.ebuild
@@ -32,8 +32,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-string/resty-string-9999.ebuild b/dev-lua/resty-string/resty-string-9999.ebuild
index 540ffc7..9f318dc 100644
--- a/dev-lua/resty-string/resty-string-9999.ebuild
+++ b/dev-lua/resty-string/resty-string-9999.ebuild
@@ -31,8 +31,8 @@ src_prepare() {
 	local lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-upload/resty-upload-9999.ebuild b/dev-lua/resty-upload/resty-upload-9999.ebuild
index 2b7d2a1..2e48f9e 100644
--- a/dev-lua/resty-upload/resty-upload-9999.ebuild
+++ b/dev-lua/resty-upload/resty-upload-9999.ebuild
@@ -32,8 +32,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild b/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild
index 1a802f4..61f1aa7 100644
--- a/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild
+++ b/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild
@@ -29,8 +29,8 @@ src_prepare() {
 	local lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }

diff --git a/dev-lua/resty-websocket/resty-websocket-9999.ebuild b/dev-lua/resty-websocket/resty-websocket-9999.ebuild
index 27a273d..3b03baf 100644
--- a/dev-lua/resty-websocket/resty-websocket-9999.ebuild
+++ b/dev-lua/resty-websocket/resty-websocket-9999.ebuild
@@ -32,8 +32,8 @@ src_prepare() {
         use luajit && lua=luajit;
 
 	sed -r \
-		-e "1,6s#(PREFIX).*#\1=/usr#" \
-		-e "1,6s#(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
-		-e "1,6s#(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s#^(PREFIX).*#\1=/usr#" \
+		-e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \
+		-e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
 		-i Makefile
 }


^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-04 18:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-04 18:06 [gentoo-commits] proj/lua:master commit in: dev-lua/resty-websocket/, dev-lua/resty-string/, dev-lua/resty-dns/, Vadim A. Misbakh-Soloviov
2014-08-16 16:25 ` [gentoo-commits] proj/lua:master commit in: dev-lua/redis-parser/, dev-lua/resty-websocket/, dev-lua/resty-redis/, Vadim A. Misbakh-Soloviov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox