[gentoo-commits] proj/lua:master commit in: dev-lua/luasec/, dev-lua/luasec/files/

[gentoo-commits] proj/lua:master commit in: dev-lua/luasec/, dev-lua/luasec/files/

[Vadim A. Misbakh-Soloviov]

commit:     976a6ef0f7a684ed1f97d0dfef3399225073868e
Author:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Mon Jun 16 15:32:13 2014 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon Jun 16 15:32:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=976a6ef0

[dev-lua/luasec] fixed DESTDIR (by temp. patch)

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

---
 dev-lua/luasec/files/fix_removed_destdir_support.patch | 17 +++++++++++++++++
 dev-lua/luasec/luasec-9999.ebuild                      | 11 +++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/dev-lua/luasec/files/fix_removed_destdir_support.patch b/dev-lua/luasec/files/fix_removed_destdir_support.patch
new file mode 100644
index 0000000..5dc4882
--- /dev/null
+++ b/dev-lua/luasec/files/fix_removed_destdir_support.patch
@@ -0,0 +1,17 @@
+--- src/Makefile	2014-06-16 14:24:14.653000000 +0400
++++ src/Makefile	2014-06-16 14:23:14.250000000 +0400
+@@ -31,10 +31,10 @@
+ all:
+ 
+ install: $(CMOD) $(LMOD)
+-	$(INSTALL) -d $(LUAPATH)/ssl $(LUACPATH)
+-	$(INSTALL) $(CMOD) $(LUACPATH)
+-	$(INSTALL) -m644 $(LMOD) $(LUAPATH)
+-	$(INSTALL) -m644 https.lua $(LUAPATH)/ssl
++	$(INSTALL) -d $(DESTDIR)$(LUAPATH)/ssl $(DESTDIR)$(LUACPATH)
++	$(INSTALL) $(CMOD) $(DESTDIR)$(LUACPATH)
++	$(INSTALL) -m644 $(LMOD) $(DESTDIR)$(LUAPATH)
++	$(INSTALL) -m644 https.lua $(DESTDIR)$(LUAPATH)/ssl
+ 
+ linux:
+ 	@$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" EXTRA="$(EXTRA)"

diff --git a/dev-lua/luasec/luasec-9999.ebuild b/dev-lua/luasec/luasec-9999.ebuild
index 77d6c2b..e08896a 100644
--- a/dev-lua/luasec/luasec-9999.ebuild
+++ b/dev-lua/luasec/luasec-9999.ebuild
@@ -18,13 +18,20 @@ KEYWORDS=""
 IUSE="luajit"
 
 RDEPEND="
-	|| ( >=dev-lang/lua-5.1[deprecated] dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1[deprecated] )
+	luajit? ( dev-lang/luajit:2 )
 	dev-lua/luasocket
 	dev-libs/openssl
 "
 DEPEND="
 	${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+"
+
+
+src_prepare() {
+	epatch "${FILESDIR}/fix_removed_destdir_support.patch" || die "Probably, Upstream finally returned DESTDIR instalation back. Please, report that."
+}
 
 src_compile() {
 	local lua=lua;

[gentoo-commits] proj/lua:master commit in: dev-lua/luasec/, dev-lua/luasec/files/

[Vadim A. Misbakh-Soloviov]

commit:     b21a82486b987cdae04b77b62c517ffc169412b9
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Fri Aug  5 22:17:54 2016 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Fri Aug  5 22:17:54 2016 +0000
URL:        https://gitweb.gentoo.org/proj/lua.git/commit/?id=b21a8248

luasec: fixed build after upstream merged DESTDIR back

 dev-lua/luasec/files/fix_removed_destdir_support.patch | 17 -----------------
 dev-lua/luasec/luasec-9999.ebuild                      | 18 ++++++++----------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/dev-lua/luasec/files/fix_removed_destdir_support.patch b/dev-lua/luasec/files/fix_removed_destdir_support.patch
deleted file mode 100644
index 5dc4882..0000000
--- a/dev-lua/luasec/files/fix_removed_destdir_support.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/Makefile	2014-06-16 14:24:14.653000000 +0400
-+++ src/Makefile	2014-06-16 14:23:14.250000000 +0400
-@@ -31,10 +31,10 @@
- all:
- 
- install: $(CMOD) $(LMOD)
--	$(INSTALL) -d $(LUAPATH)/ssl $(LUACPATH)
--	$(INSTALL) $(CMOD) $(LUACPATH)
--	$(INSTALL) -m644 $(LMOD) $(LUAPATH)
--	$(INSTALL) -m644 https.lua $(LUAPATH)/ssl
-+	$(INSTALL) -d $(DESTDIR)$(LUAPATH)/ssl $(DESTDIR)$(LUACPATH)
-+	$(INSTALL) $(CMOD) $(DESTDIR)$(LUACPATH)
-+	$(INSTALL) -m644 $(LMOD) $(DESTDIR)$(LUAPATH)
-+	$(INSTALL) -m644 https.lua $(DESTDIR)$(LUAPATH)/ssl
- 
- linux:
- 	@$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" EXTRA="$(EXTRA)"

diff --git a/dev-lua/luasec/luasec-9999.ebuild b/dev-lua/luasec/luasec-9999.ebuild
index d99ce75..9021460 100644
--- a/dev-lua/luasec/luasec-9999.ebuild
+++ b/dev-lua/luasec/luasec-9999.ebuild
@@ -28,29 +28,27 @@ DEPEND="
 all_lua_prepare() {
 	sed -i -r \
 		-e 's#(MAKE\)).*(install)#\1 \2#' \
+		-e '/LIB_PATH.*-L.usr.lib/d' \
 		Makefile
-	epatch "${FILESDIR}/fix_removed_destdir_support.patch" || die "Probably, Upstream finally returned DESTDIR instalation back. Please, report that."
-	cd src
+
+	pushd src &>/dev/null
 	lua_default
+	popd &>/dev/null
 }
 
 each_lua_configure() {
-	cd src
+	pushd src &>/dev/null
 	myeconfargs=()
 	myeconfargs+=(
 		LD='$(CC)'
 		LUAPATH="$(lua_get_pkgvar INSTALL_LMOD)"
 		LUACPATH="$(lua_get_pkgvar INSTALL_CMOD)"
 	)
-		lua_default
+
+	lua_default
+	popd &>/dev/null
 }
 
 each_lua_compile() {
 	lua_default linux
 }
-
-#each_lua_install() {
-#	dolua ssl.so ssl.lua
-#	_dolua_insdir=ssl \
-#	dolua https.lua
-#}