some more porting

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

4 files changed, 44 insertions, 73 deletions

diff --git a/dev-lua/messagepack/messagepack-9999.ebuild b/dev-lua/messagepack/messagepack-9999.ebuild
index ca713db..628dd49 100644
--- a/dev-lua/messagepack/messagepack-9999.ebuild
+++ b/dev-lua/messagepack/messagepack-9999.ebuild
@@ -4,8 +4,8 @@
 
 EAPI="5"
 
-
-inherit toolchain-funcs git-r3
+VCS="git-r3"
+inherit lua
 
 DESCRIPTION="A pure Lua implementation of msgpack.org"
 HOMEPAGE="https://fperrad.github.io/lua-MessagePack/"
@@ -13,24 +13,17 @@ EGIT_REPO_URI="https://github.com/fperrad/lua-MessagePack.git"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="luajit"
-
-RDEPEND="
-	virtual/lua[luajit=]
-"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
+KEYWORDS=""
+IUSE=""
 
-src_install() {
-	local lua=lua
-	use luajit && lua=luajit
-
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})"
-	if [[ "${lua}" = "lua" ]] && [[ $(${lua} -v 2>&1) =~ "5.3" ]]; then
-		doins src5.3/MessagePack.lua
+each_lua_install() {
+	local insfrom;
+	if [[ "${TARGET}" = "lua53" ]]; then
+		insfrom=src5.3
 	else
-		doins src/MessagePack.lua
+		insfrom=src
 	fi
+
+	dolua "${insfrom}"/MessagePack.lua
 }
 
diff --git a/dev-lua/moonscript/moonscript-9999.ebuild b/dev-lua/moonscript/moonscript-9999.ebuild
index 88fda81..5f7a789 100644
--- a/dev-lua/moonscript/moonscript-9999.ebuild
+++ b/dev-lua/moonscript/moonscript-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-DOCS=( docs/ README.md )
+DOCS=( docs/. README.md )
 
 each_lua_compile() {
 	local lua="$(lua_get_implementation)"
diff --git a/dev-lua/orbit/orbit-9999.ebuild b/dev-lua/orbit/orbit-9999.ebuild
index 2b015df..384337d 100644
--- a/dev-lua/orbit/orbit-9999.ebuild
+++ b/dev-lua/orbit/orbit-9999.ebuild
@@ -4,7 +4,8 @@
 
 EAPI="5"
 
-inherit multilib eutils git-r3 toolchain-funcs
+VCS="git-r3"
+inherit lua
 
 DESCRIPTION="MVC Web Framework for Lua"
 HOMEPAGE="https://github.com/keplerproject/orbit"
@@ -15,43 +16,30 @@ EGIT_REPO_URI="https://github.com/keplerproject/orbit.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="luajit doc"
+IUSE="doc +examples"
 
 RDEPEND="
-	virual/lua[luajit=]
 	dev-lua/wsapi
 	dev-lua/cosmo
 "
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 "
+DOCS=( doc/. )
+EXAMPLES=( samples/. test/. )
 
-src_prepare() {
-    local lua=lua
-    use luajit && lua=luajit
-    sed -r \
-        -e "s/^M//g" \
-        -e "1s%#!#.*lua$%#!/usr/bin/env ${lua}%g" \
-        -i src/launchers/ob{.cgi,.fcgi} src/launchers/orbit
-    echo "
-        BIN_DIR=${ED}/usr/bin
-        LUA_DIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})
-    " > "${S}/config"
-}
+all_lua_prepare() {
+	sed -r \
+		-e "s/^M//g" \
+		-i src/launchers/ob{.cgi,.fcgi} src/launchers/orbit
 
-src_configure() {
-    :
+	rm samples/pages/doc samples/doc
 }
 
-src_install() {
-    docompress -x /usr/share/doc
-    default
-    use doc && (
-        insinto /usr/share/doc/${PF}/examples
-        doins -r samples/*
-        insinto /usr/share/doc/${PF}
-        doins -r doc/*
-    )
-}
+src_configure() { :; }
+src_compile() { :; }
 
+each_lua_install() {
+	dolua src/${PN}{,.lua}
+	dobin src/launchers/${PN}
+}
diff --git a/dev-lua/penlight/penlight-9999.ebuild b/dev-lua/penlight/penlight-9999.ebuild
index 73e0b24..de251d3 100644
--- a/dev-lua/penlight/penlight-9999.ebuild
+++ b/dev-lua/penlight/penlight-9999.ebuild
@@ -4,7 +4,8 @@
 
 EAPI="5"
 
-inherit eutils git-r3
+VCS="git-r3"
+inherit lua
 
 DESCRIPTION="A set of pure Lua libraries focusing on input data handling, functional programming and OS path management."
 HOMEPAGE="https://github.com/stevedonovan/Penlight"
@@ -19,37 +20,26 @@ IUSE="doc +examples test luajit"
 
 # TODO: Lua 5.2 handling
 
-RDEPEND="
-	virtual/lua[luajit=]
-	doc? ( dev-lua/luadoc )
-"
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
+	doc? ( dev-lua/ldoc )
 "
-DOCS=( README.md CHANGES.md CONTRIBUTING.md )
 
-src_test() {
-	local lua=lua;
-	use luajit && lua=luajit
-	${lua} run.lua tests
-}
+HTML_DOCS=( html/. )
+DOCS=( README.md CHANGES.md CONTRIBUTING.md )
+EXAMPLES=( examples/. )
 
-src_install() {
-	local lua=lua;
-	use luajit && lua=luajit
-	use examples && {
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	}
+all_lua_compile() {
 	use doc && (
-		docompress -x /usr/share/doc/${PF}/html
 		cd doc
-		dodoc -r manual
-# Still doesn't work
-#		luadoc . -d html
-#		dohtml -r html
+		ldoc . -d ../html
 	)
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})"
-	doins -r lua/pl
+}
+
+each_lua_test() {
+	${LUA} run.lua tests
+}
+
+each_lua_install() {
+	dolua lua/pl
 }