From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 197111391DB for ; Mon, 16 Jun 2014 15:32:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DC41E0D64; Mon, 16 Jun 2014 15:32:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3288AE0D65 for ; Mon, 16 Jun 2014 15:32:46 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1933133FE3F for ; Mon, 16 Jun 2014 15:32:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id C8D7B187EB for ; Mon, 16 Jun 2014 15:32:44 +0000 (UTC) From: "Vadim A. Misbakh-Soloviov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Vadim A. Misbakh-Soloviov" Message-ID: <1402932750.976a6ef0f7a684ed1f97d0dfef3399225073868e.mva@gentoo> Subject: [gentoo-commits] proj/lua:master commit in: dev-lua/luasec/, dev-lua/luasec/files/ X-VCS-Repository: proj/lua X-VCS-Files: dev-lua/luasec/files/fix_removed_destdir_support.patch dev-lua/luasec/luasec-9999.ebuild X-VCS-Directories: dev-lua/luasec/ dev-lua/luasec/files/ X-VCS-Committer: mva X-VCS-Committer-Name: Vadim A. Misbakh-Soloviov X-VCS-Revision: 976a6ef0f7a684ed1f97d0dfef3399225073868e X-VCS-Branch: master Date: Mon, 16 Jun 2014 15:32:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 99333ba2-7cc9-40b2-89ae-047884f47151 X-Archives-Hash: fccb2a2fcf1ae065a1edb376b18975b8 commit: 976a6ef0f7a684ed1f97d0dfef3399225073868e Author: Vadim A. Misbakh-Soloviov mva name> AuthorDate: Mon Jun 16 15:32:13 2014 +0000 Commit: Vadim A. Misbakh-Soloviov mva 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.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;