[dev-lua/*] Fix luajit compat (+added some deps)

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

36 files changed, 729 insertions, 150 deletions

diff --git a/dev-lua/lapis/lapis-9999.ebuild b/dev-lua/lapis/lapis-9999.ebuild
index c959d04..cbc50b7 100644
--- a/dev-lua/lapis/lapis-9999.ebuild
+++ b/dev-lua/lapis/lapis-9999.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 HTML_DOCS=( "docs/" "README.md" )
 
 src_compile() {
-	emake build
+	use moonscript && emake build
 }
 
 src_install() {
@@ -54,4 +54,4 @@ src_install() {
 	use moonscript && doins lapis.moon
 
 	base_src_install_docs
-}
\ No newline at end of file
+}
diff --git a/dev-lua/ldoc/Manifest b/dev-lua/ldoc/Manifest
new file mode 100644
index 0000000..6132373
--- /dev/null
+++ b/dev-lua/ldoc/Manifest
@@ -0,0 +1 @@
+DIST resty-string-0.08.tar.gz 9284 SHA256 45bc178f3541f2c77c262a2fa0e7856191d3e725bffcb2df03504adc99a15f15 SHA512 a4cbb4a4990190a0eb5b51a397656e0ad0ae491e76f09ff8b0d3feb27160589c80e0d40983b0ce3d5e3f526f8080cf3706522684b316a1d4bd0b3f1d39ff8551 WHIRLPOOL 4c80fb7f5343e51e70d74dc12ce99e1f62c75e1b88445cf3c099315c3e3045f4e31271936bc283aebc8ec3c010649a9da868dc27600bbed163be39cd514ba5c3
diff --git a/dev-lua/ldoc/ldoc-9999.ebuild b/dev-lua/ldoc/ldoc-9999.ebuild
new file mode 100644
index 0000000..7f67ffe
--- /dev/null
+++ b/dev-lua/ldoc/ldoc-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: This ebuild is from Lua overlay; Bumped by mva; $
+
+EAPI="5"
+
+inherit eutils toolchain-funcs git-r3
+
+DESCRIPTION="A LuaDoc-compatible documentation generation system"
+HOMEPAGE="https://github.com/stevedonovan/LDoc/"
+SRC_URI=""
+
+EGIT_REPO_URI="https://github.com/stevedonovan/LDoc/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="luajit doc"
+
+RDEPEND="
+	luajit? ( dev-landg/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/pkgconfig
+"
+
+src_prepare() {
+	local lua=lua
+	use luajit && lua=luajit
+
+	sed -r \
+		-e "1s#(/usr/bin/env).*#\1 ${lua}#" \
+		-i ldoc.lua
+}
+
+src_compile() { :; }
+
+src_install() {
+	local lua=lua
+	use luajit && lua=luajit
+
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})"
+	doins -r ldoc ldoc.lua
+
+	newbin ldoc.lua ldoc
+}
diff --git a/dev-lua/ldoc/metadata.xml b/dev-lua/ldoc/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/ldoc/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>mva@mva.name</email>
+ <description>
+	If you have any issues, please contact me, or try to find me in IRC on Freenode, OFTC or RusNet.
+ </description> 
+ <name>Vadim A. Misbakh-Soloviov</name>
+</maintainer>
+<longdescription>FIXME</longdescription> 
+<use>
+</use>
+</pkgmetadata>
diff --git a/dev-lua/lpeg/ChangeLog b/dev-lua/lpeg/ChangeLog
new file mode 100644
index 0000000..313239c
--- /dev/null
+++ b/dev-lua/lpeg/ChangeLog
@@ -0,0 +1,27 @@
+# ChangeLog for dev-lua/lpeg
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/lpeg/ChangeLog,v 1.7 2014/06/22 22:40:01 radhermit Exp $
+
+  22 Jun 2014; Tim Harder <radhermit@gentoo.org> lpeg-0.12.ebuild:
+  Don't hardcode pkg-config.
+
+  16 Jun 2014; Tim Harder <radhermit@gentoo.org> lpeg-0.12.ebuild:
+  Use pkgconfig to determine lua C modules directory (bug #503990).
+
+  04 Mar 2014; Vicente Olivert Riera <vincent@gentoo.org> lpeg-0.12.ebuild:
+  Add ~mips keyword.
+
+  25 Feb 2014; Markus Meier <maekke@gentoo.org> lpeg-0.12.ebuild:
+  add ~arm, bug #495254
+
+  23 Feb 2014; Pacho Ramos <pacho@gentoo.org> lpeg-0.12.ebuild:
+  amd64/x86 stable, bug #501720
+
+  22 Feb 2014; Jeroen Roovers <jer@gentoo.org> lpeg-0.12.ebuild:
+  Marked ~hppa (bug #495254).
+
+*lpeg-0.12 (22 May 2013)
+
+  22 May 2013; Tim Harder <radhermit@gentoo.org> +lpeg-0.12.ebuild,
+  +files/lpeg-0.12-makefile.patch, +metadata.xml:
+  Initial import (bug #469300 by Raphaël Droz).
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
new file mode 100644
index 0000000..b03dc70
--- /dev/null
+++ b/dev-lua/lpeg/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX lpeg-0.12-makefile.patch 833 SHA256 0d3614bc95a706bbe31be40406b7e5e0f00152f8c0d12c947b7b65250d621509 SHA512 50b880fca90ff5d833ea83ce66aae1a5c846d20ea161ef317f9d926c7d4327687d09eb95c70b7a5b0f63096c31df028c5a7edd6b361753a53ef75519cdcf0d55 WHIRLPOOL f1600193dedf7b8f0b36cb6f9e428dd0c64dfe97680db77ce1c68cb165654b8d630da27e391e03687aec6e204a003efe243a09f596416c7abf90bb1864868d72
+DIST lpeg-0.12.tar.gz 66649 SHA256 efa545144cd219eee823af7624d90f78c2230677ba740b7151c5d0c303778b76 SHA512 bf8c4fe486f5e965b793d8526dd1fc5c8905c4b065a1abe52ec8e41ebbe48292315a7460dc56fb7a029b4673057f9da7e53854bb79bb54dd8a4378391efc24a2 WHIRLPOOL 3e131da888eff53fbfa6203ed363f34832c52fb0fafca9006dd1da956c89a76528dc9aaf255426a148497c55df74ccb72cf87e234f5c432c4e2c28a5dfd0a9a1
+EBUILD lpeg-0.12.ebuild 906 SHA256 ea1d523737c42911ce2a1c555d787ed1c2b37cb02a6759e953aab56a3264036c SHA512 657fb6d38b9aa6980339afd2bf3cec0e1b94c1327b65b23ad7fea4102d347a813787a7cda40a393a37a1f6ae9757320d90c105a9884d62cd24b1c8d1d91091f4 WHIRLPOOL 47d8d941a666fa9a3dceb12c407dcb982d9c29558fb2a5f44cdcff97e8f794c8edd8b2b62632dba6c12d83771ab1305e6d9307da1c1d798fdfc0fd3f23edbc9c
+MISC ChangeLog 1008 SHA256 59e96c8c45a6b1b268eb6456bec718324d524e741d0857029597335873b54a16 SHA512 9a8271af35595b73df0c6dee3582535d1160e6cd839ff668e43240e07fade8bba88c66639ee7c49a9b69c00a4109d7bbac92c6527139eb03bce63fb7003bc0e7 WHIRLPOOL 09596ca48d30b611fd733e8a8bb502e429a73c800fe0ac0345312617ad0cb870a44bcfa196d07f63f206b66af35d7d9b499a49addf574757c19620fc690b7970
+MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJTp1tEAAoJEEqz6FtPBkyjhWkIAIQJsQ1EeVz/vmVRksTtBQyv
+LmIET2posJdqPZHlY66+fkYopV7g/86hLtdK6yNWA269Ju+t8wWliAx2Ll0riZ6l
+5ItxxivrTmN+N8PvECTuNm7boT/RvqCI2KVN9C3tLFnzpFZ9GA58WVWDF0vS9fW3
+3N/GJGgMbtiwsnwsVs3KoQ16IuN2dw+WGQcFUrGygAgoMOkIM3OHz0KQhb2Shnv2
+vbe/2XLXqcbPoFbeK7MJqnOI0Z0GTyDoWsbA4FhzJLuR8gj1W06zT4eoV86Aw9en
+Kt9F0wF87moXnr4v9JnvYKQuf66Idavsa9w2s2xWsK5C3yGzIihK1t5SQ9ZcAHU=
+=azMR
+-----END PGP SIGNATURE-----
diff --git a/dev-lua/lpeg/files/lpeg-0.12-makefile.patch b/dev-lua/lpeg/files/lpeg-0.12-makefile.patch
new file mode 100644
index 0000000..5734de9
--- /dev/null
+++ b/dev-lua/lpeg/files/lpeg-0.12-makefile.patch
@@ -0,0 +1,37 @@
+--- lpeg-0.12/makefile
++++ lpeg-0.12/makefile
+@@ -1,7 +1,7 @@
+ LIBNAME = lpeg
+ LUADIR = /usr/include/lua5.1/
+ 
+-COPT = -O2
++#COPT = -O2
+ # COPT = -DLPEG_DEBUG -g
+ 
+ CWARNS = -Wall -Wextra -pedantic \
+@@ -22,21 +22,21 @@
+ # -Wunreachable-code \
+ 
+ 
+-CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
++CFLAGS += $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
+ CC = gcc
+ 
+ FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
+ 
+ # For Linux
+ linux:
+-	make lpeg.so "DLLFLAGS = -shared -fPIC"
++	$(MAKE) lpeg.so "DLLFLAGS = -shared -fPIC"
+ 
+ # For Mac OS
+ macosx:
+-	make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
++	$(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
+ 
+ lpeg.so: $(FILES)
+-	env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
++	env $(CC) $(CFLAGS) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
+ 
+ $(FILES): makefile
+ 
diff --git a/dev-lua/lpeg/lpeg-0.12.ebuild b/dev-lua/lpeg/lpeg-0.12.ebuild
new file mode 100644
index 0000000..a25ff54
--- /dev/null
+++ b/dev-lua/lpeg/lpeg-0.12.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/lpeg/lpeg-0.12.ebuild,v 1.7 2014/06/22 22:40:01 radhermit Exp $
+
+EAPI=5
+
+inherit flag-o-matic toolchain-funcs eutils multilib
+
+DESCRIPTION="Parsing Expression Grammars for Lua"
+HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/"
+SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~mips x86"
+IUSE="debug doc luajit"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	local lua=lua
+	use luajit && lua=luajit
+
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	sed -r \
+		-e "2s#^(LUADIR).*#\1 = $($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-i makefile
+	use debug && append-cflags -DLPEG_DEBUG
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_test() {
+	local lua=lua
+	use luajit && lua=luajit
+
+	${lua} test.lua || die
+}
+
+src_install() {
+	local lua=lua
+	use luajit && lua=luajit
+
+	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua})"
+	doexe lpeg.so
+
+	dodoc HISTORY
+
+	use doc && dohtml *.html
+}
diff --git a/dev-lua/lpeg/metadata.xml b/dev-lua/lpeg/metadata.xml
new file mode 100644
index 0000000..efa5eb0
--- /dev/null
+++ b/dev-lua/lpeg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-lua/lua-cjson/lua-cjson-9999.ebuild b/dev-lua/lua-cjson/lua-cjson-9999.ebuild
index dc1a6a1..e24f15e 100644
--- a/dev-lua/lua-cjson/lua-cjson-9999.ebuild
+++ b/dev-lua/lua-cjson/lua-cjson-9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Lua JSON Library, written in C"
 HOMEPAGE="http://www.kyne.com.au/~mark/software/lua-cjson.php"
 SRC_URI=""
 
-EGIT_REPO_URI="git://github.com/msva/lua-cjson.git"
+EGIT_REPO_URI="https://github.com/msva/lua-cjson"
 
 LICENSE="MIT"
 SLOT="0"
@@ -18,8 +18,8 @@ KEYWORDS=""
 IUSE="examples luajit"
 
 RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1 )
 	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1 )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-lua/lua-curl/lua-curl-9999.ebuild b/dev-lua/lua-curl/lua-curl-9999.ebuild
index 7a647bd..5fc7659 100644
--- a/dev-lua/lua-curl/lua-curl-9999.ebuild
+++ b/dev-lua/lua-curl/lua-curl-9999.ebuild
@@ -18,9 +18,8 @@ KEYWORDS=""
 IUSE="doc examples luajit"
 
 RDEPEND="
-	|| ( =dev-lang/lua-5.1* dev-lang/luajit:2 )
 	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( =dev-lang/lua-5.1* )
+	!luajit? ( >=dev-lang/lua-5.1 )
 	net-misc/curl
 "
 DEPEND="${RDEPEND}
@@ -48,8 +47,8 @@ src_install() {
 	use doc && (
 		docompress -x /usr/share/doc/${PF}/html
 		cd doc
-#		luadoc . -d html
-#		dohtml -r html
+		ldoc .
+		dohtml -r html
 	)
 	default
 }
diff --git a/dev-lua/lua-fastcgi/lua-fastcgi-9999.ebuild b/dev-lua/lua-fastcgi/lua-fastcgi-9999.ebuild
index f676c88..b426514 100644
--- a/dev-lua/lua-fastcgi/lua-fastcgi-9999.ebuild
+++ b/dev-lua/lua-fastcgi/lua-fastcgi-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils git-r3
+inherit toolchain-funcs eutils git-r3
 
 DESCRIPTION="A FastCGI server for Lua, written in C"
 HOMEPAGE="https://github.com/cramey/lua-fastcgi"
@@ -19,26 +19,26 @@ KEYWORDS=""
 IUSE="doc luajit"
 
 RDEPEND="
-	|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1 )
 	luajit? ( dev-lang/luajit:2 )
 	dev-libs/fcgi
 "
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	if use luajit; then
-	LUA_LIB="luajit-5.1"
-	LUA_INC="luajit-2.0/"
-	else
-	LUA_LIB="lua"
-	LUA_INC=""
-	fi
-	sed -e "s/-Wl,[^ ]*//g"  -i Makefile
-	sed -e "s/lua5.1/${LUA_LIB}/g"  -i Makefile
-	sed -e "s#lua5.1/#${LUA_INC}#" -i src/config.c
-	sed -e "s#lua5.1/#${LUA_INC}#" -i src/lfuncs.c
-	sed -e "s#lua5.1/#${LUA_INC}#" -i src/lua.c
-	sed -e "s#lua5.1/#${LUA_INC}#" -i src/lua-fastcgi.c
+	local lua=lua
+	use luajit && lua=luajit
+
+	LUA_LIB="$($(tc-getPKG_CONFIG) --variable libname ${lua})"
+
+	sed -r \
+		-e "s#^(CFLAGS=.*)#\1 $($(tc-getPKG_CONFIG) --variable cflags ${lua}) -I$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \
+		-e "s/-Wl,[^ ]*//g" \
+		-e "s#lua5.1#${LUA_LIB}#g" \
+		-i Makefile
+	sed \
+		-e "s#lua5.1/##" \
+		-i src/config.c src/lfuncs.c src/lua.c src/lua-fastcgi.c
 }
 
 src_install() {
diff --git a/dev-lua/lua-gd/files/lua-gd-9999-makefile.patch b/dev-lua/lua-gd/files/lua-gd-9999-makefile.patch
deleted file mode 100644
index ca94d97..0000000
--- a/dev-lua/lua-gd/files/lua-gd-9999-makefile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile	2011-11-17 19:20:40.269174977 +0700
-+++ Makefile	2011-11-17 19:20:14.839492893 +0700
-@@ -39,12 +39,11 @@
- # Name of .pc file. "lua5.1" on Debian/Ubuntu
- LUAPKG=lua5.1
- OUTFILE=gd.so
--CFLAGS=`gdlib-config --cflags` `pkg-config $(LUAPKG) --cflags` -O3 -Wall \
--    $(OMITFP) -fPIC
-+CFLAGS=`gdlib-config --cflags` `pkg-config $(LUAPKG) --cflags` $(OMITFP) -fPIC
- GDFEATURES=`gdlib-config --features |sed -e "s/GD_/-DGD_/g"`
--LFLAGS=-shared `gdlib-config --ldflags` `gdlib-config --libs` -lgd $(OMITFP)
--INSTALL_PATH=`pkg-config $(LUAPKG) --variable=INSTALL_CMOD`
--
-+LIBS=`gdlib-config --libs` `pkg-config $(LUAPKG) --libs` -lgd
-+LDFLAGS+=`gdlib-config --ldflags` -shared
-+INSTALL_PATH=$(DESTDIR)`pkg-config $(LUAPKG) --variable=INSTALL_CMOD`
- 
- # ---------------------------------------------------------------------------
- # Manual configuration for systems without pkgconfig.
-@@ -71,14 +70,15 @@
- all: $(OUTFILE)
- 
- $(OUTFILE): gd.lo
--	$(CC) -o $(OUTFILE) gd.lo $(LFLAGS)
--	lua test_features.lua
-+	$(CC) -o $(OUTFILE) gd.lo $(LDFLAGS) $(LIBS)
-+	$(LUAPKG) test_features.lua
- 
- gd.lo: luagd.c
- 	$(CC) -o gd.lo -c $(GDFEATURES) $(CFLAGS) luagd.c
- 
- install: $(OUTFILE)
--	install -D -s $(OUTFILE) $(INSTALL_PATH)
-+	mkdir -p $(INSTALL_PATH)
-+	install $(OUTFILE) $(INSTALL_PATH)
- 
- clean:
- 	rm -f $(OUTFILE) gd.lo
diff --git a/dev-lua/lua-gd/lua-gd-9999.ebuild b/dev-lua/lua-gd/lua-gd-9999.ebuild
index 95e7ae7..0fdb8df 100644
--- a/dev-lua/lua-gd/lua-gd-9999.ebuild
+++ b/dev-lua/lua-gd/lua-gd-9999.ebuild
@@ -16,19 +16,23 @@ SLOT="0"
 KEYWORDS=""
 IUSE="doc examples luajit"
 
-RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
+RDEPEND="
+	!luahit? ( >=dev-lang/lua-5.1 )
+	luajit? ( dev-lang/luajit:2 )
 	media-libs/gd[png]"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
+	sed -r \
+		-e "s/^(CFLAGS=)-O3 -Wall /\1/" \
+		-i Makefile
 }
 
 src_compile() {
 	local lua=lua;
 	use luajit && lua=luajit;
-	emake LUAPKG="${lua}" CC="$(tc-getCC)"
+	emake LUAPKG="${lua}" LUABIN="${lua}" CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/dev-lua/lua-getopt/lua-getopt-9999.ebuild b/dev-lua/lua-getopt/lua-getopt-9999.ebuild
new file mode 100644
index 0000000..bf4dc54
--- /dev/null
+++ b/dev-lua/lua-getopt/lua-getopt-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: This ebuild is from Lua overlay; Bumped by mva; $
+
+EAPI="5"
+
+inherit toolchain-funcs git-r3
+
+DESCRIPTION="Lua getopt module (simplified)"
+HOMEPAGE="https://github.com/jjensen/lua-getopt"
+EGIT_REPO_URI="https://github.com/jjensen/lua-getopt"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="luajit"
+
+RDEPEND="
+	!luajit? ( dev-lang/lua )
+	luajit? ( dev-lang/luajit:2 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/pkgconfig
+"
+
+
+src_install() {
+	local lua=lua;
+	use luajit && lua=luajit;
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})"
+	doins src/getopt.lua
+}
diff --git a/dev-lua/lua-getopt/metadata.xml b/dev-lua/lua-getopt/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/lua-getopt/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>mva@mva.name</email>
+ <description>
+	If you have any issues, please contact me, or try to find me in IRC on Freenode, OFTC or RusNet.
+ </description> 
+ <name>Vadim A. Misbakh-Soloviov</name>
+</maintainer>
+<longdescription>FIXME</longdescription> 
+<use>
+</use>
+</pkgmetadata>
diff --git a/dev-lua/lua-stdlib/lua-stdlib-9999.ebuild b/dev-lua/lua-stdlib/lua-stdlib-9999.ebuild
new file mode 100644
index 0000000..1d9e4e3
--- /dev/null
+++ b/dev-lua/lua-stdlib/lua-stdlib-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: This ebuild is from Lua overlay; Bumped by mva; $
+
+EAPI="5"
+
+inherit base git-r3 toolchain-funcs eutils
+
+DESCRIPTION="Standard Lua libraries"
+HOMEPAGE="https://github.com/lua-stdlib/lua-stdlib"
+SRC_URI=""
+
+EGIT_REPO_URI="https://github.com/lua-stdlib/lua-stdlib"
+
+LICENSE="GPL"
+SLOT="0"
+KEYWORDS=""
+IUSE="luajit"
+
+RDEPEND="
+	!luajit? ( >=dev-lang/lua-5.1 )
+	luajit? ( dev-lang/luajit:2 )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( "README.md" "NEWS" )
+
+src_prepare() {
+	if [[ -n ${EVCS_OFFLINE} ]]; then
+		die "Unfortunately, upstream uses buildsystem which depends on external submodules, so you won't be able to build package in offline mode. Sorry."
+	fi
+
+	local lua=lua
+	use luajit && lua=luajit
+	export LUA="${lua}"
+
+	./bootstrap --skip-rock-checks
+}
+
+src_configure() {
+	myeconfargs=(
+		"--datadir=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${LUA})" \
+		"--libdir=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${LUA})" \
+		"LUA_INCLUDE=-I$($(tc-getPKG_CONFIG) --variable includedir ${LUA})"
+	)
+	base_src_configure "${myeconfargs[@]}"
+}
+
+src_compile() {
+	cd "${S}"
+	./config.status --file=lib/std.lua
+}
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${LUA})"
+	doins -r lib/std lib/std.lua
+}
diff --git a/dev-lua/lua-stdlib/metadata.xml b/dev-lua/lua-stdlib/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/lua-stdlib/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>mva@mva.name</email>
+ <description>
+	If you have any issues, please contact me, or try to find me in IRC on Freenode, OFTC or RusNet.
+ </description> 
+ <name>Vadim A. Misbakh-Soloviov</name>
+</maintainer>
+<longdescription>FIXME</longdescription> 
+<use>
+</use>
+</pkgmetadata>
diff --git a/dev-lua/lua-zlib/lua-zlib-9999.ebuild b/dev-lua/lua-zlib/lua-zlib-9999.ebuild
index 20b74e9..cb54b50 100644
--- a/dev-lua/lua-zlib/lua-zlib-9999.ebuild
+++ b/dev-lua/lua-zlib/lua-zlib-9999.ebuild
@@ -15,10 +15,15 @@ SLOT="0"
 KEYWORDS=""
 IUSE="luajit"
 
-RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
-		sys-libs/zlib"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
+RDEPEND="
+	!luajit? ( >=dev-lang/lua-5.1 )
+	luajit? ( dev-lang/luajit:2 )
+	sys-libs/zlib
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/pkgconfig
+"
 
 src_prepare() {
 	mv *-${PN}-* "${S}"
@@ -26,11 +31,10 @@ src_prepare() {
 
 src_configure() {
 	local lua=lua;
-	local myconf;
+	local mycmakeargs;
 	use luajit && lua="luajit";
 	mycmakeargs=(
 		-DINSTALL_CMOD=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua})
-		$(cmake-utils_use_use luajit)
 	)
 	cmake-utils_src_configure
 }
diff --git a/dev-lua/luacrypto/luacrypto-9999.ebuild b/dev-lua/luacrypto/luacrypto-9999.ebuild
index e325824..6da8164 100644
--- a/dev-lua/luacrypto/luacrypto-9999.ebuild
+++ b/dev-lua/luacrypto/luacrypto-9999.ebuild
@@ -21,7 +21,8 @@ IUSE="doc luajit"
 IUSE+="${LANGS// / linguas_}"
 
 RDEPEND="
-	|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1 )
 	>=dev-libs/openssl-0.9.7
 "
 DEPEND="
diff --git a/dev-lua/luamacro/Manifest b/dev-lua/luamacro/Manifest
new file mode 100644
index 0000000..6132373
--- /dev/null
+++ b/dev-lua/luamacro/Manifest
@@ -0,0 +1 @@
+DIST resty-string-0.08.tar.gz 9284 SHA256 45bc178f3541f2c77c262a2fa0e7856191d3e725bffcb2df03504adc99a15f15 SHA512 a4cbb4a4990190a0eb5b51a397656e0ad0ae491e76f09ff8b0d3feb27160589c80e0d40983b0ce3d5e3f526f8080cf3706522684b316a1d4bd0b3f1d39ff8551 WHIRLPOOL 4c80fb7f5343e51e70d74dc12ce99e1f62c75e1b88445cf3c099315c3e3045f4e31271936bc283aebc8ec3c010649a9da868dc27600bbed163be39cd514ba5c3
diff --git a/dev-lua/luamacro/luamacro-9999.ebuild b/dev-lua/luamacro/luamacro-9999.ebuild
new file mode 100644
index 0000000..ed13f71
--- /dev/null
+++ b/dev-lua/luamacro/luamacro-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: This ebuild is from Lua overlay; Bumped by mva; $
+
+EAPI="5"
+
+inherit eutils toolchain-funcs git-r3
+
+DESCRIPTION="library and driver script for preprocessing and evaluating Lua code"
+HOMEPAGE="https://github.com/stevedonovan/LuaMacro/"
+SRC_URI=""
+
+EGIT_REPO_URI="https://github.com/stevedonovan/LuaMacro/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="luajit"
+
+RDEPEND="
+	luajit? ( dev-landg/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/pkgconfig
+"
+
+src_prepare() {
+	local lua=lua
+	use luajit && lua=luajit
+
+	sed -r \
+		-e "1s#(/usr/bin/env) lua#\1 ${lua}#" \
+		-i luam
+}
+
+
+src_install() {
+	local lua=lua
+	use luajit && lua=luajit
+
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})"
+	doins -r macro macro.lua
+
+	dobin luam
+}
diff --git a/dev-lua/luamacro/metadata.xml b/dev-lua/luamacro/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/luamacro/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>mva@mva.name</email>
+ <description>
+	If you have any issues, please contact me, or try to find me in IRC on Freenode, OFTC or RusNet.
+ </description> 
+ <name>Vadim A. Misbakh-Soloviov</name>
+</maintainer>
+<longdescription>FIXME</longdescription> 
+<use>
+</use>
+</pkgmetadata>
diff --git a/dev-lua/luaposix/luaposix-9999.ebuild b/dev-lua/luaposix/luaposix-9999.ebuild
index 51f4617..93ccdfb 100644
--- a/dev-lua/luaposix/luaposix-9999.ebuild
+++ b/dev-lua/luaposix/luaposix-9999.ebuild
@@ -18,9 +18,21 @@ KEYWORDS=""
 IUSE="luajit ncurses"
 
 RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1 )
+	!luajit? (
+		|| (
+			(
+				=dev-lang/lua-5.1*
+				dev-lua/LuaBitOp
+			)
+			>=dev-lang/lua-5.2
+		)
+	)
 	luajit? ( dev-lang/luajit:2 )
 "
+#	dev-lua/ldoc
+#	dev-lua/specl
+#	dev-lua/lyaml
+
 DEPEND="${RDEPEND}"
 
 DOCS=( "README.md" "NEWS" )
@@ -30,18 +42,43 @@ src_prepare() {
 		die "Unfortunately, upstream uses buildsystem which depends on external submodules, so you won't be able to build package in offline mode. Sorry."
 	fi
 
-	./bootstrap
+	sed -r \
+		-e "s#(AC_PATH_PROG\(\[LDOC\],).*#\1 [echo], [false]\)#" \
+		-e "s#(AM_CONDITIONAL\(\[HAVE_LDOC\],).*#\1 [false]\)#" \
+		-i configure.ac
+
+# kludgy, but idk, how to drop that f**n broken documentation build
+#		-e 's#^(allhtml =).*#\1#' \
+	sed -r \
+		-e 's#doc/.*html##' \
+		-e 's#doc/.*css##' \
+		-e 's#(mkdir)#\1 -p#' \
+		-e 's#^(doc:).*##' \
+		-e 's#\$\(dist_.*_DATA\)##g' \
+		-i local.mk
+
+	./bootstrap --skip-rock-checks
 }
 
 src_configure() {
 	local lua=lua;
 	use luajit && lua=luajit;
+
 	myeconfargs=(
 		"--datadir=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" \
 		"--libdir=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua})" \
-		"$(use_with ncurses)"
-		"LUA=${lua}" \
-		"LUA_INCLUDE=-I$($(tc-getPKG_CONFIG) --variable includedir ${lua})"
+		"$(use_with ncurses)"\
+		LUA="${lua}" \
+		LUA_INCLUDE="-I$($(tc-getPKG_CONFIG) --variable includedir ${lua})"
 	)
 	base_src_configure "${myeconfargs[@]}"
-}
\ No newline at end of file
+}
+
+#src_compile() {
+#	emake all-am
+#}
+#
+#src_install() {
+#	emake install-am
+##	insinto $($(tc-getPKG_CONFIG) --variable includedir ${LUA})"
+#}
diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
deleted file mode 100644
index 63e4e94..0000000
--- a/dev-lua/luarocks/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST luarocks-2.0.4.1.tar.gz 75904 SHA256 f8da04e43952b8a3047465e45df95fd4d76539fcb546a0c5b2ecf89b00c82d71 SHA512 2dd233ce5d9342cf640e8aebc597747f4e85a43d55affb7a6d9b3cc9ab8940ff13b2c3aa502152f39e832ace57179794db13c2786578a73ac6edd08ec3581fe9 WHIRLPOOL c860144973cae0c92d810655a951984b7c897a6d5843aa31af5576f27e6bfbfc8d6cfc383b937f91d9b7559a90c23f6de60d40f29d53a8c926e7ba6ea0a3a2a2
diff --git a/dev-lua/luarocks/luarocks-2.0.4.1.ebuild b/dev-lua/luarocks/luarocks-2.0.4.1.ebuild
deleted file mode 100644
index 84a3b12..0000000
--- a/dev-lua/luarocks/luarocks-2.0.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: This ebuild is from Lua overlay; Bumped by mva; $
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A deployment and management system for Lua modules"
-HOMEPAGE="http://www.luarocks.org"
-SRC_URI="http://luarocks.org/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="curl openssl"
-
-DEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
-		curl? ( net-misc/curl )
-		openssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}
-		app-arch/unzip"
-
-src_configure() {
-	USE_MD5="md5sum"
-	USE_FETCH="wget"
-	use openssl && USE_MD5="openssl"
-	use curl && USE_FETCH="curl"
-
-	# econf doesn't work b/c it passes variables the custom configure can't
-	# handle
-	./configure \
-			--prefix=/usr \
-			--with-lua=/usr \
-			--with-lua-lib=/usr/$(get_libdir) \
-			--rocks-tree=/usr/lib/lua/luarocks \
-			--with-downloader=$USE_FETCH \
-			--with-md5-checker=$USE_MD5 \
-			--force-config || die "configure failed"
-}
-
-pkg_preinst() {
-	find "${D}" -type f | xargs sed -i -e "s:${D}::g" || die "sed failed"
-}
diff --git a/dev-lua/luarocks/luarocks-9999.ebuild b/dev-lua/luarocks/luarocks-9999.ebuild
index bd82a75..d159160 100644
--- a/dev-lua/luarocks/luarocks-9999.ebuild
+++ b/dev-lua/luarocks/luarocks-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils git-r3
+inherit eutils toolchain-funcs git-r3
 
 DESCRIPTION="A deployment and management system for Lua modules"
 HOMEPAGE="http://www.luarocks.org"
@@ -13,19 +13,25 @@ EGIT_REPO_URI="git://github.com/keplerproject/luarocks.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="curl openssl"
+IUSE="curl openssl luajit"
 
-DEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
+DEPEND="
+		!luajit? ( >=dev-lang/lua-5.1 )
+		luajit? ( dev-lang/luajit:2 )
 		curl? ( net-misc/curl )
-		openssl? ( dev-libs/openssl )"
+		openssl? ( dev-libs/openssl )
+"
 RDEPEND="${DEPEND}
-		app-arch/unzip"
+		app-arch/unzip
+		dev-util/pkg-config
+"
 
 src_configure() {
-	USE_MD5="md5sum"
-	USE_FETCH="wget"
-	use openssl && USE_MD5="openssl"
-	use curl && USE_FETCH="curl"
+	local lua=lua md5="md5sum" downloader="wget"
+
+	use curl && downloader="curl"
+	use openssl && md5="openssl"
+	use luajit && lua="luajit"
 
 	# econf doesn't work b/c it passes variables the custom configure can't
 	# handle
@@ -34,8 +40,10 @@ src_configure() {
 			--with-lua=/usr \
 			--with-lua-lib=/usr/$(get_libdir) \
 			--rocks-tree=/usr \
-			--with-downloader=$USE_FETCH \
-			--with-md5-checker=$USE_MD5 \
+			--with-downloader="${downloader}" \
+			--with-md5-checker="${md5}" \
+			$(use luajit && echo "--lua-suffix=jit") \
+			--with-lua-include="$($(tc-getPKG_CONFIG) --variable includedir ${lua})" \
 			--force-config || die "configure failed"
 }
 
diff --git a/dev-lua/luaxml/luaxml-9999.ebuild b/dev-lua/luaxml/luaxml-9999.ebuild
index 44eccbd..ae52b33 100644
--- a/dev-lua/luaxml/luaxml-9999.ebuild
+++ b/dev-lua/luaxml/luaxml-9999.ebuild
@@ -8,23 +8,26 @@ inherit cmake-utils git-r3
 
 DESCRIPTION="A minimal set of XML processing function in Lua, with simple mapping between XML and Lua tables"
 HOMEPAGE="http://github.com/LuaDist/luaxml"
-EGIT_REPO_URI="git://github.com/msva/luaxml.git"
+EGIT_REPO_URI="https://github.com/msva/luaxml"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="luajit"
 
-RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )"
+RDEPEND="
+	!luajit? ( >=dev-lang/lua-5.1 )
+	luajit? ( dev-lang/luajit:2 )
+"
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
 
 src_configure() {
-	local LUA="lua"
-	use luajit && LUA="luajit"
+	local lua="lua"
+	use luajit && lua="luajit"
 	mycmakeargs=(
-		-DINSTALL_CMOD=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${LUA}) \
-		-DINSTALL_LMOD=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${LUA})
+		-DINSTALL_CMOD=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua}) \
+		-DINSTALL_LMOD=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})
 	)
 	cmake-utils_src_configure
-}
\ No newline at end of file
+}
diff --git a/dev-lua/lulpeg/lulpeg-9999.ebuild b/dev-lua/lulpeg/lulpeg-9999.ebuild
new file mode 100644
index 0000000..b568c3f
--- /dev/null
+++ b/dev-lua/lulpeg/lulpeg-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: This ebuild is from Lua overlay; Bumped by mva; $
+
+EAPI="5"
+
+inherit toolchain-funcs git-r3
+
+DESCRIPTION="A pure Lua port of LPeg, Roberto Ierusalimschy's Parsing Expression Grammars library"
+HOMEPAGE="https://github.com/pygy/LuLPeg"
+SRC_URI=""
+
+EGIT_REPO_URI="https://github.com/pygy/LuLPeg"
+
+LICENSE="WTFPL"
+SLOT="0"
+KEYWORDS=""
+IUSE="luajit +lpeg_replace"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1 )
+	lpeg_replace? ( !dev-lua/lpeg )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch_user
+}
+
+src_install() {
+	local pkg_n=lulpeg
+	local lua=lua
+	use luajit && lua=luajit
+
+	use lpeg_replace && pkg_n=lpeg
+
+	mv src "${pkg_n}"
+
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})"
+	doins -r "${pkg_n}"
+
+	dodoc README.md TODO.md ABOUT || die "dodoc failed"
+}
diff --git a/dev-lua/lulpeg/metadata.xml b/dev-lua/lulpeg/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/lulpeg/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>mva@mva.name</email>
+ <description>
+	If you have any issues, please contact me, or try to find me in IRC on Freenode, OFTC or RusNet.
+ </description> 
+ <name>Vadim A. Misbakh-Soloviov</name>
+</maintainer>
+<longdescription>FIXME</longdescription> 
+<use>
+</use>
+</pkgmetadata>
diff --git a/dev-lua/lyaml/lyaml-9999.ebuild b/dev-lua/lyaml/lyaml-9999.ebuild
new file mode 100644
index 0000000..2a23f4e
--- /dev/null
+++ b/dev-lua/lyaml/lyaml-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: This ebuild is from Lua overlay; Bumped by mva; $
+
+EAPI="5"
+
+inherit base toolchain-funcs eutils git-r3
+
+DESCRIPTION="LibYAML binding for Lua."
+HOMEPAGE="https://github.com/gvvaughan/lyaml"
+SRC_URI=""
+
+EGIT_REPO_URI="https://github.com/gvvaughan/lyaml"
+
+LICENSE="GPL"
+SLOT="0"
+KEYWORDS=""
+IUSE="luajit"
+
+RDEPEND="
+	!luajit? (
+		=dev-lang/lua-5.1*
+	)
+	luajit? ( dev-lang/luajit:2 )
+	dev-libs/libyaml
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( "README.md" "NEWS" )
+
+src_prepare() {
+	if [[ -n ${EVCS_OFFLINE} ]]; then
+		die "Unfortunately, upstream uses buildsystem which depends on external submodules, so you won't be able to build package in offline mode. Sorry."
+	fi
+
+	local lua=lua
+	use luajit && lua=luajit
+	export LUA="${lua}"
+
+	./bootstrap
+}
+
+src_configure() {
+	myeconfargs=(
+		"--datadir=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${LUA})" \
+		"--libdir=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${LUA})" \
+		"LUA_INCLUDE=-I$($(tc-getPKG_CONFIG) --variable includedir ${LUA})"
+	)
+	base_src_configure "${myeconfargs[@]}"
+}
diff --git a/dev-lua/lyaml/metadata.xml b/dev-lua/lyaml/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/lyaml/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>mva@mva.name</email>
+ <description>
+	If you have any issues, please contact me, or try to find me in IRC on Freenode, OFTC or RusNet.
+ </description> 
+ <name>Vadim A. Misbakh-Soloviov</name>
+</maintainer>
+<longdescription>FIXME</longdescription> 
+<use>
+</use>
+</pkgmetadata>
diff --git a/dev-lua/moonscript/moonscript-9999.ebuild b/dev-lua/moonscript/moonscript-9999.ebuild
index 57e2e70..5fce492 100644
--- a/dev-lua/moonscript/moonscript-9999.ebuild
+++ b/dev-lua/moonscript/moonscript-9999.ebuild
@@ -32,6 +32,19 @@ DEPEND="
 
 HTML_DOCS=( "docs/" "README.md" )
 
+src_prepare() {
+	local lua=lua;
+	use luajit && lua=luajit;
+
+	sed -r \
+			-e "s/lua5.1/${lua}/" \
+			-i Makefile
+
+	sed -r \
+			-e "1s#(/usr/bin/env) lua#\1 ${lua}#" \
+			-i bin/moon bin/moonc
+}
+
 src_compile() {
 	emake compile
 }
@@ -44,6 +57,7 @@ src_install() {
 	doins -r moon.lua moonscript.lua moon moonscript
 
 	dobin bin/moon bin/moonc
+	newbin bin/splat.moon splat
 
 	base_src_install_docs
-}
\ No newline at end of file
+}
diff --git a/dev-lua/rings/rings-9999.ebuild b/dev-lua/rings/rings-9999.ebuild
index ebde1d2..1108864 100644
--- a/dev-lua/rings/rings-9999.ebuild
+++ b/dev-lua/rings/rings-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit multilib eutils git-r3
+inherit multilib toolchain-funcs flag-o-matic eutils git-r3
 
 DESCRIPTION="Lua Rings Library"
 HOMEPAGE="https://github.com/keplerproject/rings"
@@ -18,18 +18,21 @@ SLOT="0"
 KEYWORDS=""
 IUSE="luajit"
 
-RDEPEND=" || ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
-	luajit? ( dev-lang/luajit:2 )"
+RDEPEND="
+	!luajit? ( >=dev-lang/lua-5.1 )
+	luajit? ( dev-lang/luajit:2 )
+"
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	LUA="lua";
-	use luajit && LUA="luajit"
-	cd "${S}"
-	./configure "${LUA}"
+	local lua="lua";
+	use luajit && lua="luajit"
+	./configure "${lua}"
 }
 
 src_compile() {
-	use luajit && INC="-I/usr/include/luajit-2.0/"
-	emake DESTDIR="${D}" CC="$(tc-getCC) -fPIC -DPIC" LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS} ${INC}" || die "Can't copmile Rings library"
+	local lua="lua";
+	use luajit && lua="luajit"
+	append-cflags "-I$($(tc-getPKG_CONFIG) --variable includedir ${lua})"
+	emake CC="$(tc-getCC) -fPIC -DPIC" LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" || die "Can't copmile Rings library"
 }
diff --git a/dev-lua/specl/metadata.xml b/dev-lua/specl/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/specl/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>mva@mva.name</email>
+ <description>
+	If you have any issues, please contact me, or try to find me in IRC on Freenode, OFTC or RusNet.
+ </description> 
+ <name>Vadim A. Misbakh-Soloviov</name>
+</maintainer>
+<longdescription>FIXME</longdescription> 
+<use>
+</use>
+</pkgmetadata>
diff --git a/dev-lua/specl/specl-9999.ebuild b/dev-lua/specl/specl-9999.ebuild
new file mode 100644
index 0000000..00a2812
--- /dev/null
+++ b/dev-lua/specl/specl-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: This ebuild is from Lua overlay; Bumped by mva; $
+
+EAPI="5"
+
+inherit base git-r3 toolchain-funcs eutils
+
+DESCRIPTION="a testing tool for Lua, providing a Behaviour Driven Development framework in the vein of RSpec"
+HOMEPAGE="https://github.com/gvvaughan/specl"
+SRC_URI=""
+
+EGIT_REPO_URI="https://github.com/gvvaughan/specl"
+
+LICENSE="GPL"
+SLOT="0"
+KEYWORDS=""
+IUSE="luajit"
+
+RDEPEND="
+	!luajit? (
+		=dev-lang/lua-5.1*
+	)
+	luajit? ( dev-lang/luajit:2 )
+	dev-lua/luamacro
+	dev-lua/lyaml
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( "README.md" "NEWS" )
+
+src_prepare() {
+	if [[ -n ${EVCS_OFFLINE} ]]; then
+		die "Unfortunately, upstream uses buildsystem which depends on external submodules, so you won't be able to build package in offline mode. Sorry."
+	fi
+
+	local lua=lua;
+	use luajit && lua=luajit;
+	export LUA="${lua}"
+
+	./bootstrap --skip-rock-checks
+}
+
+src_configure() {
+	myeconfargs=(
+		"--datadir=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${LUA})" \
+		"--libdir=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${LUA})" \
+		"LUA_INCLUDE=-I$($(tc-getPKG_CONFIG) --variable includedir ${LUA})"
+	)
+	base_src_configure "${myeconfargs[@]}"
+}
+
+src_compile() {
+	cd "${S}";
+	./config.status --file=lib/specl/version.lua
+}
+
+src_install() {
+	rm lib/specl/version.lua.in
+	insinto $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${LUA})
+	doins -r lib/specl
+}