1 |
commit: 7263a2f6f39836e03501d40b9bc4cf853643eecc |
2 |
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> |
3 |
AuthorDate: Thu Oct 1 08:00:44 2015 +0000 |
4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
5 |
CommitDate: Thu Oct 1 08:00:44 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=7263a2f6 |
7 |
|
8 |
some more porting |
9 |
|
10 |
Signed-off-by: Vadim A. Misbakh-Soloviov <git <AT> mva.name> |
11 |
|
12 |
dev-lua/messagepack/messagepack-9999.ebuild | 29 ++++++++----------- |
13 |
dev-lua/moonscript/moonscript-9999.ebuild | 2 +- |
14 |
dev-lua/orbit/orbit-9999.ebuild | 44 +++++++++++------------------ |
15 |
dev-lua/penlight/penlight-9999.ebuild | 42 +++++++++++---------------- |
16 |
4 files changed, 44 insertions(+), 73 deletions(-) |
17 |
|
18 |
diff --git a/dev-lua/messagepack/messagepack-9999.ebuild b/dev-lua/messagepack/messagepack-9999.ebuild |
19 |
index ca713db..628dd49 100644 |
20 |
--- a/dev-lua/messagepack/messagepack-9999.ebuild |
21 |
+++ b/dev-lua/messagepack/messagepack-9999.ebuild |
22 |
@@ -4,8 +4,8 @@ |
23 |
|
24 |
EAPI="5" |
25 |
|
26 |
- |
27 |
-inherit toolchain-funcs git-r3 |
28 |
+VCS="git-r3" |
29 |
+inherit lua |
30 |
|
31 |
DESCRIPTION="A pure Lua implementation of msgpack.org" |
32 |
HOMEPAGE="https://fperrad.github.io/lua-MessagePack/" |
33 |
@@ -13,24 +13,17 @@ EGIT_REPO_URI="https://github.com/fperrad/lua-MessagePack.git" |
34 |
|
35 |
LICENSE="MIT" |
36 |
SLOT="0" |
37 |
-KEYWORDS="~amd64 ~x86" |
38 |
-IUSE="luajit" |
39 |
- |
40 |
-RDEPEND=" |
41 |
- virtual/lua[luajit=] |
42 |
-" |
43 |
-DEPEND="${RDEPEND} |
44 |
- virtual/pkgconfig" |
45 |
+KEYWORDS="" |
46 |
+IUSE="" |
47 |
|
48 |
-src_install() { |
49 |
- local lua=lua |
50 |
- use luajit && lua=luajit |
51 |
- |
52 |
- insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" |
53 |
- if [[ "${lua}" = "lua" ]] && [[ $(${lua} -v 2>&1) =~ "5.3" ]]; then |
54 |
- doins src5.3/MessagePack.lua |
55 |
+each_lua_install() { |
56 |
+ local insfrom; |
57 |
+ if [[ "${TARGET}" = "lua53" ]]; then |
58 |
+ insfrom=src5.3 |
59 |
else |
60 |
- doins src/MessagePack.lua |
61 |
+ insfrom=src |
62 |
fi |
63 |
+ |
64 |
+ dolua "${insfrom}"/MessagePack.lua |
65 |
} |
66 |
|
67 |
|
68 |
diff --git a/dev-lua/moonscript/moonscript-9999.ebuild b/dev-lua/moonscript/moonscript-9999.ebuild |
69 |
index 88fda81..5f7a789 100644 |
70 |
--- a/dev-lua/moonscript/moonscript-9999.ebuild |
71 |
+++ b/dev-lua/moonscript/moonscript-9999.ebuild |
72 |
@@ -29,7 +29,7 @@ RDEPEND=" |
73 |
" |
74 |
DEPEND="${RDEPEND}" |
75 |
|
76 |
-DOCS=( docs/ README.md ) |
77 |
+DOCS=( docs/. README.md ) |
78 |
|
79 |
each_lua_compile() { |
80 |
local lua="$(lua_get_implementation)" |
81 |
|
82 |
diff --git a/dev-lua/orbit/orbit-9999.ebuild b/dev-lua/orbit/orbit-9999.ebuild |
83 |
index 2b015df..384337d 100644 |
84 |
--- a/dev-lua/orbit/orbit-9999.ebuild |
85 |
+++ b/dev-lua/orbit/orbit-9999.ebuild |
86 |
@@ -4,7 +4,8 @@ |
87 |
|
88 |
EAPI="5" |
89 |
|
90 |
-inherit multilib eutils git-r3 toolchain-funcs |
91 |
+VCS="git-r3" |
92 |
+inherit lua |
93 |
|
94 |
DESCRIPTION="MVC Web Framework for Lua" |
95 |
HOMEPAGE="https://github.com/keplerproject/orbit" |
96 |
@@ -15,43 +16,30 @@ EGIT_REPO_URI="https://github.com/keplerproject/orbit.git" |
97 |
LICENSE="MIT" |
98 |
SLOT="0" |
99 |
KEYWORDS="" |
100 |
-IUSE="luajit doc" |
101 |
+IUSE="doc +examples" |
102 |
|
103 |
RDEPEND=" |
104 |
- virual/lua[luajit=] |
105 |
dev-lua/wsapi |
106 |
dev-lua/cosmo |
107 |
" |
108 |
DEPEND=" |
109 |
${RDEPEND} |
110 |
- virtual/pkgconfig |
111 |
" |
112 |
+DOCS=( doc/. ) |
113 |
+EXAMPLES=( samples/. test/. ) |
114 |
|
115 |
-src_prepare() { |
116 |
- local lua=lua |
117 |
- use luajit && lua=luajit |
118 |
- sed -r \ |
119 |
- -e "s/^M//g" \ |
120 |
- -e "1s%#!#.*lua$%#!/usr/bin/env ${lua}%g" \ |
121 |
- -i src/launchers/ob{.cgi,.fcgi} src/launchers/orbit |
122 |
- echo " |
123 |
- BIN_DIR=${ED}/usr/bin |
124 |
- LUA_DIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua}) |
125 |
- " > "${S}/config" |
126 |
-} |
127 |
+all_lua_prepare() { |
128 |
+ sed -r \ |
129 |
+ -e "s/^M//g" \ |
130 |
+ -i src/launchers/ob{.cgi,.fcgi} src/launchers/orbit |
131 |
|
132 |
-src_configure() { |
133 |
- : |
134 |
+ rm samples/pages/doc samples/doc |
135 |
} |
136 |
|
137 |
-src_install() { |
138 |
- docompress -x /usr/share/doc |
139 |
- default |
140 |
- use doc && ( |
141 |
- insinto /usr/share/doc/${PF}/examples |
142 |
- doins -r samples/* |
143 |
- insinto /usr/share/doc/${PF} |
144 |
- doins -r doc/* |
145 |
- ) |
146 |
-} |
147 |
+src_configure() { :; } |
148 |
+src_compile() { :; } |
149 |
|
150 |
+each_lua_install() { |
151 |
+ dolua src/${PN}{,.lua} |
152 |
+ dobin src/launchers/${PN} |
153 |
+} |
154 |
|
155 |
diff --git a/dev-lua/penlight/penlight-9999.ebuild b/dev-lua/penlight/penlight-9999.ebuild |
156 |
index 73e0b24..de251d3 100644 |
157 |
--- a/dev-lua/penlight/penlight-9999.ebuild |
158 |
+++ b/dev-lua/penlight/penlight-9999.ebuild |
159 |
@@ -4,7 +4,8 @@ |
160 |
|
161 |
EAPI="5" |
162 |
|
163 |
-inherit eutils git-r3 |
164 |
+VCS="git-r3" |
165 |
+inherit lua |
166 |
|
167 |
DESCRIPTION="A set of pure Lua libraries focusing on input data handling, functional programming and OS path management." |
168 |
HOMEPAGE="https://github.com/stevedonovan/Penlight" |
169 |
@@ -19,37 +20,26 @@ IUSE="doc +examples test luajit" |
170 |
|
171 |
# TODO: Lua 5.2 handling |
172 |
|
173 |
-RDEPEND=" |
174 |
- virtual/lua[luajit=] |
175 |
- doc? ( dev-lua/luadoc ) |
176 |
-" |
177 |
DEPEND=" |
178 |
${RDEPEND} |
179 |
- virtual/pkgconfig |
180 |
+ doc? ( dev-lua/ldoc ) |
181 |
" |
182 |
-DOCS=( README.md CHANGES.md CONTRIBUTING.md ) |
183 |
|
184 |
-src_test() { |
185 |
- local lua=lua; |
186 |
- use luajit && lua=luajit |
187 |
- ${lua} run.lua tests |
188 |
-} |
189 |
+HTML_DOCS=( html/. ) |
190 |
+DOCS=( README.md CHANGES.md CONTRIBUTING.md ) |
191 |
+EXAMPLES=( examples/. ) |
192 |
|
193 |
-src_install() { |
194 |
- local lua=lua; |
195 |
- use luajit && lua=luajit |
196 |
- use examples && { |
197 |
- docompress -x /usr/share/doc/${PF}/examples |
198 |
- dodoc -r examples |
199 |
- } |
200 |
+all_lua_compile() { |
201 |
use doc && ( |
202 |
- docompress -x /usr/share/doc/${PF}/html |
203 |
cd doc |
204 |
- dodoc -r manual |
205 |
-# Still doesn't work |
206 |
-# luadoc . -d html |
207 |
-# dohtml -r html |
208 |
+ ldoc . -d ../html |
209 |
) |
210 |
- insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" |
211 |
- doins -r lua/pl |
212 |
+} |
213 |
+ |
214 |
+each_lua_test() { |
215 |
+ ${LUA} run.lua tests |
216 |
+} |
217 |
+ |
218 |
+each_lua_install() { |
219 |
+ dolua lua/pl |
220 |
} |