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/luafilesystem/
Date: Sun, 26 May 2013 16:09:11
Message-Id: 1369584529.ad030197a36a12b04feb87f8862f8aabdf06e506.mva@gentoo
1 commit: ad030197a36a12b04feb87f8862f8aabdf06e506
2 Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
3 AuthorDate: Sun May 26 16:08:49 2013 +0000
4 Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
5 CommitDate: Sun May 26 16:08:49 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=ad030197
7
8 [dev-lua/luafilesystem] luajit-related fix
9
10 Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
11
12 ---
13 dev-lua/luafilesystem/luafilesystem-9999.ebuild | 20 +++++++++++++-------
14 1 files changed, 13 insertions(+), 7 deletions(-)
15
16 diff --git a/dev-lua/luafilesystem/luafilesystem-9999.ebuild b/dev-lua/luafilesystem/luafilesystem-9999.ebuild
17 index d995435..7585aa8 100644
18 --- a/dev-lua/luafilesystem/luafilesystem-9999.ebuild
19 +++ b/dev-lua/luafilesystem/luafilesystem-9999.ebuild
20 @@ -3,7 +3,7 @@
21 # $Header: This ebuild is from Lua overlay; Bumped by mva; $
22
23 EAPI="5"
24 -inherit multilib toolchain-funcs git-2
25 +inherit multilib eutils git-2
26
27 DESCRIPTION="File System Library for the Lua Programming Language"
28 HOMEPAGE="http://keplerproject.github.com/luafilesystem/"
29 @@ -14,23 +14,29 @@ SRC_URI=""
30 LICENSE="MIT"
31 SLOT="0"
32 KEYWORDS=""
33 -IUSE=""
34 +IUSE="doc luajit"
35
36 -DEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )"
37 +DEPEND="
38 + !luajit? ( dev-lang/lua )
39 + luajit? ( dev-lang/luajit:2 )"
40 RDEPEND="${DEPEND}"
41
42 +DOCS=( README )
43 +
44 src_prepare() {
45 - sed -i \
46 + sed \
47 -e "s|/usr/local|/usr|" \
48 -e "s|/lib|/$(get_libdir)|" \
49 -e "s|-O2|${CFLAGS}|" \
50 -e "/^LIB_OPTION/s|= |= ${LDFLAGS} |" \
51 -e "s|gcc|$(tc-getCC)|" \
52 - config || die
53 + -i config || die "config fix failed"
54 + use luajit && sed -r \
55 + -e "s|(LUA_INC)=.*|\1 = $($(tc-getPKG_CONFIG) luajit --variable includedir)|" \
56 + -i config || die "luajit include fix failed"
57 }
58
59 src_install() {
60 emake PREFIX="${ED}usr" install || die
61 - dodoc README || die
62 - dohtml doc/us/* || die
63 + use doc && dohtml doc/us/* || die
64 }