[gentoo-commits] proj/lua:master commit in: dev-lua/luamacro/, dev-lua/lua-html/, eclass/, dev-lua/resty-core/, ...

[Vadim A. Misbakh-Soloviov]

commit:     c731b26174f23830ac6be9684b545602cc57b8ea
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Mon Jul 25 19:57:46 2016 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon Jul 25 19:57:46 2016 +0000
URL:        https://gitweb.gentoo.org/proj/lua.git/commit/?id=c731b261

dev-lua/*: move to EAPI=6 + renewed lua.eclass

 dev-lang/luajit/luajit-2.0.9999.ebuild             |   1 -
 dev-lang/luajit/luajit-2.1.9999.ebuild             |   1 -
 dev-libs/msgpack/msgpack-9999.ebuild               |   1 -
 ...BitOp-1.0.2.ebuild => LuaBitOp-1.0.2-r1.ebuild} |   6 +-
 dev-lua/alt-getopt/alt-getopt-0.7.0.ebuild         |   5 +-
 dev-lua/ansicolors/ansicolors-9999.ebuild          |  12 +-
 dev-lua/basexx/basexx-9999.ebuild                  |  33 +++
 dev-lua/basexx/metadata.xml                        |  14 +
 dev-lua/bit32/bit32-9999.ebuild                    |  11 +-
 dev-lua/captcha/captcha-9999.ebuild                |  18 +-
 dev-lua/cmsgpack/cmsgpack-9999.ebuild              |  11 +-
 dev-lua/cosmo/cosmo-9999.ebuild                    |  11 +-
 dev-lua/coxpcall/coxpcall-9999.ebuild              |  14 +-
 dev-lua/etree/etree-9999.ebuild                    |  18 +-
 dev-lua/iluajit/iluajit-9999.ebuild                |  12 +-
 dev-lua/lahttp/lahttp-9999.ebuild                  |   5 +-
 dev-lua/lapis/lapis-9999.ebuild                    |   8 +-
 dev-lua/ldoc/ldoc-9999.ebuild                      |  20 +-
 dev-lua/lgi/lgi-9999.ebuild                        |  10 +-
 dev-lua/linotify/linotify-9999.ebuild              |  12 +-
 dev-lua/ljsyscall/ljsyscall-9999.ebuild            |  12 +-
 dev-lua/lpc/lpc-9999.ebuild                        |   8 +-
 .../{lpeg-1.0.0.ebuild => lpeg-1.0.0-r1.ebuild}    |  11 +-
 dev-lua/lsysstats/lsysstats-9999.ebuild            |   4 +-
 dev-lua/ltn12ce/ltn12ce-9999.ebuild                |  48 ++++
 dev-lua/ltn12ce/metadata.xml                       |  14 +
 dev-lua/lua-cjson/lua-cjson-9999.ebuild            |  28 +-
 dev-lua/lua-csv/lua-csv-9999.ebuild                |  10 +-
 dev-lua/lua-curl/lua-curl-9999.ebuild              |  16 +-
 dev-lua/lua-ext/lua-ext-9999.ebuild                |  23 +-
 dev-lua/lua-ext/metadata.xml                       |  14 +
 dev-lua/lua-fann/Manifest                          |   2 +-
 dev-lua/lua-fann/lua-fann-0.5.3.ebuild             |  16 +-
 dev-lua/lua-fann/lua-fann-9999.ebuild              |  19 +-
 dev-lua/lua-fastcgi/lua-fastcgi-9999.ebuild        |  27 +-
 dev-lua/lua-feeds/lua-feeds-9999.ebuild            |   6 +-
 .../lua-ffi-bindings/lua-ffi-bindings-9999.ebuild  |  29 ++
 dev-lua/lua-ffi-bindings/metadata.xml              |  14 +
 dev-lua/lua-gd/Manifest                            |   1 -
 dev-lua/lua-gd/lua-gd-9999.ebuild                  |  26 +-
 dev-lua/lua-geoip/lua-geoip-9999.ebuild            |  14 +-
 dev-lua/lua-getopt/lua-getopt-9999.ebuild          |   7 +-
 dev-lua/lua-html/lua-html-9999.ebuild              |  11 +-
 dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild  |   9 +-
 dev-lua/lua-iconv/lua-iconv-9999.ebuild            |   9 +-
 dev-lua/lua-idn/lua-idn-9999.ebuild                |   9 +-
 dev-lua/lua-sendmail/lua-sendmail-9999.ebuild      |  13 +-
 dev-lua/lua-set/lua-set-9999.ebuild                |   9 +-
 dev-lua/lua-stdlib/lua-stdlib-9999.ebuild          |  29 +-
 dev-lua/lua-zip/lua-zip-9999.ebuild                |  10 +-
 dev-lua/lua-zlib/lua-zlib-9999.ebuild              |  46 ++--
 dev-lua/lua2html/lua2html-9999.ebuild              |   2 +-
 dev-lua/luacrypto/luacrypto-9999.ebuild            |  27 +-
 dev-lua/luadbi/luadbi-9999.ebuild                  |   6 +-
 dev-lua/luadoc/luadoc-3.0.1.ebuild                 |   7 +-
 dev-lua/luadoc/luadoc-9999.ebuild                  |  12 +-
 dev-lua/luaevent/luaevent-9999.ebuild              |  11 +-
 dev-lua/luaexpat/luaexpat-9999.ebuild              |   7 +-
 dev-lua/luafilesystem/luafilesystem-9999.ebuild    |  13 +-
 dev-lua/luahpdf/luahpdf-9999.ebuild                |  25 +-
 dev-lua/lualdap/lualdap-9999.ebuild                |  20 +-
 dev-lua/luamacro/luamacro-9999.ebuild              |   9 +-
 dev-lua/luamongo/luamongo-9999.ebuild              |  26 +-
 dev-lua/luaossl/luaossl-99999999.ebuild            |  43 +++
 dev-lua/luaossl/metadata.xml                       |  14 +
 dev-lua/luaotp/luaotp-9999.ebuild                  |  36 +++
 dev-lua/luaotp/metadata.xml                        |  14 +
 dev-lua/luaposix/luaposix-9999.ebuild              |  83 ++----
 dev-lua/luarocks/luarocks-9999.ebuild              |  17 +-
 dev-lua/luasec/luasec-9999.ebuild                  |  16 +-
 dev-lua/luasocket/luasocket-9999.ebuild            |  29 +-
 dev-lua/luaunbound/luaunbound-9999.ebuild          |   4 +-
 dev-lua/luaxml/luaxml-9999.ebuild                  |   3 -
 dev-lua/luazip/luazip-9999.ebuild                  |  16 +-
 dev-lua/lullaby/lullaby-9999.ebuild                |  13 +-
 dev-lua/lulpeg/lulpeg-9999.ebuild                  |  22 +-
 dev-lua/lunit/lunit-9999.ebuild                    |  15 +-
 dev-lua/lyaml/lyaml-9999.ebuild                    |  94 +++----
 dev-lua/messagepack/messagepack-9999.ebuild        |   8 +-
 dev-lua/moonscript/moonscript-9999.ebuild          |  11 +-
 dev-lua/moses/metadata.xml                         |  14 +
 .../moses-9999.ebuild}                             |  18 +-
 dev-lua/orbit/orbit-9999.ebuild                    |  20 +-
 dev-lua/penlight/penlight-9999.ebuild              |  20 +-
 dev-lua/profi/Manifest                             |   2 +-
 .../profi/{profi-12.ebuild => profi-1.3.ebuild}    |  11 +-
 dev-lua/raven/raven-9999.ebuild                    |  24 +-
 dev-lua/rds-parser/rds-parser-9999.ebuild          |  10 +-
 dev-lua/redis-parser/redis-parser-9999.ebuild      |  10 +-
 dev-lua/resty-cookie/resty-cookie-9999.ebuild      |  12 +-
 dev-lua/resty-core/resty-core-9999.ebuild          |  12 +-
 dev-lua/resty-dns/resty-dns-9999.ebuild            |  12 +-
 dev-lua/resty-hoedown/metadata.xml                 |  14 +
 .../resty-hoedown-9999.ebuild}                     |  16 +-
 dev-lua/resty-lock/resty-lock-9999.ebuild          |  12 +-
 dev-lua/resty-lrucache/resty-lrucache-9999.ebuild  |  12 +-
 .../resty-memcached/resty-memcached-9999.ebuild    |  12 +-
 dev-lua/resty-mysql/resty-mysql-9999.ebuild        |  12 +-
 dev-lua/resty-random/resty-random-9999.ebuild      |  14 +-
 dev-lua/resty-redis/resty-redis-9999.ebuild        |  12 +-
 dev-lua/resty-session/resty-session-9999.ebuild    |  12 +-
 dev-lua/resty-string/resty-string-9999.ebuild      |  20 +-
 dev-lua/resty-tags/metadata.xml                    |  14 +
 .../resty-tags-9999.ebuild}                        |  16 +-
 dev-lua/resty-template/resty-template-9999.ebuild  |  12 +-
 dev-lua/resty-upload/resty-upload-9999.ebuild      |  12 +-
 .../resty-upstream-healthcheck-9999.ebuild         |  12 +-
 .../resty-websocket/resty-websocket-9999.ebuild    |  11 +-
 dev-lua/rings/rings-9999.ebuild                    |  10 +-
 dev-lua/specl/specl-9999.ebuild                    |  46 ++--
 dev-lua/squish/squish-9999.ebuild                  |  13 +-
 dev-lua/verse/verse-9999.ebuild                    |   6 +-
 dev-lua/wsapi/wsapi-9999.ebuild                    |  17 +-
 dev-lua/yubikey-lua/yubikey-lua-9999.ebuild        |   2 +-
 eclass/lua.eclass                                  |  12 +-
 profiles/use.local.desc                            | 292 ++++++++++++++++-----
 116 files changed, 1219 insertions(+), 877 deletions(-)

diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index 9640a6c..f4aeeb2 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -7,7 +7,6 @@ inherit base eutils multilib multilib-minimal portability pax-utils toolchain-fu
 
 DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
 HOMEPAGE="http://luajit.org/"
-SRC_URI=""
 EGIT_REPO_URI="http://luajit.org/git/luajit-2.0.git"
 SLOT="2"
 

diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index f609d59..3decbae 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -7,7 +7,6 @@ inherit eutils multilib multilib-minimal portability pax-utils toolchain-funcs v
 
 DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
 HOMEPAGE="http://luajit.org/"
-SRC_URI=""
 EGIT_REPO_URI="http://luajit.org/git/luajit-2.0.git"
 SLOT="2"
 EGIT_BRANCH="v2.1"

diff --git a/dev-libs/msgpack/msgpack-9999.ebuild b/dev-libs/msgpack/msgpack-9999.ebuild
index 81a3b13..5ea6e85 100644
--- a/dev-libs/msgpack/msgpack-9999.ebuild
+++ b/dev-libs/msgpack/msgpack-9999.ebuild
@@ -6,7 +6,6 @@ inherit cmake-multilib git-r3
 
 DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
 HOMEPAGE="http://msgpack.org/ https://github.com/msgpack/msgpack-c/"
-SRC_URI=""
 EGIT_REPO_URI="https://github.com/${PN}/${PN}-c"
 
 LICENSE="Apache-2.0"

diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild
similarity index 92%
rename from dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild
rename to dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild
index 6ebca41..e2b8a1d 100644
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 IS_MULTILIB=true
 LUA_COMPAT="lua51 lua52 lua53"
@@ -17,8 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-READMES=( README )
-HTML_DOCS=( doc/. )
+DOCS=(README)
+HTML_DOCS=(doc/.)
 
 each_lua_configure() {
 	# Lua5.3 compilation hack

diff --git a/dev-lua/alt-getopt/alt-getopt-0.7.0.ebuild b/dev-lua/alt-getopt/alt-getopt-0.7.0.ebuild
index 0a9a9e7..fdfb324 100644
--- a/dev-lua/alt-getopt/alt-getopt-0.7.0.ebuild
+++ b/dev-lua/alt-getopt/alt-getopt-0.7.0.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
+EAPI=6
 inherit lua
 
 DESCRIPTION="Lua bindings to getopt_long"
@@ -15,7 +14,7 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-READMES=( README )
+DOCS=(README)
 
 S="${WORKDIR}/all/${MY_P}"
 LUA_S="${MY_P}"

diff --git a/dev-lua/ansicolors/ansicolors-9999.ebuild b/dev-lua/ansicolors/ansicolors-9999.ebuild
index 27b2f39..7aac38d 100644
--- a/dev-lua/ansicolors/ansicolors-9999.ebuild
+++ b/dev-lua/ansicolors/ansicolors-9999.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A=kikito
+GITHUB_PN="${PN}.lua"
 
-VCS=git-r3
 inherit lua
 
 DESCRIPTION="A simple Lua function for printing to the console in color."
 HOMEPAGE="https://github.com/kikito/ansicolors.lua"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/kikito/ansicolors.lua"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-READMES=( "README.textile" )
+DOCS=(README.textile)
 
 each_lua_install() {
 	dolua ansicolors.lua

diff --git a/dev-lua/basexx/basexx-9999.ebuild b/dev-lua/basexx/basexx-9999.ebuild
new file mode 100644
index 0000000..8d803a2
--- /dev/null
+++ b/dev-lua/basexx/basexx-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VCS="git"
+GITHUB_A="aiq"
+inherit lua
+
+DESCRIPTION="A simple implementation of OATH-HOTP and OATH-TOTP written for Lua"
+HOMEPAGE="https://github.com/aiq/basexx"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc test"
+
+DEPEND="
+	test? ( dev-lua/busted )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(README.adoc)
+
+each_lua_test() {
+	for t in test/*; do
+		busted "${t}"
+	done
+}
+
+each_lua_install() {
+	dolua lib/basexx.lua
+}

diff --git a/dev-lua/basexx/metadata.xml b/dev-lua/basexx/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/basexx/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@×××.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/bit32/bit32-9999.ebuild b/dev-lua/bit32/bit32-9999.ebuild
index b4c505a..2feb9ea 100644
--- a/dev-lua/bit32/bit32-9999.ebuild
+++ b/dev-lua/bit32/bit32-9999.ebuild
@@ -1,27 +1,28 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 # building fine, but not needed for Lua5.2 and Lua5.3
 LUA_COMPAT="lua51 luajit2"
-
 IS_MULTILIB=true
-VCS="git-r3"
+VCS="git"
+GITHUB_A="keplerproject"
+GITHUB_PN="lua-compat-5.2"
 
 inherit lua
 
 DESCRIPTION="A Lua5.2+ bit manipulation library"
 HOMEPAGE="https://github.com/keplerproject/lua-compat-5.2"
 
-EGIT_REPO_URI="https://github.com/keplerproject/lua-compat-5.2"
 KEYWORDS=""
-READMES=( README.md )
 
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
+DOCS=(README.md)
+
 each_lua_compile() {
 	_lua_setFLAGS
 	local MY_PN="lbitlib"

diff --git a/dev-lua/captcha/captcha-9999.ebuild b/dev-lua/captcha/captcha-9999.ebuild
index 967913e..f30fac6 100644
--- a/dev-lua/captcha/captcha-9999.ebuild
+++ b/dev-lua/captcha/captcha-9999.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="mrDoctorWho"
+GITHUB_PN="lua-${PN}"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="A small lua module to generate CAPTCHA images using lua-gd"
 HOMEPAGE="https://github.com/mrDoctorWho/lua-captcha"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/mrDoctorWho/lua-${PN}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="jpeg png +examples"
+IUSE="jpeg png examples"
 
-READMES=( README.md )
-EXAMPLES=( examples/ )
+DOCS=(README.md)
+EXAMPLES=(examples/.)
 
 RDEPEND="
 	dev-lua/lua-gd
@@ -27,6 +27,8 @@ RDEPEND="
 
 REQUIRED_USE="|| ( jpeg png )"
 
+src_compile() { :; }
+
 each_lua_install() {
 	dolua src/*
 }

diff --git a/dev-lua/cmsgpack/cmsgpack-9999.ebuild b/dev-lua/cmsgpack/cmsgpack-9999.ebuild
index c614840..202e41b 100644
--- a/dev-lua/cmsgpack/cmsgpack-9999.ebuild
+++ b/dev-lua/cmsgpack/cmsgpack-9999.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 IS_MULTILIB=true
-VCS="git-r3"
+VCS="git"
+GITHUB_A="antirez"
+GITHUB_PN="lua-${PN}"
 
 inherit lua
 
 DESCRIPTION="A self contained Lua MessagePack C implementation"
 HOMEPAGE="https://github.com/antirez/lua-cmsgpack"
 
-EGIT_REPO_URI="https://github.com/antirez/lua-cmsgpack"
 KEYWORDS=""
-READMES=( README.md )
+DOCS=(README.md)
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="test"
+IUSE="doc test"
 
 each_lua_compile() {
 	_lua_setFLAGS

diff --git a/dev-lua/cosmo/cosmo-9999.ebuild b/dev-lua/cosmo/cosmo-9999.ebuild
index b010817..7e6ed92 100644
--- a/dev-lua/cosmo/cosmo-9999.ebuild
+++ b/dev-lua/cosmo/cosmo-9999.ebuild
@@ -1,16 +1,14 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="mascarenhas"
 inherit lua
 
 DESCRIPTION="safe-template engine for lua"
 HOMEPAGE="https://github.com/mascarenhas/cosmo"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/mascarenhas/cosmo.git"
 
 LICENSE="MIT"
 SLOT="0"
@@ -28,6 +26,9 @@ DOCS=( README doc/cosmo.md )
 HTML_DOCS=( doc/index.html doc/cosmo.png )
 EXAMPLES=( samples/sample.lua )
 
+src_configure() { :; }
+src_compile() { :; }
+
 each_lua_install() {
 	dolua src/*
 }

diff --git a/dev-lua/coxpcall/coxpcall-9999.ebuild b/dev-lua/coxpcall/coxpcall-9999.ebuild
index f4bfdc0..09efb07 100644
--- a/dev-lua/coxpcall/coxpcall-9999.ebuild
+++ b/dev-lua/coxpcall/coxpcall-9999.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="keplerproject"
 inherit lua
 
 DESCRIPTION="Lua coxpcall Library"
 HOMEPAGE="https://github.com/keplerproject/coxpcall"
-SRC_URI=""
-
-#s/msva/keplerproject/ when they apply pull-request
-EGIT_REPO_URI="https://github.com/msva/coxpcall.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="doc"
 
-HTML_DOCS=( doc/us/ )
+HTML_DOCS=( doc/. )
+
+src_configure() { :; }
+src_compile() { :; }
 
 each_lua_install() {
 	dolua src/*

diff --git a/dev-lua/etree/etree-9999.ebuild b/dev-lua/etree/etree-9999.ebuild
index 8f334ae..637f895 100644
--- a/dev-lua/etree/etree-9999.ebuild
+++ b/dev-lua/etree/etree-9999.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="msva"
 inherit lua
 
 DESCRIPTION="XML library that enables manipulation of XML documents as simple Lua data structures"
 HOMEPAGE="https://github.com/msva/etree"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/msva/${PN}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -23,15 +22,8 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README doc/manual.txt )
-HTML_DOCS=( doc/manual.html doc/style.css )
-
-all_lua_compile() {
-	touch .lua_eclass_config
-	use doc && (
-		emake doc
-	)
-}
+DOCS=(README doc/manual.txt)
+HTML_DOCS=(doc/manual.html doc/style.css)
 
 src_compile() { :; }
 

diff --git a/dev-lua/iluajit/iluajit-9999.ebuild b/dev-lua/iluajit/iluajit-9999.ebuild
index b8b9f16..6585aa6 100644
--- a/dev-lua/iluajit/iluajit-9999.ebuild
+++ b/dev-lua/iluajit/iluajit-9999.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=6
 
-LUA_COMPAT=luajit2
-VCS=git
-GITHUB_A=jdesgats
-GITHUB_PN=ILuaJIT
+LUA_COMPAT="luajit2"
+VCS="git"
+GITHUB_A="jdesgats"
+GITHUB_PN="ILuaJIT"
 
 inherit lua
 
@@ -25,8 +25,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-READMES=( README.md )
-HTML_DOCS=( html/. )
+DOCS=(README.md)
+HTML_DOCS=(html/.)
 
 all_lua_prepare() {
 	use doc && luadoc . -d html

diff --git a/dev-lua/lahttp/lahttp-9999.ebuild b/dev-lua/lahttp/lahttp-9999.ebuild
index fb720ac..c7453b7 100644
--- a/dev-lua/lahttp/lahttp-9999.ebuild
+++ b/dev-lua/lahttp/lahttp-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 VCS="mercurial"
 inherit lua
@@ -29,7 +29,8 @@ all_lua_prepare() {
 }
 
 each_lua_compile() {
-	squish --use-http
+	# TODO: Do something about using with network-sandbox
+	squish --use-http || die
 }
 
 each_lua_install() {

diff --git a/dev-lua/lapis/lapis-9999.ebuild b/dev-lua/lapis/lapis-9999.ebuild
index 22c29a7..7c8045f 100644
--- a/dev-lua/lapis/lapis-9999.ebuild
+++ b/dev-lua/lapis/lapis-9999.ebuild
@@ -1,16 +1,14 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="leafo"
 inherit lua
 
 DESCRIPTION="A web framework for Lua/MoonScript."
 HOMEPAGE="https://github.com/leafo/lapis"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/leafo/lapis"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/dev-lua/ldoc/ldoc-9999.ebuild b/dev-lua/ldoc/ldoc-9999.ebuild
index 940758c..8ca7c38 100644
--- a/dev-lua/ldoc/ldoc-9999.ebuild
+++ b/dev-lua/ldoc/ldoc-9999.ebuild
@@ -1,16 +1,14 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="stevedonovan"
 inherit lua
 
 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"
@@ -23,14 +21,20 @@ RDEPEND="
 
 DOCS=( doc/doc.md readme.md )
 
-HTML_DOCS=( doc_html/ ldoc_html/ )
+HTML_DOCS=( doc_html/. ldoc_html/. )
 
 all_lua_prepare() {
 	local lua="$(lua_get_implementation)"
 
-	cd doc; ${lua} ../ldoc.lua . -d ../doc_html; cd ..
-	cd ldoc; ${lua} ../ldoc.lua . -d ../ldoc_html; cd ..
+	mkdir -p doc_html/ ldoc_html/ # for USE=-doc case
 
+	use doc && (
+		for doc in {,l}doc; do
+			pushd "${doc}" &>/dev/null
+			"${lua}" ../ldoc.lua . -d ../${doc}_html || die "Failed to build in ${doc} dir"
+			popd
+		done
+	)
 	rm ldoc/{SciTE.properties,config.ld}
 }
 

diff --git a/dev-lua/lgi/lgi-9999.ebuild b/dev-lua/lgi/lgi-9999.ebuild
index 3b21c5f..41df354 100644
--- a/dev-lua/lgi/lgi-9999.ebuild
+++ b/dev-lua/lgi/lgi-9999.ebuild
@@ -1,23 +1,21 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="pavouk"
 #IS_MULTILIB=1
 # ^ gobject-introspection isn't multilib yet!
 inherit lua
 
 DESCRIPTION="Dynamic Lua binding to GObject libraries using GObject-Introspection"
 HOMEPAGE="https://github.com/pavouk/lgi"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/pavouk/lgi"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +examples test luajit"
+IUSE="doc examples test luajit"
 
 # TODO: Lua 5.2 handling
 

diff --git a/dev-lua/linotify/linotify-9999.ebuild b/dev-lua/linotify/linotify-9999.ebuild
index 274b9c8..e97417c 100644
--- a/dev-lua/linotify/linotify-9999.ebuild
+++ b/dev-lua/linotify/linotify-9999.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 IS_MULTILIB=true
-VCS="git-r3"
+VCS="git"
+GITHUB_A="hoelzro"
+
 inherit lua
 
 DESCRIPTION="inotify bindings for Lua"
-HOMEPAGE="https://github.com/hoelzro/linotify"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/hoelzro/linotify.git"
 
 LICENSE="MIT"
 SLOT="0"
@@ -20,7 +18,7 @@ IUSE=""
 
 RDEPEND="virtual/libc"
 
-READMES=( README.md )
+DOCS=(README.md)
 
 each_lua_compile() {
 	lua_default LUAPKG_CMD="${lua_impl}"

diff --git a/dev-lua/ljsyscall/ljsyscall-9999.ebuild b/dev-lua/ljsyscall/ljsyscall-9999.ebuild
index 19c0620..385202e 100644
--- a/dev-lua/ljsyscall/ljsyscall-9999.ebuild
+++ b/dev-lua/ljsyscall/ljsyscall-9999.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 LUA_COMPAT="luajit2"
+GITHUB_A="justincormack"
 inherit lua
 
 DESCRIPTION="LuaJIT Unix syscall FFI"
 HOMEPAGE="https://github.com/justincormack/ljsyscall"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/justincormack/ljsyscall"
 
 LICENSE="MIT"
 SLOT="0"
@@ -23,8 +21,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-DOCS=( README.md doc/ )
-EXAMPLES=( examples/ )
+DOCS=( README.md doc/. )
+EXAMPLES=( examples/. )
 
 each_lua_install() {
 	dolua syscall syscall.lua

diff --git a/dev-lua/lpc/lpc-9999.ebuild b/dev-lua/lpc/lpc-9999.ebuild
index 75ed036..9c6e90d 100644
--- a/dev-lua/lpc/lpc-9999.ebuild
+++ b/dev-lua/lpc/lpc-9999.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 IS_MULTILIB=true
-VCS="git-r3"
+VCS="git"
+GITHUB_A="msva"
 inherit lua
 
 DESCRIPTION="Allows Lua scripts to call external processes while capturing both their input and output."
-HOMEPAGE="http://lua.net-core.org/sputnik.lua?p=Telesto:About"
-EGIT_REPO_URI="https://github.com/msva/lpc"
+HOMEPAGE="https://github.com/msva/lpc"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/dev-lua/lpeg/lpeg-1.0.0.ebuild b/dev-lua/lpeg/lpeg-1.0.0-r1.ebuild
similarity index 84%
rename from dev-lua/lpeg/lpeg-1.0.0.ebuild
rename to dev-lua/lpeg/lpeg-1.0.0-r1.ebuild
index 061d5c8..7289a25 100644
--- a/dev-lua/lpeg/lpeg-1.0.0.ebuild
+++ b/dev-lua/lpeg/lpeg-1.0.0-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 IS_MULTILIB=true
 LUA_COMPAT="lua51 luajit2"
+
 inherit lua
 
 DESCRIPTION="Parsing Expression Grammars for Lua"
@@ -16,9 +17,9 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~hppa ~mips x86"
 IUSE="debug doc"
 
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-DOCS=( HISTORY )
-HTML_DOCS=( {lpeg,re}.html )
+PATCHES=("${FILESDIR}/${P}-makefile.patch")
+DOCS=(HISTORY)
+HTML_DOCS=({lpeg,re}.html)
 
 all_lua_prepare() {
 	use debug && append-cflags -DLPEG_DEBUG
@@ -33,5 +34,5 @@ each_lua_test() {
 }
 
 each_lua_install() {
-	dolua lpeg.so
+	dolua lpeg.so re.lua
 }

diff --git a/dev-lua/lsysstats/lsysstats-9999.ebuild b/dev-lua/lsysstats/lsysstats-9999.ebuild
index 8a3e33e..ef56ead 100644
--- a/dev-lua/lsysstats/lsysstats-9999.ebuild
+++ b/dev-lua/lsysstats/lsysstats-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 VCS="mercurial"
 inherit lua
@@ -13,7 +13,7 @@ EHG_REPO_URI="http://code.matthewwild.co.uk/${PN}/"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="+examples"
+IUSE="examples"
 
 EXAMPLES=( demo.lua )
 

diff --git a/dev-lua/ltn12ce/ltn12ce-9999.ebuild b/dev-lua/ltn12ce/ltn12ce-9999.ebuild
new file mode 100644
index 0000000..4ad51d0
--- /dev/null
+++ b/dev-lua/ltn12ce/ltn12ce-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VCS="git"
+GITHUB_A="mkottman"
+IS_MULTILIB=true
+
+inherit cmake-utils lua
+
+DESCRIPTION="LuaSocket's LTN12-compatible Crypto/Compressing Engine"
+HOMEPAGE="https://github.com/mkottman/ltn12ce"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="+system-bzip +system-lzma +system-polarssl +system-zlib"
+
+RDEPEND="
+	system-bzip? ( app-arch/bzip2[$MULTILIB_USEDEP] )
+	system-lzma? ( app-arch/xz-utils[$MULTILIB_USEDEP] )
+	system-polarssl? ( net-libs/polarssl[$MULTILIB_USEDEP] )
+	system-zlib? ( sys-libs/zlib[$MULTILIB_USEDEP] )
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+DOCS=(README.md)
+
+all_lua_prepare() {
+#	for d in {bzip,lzma,polarssl,zlib}; do
+#		use "system-${d}" &&
+#		sed -e "/add_subdirectory.*${d}/d" -i src/CMakeLists.txt
+#		sed -e "/include_directories.*${d}/d" -i CMakeLists.txt
+#	done
+#	use system-lzma && sed -e "/include_directories ( include )/d" -i CMakeLists.txt
+	lua_default
+}
+
+each_lua_configure() {
+	mycmakeargs=(
+		-DINSTALL_CMOD="$(lua_get_pkgvar INSTALL_CMOD)"
+	)
+	cmake-utils_src_configure
+}

diff --git a/dev-lua/ltn12ce/metadata.xml b/dev-lua/ltn12ce/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/ltn12ce/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@×××.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-cjson/lua-cjson-9999.ebuild b/dev-lua/lua-cjson/lua-cjson-9999.ebuild
index 69de699..0d0b46f 100644
--- a/dev-lua/lua-cjson/lua-cjson-9999.ebuild
+++ b/dev-lua/lua-cjson/lua-cjson-9999.ebuild
@@ -1,42 +1,24 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 IS_MULTILIB=true
+GITHUB_A="openresty"
 #LUA_COMPAT="lua51 luajit2"
-#inherit cmake-utils lua
 inherit lua
 
 DESCRIPTION="Lua JSON Library, written in C"
 HOMEPAGE="http://www.kyne.com.au/~mark/software/lua-cjson.php"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/msva/lua-cjson"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="+examples"
-
-EXAMPLES=( tests/ lua/{json2lua,lua2json}.lua )
-
-#each_lua_configure() {
-#	mycmakeargs=(
-#		-DUSE_INTERNAL_FPCONV=ON
-#	)
-#	cmake-utils_src_configure
-#}
+IUSE="examples"
 
-#each_lua_configure() {
-#	mycmakeargs=(
-#		-DUSE_INTERNAL_FPCONV=ON
-#	)
-#	cmake-utils_src_configure
-#}
+EXAMPLES=( tests/. lua/{json2lua,lua2json}.lua )
 
 each_lua_install() {
 	dolua lua/cjson cjson.so
-#	cmake-utils_src_install
 }

diff --git a/dev-lua/lua-csv/lua-csv-9999.ebuild b/dev-lua/lua-csv/lua-csv-9999.ebuild
index 1639711..70971b6 100644
--- a/dev-lua/lua-csv/lua-csv-9999.ebuild
+++ b/dev-lua/lua-csv/lua-csv-9999.ebuild
@@ -1,23 +1,21 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="geoffleyland"
 inherit lua
 
 DESCRIPTION="a Lua module for reading delimited text files"
 HOMEPAGE="https://github.com/geoffleyland/lua-csv"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/geoffleyland/lua-csv"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-READMES=( README.md )
+DOCS=(README.md)
 
 each_lua_install() {
 	dolua lua/csv.lua

diff --git a/dev-lua/lua-curl/lua-curl-9999.ebuild b/dev-lua/lua-curl/lua-curl-9999.ebuild
index 3645dda..605cd3d 100644
--- a/dev-lua/lua-curl/lua-curl-9999.ebuild
+++ b/dev-lua/lua-curl/lua-curl-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="Lua-cURL"
+GITHUB_PN="Lua-cURLv3"
 inherit lua
 
 DESCRIPTION="Lua cURL Library"
 HOMEPAGE="https://github.com/Lua-cURL/Lua-cURLv3"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/Lua-cURL/Lua-cURLv3"
 
 LICENSE="MIT"
 SLOT="0"
@@ -25,9 +24,9 @@ DEPEND="
 	${RDEPEND}
 "
 
-EXAMPLES=( examples/ )
-HTML_DOCS=( html/ )
-READMES=( README.md )
+EXAMPLES=( examples/. )
+HTML_DOCS=( html/. )
+DOCS=(README.md)
 
 each_lua_compile() {
 	lua_default LUA_IMPL="${lua_impl}"
@@ -40,7 +39,6 @@ all_lua_compile() {
 	)
 }
 
-
 each_lua_install() {
 	lua_default LUA_IMPL="${lua_impl}"
 }

diff --git a/dev-lua/lua-ext/lua-ext-9999.ebuild b/dev-lua/lua-ext/lua-ext-9999.ebuild
index 857a818..5423ec4 100644
--- a/dev-lua/lua-ext/lua-ext-9999.ebuild
+++ b/dev-lua/lua-ext/lua-ext-9999.ebuild
@@ -1,25 +1,34 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="thenumbernine"
 inherit lua
 
 DESCRIPTION="Some useful extensions to Lua classes"
 HOMEPAGE="https://github.com/thenumbernine/lua-ext"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/thenumbernine/ext"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="gcmem"
+
+DEPEND=""
+RDEPEND="
+	dev-lua/luafilesystem
+	gcmem? (
+		dev-lua/lua-ffi-bindings
+		dev-lang/luajit
+	)
+"
 
-READMES=( README )
+DOCS=(README)
 
 each_lua_install() {
+	use gcmem || rm gcmem.lua
+	mv ext.lua init.lua
 	_dolua_insdir="ext" \
 	dolua *.lua
 }

diff --git a/dev-lua/lua-ext/metadata.xml b/dev-lua/lua-ext/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/lua-ext/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@×××.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-fann/Manifest b/dev-lua/lua-fann/Manifest
index 8417e37..3f19617 100644
--- a/dev-lua/lua-fann/Manifest
+++ b/dev-lua/lua-fann/Manifest
@@ -1 +1 @@
-DIST lua-fann-0.5.3.tgz 18937 SHA256 575c7fc6282989578cf3dae7bf19e2e56f107d6b38076695fd329f7bb40b1b40 SHA512 01dcdb13f88705ad6b5ead3d398da56721b2db9faf1c421d9bf743dad4fd26da9d3091fe257d66bf7744575e703add11a9fe95553830f487af3cb14af6eba05d WHIRLPOOL f0f2f23a8161e4f1f87fbb0bb0c7fae5c903eba7248a2e863bb4adaf59f0bca34cc45976c84f95a3040686c8bc7b093daa5df04ee5e449ac3e762dcf2c7a6f1d
+DIST lua-fann-0.5.3.tar.gz 18937 SHA256 575c7fc6282989578cf3dae7bf19e2e56f107d6b38076695fd329f7bb40b1b40 SHA512 01dcdb13f88705ad6b5ead3d398da56721b2db9faf1c421d9bf743dad4fd26da9d3091fe257d66bf7744575e703add11a9fe95553830f487af3cb14af6eba05d WHIRLPOOL f0f2f23a8161e4f1f87fbb0bb0c7fae5c903eba7248a2e863bb4adaf59f0bca34cc45976c84f95a3040686c8bc7b093daa5df04ee5e449ac3e762dcf2c7a6f1d

diff --git a/dev-lua/lua-fann/lua-fann-0.5.3.ebuild b/dev-lua/lua-fann/lua-fann-0.5.3.ebuild
index 6e7245f..4bab854 100644
--- a/dev-lua/lua-fann/lua-fann-0.5.3.ebuild
+++ b/dev-lua/lua-fann/lua-fann-0.5.3.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+IS_MULTILIB=true
+GITHUB_A="msva"
 
-# fixme when fann will be multilib
-#IS_MULTILIB=true
 inherit lua
 
 DESCRIPTION="A set of Lua bindings for the Fast Artificial Neural Network (FANN) library."
 HOMEPAGE="https://github.com/msva/lua-fann"
-SRC_URI="https://github.com/msva/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +examples"
+IUSE="doc examples"
 
 RDEPEND="
 	sci-mathematics/fann
@@ -23,9 +23,9 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.md TODO )
-HTML_DOCS=( doc/luafann.html )
-EXAMPLES=( examples/ )
+DOCS=(README.md)
+HTML_DOCS=(doc/luafann.html)
+EXAMPLES=(test/.)
 
 all_lua_compile() {
 	use doc && (

diff --git a/dev-lua/lua-fann/lua-fann-9999.ebuild b/dev-lua/lua-fann/lua-fann-9999.ebuild
index d8eac99..afaa59c 100644
--- a/dev-lua/lua-fann/lua-fann-9999.ebuild
+++ b/dev-lua/lua-fann/lua-fann-9999.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+IS_MULTILIB=true
+GITHUB_A="msva"
 
-# fixme when fann will be multilib
-#IS_MULTILIB=true
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="A set of Lua bindings for the Fast Artificial Neural Network (FANN) library."
 HOMEPAGE="https://github.com/msva/lua-fann"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/msva/${PN}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +examples"
+IUSE="doc examples"
 
 RDEPEND="
 	sci-mathematics/fann
@@ -25,9 +24,9 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.md TODO )
-HTML_DOCS=( doc/luafann.html )
-EXAMPLES=( test/. )
+DOCS=(README.md)
+HTML_DOCS=(doc/luafann.html)
+EXAMPLES=(test/.)
 
 all_lua_compile() {
 	touch .lua_eclass_config

diff --git a/dev-lua/lua-fastcgi/lua-fastcgi-9999.ebuild b/dev-lua/lua-fastcgi/lua-fastcgi-9999.ebuild
index 4a2eacc..9d49a88 100644
--- a/dev-lua/lua-fastcgi/lua-fastcgi-9999.ebuild
+++ b/dev-lua/lua-fastcgi/lua-fastcgi-9999.ebuild
@@ -1,49 +1,42 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="cramey"
+EGIT_BRANCH="public"
 
-VCS="git-r3"
-# FIXME when fcgi will be multilib
-#IS_MULTILIB=true
 inherit lua
 
 DESCRIPTION="A FastCGI server for Lua, written in C"
 HOMEPAGE="https://github.com/cramey/lua-fastcgi"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/cramey/lua-fastcgi.git"
-EGIT_BRANCH="public"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +examples"
+IUSE="doc examples"
 
 RDEPEND="
 	dev-libs/fcgi
 "
 DEPEND="${RDEPEND}"
 
-READMES=( README.md TODO )
-EXAMPLES=( ${PN}.lua )
+DOCS=(README.md TODO)
+EXAMPLES=(${PN}.lua)
 
 all_lua_prepare() {
 	sed -r \
-		-e 's#CFLAGS#CF#g' \
-		-e 's#LDFLAGS#LF#g' \
-		-e 's#^(CF=)#\1 $(CFLAGS) #' \
-		-e 's#^(LF=)#\1 $(LDFLAGS) #' \
 		-e 's/-Wl,[^ ]*//g' \
-		-e 's#-llua5.1#$(LUA_LINK_LIB)#g' \
 		-i Makefile
 
 	sed \
 		-e "s#lua5.1/##" \
 		-i src/config.c src/lfuncs.c src/lua.c src/lua-fastcgi.c
+
+	lua_default
 }
 
 each_lua_install() {
 	newbin ${PN} ${PN}-${TARGET}
-#-${ABI} #is it needed?
 }

diff --git a/dev-lua/lua-feeds/lua-feeds-9999.ebuild b/dev-lua/lua-feeds/lua-feeds-9999.ebuild
index 92978e8..7610d9c 100644
--- a/dev-lua/lua-feeds/lua-feeds-9999.ebuild
+++ b/dev-lua/lua-feeds/lua-feeds-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 VCS="mercurial"
 inherit lua
@@ -13,14 +13,14 @@ EHG_REPO_URI="http://code.matthewwild.co.uk/lua-feeds"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="+examples"
+IUSE="examples"
 
 DEPEND="
 	${RDEPEND}
 	dev-lua/squish
 "
 
-EXAMPLES=( demo.lua demo_string.lua )
+EXAMPLES=(demo.lua demo_string.lua)
 
 each_lua_compile() {
 	squish

diff --git a/dev-lua/lua-ffi-bindings/lua-ffi-bindings-9999.ebuild b/dev-lua/lua-ffi-bindings/lua-ffi-bindings-9999.ebuild
new file mode 100644
index 0000000..d31d658
--- /dev/null
+++ b/dev-lua/lua-ffi-bindings/lua-ffi-bindings-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+LUA_COMPAT="luajit2"
+VCS="git"
+GITHUB_A="thenumbernine"
+inherit lua
+
+DESCRIPTION="Some common headers ported over to LuaJIT FFI"
+HOMEPAGE="https://github.com/thenumbernine/lua-ffi-bindings"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	dev-lua/lua-ffi-bindings
+"
+
+DOCS=(README)
+
+each_lua_install() {
+	_dolua_jit_insdir="ffi" \
+	dolua_jit *.lua c/ vec/
+}

diff --git a/dev-lua/lua-ffi-bindings/metadata.xml b/dev-lua/lua-ffi-bindings/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/lua-ffi-bindings/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@×××.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-gd/Manifest b/dev-lua/lua-gd/Manifest
deleted file mode 100644
index 058dadf..0000000
--- a/dev-lua/lua-gd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lua-gd-2.0.33r2.tar.gz 448606 SHA256 235eceba9b55fd6b6cb6d88b0df676d6f94ff49155a0710363c21e2cc0987ec6 SHA512 913225411612705b6be77d7023261890d21bf5bf43e4ef694826288933b1bb6d9d5a1790b5974de5e3b688b672f51d930f763c5fb56464932189ec9c27c4b3ab WHIRLPOOL 145200dd76a01aadaf9a6c14592c5c51d63c54c00afc68bc7b287ee4c05e069b17a1fa91231a37996c77e3f7bbc2fe598d62f71a66d61a6faa87147b50c5ce7e

diff --git a/dev-lua/lua-gd/lua-gd-9999.ebuild b/dev-lua/lua-gd/lua-gd-9999.ebuild
index 8c15d1e..3b67603 100644
--- a/dev-lua/lua-gd/lua-gd-9999.ebuild
+++ b/dev-lua/lua-gd/lua-gd-9999.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 IS_MULTILIB=true
+GITHUB_A="ittner"
+
 inherit lua
 
 DESCRIPTION="Lua bindings to Thomas Boutell's gd library"
 HOMEPAGE="http://lua-gd.luaforge.net/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/ittner/lua-gd.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +examples"
+IUSE="doc examples"
 
 RDEPEND="
 	media-libs/gd[png]
@@ -24,19 +24,9 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README )
-EXAMPLES=( demos/. )
-HTML_DOCS=( doc/. )
-
-#all_lua_prepare() {
-#	sed -r \
-#		-e 's#CFLAGS#CF#g' \
-#		-e 's#LFLAGS#LF#g' \
-#		-e 's/^(CF=.*)/\1 $(CFLAGS)/' \
-#		-e 's/^(LF=.*)/\1 $(LDFLAGS)/' \
-#		-e 's/`pkg-config/`$(PKG_CONFIG)/' \
-#		-i Makefile
-#}
+DOCS=(README)
+EXAMPLES=(demos/.)
+HTML_DOCS=(doc/.)
 
 each_lua_configure() {
 	local lua=$(lua_get_lua)

diff --git a/dev-lua/lua-geoip/lua-geoip-9999.ebuild b/dev-lua/lua-geoip/lua-geoip-9999.ebuild
index ab1f42f..45c3c99 100644
--- a/dev-lua/lua-geoip/lua-geoip-9999.ebuild
+++ b/dev-lua/lua-geoip/lua-geoip-9999.ebuild
@@ -1,24 +1,20 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="agladysh"
 
-# FIXME when GeoIP will be multilib
-#IS_MULTILIB=true
 inherit lua
 
 DESCRIPTION="Lua GeoIP Library"
 HOMEPAGE="https://agladysh.github.io/lua-geoip"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/msva/lua-geoip"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="doc"
 
 RDEPEND="
 	dev-libs/geoip
@@ -27,7 +23,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.md HISTORY TODO )
+DOCS=(README.md HISTORY TODO)
 
 src_test() {
 	${LUA} test/test.lua /usr/share/GeoIP/Geo{IP,LiteCity}.dat

diff --git a/dev-lua/lua-getopt/lua-getopt-9999.ebuild b/dev-lua/lua-getopt/lua-getopt-9999.ebuild
index 0e2654e..4d56887 100644
--- a/dev-lua/lua-getopt/lua-getopt-9999.ebuild
+++ b/dev-lua/lua-getopt/lua-getopt-9999.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="jjensen"
 
-VCS="git-r3"
 inherit lua
 
 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"

diff --git a/dev-lua/lua-html/lua-html-9999.ebuild b/dev-lua/lua-html/lua-html-9999.ebuild
index 0067652..dfa3870 100644
--- a/dev-lua/lua-html/lua-html-9999.ebuild
+++ b/dev-lua/lua-html/lua-html-9999.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 LUA_COMPAT="lua52"
-VCS="git-r3"
+VCS="git"
 IS_MULTILIB=true
+GITHUB_A="sprhawk"
+
 inherit lua
 
 DESCRIPTION="lua bindings for HTMLParser in libxml2"
 HOMEPAGE="https://github.com/sprhawk/lua-html"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/sprhawk/lua-html"
 
 LICENSE="MIT"
 SLOT="0"
@@ -24,7 +23,7 @@ RDEPEND="
 	dev-libs/libxml2
 "
 
-READMES=( Readme.md )
+DOCS=(Readme.md)
 
 all_lua_prepare() {
 	lua_default

diff --git a/dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild b/dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild
index 135a8db..a32edac 100644
--- a/dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild
+++ b/dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="msva"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="Parse HTML text into a tree of elements with selectors"
 HOMEPAGE="https://github.com/msva/lua-htmlparser"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/msva/lua-htmlparser"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/dev-lua/lua-iconv/lua-iconv-9999.ebuild b/dev-lua/lua-iconv/lua-iconv-9999.ebuild
index 3f50e9e..ad0ebd4 100644
--- a/dev-lua/lua-iconv/lua-iconv-9999.ebuild
+++ b/dev-lua/lua-iconv/lua-iconv-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 IS_MULTILIB=true
+GITHUB_A="ittner"
+
 inherit lua
 
 DESCRIPTION="Lua bindings for POSIX iconv"
 HOMEPAGE="http://ittner.github.com/lua-iconv"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/ittner/lua-iconv"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/dev-lua/lua-idn/lua-idn-9999.ebuild b/dev-lua/lua-idn/lua-idn-9999.ebuild
index d6cd8f9..55255ec 100644
--- a/dev-lua/lua-idn/lua-idn-9999.ebuild
+++ b/dev-lua/lua-idn/lua-idn-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="haste"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="A Lua implementation of Internationalizing Domain Names in Applications (RFC 3490)"
 HOMEPAGE="https://github.com/haste/lua-idn"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/haste/lua-idn"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/dev-lua/lua-sendmail/lua-sendmail-9999.ebuild b/dev-lua/lua-sendmail/lua-sendmail-9999.ebuild
index 48c546a..903fcfa 100644
--- a/dev-lua/lua-sendmail/lua-sendmail-9999.ebuild
+++ b/dev-lua/lua-sendmail/lua-sendmail-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="moteus"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="Simple wrapper around luasoket smtp.send"
 HOMEPAGE="https://github.com/moteus/lua-sendmail"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/moteus/lua-sendmail"
 
 LICENSE="MIT"
 SLOT="0"
@@ -24,8 +23,8 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.md )
-HTML_DOCS=( docs/ )
+DOCS=(README.md)
+HTML_DOCS=(docs/.)
 
 each_lua_install() {
 	dolua lua/sendmail.lua

diff --git a/dev-lua/lua-set/lua-set-9999.ebuild b/dev-lua/lua-set/lua-set-9999.ebuild
index aa39722..f7556a5 100644
--- a/dev-lua/lua-set/lua-set-9999.ebuild
+++ b/dev-lua/lua-set/lua-set-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="wscherphof"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="Straightforward Set library for Lua"
 HOMEPAGE="https://github.com/wscherphof/lua-set"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/wscherphof/lua-set"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/dev-lua/lua-stdlib/lua-stdlib-9999.ebuild b/dev-lua/lua-stdlib/lua-stdlib-9999.ebuild
index fd7669e..0788ac1 100644
--- a/dev-lua/lua-stdlib/lua-stdlib-9999.ebuild
+++ b/dev-lua/lua-stdlib/lua-stdlib-9999.ebuild
@@ -1,37 +1,34 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="lua-stdlib"
 
 inherit lua
 
 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=""
+IUSE="doc"
 
-READMES=( README.md NEWS.md HACKING )
+DOCS=(README.md NEWS.md STYLE.md)
 
 all_lua_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
-
-	./bootstrap --skip-rock-checks
+    mkdir -p html
+    sed \
+        -e '/^dir/s@"."@"../html"@' \
+        -i doc/config.ld.in
 }
 
-each_lua_compile() {
-	./config.status --file=lib/std.lua
-}
+each_lua_compile() { :; }
+# ldoc definitions are currently broken
+all_lua_compile() { :; }
 
 each_lua_install() {
-	dolua lib/std lib/std.lua
+	dolua lib/std
 }

diff --git a/dev-lua/lua-zip/lua-zip-9999.ebuild b/dev-lua/lua-zip/lua-zip-9999.ebuild
index a8515b9..5802e33 100644
--- a/dev-lua/lua-zip/lua-zip-9999.ebuild
+++ b/dev-lua/lua-zip/lua-zip-9999.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+#GITHUB_A="brimworks"
+GITHUB_A="markuman"
 
-VCS="git-r3"
 inherit cmake-utils lua
 
 DESCRIPTION="Lua bindings to libzip"
 HOMEPAGE="https://github.com/brimworks/lua-zip"
-EGIT_REPO_URI="https://github.com/brimworks/lua-zip.git"
 
 LICENSE="MIT"
 SLOT="0"
@@ -23,7 +25,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README )
+DOCS=(README.md)
 
 each_lua_configure() {
 	mycmakeargs=(

diff --git a/dev-lua/lua-zlib/lua-zlib-9999.ebuild b/dev-lua/lua-zlib/lua-zlib-9999.ebuild
index 686d187..bc1ef13 100644
--- a/dev-lua/lua-zlib/lua-zlib-9999.ebuild
+++ b/dev-lua/lua-zlib/lua-zlib-9999.ebuild
@@ -1,38 +1,36 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils git-r3 toolchain-funcs
+VCS="git"
+GITHUB_A="brimworks"
+
+inherit lua
 
 DESCRIPTION="Lua bindings to zlib"
 HOMEPAGE="http://github.com/brimworks/lua-zlib"
-EGIT_REPO_URI="git://github.com/msva/lua-zlib.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="luajit"
-
-RDEPEND="
-	virtual/lua[luajit=]
-	sys-libs/zlib
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	mv *-${PN}-* "${S}"
-}
+IUSE=""
 
-src_configure() {
-	local lua=lua;
-	local mycmakeargs;
-	use luajit && lua="luajit";
-	mycmakeargs=(
-		-DINSTALL_CMOD=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua})
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+each_lua_configure() {
+	local myeconfargs=(
+		INCDIR=""
+		LIBDIR=""
 	)
-	cmake-utils_src_configure
+	lua_default
+}
+
+each_lua_compile() {
+	lua_default linux
+}
+
+each_lua_install() {
+	dolua "${PN//lua-}".so
 }

diff --git a/dev-lua/lua2html/lua2html-9999.ebuild b/dev-lua/lua2html/lua2html-9999.ebuild
index 32179e0..c97eb3e 100644
--- a/dev-lua/lua2html/lua2html-9999.ebuild
+++ b/dev-lua/lua2html/lua2html-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 VCS="mercurial"
 inherit lua

diff --git a/dev-lua/luacrypto/luacrypto-9999.ebuild b/dev-lua/luacrypto/luacrypto-9999.ebuild
index 44db086..d2ae518 100644
--- a/dev-lua/luacrypto/luacrypto-9999.ebuild
+++ b/dev-lua/luacrypto/luacrypto-9999.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-LANGS=( "en" "ru" )
+LANGS=(en ru)
 
-VCS=git-r3
+VCS="git"
 IS_MULTILIB=true
-
+GITHUB_A="msva"
+GITHUB_PN="lua-crypto"
 inherit lua
 
 DESCRIPTION="Lua Crypto Library"
 HOMEPAGE="https://github.com/msva/lua-crypto"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/msva/lua-crypto.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +openssl gcrypt linguas_en linguas_ru"
+IUSE="doc +openssl gcrypt l10n_en l10n_ru"
 
 RDEPEND="
 	openssl? ( >=dev-libs/openssl-0.9.7 )
@@ -28,15 +26,16 @@ RDEPEND="
 
 REQUIRED_USE="^^ ( openssl gcrypt )"
 
-READMES=( README )
+DOCS=(README)
 HTML_DOCS=()
 
 all_lua_prepare() {
-		for x in ${LANGS[@]}; do
-			if use linguas_${x}; then
-				HTML_DOCS+=( doc/${x} )
-			fi
-		done
+	for x in ${LANGS[@]}; do
+		if use l10n_${x}; then
+			HTML_DOCS+=( doc/${x} )
+		fi
+	done
+	lua_default
 }
 
 each_lua_compile() {

diff --git a/dev-lua/luadbi/luadbi-9999.ebuild b/dev-lua/luadbi/luadbi-9999.ebuild
index 88dcc07..3138211 100644
--- a/dev-lua/luadbi/luadbi-9999.ebuild
+++ b/dev-lua/luadbi/luadbi-9999.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 LUA_COMPAT="lua51 luajit2"
 IS_MULTILIB=true
 VCS="mercurial"
+BITBUCKET_A="mva"
+BITBUCKET_PN="${PN}-temp"
 inherit lua
 
 DESCRIPTION="DBI module for Lua"
 HOMEPAGE="https://code.google.com/p/luadbi"
 #EHG_REPO_URI="https://code.google.com/p/luadbi"
-EHG_REPO_URI="https://bitbucket.org/mva/luadbi-temp"
+#EHG_REPO_URI="https://bitbucket.org/mva/luadbi-temp"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/dev-lua/luadoc/luadoc-3.0.1.ebuild b/dev-lua/luadoc/luadoc-3.0.1.ebuild
index 6ac5cd8..8fa3fec 100644
--- a/dev-lua/luadoc/luadoc-3.0.1.ebuild
+++ b/dev-lua/luadoc/luadoc-3.0.1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit lua
+
 DESCRIPTION="LuaDoc is a documentation tool for Lua source code"
 HOMEPAGE="http://keplerproject.github.io/luadoc/"
 SRC_URI="http://luaforge.net/frs/download.php/3185/${P}.tar.gz"
@@ -18,8 +19,8 @@ RDEPEND="
 	dev-lua/luafilesystem
 "
 
-READMES=( README )
-HTML_DOCS=( doc/us/ )
+DOCS=(README)
+HTML_DOCS=(doc/us/.)
 
 
 all_lua_prepare() {

diff --git a/dev-lua/luadoc/luadoc-9999.ebuild b/dev-lua/luadoc/luadoc-9999.ebuild
index 02ea17e..7c8b203 100644
--- a/dev-lua/luadoc/luadoc-9999.ebuild
+++ b/dev-lua/luadoc/luadoc-9999.ebuild
@@ -1,16 +1,14 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="keplerproject"
 inherit lua
 
 DESCRIPTION="LuaDoc is a documentation tool for Lua source code"
 HOMEPAGE="http://keplerproject.github.io/luadoc/"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/keplerproject/luadoc/"
 
 LICENSE="MIT"
 SLOT="0"
@@ -22,8 +20,8 @@ RDEPEND="
 	dev-lua/luafilesystem
 "
 
-READMES=( README.md )
-HTML_DOCS=( doc/us/ )
+DOCS=( README.md )
+HTML_DOCS=( doc/us/. )
 
 
 all_lua_prepare() {

diff --git a/dev-lua/luaevent/luaevent-9999.ebuild b/dev-lua/luaevent/luaevent-9999.ebuild
index 711f6e9..b9cc916 100644
--- a/dev-lua/luaevent/luaevent-9999.ebuild
+++ b/dev-lua/luaevent/luaevent-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-#LUA_COMPAT="lua51 lua52 luajit2"
-VCS="git-r3"
+VCS="git"
 IS_MULTILIB=true
+GITHUB_A="harningt"
 inherit lua
 
 DESCRIPTION="libevent bindings for Lua"
 HOMEPAGE="http://luaforge.net/projects/luaevent http://repo.or.cz/w/luaevent.git"
-EGIT_REPO_URI="https://github.com/harningt/luaevent"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -24,9 +23,9 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README )
+DOCS=(README)
 
-PATCHES=( ${FILESDIR}/gc-anchoring.patch )
+PATCHES=(${FILESDIR}/gc-anchoring.patch)
 
 each_lua_install() {
 	dolua lua/*

diff --git a/dev-lua/luaexpat/luaexpat-9999.ebuild b/dev-lua/luaexpat/luaexpat-9999.ebuild
index 2afbecb..baa72f2 100644
--- a/dev-lua/luaexpat/luaexpat-9999.ebuild
+++ b/dev-lua/luaexpat/luaexpat-9999.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 VCS="mercurial"
 IS_MULTILIB=true
+
 inherit lua
 
 DESCRIPTION="SAX XML parser based on the Expat library."
@@ -24,8 +25,8 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README )
-HTML_DOCS=( doc/. )
+DOCS=(README)
+HTML_DOCS=(doc/.)
 
 all_lua_prepare() {
 	sed -i -r \

diff --git a/dev-lua/luafilesystem/luafilesystem-9999.ebuild b/dev-lua/luafilesystem/luafilesystem-9999.ebuild
index 99432b4..4fe5bf2 100644
--- a/dev-lua/luafilesystem/luafilesystem-9999.ebuild
+++ b/dev-lua/luafilesystem/luafilesystem-9999.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 IS_MULTILIB="true"
+GITHUB_A="keplerproject"
+
 inherit lua
 
 DESCRIPTION="File System Library for the Lua Programming Language"
 HOMEPAGE="https://keplerproject.github.io/luafilesystem/"
-EGIT_REPO_URI="https://github.com/keplerproject/luafilesystem.git"
-SRC_URI=""
-#SRC_URI="https://github.com/downloads/keplerproject/luafilesystem/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="doc"
 
-HTML_DOCS=( doc/us/. )
-READMES=( README.md )
+HTML_DOCS=(doc/us/.)
+DOCS=(README.md)
 
 all_lua_prepare() {
 	sed -e 'd' config

diff --git a/dev-lua/luahpdf/luahpdf-9999.ebuild b/dev-lua/luahpdf/luahpdf-9999.ebuild
index 2488475..4e1dcaf 100644
--- a/dev-lua/luahpdf/luahpdf-9999.ebuild
+++ b/dev-lua/luahpdf/luahpdf-9999.ebuild
@@ -1,38 +1,37 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 IS_MULTILIB=true
+GITHUB_A="msva"
+
 inherit lua
 
 DESCRIPTION="Lua binding to media-libs/libharu (PDF generator)"
 HOMEPAGE="https://github.com/jung-kurt/luahpdf"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/msva/luahpdf"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +examples"
+IUSE="doc examples"
 
 RDEPEND="
 	media-libs/libharu
 "
 DEPEND="${RDEPEND}"
 
-DOCS=( README.md doc/text/. )
-HTML_DOCS=( doc/html/. )
-EXAMPLES=( demo/. )
+DOCS=(README.md doc/text/.)
+HTML_DOCS=(doc/html/.)
+EXAMPLES=(demo/.)
 
 all_lua_prepare() {
 	sed -i -r \
-	-e 's#(_COMPILE=)cc#\1$(CC)#' \
-	-e 's#(_LINK=)cc#\1$(CC)#' \
-	-e 's#(_REPORT=).*#\1#' \
-	Makefile
+		-e 's#(_COMPILE=)cc#\1$(CC)#' \
+		-e 's#(_LINK=)cc#\1$(CC)#' \
+		-e 's#(_REPORT=).*#\1#' \
+		Makefile
 
 	lua_default
 }

diff --git a/dev-lua/lualdap/lualdap-9999.ebuild b/dev-lua/lualdap/lualdap-9999.ebuild
index b4f7b94..a89fadc 100644
--- a/dev-lua/lualdap/lualdap-9999.ebuild
+++ b/dev-lua/lualdap/lualdap-9999.ebuild
@@ -1,31 +1,30 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 IS_MULTILIB=true
+GITHUB_A="mwild1"
+
 inherit lua
 
 DESCRIPTION="Lua driver for LDAP"
 HOMEPAGE="https://github.com/mwild1/lualdap/"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/mwild1/lualdap.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +examples"
+IUSE="doc examples"
 
 RDEPEND="
 	net-nds/openldap
 "
 DEPEND="${RDEPEND}"
 
-READMES=( README )
-EXAMPLES=( tests/ )
-HTML_DOCS=( doc/us/ )
+DOCS=(README)
+EXAMPLES=(tests/.)
+HTML_DOCS=(doc/us/.)
 
 all_lua_prepare() {
 	sed -i -e 'd' config
@@ -35,8 +34,7 @@ all_lua_prepare() {
 each_lua_configure() {
 	local luav="$(lua_get_abi)"
 	luav="${luav//./0}"
-	myeconfargs=()
-	myeconfargs+=(
+	myeconfargs=(
 		OPENLDAP_LIB="-lldap"
 		LUA_VERSION_LUM="${luav}"
 		LIBNAME="${PN}.so"

diff --git a/dev-lua/luamacro/luamacro-9999.ebuild b/dev-lua/luamacro/luamacro-9999.ebuild
index 1a69067..6438811 100644
--- a/dev-lua/luamacro/luamacro-9999.ebuild
+++ b/dev-lua/luamacro/luamacro-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="stevedonovan"
 
-VCS="git-r3"
 inherit lua
 
 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"

diff --git a/dev-lua/luamongo/luamongo-9999.ebuild b/dev-lua/luamongo/luamongo-9999.ebuild
index 3b7380f..03dd9a3 100644
--- a/dev-lua/luamongo/luamongo-9999.ebuild
+++ b/dev-lua/luamongo/luamongo-9999.ebuild
@@ -1,36 +1,32 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-VCS="git-r3"
-
-# Incompatible with current mongo-driver
-
-# FIXME: when libmongo-drivers will be multilib
-#IS_MULTILIB=true
+# XXX: broken build FIXME later
+EAPI=6
+VCS="git"
+GITHUB_A="moai"
 
 inherit lua
 
 DESCRIPTION="Lua driver for MongoDB"
 HOMEPAGE="https://github.com/mwild1/luamongo/"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/moai/luamongo"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-*"
-IUSE="+examples"
+IUSE="doc examples"
 
 RDEPEND="
 	dev-libs/boost
 	dev-libs/mongo-cxx-driver
 "
 #	dev-db/mongodb[sharedclient]
+# NB: Incompatible with current mongo-driver
+
 DEPEND="${RDEPEND}"
 
-READMES=( README.md )
-EXAMPLES=( tests/ )
+DOCS=(README.md)
+EXAMPLES=(tests/.)
 
 all_lua_prepare() {
 	# Preparing makefile to default_prepare magic fix
@@ -41,13 +37,11 @@ all_lua_prepare() {
 		-e '/if . -z /d' \
 		-e 's#\$\(shell pkg-config --libs \$\(LUAPKG\)\)#-llua#' \
 		Makefile
-
 	lua_default
 }
 
 each_lua_configure() {
-	myeconfargs=()
-	myeconfargs+=(
+	myeconfargs=(
 		LUAPKG="$(lua_get_lua)"
 	)
 	lua_default

diff --git a/dev-lua/luaossl/luaossl-99999999.ebuild b/dev-lua/luaossl/luaossl-99999999.ebuild
new file mode 100644
index 0000000..d9ecfc8
--- /dev/null
+++ b/dev-lua/luaossl/luaossl-99999999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VCS="git"
+GITHUB_A="wahern"
+IS_MULTILIB=true
+
+inherit lua
+
+DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe."
+HOMEPAGE="https://github.com/remjey/luaotp"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc examples"
+
+DEPEND="
+	dev-libs/openssl
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(doc/.)
+EXAMPLES=(examples/.)
+
+all_lua_prepare() {
+	sed  -r \
+		-e "s@(^prefix ).*@\1=/usr@" \
+		-i GNUmakefile
+	lua_default
+}
+
+each_lua_compile() {
+	_lua_setFLAGS
+	lua_default "openssl$(lua_get_abi)"
+}
+
+each_lua_install() {
+	_lua_setFLAGS
+	emake DESTDIR="${D}" "install$(lua_get_abi)"
+}

diff --git a/dev-lua/luaossl/metadata.xml b/dev-lua/luaossl/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/luaossl/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@×××.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/luaotp/luaotp-9999.ebuild b/dev-lua/luaotp/luaotp-9999.ebuild
new file mode 100644
index 0000000..2ba4ddc
--- /dev/null
+++ b/dev-lua/luaotp/luaotp-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VCS="git"
+GITHUB_A="remjey"
+
+inherit lua
+
+DESCRIPTION="A simple implementation of OATH-HOTP and OATH-TOTP written for Lua"
+HOMEPAGE="https://github.com/remjey/luaotp"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc test"
+
+DEPEND="
+	dev-lua/luaossl
+	dev-lua/basexx
+	test? ( dev-lua/busted )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(README.md doc/.)
+
+each_lua_test() {
+	for t in spec/*; do
+		busted "${t}"
+	done
+}
+
+each_lua_install() {
+	dolua src/otp.lua
+}

diff --git a/dev-lua/luaotp/metadata.xml b/dev-lua/luaotp/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/luaotp/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@×××.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 bd84bdc..c1ea90a 100644
--- a/dev-lua/luaposix/luaposix-9999.ebuild
+++ b/dev-lua/luaposix/luaposix-9999.ebuild
@@ -1,24 +1,21 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 IS_MULTILIB=true
-#AT_NOEAUTOMAKE=yes
+GITHUB_A="luaposix"
 
 inherit autotools lua
 
 DESCRIPTION="POSIX binding, including curses, for Lua 5.1 and 5.2"
 HOMEPAGE="https://github.com/luaposix/luaposix"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/luaposix/luaposix.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +examples ncurses"
+IUSE="doc examples ncurses"
 
 RDEPEND="
 	virtual/lua[bit32]
@@ -27,74 +24,42 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
+	sys-kernel/linux-headers
+	virtual/libc
 	doc? ( dev-lua/ldoc )
 "
 #	dev-libs/gnulib
 #	dev-lua/specl
 #	dev-lua/lyaml
 
-READMES=( README.md NEWS.md )
-EXAMPLES=( examples/ )
-HTML_DOCS=( doc/ )
+DOCS=(README.md NEWS.md)
+EXAMPLES=(examples/.)
+HTML_DOCS=(html/.)
 
 all_lua_prepare() {
-	[[ -n "${EGIT_OFFLINE}" ]] && die "Upstream unfortunately uses buildsystem, which requires to fetch some git "
+	mkdir -p html
+	sed \
+		-e '/^dir/s@"."@"../html"@' \
+		-i build-aux/config.ld.in
 
-	# we'll check for ldoc ourslves
-	sed -r \
-		-e "s#(AC_PATH_PROG\(\[LDOC\],).*#\1 [echo], [false]\)#" \
-		-e "s#(AM_CONDITIONAL\(\[HAVE_LDOC\],).*#\1 [false]\)#" \
-		-i configure.ac
+	cp build-aux/config.ld.in build-aux/config.ld
+	cp lib/posix.lua.in lib/posix/init.lua
 
-	# we don't need and install documentation for each target, so we'll take care on this ourselves
 	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
-
-	myeprepareargs=(
-		--skip-rock-checks
-		--gnulib-srcdir=/usr/share/gnulib
-		-Wnone
-	)
-		#--skip-git
-#	AT_NOEAUTOMAKE=yes
-#	gnulib-tool  --no-changelog --avoid=dummy --aux-dir=build-aux --m4-base=m4 --source-base=unused --libtool --symlink --import warnings manywarnings
-#	eautoreconf
-
-	./bootstrap "${myeprepareargs[@]}"
-
-	# Unneded wrapper over ./bootstrap+./configure
-	rm GNUmakefile; ls
+		-e "s/@PACKAGE_STRING@/${P}/" \
+		-i build-aux/config.ld lib/posix/init.lua
 }
 
 all_lua_compile() {
 	use doc && (
-		cp build-aux/config.ld.in build-aux/config.ld
-		cp lib/posix.lua.in lib/posix/init.lua
-
-		sed -r \
-			-e "s/@PACKAGE_STRING@/${P}/" \
-			-i build-aux/config.ld lib/posix/init.lua
-
-		cd build-aux && ldoc -d ../doc . && cd ..
-
-		rm build-aux/config.ld lib/posix/init.lua
+		pushd build-aux &>/dev/null
+		ldoc -d ../doc .
+		popd
 	)
-}
 
-each_lua_configure() {
-	myeconfargs=(
-		"$(use_with ncurses)" \
-		LUA="$(lua_get_lua)" \
-		LUA_INCLUDE="$(lua_get_pkgvar --cflags --cflags-only-I)" \
-		ax_cv_lua_luadir="$(lua_get_pkgvar INSTALL_LMOD)" \
-		ax_cv_lua_luaexecdir="$(lua_get_pkgvar INSTALL_CMOD)"
-		
-	)
-	econf ${myeconfargs[@]}
+	rm build-aux/config.ld lib/posix/init.lua
 }
 
+each_lua_compile() {
+	:; #wip
+}

diff --git a/dev-lua/luarocks/luarocks-9999.ebuild b/dev-lua/luarocks/luarocks-9999.ebuild
index 8b1c7fd..8f08f1f 100644
--- a/dev-lua/luarocks/luarocks-9999.ebuild
+++ b/dev-lua/luarocks/luarocks-9999.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="keplerproject"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="A deployment and management system for Lua modules"
 HOMEPAGE="http://www.luarocks.org"
-EGIT_REPO_URI="https://github.com/keplerproject/luarocks.git"
 
 LICENSE="MIT"
 SLOT="0"
@@ -27,6 +28,7 @@ RDEPEND="
 "
 
 all_lua_prepare() {
+	# Don't die on gentoo's econf calls!
 	sed -r \
 		-e "/die.*Unknown flag:/d" \
 		-i configure
@@ -58,6 +60,15 @@ each_lua_configure() {
 	lua_default
 }
 
+each_lua_compile() {
+	lua_default build
+}
+
 pkg_preinst() {
+	local abi="$(lua_get_abi)"
 	find "${D}" -type f | xargs sed -e "s:${D}::g" -i || die "sed failed"
+	for l in luarocks{,-admin}; do
+		rm "${D}/usr/bin/${l}"
+		dosym "${l}-${abi}" "/usr/bin/${l}"
+	done
 }

diff --git a/dev-lua/luasec/luasec-9999.ebuild b/dev-lua/luasec/luasec-9999.ebuild
index c98f525..d99ce75 100644
--- a/dev-lua/luasec/luasec-9999.ebuild
+++ b/dev-lua/luasec/luasec-9999.ebuild
@@ -1,23 +1,21 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="brunoos"
 IS_MULTILIB=true
 
 inherit lua
 
 DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication."
 HOMEPAGE="http://www.inf.puc-rio.br/~brunoos/luasec/"
-#EGIT_REPO_URI="https://github.com/msva/luasec"
-#EGIT_REPO_URI="https://github.com/mwild1/luasec"
-EGIT_REPO_URI="https://github.com/brunoos/luasec"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="+examples"
+IUSE="examples"
 
 RDEPEND="
 	dev-lua/luasocket
@@ -31,7 +29,7 @@ all_lua_prepare() {
 	sed -i -r \
 		-e 's#(MAKE\)).*(install)#\1 \2#' \
 		Makefile
-#	epatch "${FILESDIR}/fix_removed_destdir_support.patch" || die "Probably, Upstream finally returned DESTDIR instalation back. Please, report that."
+	epatch "${FILESDIR}/fix_removed_destdir_support.patch" || die "Probably, Upstream finally returned DESTDIR instalation back. Please, report that."
 	cd src
 	lua_default
 }
@@ -41,8 +39,8 @@ each_lua_configure() {
 	myeconfargs=()
 	myeconfargs+=(
 		LD='$(CC)'
-		LUAPATH="\$(DESTDIR)/$(lua_get_pkgvar INSTALL_LMOD)"
-		LUACPATH="\$(DESTDIR)/$(lua_get_pkgvar INSTALL_CMOD)"
+		LUAPATH="$(lua_get_pkgvar INSTALL_LMOD)"
+		LUACPATH="$(lua_get_pkgvar INSTALL_CMOD)"
 	)
 		lua_default
 }

diff --git a/dev-lua/luasocket/luasocket-9999.ebuild b/dev-lua/luasocket/luasocket-9999.ebuild
index 2600eb1..4fcc497 100644
--- a/dev-lua/luasocket/luasocket-9999.ebuild
+++ b/dev-lua/luasocket/luasocket-9999.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 IS_MULTILIB=true
-
+GITHUB_A="diegonehab"
 inherit lua
 
 DESCRIPTION="Networking support library for the Lua language."
 HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/"
-EGIT_REPO_URI="https://github.com/diegonehab/luasocket"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc debug"
+IUSE="doc examples debug"
 
-DOCS=( NEW README )
-HTML_DOCS=( doc/ )
+DOCS=(NEW README)
+HTML_DOCS=(doc/.)
+EXAMPLES=(samples/.)
 
 all_lua_prepare() {
 	lua_default
@@ -48,13 +48,13 @@ each_lua_configure() {
 	)
 
 	use debug && \
-		myeconfargs+=( "DEBUG=DEBUG" )
+		myeconfargs+=("DEBUG=DEBUG")
 
 	use elibc_Winnt && \
-		myeconfargs+=( "PLAT=win32" )
+		myeconfargs+=("PLAT=win32")
 
 	use elibc_Cygwin && \
-		myeconfargs+=( "PLAT=mingw" )
+		myeconfargs+=("PLAT=mingw")
 
 	use elibc_Darwin && (
 		myeconfargs+=(
@@ -74,12 +74,3 @@ each_lua_configure() {
 		-e 's#(^LDFLAGS=)#MY\1#' \
 		-i .lua_eclass_config
 }
-
-#each_lua_install() {
-#	myeinstallargs=()
-#	if ! use elibc_Winnt && ! use elibc_Cygwin; then
-#		myeinstallargs+=( "install-unix" )
-#	fi
-#
-#	lua_default
-#}

diff --git a/dev-lua/luaunbound/luaunbound-9999.ebuild b/dev-lua/luaunbound/luaunbound-9999.ebuild
index 288f1e8..2f6e813 100644
--- a/dev-lua/luaunbound/luaunbound-9999.ebuild
+++ b/dev-lua/luaunbound/luaunbound-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 VCS="mercurial"
 
@@ -24,7 +24,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.markdown )
+DOCS=(README.markdown)
 
 #all_lua_prepare() {
 #	

diff --git a/dev-lua/luaxml/luaxml-9999.ebuild b/dev-lua/luaxml/luaxml-9999.ebuild
index 99fe09d..1f3a926 100644
--- a/dev-lua/luaxml/luaxml-9999.ebuild
+++ b/dev-lua/luaxml/luaxml-9999.ebuild
@@ -5,15 +5,12 @@ EAPI=6
 
 VCS="git"
 IS_MULTILIB=true
-LUA_COMPAT="lua51 luajit2"
-
 GITHUB_A="msva"
 
 inherit cmake-utils lua
 
 DESCRIPTION="A minimal set of XML processing function in Lua, with simple mapping between XML and Lua tables"
 HOMEPAGE="http://viremo.eludi.net/LuaXML/"
-#EGIT_REPO_URI="https://github.com/msva/luaxml"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/dev-lua/luazip/luazip-9999.ebuild b/dev-lua/luazip/luazip-9999.ebuild
index 077bf64..75cc4d1 100644
--- a/dev-lua/luazip/luazip-9999.ebuild
+++ b/dev-lua/luazip/luazip-9999.ebuild
@@ -1,23 +1,21 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="msva"
 
-# FIXME
-#IS_MULTILIB=true
 inherit lua
 
 
 DESCRIPTION="Lua bindings to zziplib"
 HOMEPAGE="https://github.com/msva/luazip"
-EGIT_REPO_URI="https://github.com/msva/luazip"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +examples"
+IUSE="doc examples"
 
 RDEPEND="
 	dev-libs/zziplib
@@ -26,9 +24,9 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README )
-HTML_DOCS=( doc/us/ )
-EXAMPLES=( tests/ )
+DOCS=(README)
+HTML_DOCS=(doc/us/.)
+EXAMPLES=(tests/.)
 
 all_lua_prepare() {
 	sed -i -e 'd' config

diff --git a/dev-lua/lullaby/lullaby-9999.ebuild b/dev-lua/lullaby/lullaby-9999.ebuild
index 1109e9d..6b2cd86 100644
--- a/dev-lua/lullaby/lullaby-9999.ebuild
+++ b/dev-lua/lullaby/lullaby-9999.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="hugomg"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="A stream-based HTML template library for Lua."
 HOMEPAGE="https://github.com/hugomg/lullaby"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/hugomg/lullaby"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="doc"
 
-READMES=( README.md )
-HTML_DOCS=( htmlspec/. )
+DOCS=(README.md)
+HTML_DOCS=(htmlspec/.)
 
 each_lua_install() {
 	dolua lullaby.lua lullaby

diff --git a/dev-lua/lulpeg/lulpeg-9999.ebuild b/dev-lua/lulpeg/lulpeg-9999.ebuild
index 030cb98..e4af01a 100644
--- a/dev-lua/lulpeg/lulpeg-9999.ebuild
+++ b/dev-lua/lulpeg/lulpeg-9999.ebuild
@@ -1,30 +1,30 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="pygy"
 
-VCS="git-r3"
 inherit lua
 
 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="lpeg_replace"
+IUSE="doc lpeg_replace"
+
+RDEPEND="lpeg_replace? ( !dev-lua/lpeg )"
+DEPEND="${RDEPEND}"
 
-READMES=( README.md TODO.md ABOUT )
+DOCS=(README.md TODO.md ABOUT)
 
 each_lua_compile() {
-	#paranoid mode:
-	rm "${PN}.lua" && (
-		cd src
+	pushd src &>/dev/null
 		"${LUA}" ../scripts/pack.lua > ../"${PN}.lua"
-	)
+	popd
 }
 
 each_lua_install() {

diff --git a/dev-lua/lunit/lunit-9999.ebuild b/dev-lua/lunit/lunit-9999.ebuild
index 3a6f6af..0d8a46b 100644
--- a/dev-lua/lunit/lunit-9999.ebuild
+++ b/dev-lua/lunit/lunit-9999.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="dcurrie"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="A unit testing framework for Lua"
 HOMEPAGE="https://github.com/dcurrie/lunit"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/dcurrie/${PN}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="+examples"
+IUSE="doc examples"
 
-EXAMPLES=( examples/. )
-READMES=( README README.lunitx DOCUMENTATION )
+EXAMPLES=(examples/.)
+DOCS=(README README.lunitx DOCUMENTATION)
 
 each_lua_install() {
 	dolua lua/*

diff --git a/dev-lua/lyaml/lyaml-9999.ebuild b/dev-lua/lyaml/lyaml-9999.ebuild
index a514ea1..bd276f5 100644
--- a/dev-lua/lyaml/lyaml-9999.ebuild
+++ b/dev-lua/lyaml/lyaml-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
-inherit lua
+VCS="git"
+GITHUB_A="gvvaughan"
+
+inherit autotools lua
 
 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"
@@ -22,62 +21,53 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-READMES=( README.md NEWS.md )
-HTML_DOCS=( doc/. )
+DOCS=(README.md NEWS.md)
+HTML_DOCS=(html/.)
 
 all_lua_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
-
-    # we'll check for ldoc ourslves
-    sed -r \
-        -e "s#(AC_PATH_PROG\(\[LDOC\],).*#\1 [echo], [false]\)#" \
-        -e "s#(AM_CONDITIONAL\(\[HAVE_LDOC\],).*#\1 [false]\)#" \
-        -i configure.ac
-
-    # we don't need and install documentation for each target, so we'll take care on this ourselves
-    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
-
-	#unneded bootstrap wrapper
-    rm GNUmakefile
+	sed -r \
+		-e "s/@PACKAGE_STRING@/${P}/" \
+		-e '/^dir/s@"."@"../html"@' \
+		build-aux/config.ld.in > build-aux/config.ld
+
+	gawk \
+		'/^AC_INIT/{print gensub(/[^0-9.]*([0-9.]*)[^0-9.]*/,"#define VERSION \"\\1\"","g",$2)}' \
+		configure.ac > config.h
 }
 
-all_lua_compile() {
-    use doc && (
-        cp build-aux/config.ld.in build-aux/config.ld
-
-        sed -r \
-            -e "s/@PACKAGE_STRING@/${P}/" \
-            -i build-aux/config.ld
+each_lua_compile() {
+	_lua_setFLAGS
 
-        cd build-aux && ldoc -d ../doc . && cd ..
+	# CRAZY buildsystem, no thanks
+	for c in ext/yaml/*.c; do
+		"${CC}" ${CFLAGS} -I. -c -o "${c/.c/.o}" "${c}" || die
+	done;
 
-        rm build-aux/config.ld
-    )
+    "${CC}" ${LDFLAGS} $(${PKG_CONFIG} --libs yaml-0.1) -o "${PN:1}.so" ext/yaml/*.o || die
 }
 
-each_lua_configure() {
-	myeconfargs=(
-		LUA="$(lua_get_lua)"
-		LUA_INCLUDE="$(lua_get_pkgvar --cflags --cflags-only-I)"
-		ax_cv_lua_luadir="$(lua_get_pkgvar INSTALL_LMOD)"
-		ax_cv_lua_luaexecdir="$(lua_get_pkgvar INSTALL_CMOD)"
-		--datadir="$(lua_get_pkgvar INSTALL_LMOD)"
-		--libdir="$(lua_get_pkgvar INSTALL_CMOD)"
+
+all_lua_compile() {
+    use doc && (
+		pushd build-aux &>/dev/null
+		ldoc .
+		popd
 	)
-	base_src_configure "${myeconfargs[@]}"
+}
 
+each_lua_install() {
+	dolua "${PN:1}.so"
+}
+
+#each_lua_configure() {
+#	myeconfargs=(
+#		LUA="$(lua_get_lua)"
+#		LUA_INCLUDE="$(lua_get_pkgvar --cflags --cflags-only-I)"
+#		ax_cv_lua_luadir="$(lua_get_pkgvar INSTALL_LMOD)"
+#		ax_cv_lua_luaexecdir="$(lua_get_pkgvar INSTALL_CMOD)"
+#		--datadir="$(lua_get_pkgvar INSTALL_LMOD)"
+#		--libdir="$(lua_get_pkgvar INSTALL_CMOD)"
 #	)
-#		"LUA_INCLUDE=-I$(lua_get_pkgvar includedir)"
 #	lua_default
 #	econf ${myeconfargs[@]}
-}
+#}

diff --git a/dev-lua/messagepack/messagepack-9999.ebuild b/dev-lua/messagepack/messagepack-9999.ebuild
index d489966..3dd5240 100644
--- a/dev-lua/messagepack/messagepack-9999.ebuild
+++ b/dev-lua/messagepack/messagepack-9999.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="fperrad"
+GITHUB_PN="lua-${PN^}"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="A pure Lua implementation of msgpack.org"
 HOMEPAGE="https://fperrad.github.io/lua-MessagePack/"
-EGIT_REPO_URI="https://github.com/fperrad/lua-MessagePack.git"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/dev-lua/moonscript/moonscript-9999.ebuild b/dev-lua/moonscript/moonscript-9999.ebuild
index ff2671b..bbb9a33 100644
--- a/dev-lua/moonscript/moonscript-9999.ebuild
+++ b/dev-lua/moonscript/moonscript-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="leafo"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="A programmer friendly language that compiles into Lua."
 HOMEPAGE="https://github.com/leafo/moonscript"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/leafo/moonscript"
 
 LICENSE="MIT"
 SLOT="0"
@@ -28,7 +27,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/moses/metadata.xml b/dev-lua/moses/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/moses/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@×××.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-sendmail/lua-sendmail-9999.ebuild b/dev-lua/moses/moses-9999.ebuild
similarity index 60%
copy from dev-lua/lua-sendmail/lua-sendmail-9999.ebuild
copy to dev-lua/moses/moses-9999.ebuild
index 48c546a..7d43abb 100644
--- a/dev-lua/lua-sendmail/lua-sendmail-9999.ebuild
+++ b/dev-lua/moses/moses-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="Yonaba"
+GITHUB_PN="${PN^}"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="Simple wrapper around luasoket smtp.send"
-HOMEPAGE="https://github.com/moteus/lua-sendmail"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/moteus/lua-sendmail"
+HOMEPAGE="https://github.com/Yonaba/Moses"
 
 LICENSE="MIT"
 SLOT="0"
@@ -24,9 +24,9 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.md )
-HTML_DOCS=( docs/ )
+DOCS=(README.md doc/tutorial.md)
+HTML_DOCS=(doc/index.html doc/topics)
 
 each_lua_install() {
-	dolua lua/sendmail.lua
+	dolua ${PN}.lua
 }

diff --git a/dev-lua/orbit/orbit-9999.ebuild b/dev-lua/orbit/orbit-9999.ebuild
index 072764e..c4ecc46 100644
--- a/dev-lua/orbit/orbit-9999.ebuild
+++ b/dev-lua/orbit/orbit-9999.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="keplerproject"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="MVC Web Framework for Lua"
 HOMEPAGE="https://github.com/keplerproject/orbit"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/keplerproject/orbit.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +examples"
+IUSE="doc examples"
 
 RDEPEND="
 	dev-lua/wsapi
@@ -24,8 +23,8 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 "
-DOCS=( doc/. )
-EXAMPLES=( samples/. test/. )
+DOCS=(doc/.)
+EXAMPLES=(samples/. test/.)
 
 all_lua_prepare() {
 	sed -r \
@@ -35,10 +34,7 @@ all_lua_prepare() {
 	rm samples/pages/doc samples/doc
 }
 
-src_configure() { :; }
-src_compile() { :; }
-
 each_lua_install() {
 	dolua src/${PN}{,.lua}
-	dobin src/launchers/${PN}
+	dobin src/launchers/*
 }

diff --git a/dev-lua/penlight/penlight-9999.ebuild b/dev-lua/penlight/penlight-9999.ebuild
index f5c7c4c..9ceebc0 100644
--- a/dev-lua/penlight/penlight-9999.ebuild
+++ b/dev-lua/penlight/penlight-9999.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="stevedonovan"
 
-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"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/stevedonovan/Penlight git://github.com/stevedonovan/Penlight"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +examples test luajit"
+IUSE="doc examples test luajit"
 
 # TODO: Lua 5.2 handling
 
@@ -24,14 +23,15 @@ DEPEND="
 	doc? ( dev-lua/ldoc )
 "
 
-HTML_DOCS=( html/. )
-DOCS=( README.md CHANGES.md CONTRIBUTING.md )
-EXAMPLES=( examples/. )
+HTML_DOCS=(html/.)
+DOCS=(README.md CHANGES.md CONTRIBUTING.md)
+EXAMPLES=(examples/.)
 
 all_lua_compile() {
 	use doc && (
-		cd doc
+		pushd doc &>/dev/null
 		ldoc . -d ../html
+		popd
 	)
 }
 

diff --git a/dev-lua/profi/Manifest b/dev-lua/profi/Manifest
index 7faa12f..e257c1f 100644
--- a/dev-lua/profi/Manifest
+++ b/dev-lua/profi/Manifest
@@ -1 +1 @@
-DIST profi-12.tar.gz 3911 SHA256 3738c20a3a3d401e0fc680bf2db58eee8896a26e26686e5bfd1c8e33ad1595b2 SHA512 f5bd625dc8a828d2e1fe9763f775f13430decbdf057aa4577abd2907bb3d68d84feed74e9fa9c6b3e71e6ebf986ef56d9fa2e8deb21490851e5d875e3653a8d2 WHIRLPOOL fdc2858b5f4ee87e741bc3c775d707a9ddd5255c0573e807d2e1fb370c561deacaff0096ceced5a329e9d779704b5ae2a1d5d0617f5849d47788fc815f13f540
+DIST profi-1.3.tar.gz 3911 SHA256 3738c20a3a3d401e0fc680bf2db58eee8896a26e26686e5bfd1c8e33ad1595b2 SHA512 f5bd625dc8a828d2e1fe9763f775f13430decbdf057aa4577abd2907bb3d68d84feed74e9fa9c6b3e71e6ebf986ef56d9fa2e8deb21490851e5d875e3653a8d2 WHIRLPOOL fdc2858b5f4ee87e741bc3c775d707a9ddd5255c0573e807d2e1fb370c561deacaff0096ceced5a329e9d779704b5ae2a1d5d0617f5849d47788fc815f13f540

diff --git a/dev-lua/profi/profi-12.ebuild b/dev-lua/profi/profi-1.3.ebuild
similarity index 54%
rename from dev-lua/profi/profi-12.ebuild
rename to dev-lua/profi/profi-1.3.ebuild
index 0147dd4..c16e67c 100644
--- a/dev-lua/profi/profi-12.ebuild
+++ b/dev-lua/profi/profi-1.3.ebuild
@@ -1,21 +1,24 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+GIST_A="perky"
+GIST_ID="2838755"
+GIST_SHA="78e573ca38b859c8639427c52d2c850736969bc7"
 
 inherit lua
 
 DESCRIPTION="a Lua Profiler"
 HOMEPAGE="https://gist.github.com/perky/2838755"
-SRC_URI="https://gist.github.com/perky/2838755/archive/78e573ca38b859c8639427c52d2c850736969bc7.tar.gz -> ${P}.tar.gz"
-#SRC_URI="https://gist.github.com/perky/2838755/download -> ${P}.zip"
+SRC_URI="https://gist.github.com/${GIST_A}/${GIST_ID}/archive/${GIST_SHA}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc mips arm"
 IUSE=""
 
-LUA_S="2838755-78e573ca38b859c8639427c52d2c850736969bc7"
+LUA_S="${GIST_ID}-${GIST_SHA}"
 
 each_lua_install() {
 	dolua ProFi.lua

diff --git a/dev-lua/raven/raven-9999.ebuild b/dev-lua/raven/raven-9999.ebuild
index 08d7b7f..f643fc8 100644
--- a/dev-lua/raven/raven-9999.ebuild
+++ b/dev-lua/raven/raven-9999.ebuild
@@ -1,34 +1,36 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="cloudflare"
+GITHUB_PN="${PN}-lua"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="A small Lua interface to Sentry"
 HOMEPAGE="https://github.com/cloudflare/raven-lua"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/cloudflare/${PN}-lua"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +examples"
+IUSE="doc test examples"
 
 RDEPEND="
 	dev-lua/lua-cjson
-	dev-lua/lunit
-	dev-lua/luaposix
+	test? (
+		dev-lua/lunit
+		dev-lua/luaposix
+	)
 "
 DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.md )
-HTML_DOCS=( docs/. )
-EXAMPLES=( tests/. )
+DOCS=(README.md)
+HTML_DOCS=(docs/.)
+EXAMPLES=(tests/.)
 
 # Makefile is only used to run tests
 src_compile() { :; }

diff --git a/dev-lua/rds-parser/rds-parser-9999.ebuild b/dev-lua/rds-parser/rds-parser-9999.ebuild
index 80d0ea5..a829ee3 100644
--- a/dev-lua/rds-parser/rds-parser-9999.ebuild
+++ b/dev-lua/rds-parser/rds-parser-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 LUA_COMPAT="lua51 luajit2"
 IS_MULTILIB=true
+GITHUB_A="openresty"
+GITHUB_PN="lua-${PN}"
+
 inherit lua
 
 DESCRIPTION="Resty-DBD-Stream (RDS) parser for Lua written in C"
 HOMEPAGE="https://github.com/openresty/lua-rds-parser"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/openresty/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"

diff --git a/dev-lua/redis-parser/redis-parser-9999.ebuild b/dev-lua/redis-parser/redis-parser-9999.ebuild
index f75d8a3..49c1012 100644
--- a/dev-lua/redis-parser/redis-parser-9999.ebuild
+++ b/dev-lua/redis-parser/redis-parser-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 LUA_COMPAT="lua51 luajit2"
 IS_MULTILIB=true
+GITHUB_A="openresty"
+GITHUB_PN="lua-${PN}"
+
 inherit lua
 
 DESCRIPTION="Redis reply parser and request constructor library for Lua"
 HOMEPAGE="https://github.com/openresty/lua-redis-parser"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/openresty/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"

diff --git a/dev-lua/resty-cookie/resty-cookie-9999.ebuild b/dev-lua/resty-cookie/resty-cookie-9999.ebuild
index 72cb73b..74d1aaf 100644
--- a/dev-lua/resty-cookie/resty-cookie-9999.ebuild
+++ b/dev-lua/resty-cookie/resty-cookie-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="cloudflare"
+GITHUB_PN="lua-${PN}"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="Library for parsing HTTP Cookie header for Nginx"
 HOMEPAGE="https://github.com/cloudflare/lua-resty-cookie"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/cloudflare/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,7 +24,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.md )
+DOCS=(README.md)
 
 each_lua_install() {
 	dolua lib/resty

diff --git a/dev-lua/resty-core/resty-core-9999.ebuild b/dev-lua/resty-core/resty-core-9999.ebuild
index 6572a77..f8d61ff 100644
--- a/dev-lua/resty-core/resty-core-9999.ebuild
+++ b/dev-lua/resty-core/resty-core-9999.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 LUA_COMPAT="luajit2"
-VCS="git-r3"
+VCS="git"
+GITHUB_A="openresty"
+GITHUB_PN="lua-${PN}"
+
 inherit lua
 
 DESCRIPTION="New LuaJIT FFI based API for lua-nginx-module"
 HOMEPAGE="https://github.com/openresty/lua-resty-core"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/openresty/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -27,7 +27,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.markdown )
+DOCS=(README.markdown)
 
 each_lua_install() {
 	dolua_jit lib/resty

diff --git a/dev-lua/resty-dns/resty-dns-9999.ebuild b/dev-lua/resty-dns/resty-dns-9999.ebuild
index 5719be4..90b5b5f 100644
--- a/dev-lua/resty-dns/resty-dns-9999.ebuild
+++ b/dev-lua/resty-dns/resty-dns-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="openresty"
+GITHUB_PN="lua-${PN}"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="Lua DNS resolver for the ngx_lua based on the cosocket API"
 HOMEPAGE="https://github.com/openresty/lua-resty-dns"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/openresty/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -25,7 +25,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.markdown )
+DOCS=(README.markdown)
 
 each_lua_install() {
 	dolua lib/resty

diff --git a/dev-lua/resty-hoedown/metadata.xml b/dev-lua/resty-hoedown/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/resty-hoedown/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@×××.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/resty-lock/resty-lock-9999.ebuild b/dev-lua/resty-hoedown/resty-hoedown-9999.ebuild
similarity index 58%
copy from dev-lua/resty-lock/resty-lock-9999.ebuild
copy to dev-lua/resty-hoedown/resty-hoedown-9999.ebuild
index 8e8c148..872b0bf 100644
--- a/dev-lua/resty-lock/resty-lock-9999.ebuild
+++ b/dev-lua/resty-hoedown/resty-hoedown-9999.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="bungle"
+GITHUB_PN="lua-${PN}"
 LUA_COMPAT="luajit2"
-inherit lua
 
-DESCRIPTION="Simple shm-based nonblocking lock API"
-HOMEPAGE="https://github.com/openresty/lua-resty-lock"
-SRC_URI=""
+inherit lua
 
-EGIT_REPO_URI="https://github.com/openresty/lua-${PN}"
+DESCRIPTION="LuaJIT FFI bindings to app-text/hoedown"
+HOMEPAGE="https://github.com/bungle/lua-resty-hoedown"
 
 LICENSE="BSD"
 SLOT="0"
@@ -25,7 +25,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.markdown )
+DOCS=(README.md)
 
 each_lua_install() {
 	dolua_jit lib/resty

diff --git a/dev-lua/resty-lock/resty-lock-9999.ebuild b/dev-lua/resty-lock/resty-lock-9999.ebuild
index 8e8c148..09e8436 100644
--- a/dev-lua/resty-lock/resty-lock-9999.ebuild
+++ b/dev-lua/resty-lock/resty-lock-9999.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 LUA_COMPAT="luajit2"
+GITHUB_A="openresty"
+GITHUB_PN="lua-${PN}"
+
 inherit lua
 
 DESCRIPTION="Simple shm-based nonblocking lock API"
 HOMEPAGE="https://github.com/openresty/lua-resty-lock"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/openresty/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -25,7 +25,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.markdown )
+DOCS=(README.markdown)
 
 each_lua_install() {
 	dolua_jit lib/resty

diff --git a/dev-lua/resty-lrucache/resty-lrucache-9999.ebuild b/dev-lua/resty-lrucache/resty-lrucache-9999.ebuild
index 01c63cd..1b13fcf 100644
--- a/dev-lua/resty-lrucache/resty-lrucache-9999.ebuild
+++ b/dev-lua/resty-lrucache/resty-lrucache-9999.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 LUA_COMPAT="luajit2"
+GITHUB_A="openresty"
+GITHUB_PN="lua-${PN}"
+
 inherit lua
 
 DESCRIPTION="A simple LRU cache for OpenResty and the ngx_lua module (based on LuaJIT FFI)"
 HOMEPAGE="https://github.com/openresty/lua-resty-lrucache"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/openresty/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -25,7 +25,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.markdown )
+DOCS=(README.markdown)
 
 each_lua_install() {
 	dolua_jit lib/resty

diff --git a/dev-lua/resty-memcached/resty-memcached-9999.ebuild b/dev-lua/resty-memcached/resty-memcached-9999.ebuild
index 8b557d6..76b94f3 100644
--- a/dev-lua/resty-memcached/resty-memcached-9999.ebuild
+++ b/dev-lua/resty-memcached/resty-memcached-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="openresty"
+GITHUB_PN="lua-${PN}"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="Lua memcached client driver for the ngx_lua based on the cosocket API"
 HOMEPAGE="https://github.com/openresty/lua-resty-memcached"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/openresty/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,7 +24,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.markdown )
+DOCS=(README.markdown)
 
 each_lua_install() {
 	dolua lib/resty

diff --git a/dev-lua/resty-mysql/resty-mysql-9999.ebuild b/dev-lua/resty-mysql/resty-mysql-9999.ebuild
index 3a572cf..bd0f4b8 100644
--- a/dev-lua/resty-mysql/resty-mysql-9999.ebuild
+++ b/dev-lua/resty-mysql/resty-mysql-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="openresty"
+GITHUB_PN="lua-${PN}"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="Lua MySQL client driver for ngx_lua based on the cosocket API"
 HOMEPAGE="https://github.com/openresty/lua-resty-mysql"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/openresty/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -25,7 +25,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.markdown )
+DOCS=(README.markdown)
 
 each_lua_install() {
 	dolua lib/resty

diff --git a/dev-lua/resty-random/resty-random-9999.ebuild b/dev-lua/resty-random/resty-random-9999.ebuild
index 922a05b..4d6f85c 100644
--- a/dev-lua/resty-random/resty-random-9999.ebuild
+++ b/dev-lua/resty-random/resty-random-9999.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 LUA_COMPAT="luajit2"
+GITHUB_A="bungle"
+GITHUB_PN="lua-${PN}"
+
 inherit lua
 
 DESCRIPTION="LuaJIT FFI-based Random Library for OpenResty"
 HOMEPAGE="https://github.com/bungle/lua-resty-random"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/bungle/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -19,7 +19,6 @@ KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-	!dev-lua/resty-string[-ext-random(+)]
 	www-servers/nginx[nginx_modules_http_lua,ssl]
 	dev-libs/openssl
 "
@@ -27,9 +26,8 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.md )
+DOCS=(README.md)
 
 each_lua_install() {
-#	mv lib/resty/random.lua lib/resty/resty_random.lua
 	dolua_jit lib/resty
 }

diff --git a/dev-lua/resty-redis/resty-redis-9999.ebuild b/dev-lua/resty-redis/resty-redis-9999.ebuild
index fab7ae1..84a981e 100644
--- a/dev-lua/resty-redis/resty-redis-9999.ebuild
+++ b/dev-lua/resty-redis/resty-redis-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="openresty"
+GITHUB_PN="lua-${PN}"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="Lua redis client driver for the ngx_lua based on the cosocket API"
 HOMEPAGE="https://github.com/openresty/lua-resty-redis"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/openresty/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,7 +24,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.markdown )
+DOCS=(README.markdown)
 
 each_lua_install() {
 	dolua lib/resty

diff --git a/dev-lua/resty-session/resty-session-9999.ebuild b/dev-lua/resty-session/resty-session-9999.ebuild
index bb05b66..b0e1523 100644
--- a/dev-lua/resty-session/resty-session-9999.ebuild
+++ b/dev-lua/resty-session/resty-session-9999.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 LUA_COMPAT="luajit2"
+GITHUB_A="bungle"
+GITHUB_PN="lua-${PN}"
+
 inherit lua
 
 DESCRIPTION="Session library for OpenResty implementing Secure Cookie Protocol"
 HOMEPAGE="https://github.com/bungle/lua-resty-session"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/bungle/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -27,7 +27,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.md )
+DOCS=(README.md)
 
 each_lua_install() {
 	dolua_jit lib/resty

diff --git a/dev-lua/resty-string/resty-string-9999.ebuild b/dev-lua/resty-string/resty-string-9999.ebuild
index 2df76d3..f1ddac7 100644
--- a/dev-lua/resty-string/resty-string-9999.ebuild
+++ b/dev-lua/resty-string/resty-string-9999.ebuild
@@ -1,36 +1,36 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 LUA_COMPAT="luajit2"
+GITHUB_A="openresty"
+GITHUB_PN="lua-${PN}"
+
 inherit lua
 
 DESCRIPTION="String utilities and common hash functions for ngx_lua and LuaJIT"
-HOMEPAGE="https://github.com/openresty/lua-string"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/openresty/lua-${PN}"
+HOMEPAGE="https://github.com/openresty/lua-resty-string"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="+ext_random"
+IUSE="naive-random"
 
 RDEPEND="
-	ext_random? ( dev-lua/resty-random )
 	www-servers/nginx[nginx_modules_http_lua,ssl]
 	dev-libs/openssl
 "
 DEPEND="
 	${RDEPEND}
 "
+PDEPEND="!naive-random? ( dev-lua/resty-random )"
 
-READMES=( README.markdown )
+DOCS=(README.markdown)
 
 all_lua_prepare() {
-	use ext_random && rm lib/resty/random.lua
+	use naive-random || rm lib/resty/random.lua
 }
 
 each_lua_install() {

diff --git a/dev-lua/resty-tags/metadata.xml b/dev-lua/resty-tags/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/resty-tags/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@×××.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/resty-template/resty-template-9999.ebuild b/dev-lua/resty-tags/resty-tags-9999.ebuild
similarity index 56%
copy from dev-lua/resty-template/resty-template-9999.ebuild
copy to dev-lua/resty-tags/resty-tags-9999.ebuild
index 03be656..e980a2c 100644
--- a/dev-lua/resty-template/resty-template-9999.ebuild
+++ b/dev-lua/resty-tags/resty-tags-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
-inherit lua
+VCS="git"
+GITHUB_A="bungle"
+GITHUB_PN="lua-${PN}"
 
-DESCRIPTION="Templating Engine (HTML) for Lua and OpenResty."
-HOMEPAGE="https://github.com/bungle/lua-resty-template"
-SRC_URI=""
+inherit lua
 
-EGIT_REPO_URI="https://github.com/bungle/lua-${PN}"
+DESCRIPTION="A small DSL for building HTML documents"
+HOMEPAGE="https://github.com/bungle/lua-resty-tags"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,7 +24,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( "README.md" )
+DOCS=(README.md)
 
 each_lua_install() {
 	dolua lib/resty

diff --git a/dev-lua/resty-template/resty-template-9999.ebuild b/dev-lua/resty-template/resty-template-9999.ebuild
index 03be656..39b75eb 100644
--- a/dev-lua/resty-template/resty-template-9999.ebuild
+++ b/dev-lua/resty-template/resty-template-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="bungle"
+GITHUB_PN="lua-${PN}"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="Templating Engine (HTML) for Lua and OpenResty."
 HOMEPAGE="https://github.com/bungle/lua-resty-template"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/bungle/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,7 +24,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( "README.md" )
+DOCS=(README.md)
 
 each_lua_install() {
 	dolua lib/resty

diff --git a/dev-lua/resty-upload/resty-upload-9999.ebuild b/dev-lua/resty-upload/resty-upload-9999.ebuild
index 3cbff63..c1ed2be 100644
--- a/dev-lua/resty-upload/resty-upload-9999.ebuild
+++ b/dev-lua/resty-upload/resty-upload-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="openresty"
+GITHUB_PN="lua-${PN}"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="Streaming reader and parser for HTTP file uploading based on ngx_lua cosocket"
 HOMEPAGE="https://github.com/openresty/lua-resty-upload"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/openresty/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,7 +24,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.markdown )
+DOCS=(README.markdown)
 
 each_lua_install() {
 	dolua lib/resty

diff --git a/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild b/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild
index 1b1998a..1717891 100644
--- a/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild
+++ b/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="openresty"
+GITHUB_PN="lua-${PN}"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="Health Checker for Nginx Upstream Servers in Pure Lua"
 HOMEPAGE="https://github.com/openresty/lua-resty-upstream-healthcheck"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/openresty/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,7 +24,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.markdown )
+DOCS=(README.markdown)
 
 each_lua_install() {
 	dolua lib/resty

diff --git a/dev-lua/resty-websocket/resty-websocket-9999.ebuild b/dev-lua/resty-websocket/resty-websocket-9999.ebuild
index 7aab7e2..c17ccac 100644
--- a/dev-lua/resty-websocket/resty-websocket-9999.ebuild
+++ b/dev-lua/resty-websocket/resty-websocket-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
+VCS="git"
+GITHUB_A="openresty"
+GITHUB_PN="lua-${PN}"
 
-VCS="git-r3"
 inherit lua
 
 DESCRIPTION="Lua WebSocket implementation for the NginX lua module"
 HOMEPAGE="https://github.com/openresty/lua-resty-websocket"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/openresty/lua-${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -25,7 +24,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-READMES=( README.markdown )
+DOCS=(README.markdown)
 
 each_lua_install() {
 	dolua lib/resty

diff --git a/dev-lua/rings/rings-9999.ebuild b/dev-lua/rings/rings-9999.ebuild
index f8be909..232b4a8 100644
--- a/dev-lua/rings/rings-9999.ebuild
+++ b/dev-lua/rings/rings-9999.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
 IS_MULTILIB=true
+GITHUB_A="keplerproject"
+
 inherit lua
 
 DESCRIPTION="Lua Rings Library"
 HOMEPAGE="https://github.com/keplerproject/rings"
-SRC_URI=""
-
-#s/msva/keplerproject/ when they apply pull-request
-EGIT_REPO_URI="git://github.com/msva/rings.git https://github.com/msva/rings.git"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/dev-lua/specl/specl-9999.ebuild b/dev-lua/specl/specl-9999.ebuild
index 2cd50c9..3c7d058 100644
--- a/dev-lua/specl/specl-9999.ebuild
+++ b/dev-lua/specl/specl-9999.ebuild
@@ -1,53 +1,49 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+VCS="git"
+GITHUB_A="gvvaughan"
 
-VCS="git-r3"
 inherit lua
 
 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=""
+IUSE="doc"
 
 RDEPEND="
 	dev-lua/luamacro
 	dev-lua/lyaml
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
 
-READMES=( README.md NEWS )
+DOCS=(README.md doc/specl.md NEWS.md)
+HTML_DOCS=(html/.)
 
 all_lua_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
-
-	./bootstrap --skip-rock-checks
-	lua_default
+	mkdir -p html
+	sed \
+		-e '/^dir/s@"."@"../html"@' \
+		-i doc/config.ld.in
 }
 
-each_lua_configure() {
-	myeconfargs=(
-		"--datadir=$(lua_get_pkgvar INSTALL_LMOD)"
-		"--libdir=$(lua_get_pkgvar INSTALL_CMOD)"
-		"LUA_INCLUDE=-I$(lua_get_pkgvar includedir)"
-	)
-	lua_default
+each_lua_compile() {
+	make lib/specl/version.lua
 }
 
-each_lua_compile() {
-	./config.status --file=lib/specl/version.lua
+all_lua_compile() {
+	lua_default
+	emake doc/specl.1
 }
 
 each_lua_install() {
-	rm lib/specl/version.lua.in
-	dolua lib/specl
+	dobin bin/specl
+	dolua lib/specl/*.lua lib/specl/*/
 }

diff --git a/dev-lua/squish/squish-9999.ebuild b/dev-lua/squish/squish-9999.ebuild
index b3b08fe..f1e1c96 100644
--- a/dev-lua/squish/squish-9999.ebuild
+++ b/dev-lua/squish/squish-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils mercurial
+inherit mercurial
 
 DESCRIPTION="XMPP client library written in Lua."
 HOMEPAGE="http://code.matthewwild.co.uk/"
@@ -14,13 +14,12 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="virtual/lua"
+RDEPEND="
+	dev-lua/luasocket
+	virtual/lua
+"
 DEPEND="${RDEPEND}"
 
-src_compile() {
-	default
-}
-
 src_install() {
 	dobin squish
 	dobin make_squishy

diff --git a/dev-lua/verse/verse-9999.ebuild b/dev-lua/verse/verse-9999.ebuild
index 6088335..87c4a24 100644
--- a/dev-lua/verse/verse-9999.ebuild
+++ b/dev-lua/verse/verse-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 VCS="mercurial"
 LUA_COMPAT="lua51 luajit2"
@@ -14,7 +14,7 @@ EHG_REPO_URI="http://code.matthewwild.co.uk/${PN}/"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="+examples"
+IUSE="examples"
 
 RDEPEND="
 	dev-lua/squish
@@ -27,7 +27,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-EXAMPLES=( doc/. )
+EXAMPLES=(doc/.)
 
 each_lua_compile() {
 	squish --use-http

diff --git a/dev-lua/wsapi/wsapi-9999.ebuild b/dev-lua/wsapi/wsapi-9999.ebuild
index 8c31ac3..6700af4 100644
--- a/dev-lua/wsapi/wsapi-9999.ebuild
+++ b/dev-lua/wsapi/wsapi-9999.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-VCS="git-r3"
+VCS="git"
+GITHUB_A="keplerproject"
 #IS_MULTILIB=true
+
 inherit lua
 
 DESCRIPTION="Lua WSAPI Library"
 HOMEPAGE="https://github.com/keplerproject/wsapi"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/keplerproject/wsapi.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +examples uwsgi +fcgi"
+IUSE="doc examples uwsgi fcgi"
 #TODO: xavante"
 RDEPEND="
 	fcgi? (
@@ -32,9 +31,9 @@ RDEPEND="
 #TODO:	xavante? ( dev-lua/xavante )"
 DEPEND="${RDEPEND}"
 
-DOCS=( doc/us/{index,libraries,license,manual}.md )
-HTML_DOCS=( doc/us/{index,libraries,license,manual}.html doc/us/doc.css doc/us/${PN}.png )
-EAMPLES=( samples/. )
+DOCS=(doc/us/{index,libraries,license,manual}.md)
+HTML_DOCS=(doc/us/{index,libraries,license,manual}.html doc/us/doc.css doc/us/${PN}.png)
+EAMPLES=(samples/.)
 
 all_lua_prepare() {
 	sed -r \

diff --git a/dev-lua/yubikey-lua/yubikey-lua-9999.ebuild b/dev-lua/yubikey-lua/yubikey-lua-9999.ebuild
index 704708a..a6633b4 100644
--- a/dev-lua/yubikey-lua/yubikey-lua-9999.ebuild
+++ b/dev-lua/yubikey-lua/yubikey-lua-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 VCS="mercurial"
 inherit lua

diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index bf1e4fb..7bfc398 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -61,9 +61,9 @@
 # you are looking for if you get the related "Missing links" QA warning,
 # since the proper fix is almost always to make sure the shared object
 # is linked against liblua. There are cases were this is not the case
-# and the shared object is generic code to be used in some other way
-# (e.g. selenium's firefox driver extension). When set this argument is
-# passed to "grep -E" to remove reporting of these shared objects.
+# and the shared object is generic code to be used in some other way.
+# When set this argument is passed to "grep -E" to remove reporting of
+# these shared objects.
 
 : ${GLOBAL_CFLAGS-${CFLAGS}}
 : ${GLOBAL_CXXFLAGS-${CXXFLAGS}}
@@ -198,7 +198,7 @@ _lua_atoms_samelib_generic() {
 				;;
 			*])
 				echo "${token%[*}[LUATARGET,${token/*[}"
-				#"]}" # <= kludge for vim's syntax highlighting engine to don't mess up all the things below this line
+				#"]}" # <- kludge for vim's syntax highlighting engine to don't mess up all the things below this line
 				;;
 			*)
 				echo "${token}[LUATARGET]"
@@ -811,7 +811,7 @@ _lua_install_cmod() {
 _lua_jit_insopts() {
 	[[ "${LUA}" =~ "luajit" ]] || die "Calling dolua_jit for non-jit targets isn't supported"
 	local insdir=$(${LUA} -e 'print(package.path:match(";(/[^;]+luajit[^;]+)/%?.lua;"))')
-	insinto ${insdir}
+	insinto ${insdir}/${_dolua_jit_insdir}
 	insopts -m 0644
 }
 
@@ -917,8 +917,8 @@ _lua_default_all_prepare() {
 				-e 's#(^LFLAGS[[:space:]]*)[[:punct:]]*=#\1+=$(LDCONFIG)#' \
 				-e 's#`pkg-config#`$(PKG_CONFIG)#g' \
 				-e 's#(shell[[:space:][:punct:]]*)pkg-config#\1$(PKG_CONFIG)#g' \
-				-e 's#lua5.[[:digit:]]#$(LUA_IMPL)#g' \
 				-e 's#-llua[[:digit:][:punct:]]*#__LESLPH__#g;s#__LESLPH__([[:alpha:]])#-llua\1#g;s#__LESLPH__#$(LUA_LINK_LIB)#g' \
+				-e 's#lua5.[[:digit:]]#$(LUA_IMPL)#g' \
 				"${mf}"
 		fi
 		touch ${T}/.lua_ecl_conf

diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 692f68a..4944b46 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -12,73 +12,225 @@ dev-lua/wsapi:luajit - Enable linking with LuaJIT library instead of Lua.
 games-engines/love:luajit - Enable linking with LuaJIT library instead of Lua
 net-im/prosody:libevent - 
 net-im/prosody:luajit - 
-net-im/prosody-modules:addressing - 
-net-im/prosody-modules:adhoc - 
-net-im/prosody-modules:adhoc_cmd_admin - 
-net-im/prosody-modules:adhoc_cmd_modules - 
-net-im/prosody-modules:adhoc_cmd_ping - 
-net-im/prosody-modules:adhoc_cmd_uptime - 
-net-im/prosody-modules:admin_web - 
-net-im/prosody-modules:archive - 
-net-im/prosody-modules:archive_muc - 
-net-im/prosody-modules:auth_dovecot - 
-net-im/prosody-modules:auth_external - 
-net-im/prosody-modules:auth_internal_yubikey - 
-net-im/prosody-modules:auth_joomla - 
-net-im/prosody-modules:auth_ldap - 
-net-im/prosody-modules:auth_phpbb3 - 
-net-im/prosody-modules:auth_sql - 
-net-im/prosody-modules:auth_wordpress - 
-net-im/prosody-modules:blocking - 
-net-im/prosody-modules:carbons - 
-net-im/prosody-modules:component_guard - 
-net-im/prosody-modules:component_roundrobin - 
-net-im/prosody-modules:couchdb - 
-net-im/prosody-modules:data_access - 
-net-im/prosody-modules:default_bookmarks - 
-net-im/prosody-modules:default_vcard - 
-net-im/prosody-modules:discoitems - 
-net-im/prosody-modules:extdisco - 
-net-im/prosody-modules:flash_policy - 
-net-im/prosody-modules:group_bookmarks - 
-net-im/prosody-modules:ipcheck - 
-net-im/prosody-modules:ircd - 
-net-im/prosody-modules:json_streams - 
-net-im/prosody-modules:log_auth - 
-net-im/prosody-modules:motd_sequential - 
-net-im/prosody-modules:muc_intercom - 
-net-im/prosody-modules:muc_log - 
-net-im/prosody-modules:muc_log_http - 
-net-im/prosody-modules:offline_email - 
-net-im/prosody-modules:onhold - 
-net-im/prosody-modules:openid - 
-net-im/prosody-modules:pastebin - 
-net-im/prosody-modules:post_msg - 
-net-im/prosody-modules:privacy - 
-net-im/prosody-modules:proxy65 - 
-net-im/prosody-modules:pubsub_feed - 
-net-im/prosody-modules:register_json - 
-net-im/prosody-modules:register_redirect - 
-net-im/prosody-modules:reload_modules - 
-net-im/prosody-modules:remote_roster - 
-net-im/prosody-modules:roster_command - 
-net-im/prosody-modules:s2s_blackwhitelist - 
-net-im/prosody-modules:s2s_idle_timeout - 
-net-im/prosody-modules:s2s_never_encrypt_blacklist - 
-net-im/prosody-modules:s2s_reload_newcomponent - 
-net-im/prosody-modules:saslauth_muc - 
-net-im/prosody-modules:seclabels - 
-net-im/prosody-modules:server_contact_info - 
-net-im/prosody-modules:sift - 
-net-im/prosody-modules:smacks - 
-net-im/prosody-modules:sms_clickatell - 
-net-im/prosody-modules:srvinjection - 
-net-im/prosody-modules:stanza_counter - 
-net-im/prosody-modules:streamstats - 
-net-im/prosody-modules:support_contact - 
-net-im/prosody-modules:swedishchef - 
-net-im/prosody-modules:tcpproxy - 
-net-im/prosody-modules:throttle_presence - 
-net-im/prosody-modules:twitter - 
-net-im/prosody-modules:webpresence - 
-net-im/prosody-modules:websocket - 
+net-im/prosody-modules:addressing - This module is a partial implementation of XEP-0033: Extended Stanza Addressing. (info: https://modules.prosody.im/mod_addressing)
+net-im/prosody-modules:adhoc_account_management - This module adds an ad-hoc command that lets an user change their password. This is useful for clients that don't have support for XEP-0077 style password changing. In the future, it may provide other account management commands. (info: https://modules.prosody.im/mod_adhoc_account_management)
+net-im/prosody-modules:adhoc_blacklist - This module provides the Edit Blacklist ad-hoc command described in XEP-0133 and also performs the actual blocking of incoming and outgoing server-to-server connections. (info: https://modules.prosody.im/mod_adhoc_blacklist)
+net-im/prosody-modules:admin_blocklist - This module uses the blocklists set by admins for blocking s2s connections. (info: https://modules.prosody.im/mod_admin_blocklist)
+net-im/prosody-modules:admin_message - This module provides a console over XMPP. All the commands of the mod_admin_telnet module are available from an XMPP client. (info: https://modules.prosody.im/mod_admin_message)
+net-im/prosody-modules:admin_probe - This module lets server administrators send <presence type="probe"/> to any local user and receive their presence in response, bypassing roster checks. (info: https://modules.prosody.im/mod_admin_probe)
+net-im/prosody-modules:admin_web - This module provides a basic web administration interface. It currently gives you access to Ad-Hoc commands on any virtual host or component that you are set as an administrator for in the Prosody config file. It also provides a live list of all S2S and C2S connections. (info: https://modules.prosody.im/mod_admin_web)
+net-im/prosody-modules:alias - This module allows you to set up aliases that alert people who try to contact them or add them to their roster what your actual JID is. This is useful for changing JIDs, or just in the case where you own both example.com and example.net, and want people who contact you@×××××××.com to be alerted to contact you at you@×××××××.net instead. (info: https://modules.prosody.im/mod_alias)
+net-im/prosody-modules:auth_any - This module accepts any username and password, which can be useful for testing. (info: https://modules.prosody.im/mod_auth_any)
+net-im/prosody-modules:auth_ccert - This module implements PKI-style client certificate authentication. You will therefore need your own Certificate Authority. How to set that up is beyond the current scope of this document. (info: https://modules.prosody.im/mod_auth_ccert)
+net-im/prosody-modules:auth_custom_http - To authenticate users, this module does a POST request to a configured URL with a JSON payload. It is not async so requests block the server until answered. (info: https://modules.prosody.im/mod_auth_custom_http)
+net-im/prosody-modules:auth_dovecot - This is a Prosody authentication plugin which uses Dovecot as the backend. (info: https://modules.prosody.im/mod_auth_dovecot)
+net-im/prosody-modules:auth_external - Allow client authentication to be handled by an external script/process. (info: https://modules.prosody.im/mod_auth_external)
+net-im/prosody-modules:auth_ha1 - This module authenticates users against hashed credentials stored in a plain text file. The format is the same as that used by reTurnServer. (info: https://modules.prosody.im/mod_auth_ha1)
+net-im/prosody-modules:auth_http_async - This is an experimental authentication module that does an asynchronous HTTP call to verify username and password. (info: https://modules.prosody.im/mod_auth_http_async)
+net-im/prosody-modules:auth_imap - This is a Prosody authentication plugin which uses a generic IMAP server as the backend. (info: https://modules.prosody.im/mod_auth_imap)
+net-im/prosody-modules:auth_internal_yubikey - A YubiKey is a small USB one-time-password (OTP) generator. (info: https://modules.prosody.im/mod_auth_internal_yubikey)
+net-im/prosody-modules:auth_joomla - This module allows you to authenticate against an Joomla database. (info: https://modules.prosody.im/mod_auth_joomla)
+net-im/prosody-modules:auth_ldap - This is a Prosody authentication plugin which uses LDAP as the backend. (info: https://modules.prosody.im/mod_auth_ldap)
+net-im/prosody-modules:auth_ldap2 - See mod_lib_ldap for more information. (info: https://modules.prosody.im/mod_auth_ldap2)
+net-im/prosody-modules:auth_pam - This module makes Prosody authenticate users against PAM (Linux Pluggable Authentication Modules) (info: https://modules.prosody.im/mod_auth_pam)
+net-im/prosody-modules:auth_phpbb3 - This module allows you to authenticate against an PHPBB3 database. (info: https://modules.prosody.im/mod_auth_phpbb3)
+net-im/prosody-modules:auth_sql - Allow client authentication to be handled by an SQL database query. (info: https://modules.prosody.im/mod_auth_sql)
+net-im/prosody-modules:auth_wordpress - This module allows you to authenticate against an Wordpress database. (info: https://modules.prosody.im/mod_auth_wordpress)
+net-im/prosody-modules:auto_accept_subscriptions - In some environments where all users on the system have mutual trust in each other, it's sometimes fine to skip the usual authorization process to add someone to your contact list and see their status. (info: https://modules.prosody.im/mod_auto_accept_subscriptions)
+net-im/prosody-modules:auto_activate_hosts - By default Prosody does not automatically activate/deactivate hosts when they are added to and removed from the configuration. (info: https://modules.prosody.im/mod_auto_activate_hosts)
+net-im/prosody-modules:benchmark_storage - To benchmark mod_storage_internal: (info: https://modules.prosody.im/mod_benchmark_storage)
+net-im/prosody-modules:bidi - This module implements XEP-0288: Bidirectional Server-to-Server Connections. It allows servers to use a single connection for sending stanzas to each other, instead of two connections (one for stanzas in each direction). (info: https://modules.prosody.im/mod_bidi)
+net-im/prosody-modules:block_outgoing - No documentation yet :( (info: https://modules.prosody.im/mod_block_outgoing)
+net-im/prosody-modules:block_registrations - On a server with public registration it is usually desirable to prevent registration of certain "reserved" accounts, such as "admin". (info: https://modules.prosody.im/mod_block_registrations)
+net-im/prosody-modules:block_s2s_subscriptions - No documentation yet :( (info: https://modules.prosody.im/mod_block_s2s_subscriptions)
+net-im/prosody-modules:block_strangers - No documentation yet :( (info: https://modules.prosody.im/mod_block_strangers)
+net-im/prosody-modules:block_subscribes - No documentation yet :( (info: https://modules.prosody.im/mod_block_subscribes)
+net-im/prosody-modules:block_subscriptions - No documentation yet :( (info: https://modules.prosody.im/mod_block_subscriptions)
+net-im/prosody-modules:blocking - Privacy lists are a widely implemented protocol for instructing your server on blocking communications with selected users and services. (info: https://modules.prosody.im/mod_blocking)
+net-im/prosody-modules:broadcast - This module largely duplicates the functionality of the standard mod_announce that is included with Prosody. It was developed for compatibility with some clients (e.g. iChat) that do not support ad-hoc commands or sending to JIDs with the format 'example.com/announce/online'. (info: https://modules.prosody.im/mod_broadcast)
+net-im/prosody-modules:c2s_conn_throttle - This module allows to throttle those client connections which exceed a n*seconds limit. (info: https://modules.prosody.im/mod_c2s_conn_throttle)
+net-im/prosody-modules:c2s_limit_sessions - This module lets you limit number of resources a user may connect. (info: https://modules.prosody.im/mod_c2s_limit_sessions)
+net-im/prosody-modules:candy - This is a very simple demo module showing how to serve a BOSH-using web app from prosody. (info: https://modules.prosody.im/mod_candy)
+net-im/prosody-modules:captcha_registration - Prosody-captcha is a little modification of prosody's "mod_register.lua" module that provides captcha protection for registration form. (info: https://modules.prosody.im/mod_captcha_registration)
+net-im/prosody-modules:carbons - This module implements XEP-0280: Message Carbons, allowing users to maintain a shared and synchronized view of all conversations across all their online clients and devices. (info: https://modules.prosody.im/mod_carbons)
+net-im/prosody-modules:carbons_adhoc - No documentation yet :( (info: https://modules.prosody.im/mod_carbons_adhoc)
+net-im/prosody-modules:carbons_copies - No documentation yet :( (info: https://modules.prosody.im/mod_carbons_copies)
+net-im/prosody-modules:checkcerts - This module periodically checks your certificate to see if it is about to expire soon. The time before expiry is printed in the logs. About a week before a certificate expires, reminder messages will be sent to admins. (info: https://modules.prosody.im/mod_checkcerts)
+net-im/prosody-modules:client_certs - XEP-0257 specifies a protocol for clients to store and manage client side certificates. When a client presents a stored client side certificate during the TLS handshake, it can log in without supplying a password (using SASL EXTERNAL). This makes it possible to have multiple devices accessing an account, without any of them needing to know the password, and makes it easier to revoke access for a single device. (info: https://modules.prosody.im/mod_client_certs)
+net-im/prosody-modules:cloud_notify - This is an implementation of the server bits of XEP-0357: Push Notifications. It allows clients to register an "app server" which is notified about new messages while the user is offline or disconnected. Implementation of the "app server" is not included1. (info: https://modules.prosody.im/mod_cloud_notify)
+net-im/prosody-modules:compact_resource - No documentation yet :( (info: https://modules.prosody.im/mod_compact_resource)
+net-im/prosody-modules:compat_bind - No documentation yet :( (info: https://modules.prosody.im/mod_compat_bind)
+net-im/prosody-modules:compat_dialback - This module provides a workaround for servers that do not set the to attribute on stream headers, which is required per RFC6120: (info: https://modules.prosody.im/mod_compat_dialback)
+net-im/prosody-modules:compat_muc_admin - Adds compatibility for old clients/libraries attempting to change affiliations and retrieve 'em sending the < http://jabber.org/protocol/muc#owner > xmlns instead of < http://jabber.org/protocol/muc#admin >. (info: https://modules.prosody.im/mod_compat_muc_admin)
+net-im/prosody-modules:compat_vcard - No documentation yet :( (info: https://modules.prosody.im/mod_compat_vcard)
+net-im/prosody-modules:component_client - No documentation yet :( (info: https://modules.prosody.im/mod_component_client)
+net-im/prosody-modules:component_roundrobin - This module enables multiple instances of external components to connect at the same time, and does round-robin load-balancing of incoming stanzas. (info: https://modules.prosody.im/mod_component_roundrobin)
+net-im/prosody-modules:conformance_restricted - This module sends processing instructions, comments, DTDs and a non predefined entity (defined by the DTD) to the requesting entity. (info: https://modules.prosody.im/mod_conformance_restricted)
+net-im/prosody-modules:couchdb - Note: This module needs updating to the 0.8 storage module API. (info: https://modules.prosody.im/mod_couchdb)
+net-im/prosody-modules:csi - This module implements Client State Indication, a way for mobile clients to tell the server that they are sitting in someones pocket and would rather not get some less urgent things pushed to it. (info: https://modules.prosody.im/mod_csi)
+net-im/prosody-modules:csi_compat - This module implements the google:queue protocol and maps it to mod_csi events. (info: https://modules.prosody.im/mod_csi_compat)
+net-im/prosody-modules:data_access - This module gives HTTP access to prosody’s storage mechanism. It uses normal HTTP verbs and Basic HTTP authentication, so you could call it RESTful if you like buzzwords. (info: https://modules.prosody.im/mod_data_access)
+net-im/prosody-modules:default_bookmarks - This module allows you to add default bookmarks for users. It only kicks in when the user has no existing bookmarks, so users are free to add, change or remove them. (info: https://modules.prosody.im/mod_default_bookmarks)
+net-im/prosody-modules:default_vcard - It is possible for the user to supply more than just a username and password when creating an account using mod_register. This module automatically copies over that data to the user's vcard. (info: https://modules.prosody.im/mod_default_vcard)
+net-im/prosody-modules:delegation - Namespace Delegation is an extension which allows server to delegate some features handling to an entity/component. Typical use case is an external PEP service, but it can be used more generally when your prefered server lack one internal feature and you found an external component which can do it. (info: https://modules.prosody.im/mod_delegation)
+net-im/prosody-modules:disable_tls - This module can be used to prevent Prosody from offering TLS on client ports that you specify. This can be useful to work around buggy clients when transport security is not required. (info: https://modules.prosody.im/mod_disable_tls)
+net-im/prosody-modules:discoitems - This Prosody plugin lets you manually override the service discovery items for a host. (info: https://modules.prosody.im/mod_discoitems)
+net-im/prosody-modules:dwd - This module implements an optimization of the Dialback protocol, by skipping the dialback step for servers presenting a valid certificate. (info: https://modules.prosody.im/mod_dwd)
+net-im/prosody-modules:email_pass - This module aims to help in the procedure of user password restoration. To start the restoration, the user must go to an URL provided by this module, fill the JID and email and submit the request. (info: https://modules.prosody.im/mod_email_pass)
+net-im/prosody-modules:extdisco - This module adds support for XEP-0215: External Service Discovery, which lets Prosody advertise non-XMPP services. (info: https://modules.prosody.im/mod_extdisco)
+net-im/prosody-modules:fallback_vcard - No documentation yet :( (info: https://modules.prosody.im/mod_fallback_vcard)
+net-im/prosody-modules:filter_chatstates - Some mobile XMPP client developers consider Chat State Notifications to be a waste of power and bandwidth, especially when the user is not actively looking at their device. This module will filter them out while the session is considered inactive. It depends on mod_csi for deciding when to begin and end filtering. (info: https://modules.prosody.im/mod_filter_chatstates)
+net-im/prosody-modules:firewall - Note: mod_firewall is in its very early stages. This documentation is liable to change, and some described functionality may be missing, incomplete or contain bugs. Feedback is welcome in the comments section at the bottom of this page. (info: https://modules.prosody.im/mod_firewall)
+net-im/prosody-modules:flash_policy - This Prosody plugin adds support for flash socket policies. When connecting with a flash client (from a webpage, not an exe) to prosody the flash client requests for an xml "file" on port 584 or the connecting port (5222 in the case of default xmpp). Responding on port 584 is tricky because it requires root priviliges to set up a socket on a port < 1024. (info: https://modules.prosody.im/mod_flash_policy)
+net-im/prosody-modules:graceful_shutdown - This module is an experiment about a more graceful shutdown process. (info: https://modules.prosody.im/mod_graceful_shutdown)
+net-im/prosody-modules:group_bookmarks - mod_groups allows you to insert contacts into users' contact lists. Well mod_group_bookmarks allows you to insert chatrooms into the user's bookmarks. These are fetched by their client and automatically joined when the log in. (info: https://modules.prosody.im/mod_group_bookmarks)
+net-im/prosody-modules:host_blacklist - No documentation yet :( (info: https://modules.prosody.im/mod_host_blacklist)
+net-im/prosody-modules:host_guard - As often it's undesiderable to employ only whitelisting logics in public environments, this module let's you more selectively restrict access to your hosts (component or server host) either disallowing access completely (with optional exceptions) or blacklisting certain sources. (info: https://modules.prosody.im/mod_host_guard)
+net-im/prosody-modules:http_altconnect - No documentation yet :( (info: https://modules.prosody.im/mod_http_altconnect)
+net-im/prosody-modules:http_dir_listing - This module generates directory listings when invoked by mod_http_files. See documentation on mod_http_files. (info: https://modules.prosody.im/mod_http_dir_listing)
+net-im/prosody-modules:http_favicon - This simple module serves a favicon.ico from prosodys HTTP server and nothing else. (info: https://modules.prosody.im/mod_http_favicon)
+net-im/prosody-modules:http_index - This module produces a list of enabled HTTP "apps" exposed from Prosody at http://example.org:5280/, e.g. mod_http_muc_log, mod_http_files or mod_admin_web. If you think Prosodys default "root" web page (a 404 error usually) is boring, this might be the module for you! :) (info: https://modules.prosody.im/mod_http_index)
+net-im/prosody-modules:http_logging - No documentation yet :( (info: https://modules.prosody.im/mod_http_logging)
+net-im/prosody-modules:http_muc_log - This module provides a built-in web interface to view chatroom logs stored by mod_mam_muc. (info: https://modules.prosody.im/mod_http_muc_log)
+net-im/prosody-modules:http_roster_admin - Normally the XMPP server will store and maintain the users' contact rosters. This module lets you delegate roster management to an external service. (info: https://modules.prosody.im/mod_http_roster_admin)
+net-im/prosody-modules:http_upload - This module implements XEP-0363, which lets clients upload files over HTTP. (info: https://modules.prosody.im/mod_http_upload)
+net-im/prosody-modules:http_user_count - No documentation yet :( (info: https://modules.prosody.im/mod_http_user_count)
+net-im/prosody-modules:idlecompat - This module adds XEP-0319 idle tags to presence stanzas containing XEP-0012: Last Activity tags for idle indication (e.g. supported by libpurple clients). It works on outgoing and incoming presence stanzas. (info: https://modules.prosody.im/mod_idlecompat)
+net-im/prosody-modules:incidents_handling - This module implements XEP-268. (info: https://modules.prosody.im/mod_incidents_handling)
+net-im/prosody-modules:inotify_reload - No documentation yet :( (info: https://modules.prosody.im/mod_inotify_reload)
+net-im/prosody-modules:invite - This module allows users with an account to generate single-use invite URLs using an ad-hoc command. The invite URLs allow new users to create an account even if public registration is disabled. (info: https://modules.prosody.im/mod_invite)
+net-im/prosody-modules:ipcheck - Sometimes for various reasons a client might want to know its IP address as it appears to the server. This simple XEP allows the client to ask the server for the IP address it is connected from. (info: https://modules.prosody.im/mod_ipcheck)
+net-im/prosody-modules:isolate_host - In some environments it is desirable to isolate one or more hosts, and prevent communication with external, or even other internal domains. (info: https://modules.prosody.im/mod_isolate_host)
+net-im/prosody-modules:jid_prep - This is a plugin that implements the JID prep protocol defined in http://xmpp.org/extensions/inbox/jidprep.html (info: https://modules.prosody.im/mod_jid_prep)
+net-im/prosody-modules:json_streams - This plugin encodes XMPP as JSON. This is an implementation of XEP-0295: JSON Encodings for XMPP. (info: https://modules.prosody.im/mod_json_streams)
+net-im/prosody-modules:lastlog - Simple module that stores the timestamp of when a user logs in. (info: https://modules.prosody.im/mod_lastlog)
+net-im/prosody-modules:latex - This module intercepts messages between users and into chatrooms, and attaches a links to a rendered version of any LaTeX in the message. This requires client support for XHTML-IM, and fetching images via HTTP. (info: https://modules.prosody.im/mod_latex)
+net-im/prosody-modules:lib_ldap - This module is used by other modules to access an LDAP server. It's pretty useless on its own; you should use it if you want to write your own LDAP-related module, or if you want to use one of mine (mod_auth_ldap2, mod_storage_ldap). (info: https://modules.prosody.im/mod_lib_ldap)
+net-im/prosody-modules:limit_auth - This module lets you put a per-IP limit on the number of failed authentication attempts. (info: https://modules.prosody.im/mod_limit_auth)
+net-im/prosody-modules:limits - On some servers, especially public ones, it is desired to make sure that everyone gets their fair share of system resources (and no more). (info: https://modules.prosody.im/mod_limits)
+net-im/prosody-modules:list_inactive - No documentation yet :( (info: https://modules.prosody.im/mod_list_inactive)
+net-im/prosody-modules:listusers - No documentation yet :( (info: https://modules.prosody.im/mod_listusers)
+net-im/prosody-modules:log_auth - Prosody doesn't write IP addresses to its log file by default for privacy reasons (unless debug logging is enabled). (info: https://modules.prosody.im/mod_log_auth)
+net-im/prosody-modules:log_events - No documentation yet :( (info: https://modules.prosody.im/mod_log_events)
+net-im/prosody-modules:log_mark - This module sends -- MARK -- to the log once per minute. This may be useful to give a sense of how busy the server is or see that logging and timers are still working. (info: https://modules.prosody.im/mod_log_mark)
+net-im/prosody-modules:log_messages_sql - No documentation yet :( (info: https://modules.prosody.im/mod_log_messages_sql)
+net-im/prosody-modules:log_rate - If you ever wanted to collect statistics on the number of log messages, this is the module for you! (info: https://modules.prosody.im/mod_log_rate)
+net-im/prosody-modules:log_sasl_mech - No documentation yet :( (info: https://modules.prosody.im/mod_log_sasl_mech)
+net-im/prosody-modules:log_slow_events - No documentation yet :( (info: https://modules.prosody.im/mod_log_slow_events)
+net-im/prosody-modules:mam - Implementation of XEP-0313: Message Archive Management. (info: https://modules.prosody.im/mod_mam)
+net-im/prosody-modules:mam_adhoc - This module complements mod_mam by allowing clients to change archiving preferences through an Ad-hoc command. (info: https://modules.prosody.im/mod_mam_adhoc)
+net-im/prosody-modules:mam_archive - Implementation of XEP-0136: Message Archiving for mod_mam. (info: https://modules.prosody.im/mod_mam_archive)
+net-im/prosody-modules:mam_muc - This module logs the conversation of chatrooms running on the server to Prosody's archive storage. To access them you will need a client with support for XEP-0313: Message Archive Management or a module such as mod_http_muc_log. (info: https://modules.prosody.im/mod_mam_muc)
+net-im/prosody-modules:mamsub - No documentation yet :( (info: https://modules.prosody.im/mod_mamsub)
+net-im/prosody-modules:manifesto - This module informs users about the XMPP Test day and whether their contacts are affected. For mor info about the test day, see https://stpeter.im/journal/1496.html (info: https://modules.prosody.im/mod_manifesto)
+net-im/prosody-modules:measure_cpu - This module measures CPU usage and reports using Prosody 0.10 APIs (info: https://modules.prosody.im/mod_measure_cpu)
+net-im/prosody-modules:measure_memory - This module measures memory usage and reports using Prosody 0.10 APIs (info: https://modules.prosody.im/mod_measure_memory)
+net-im/prosody-modules:message_logging - Often service administrators need to log their users' messages for reasons such as auditing and compliance. This module simply logs user messages to simple text files, which can be easily searched, archived or removed on a regular basis. (info: https://modules.prosody.im/mod_message_logging)
+net-im/prosody-modules:migrate - This module adds a command to prosodyctl for copying data between storage drivers. (info: https://modules.prosody.im/mod_migrate)
+net-im/prosody-modules:motd_sequential - mod_motd_sequential is a variant of mod_motd that lets you specify a sequence of MOTD messages instead of a single static one. Each message is only sent once and the module keeps track of who as seen which message. (info: https://modules.prosody.im/mod_motd_sequential)
+net-im/prosody-modules:muc_access_control - No documentation yet :( (info: https://modules.prosody.im/mod_muc_access_control)
+net-im/prosody-modules:muc_ban_ip - One frequent complaint about XMPP chatrooms (MUCs) compared to IRC is the inability for a room admin to ban a user based on their IP address. This is because an XMPP user is not identified on the network by their IP address, only their JID. (info: https://modules.prosody.im/mod_muc_ban_ip)
+net-im/prosody-modules:muc_config_restrict - Sometimes, especially on public services, you may want to allow people to create their own rooms, but prevent some options from being modified by normal users. (info: https://modules.prosody.im/mod_muc_config_restrict)
+net-im/prosody-modules:muc_intercom - No documentation yet :( (info: https://modules.prosody.im/mod_muc_intercom)
+net-im/prosody-modules:muc_limits - This module allows you to control the maximum rate of 'events' in a MUC room. This makes it useful to prevent room floods (whether malicious or accidental). (info: https://modules.prosody.im/mod_muc_limits)
+net-im/prosody-modules:muc_log - This module logs the conversation of chatrooms running on the server to Prosody's data store. To view them you will need a module such as mod_muc_log_http. (info: https://modules.prosody.im/mod_muc_log)
+net-im/prosody-modules:muc_log_http - This module provides a built-in web interface to view chatroom logs stored by mod_muc_log. (info: https://modules.prosody.im/mod_muc_log_http)
+net-im/prosody-modules:muc_restrict_rooms - This module allows disabling room creation based on regexp patterns defined in configuration. (info: https://modules.prosody.im/mod_muc_restrict_rooms)
+net-im/prosody-modules:munin - This module implements the Munin reporting protocol, allowing you to collect statistics directly from Prosody into Munin. (info: https://modules.prosody.im/mod_munin)
+net-im/prosody-modules:net_dovecotauth - mod_net_dovecotauth is a server implementation of the Dovecot authentication protocol. It allows you to authenticate eg Postfix against your Prosody installation. (info: https://modules.prosody.im/mod_net_dovecotauth)
+net-im/prosody-modules:offline_email - Quite often when I am out and about, I'm not able to connect to Jabber. It is usually much more likely I can access my email though (whether via the web, or a mobile client). (info: https://modules.prosody.im/mod_offline_email)
+net-im/prosody-modules:onhold - Enable mod_onhold to allow temporarily placing messages from particular JIDs "on hold" -- i.e. store them, but do not deliver them until the hold status is taken away. (info: https://modules.prosody.im/mod_onhold)
+net-im/prosody-modules:onions - This plugin allows Prosody to connect to other servers that are running as a Tor hidden service. Running Prosody on a hidden service works without this module, this module is only necessary to allow Prosody to federate to hidden XMPP servers. (info: https://modules.prosody.im/mod_onions)
+net-im/prosody-modules:openid - OpenID is an decentralized authentication mechanism for the Web. mod_openid turns Prosody into an OpenID provider, allowing users to use their Prosody credentials to authenticate with various third party websites. (info: https://modules.prosody.im/mod_openid)
+net-im/prosody-modules:password_policy - No documentation yet :( (info: https://modules.prosody.im/mod_password_policy)
+net-im/prosody-modules:pastebin - Pastebins are used very often in IM, especially in chat rooms. You have a long log or command output which you need to send to someone over IM, and don't want to fill their message window with it. Put it on a pastebin site, and give them the URL instead, simple. (info: https://modules.prosody.im/mod_pastebin)
+net-im/prosody-modules:pep_vcard_avatar - This module pushes the users nickname and avatar from vCards into PEP, or into vCards from PEP. This allows interop between older clients that use XEP-0153: vCard-Based Avatars to see the avatars of clients that use XEP-0084: User Avatar and vice versa. (info: https://modules.prosody.im/mod_pep_vcard_avatar)
+net-im/prosody-modules:pinger - No documentation yet :( (info: https://modules.prosody.im/mod_pinger)
+net-im/prosody-modules:poke_strangers - In order to build heuristics for which messages are spam, it is necessary to log as many details as possible about the spammers. This module sends a version and disco query whenever a message is received from a JID to a user it is not subscribed to. The results are printed to Prosody's log file at the 'info' level. Queried full JIDs are not queried again until Prosody restarts. (info: https://modules.prosody.im/mod_poke_strangers)
+net-im/prosody-modules:post_msg - Sometimes it's useful to have different interfaces to access XMPP. (info: https://modules.prosody.im/mod_post_msg)
+net-im/prosody-modules:presence_cache - This module stores a timestamp of the latest presence received from users contacts so that the client can see who is online faster when they sign in, and won't have to wait for remote servers to reply. (info: https://modules.prosody.im/mod_presence_cache)
+net-im/prosody-modules:presence_dedup - This module tries to squash incoming identical presence stanzas to save some bandwith at the cost of increased memory use. (info: https://modules.prosody.im/mod_presence_dedup)
+net-im/prosody-modules:privacy_lists - Privacy lists are a flexible method for blocking communications. (info: https://modules.prosody.im/mod_privacy_lists)
+net-im/prosody-modules:private_adhoc - This is a very simple module which implements an adhoc commant toretrieves the users private XML data. (info: https://modules.prosody.im/mod_private_adhoc)
+net-im/prosody-modules:privilege - Privileged Entity is an extension which allows entity/component to have privileged access to server (set/get roster, send message on behalf of server, access presence informations). It can be used to build services independently of server (e.g.: PEP service). (info: https://modules.prosody.im/mod_privilege)
+net-im/prosody-modules:proctitle - This module sets the process name to prosody so it shows up as such instead of lua in process management tools. (info: https://modules.prosody.im/mod_proctitle)
+net-im/prosody-modules:profile - This module provides a replacement for mod_vcard. In addition to the ageing protocol defined by XEP-0054, it also supports the new vCard 4 based protocol and integrates with Personal Eventing Protocol. The vCard 4, User Avatar and User Nickname PEP nodes are updated when the vCard is changed.. (info: https://modules.prosody.im/mod_profile)
+net-im/prosody-modules:proxy65_whitelist - This module attempts to restrict use of non-whitelisted XEP-0065 proxies. (info: https://modules.prosody.im/mod_proxy65_whitelist)
+net-im/prosody-modules:pubsub_eventsource - Server-Sent Events is a simple HTTP/line-based protocol supported in HTML5, making it easy to receive a stream of "events" in realtime using the Javascript EventSource API. (info: https://modules.prosody.im/mod_pubsub_eventsource)
+net-im/prosody-modules:pubsub_feeds - This module allows Prosody to fetch Atom and RSS feeds for you, and push new results to subscribers over XMPP. (info: https://modules.prosody.im/mod_pubsub_feeds)
+net-im/prosody-modules:pubsub_github - This module accepts Github web hooks and publishes them to a local pubsub component for XMPP clients to subscribe to. (info: https://modules.prosody.im/mod_pubsub_github)
+net-im/prosody-modules:pubsub_hub - This module implements a PubSubHubbub (PuSH) hub, allowing PuSH clients to subscribe to local XMPP Publish-Subscribe nodes stored by mod_pubsub and receive real time updates to feeds. (info: https://modules.prosody.im/mod_pubsub_hub)
+net-im/prosody-modules:pubsub_mqtt - MQTT is a lightweight binary pubsub protocol suited to embedded devices. This module provides a way for MQTT clients to connect to Prosody and publish or subscribe to local pubsub nodes. (info: https://modules.prosody.im/mod_pubsub_mqtt)
+net-im/prosody-modules:pubsub_pivotaltracker - No documentation yet :( (info: https://modules.prosody.im/mod_pubsub_pivotaltracker)
+net-im/prosody-modules:pubsub_post - No documentation yet :( (info: https://modules.prosody.im/mod_pubsub_post)
+net-im/prosody-modules:pubsub_twitter - Twitter has an open 'realtime' search API, but it requires polling (within their rate limits). This module allows Prosody to poll for you, and push new results to subscribers over XMPP. (info: https://modules.prosody.im/mod_pubsub_twitter)
+net-im/prosody-modules:query_client_ver - No documentation yet :( (info: https://modules.prosody.im/mod_query_client_ver)
+net-im/prosody-modules:rawdebug - Sometimes it is useful to get the raw XML logs from clients for debugging purposes, but some clients don't expose this. This command lets you activate this on specific sessions. (info: https://modules.prosody.im/mod_rawdebug)
+net-im/prosody-modules:readonly - No documentation yet :( (info: https://modules.prosody.im/mod_readonly)
+net-im/prosody-modules:register_dnsbl - No documentation yet :( (info: https://modules.prosody.im/mod_register_dnsbl)
+net-im/prosody-modules:register_json - This module let's you activate a httpserver interface to handle data from webforms with POST and Base64 encoded JSON. (info: https://modules.prosody.im/mod_register_json)
+net-im/prosody-modules:register_redirect - Registration Redirect as explained in the IBR XEP. (info: https://modules.prosody.im/mod_register_redirect)
+net-im/prosody-modules:register_web - There are various reasons to prefer web registration instead of "in-band" account registration over XMPP. For example the lack of CAPTCHA support in clients and servers. (info: https://modules.prosody.im/mod_register_web)
+net-im/prosody-modules:reload_modules - By default Prosody does not reload modules at runtime unless instructed to via one of its admin interfaces. However sometimes you want to easily reload a module to apply new settings when the config changes. (info: https://modules.prosody.im/mod_reload_modules)
+net-im/prosody-modules:remote_roster - This module adds support for XEP-0321: Remote Roster Management which is commonly used to allow components such as transports to modify the rosters of local users. (info: https://modules.prosody.im/mod_remote_roster)
+net-im/prosody-modules:require_otr - OTR, "Off The Record", encryption allows clients to encrypt messages such that the server cannot read/modify them. (info: https://modules.prosody.im/mod_require_otr)
+net-im/prosody-modules:roster_allinall - This module is similar in purpouse to mod_groups, for when you want all users on the server to be in each others roster. (info: https://modules.prosody.im/mod_roster_allinall)
+net-im/prosody-modules:roster_command - This module allows you to perform various actions on user rosters via prosodyctl. (info: https://modules.prosody.im/mod_roster_command)
+net-im/prosody-modules:s2s_auth_compat - This module is a workaround for servers that try to do s2s authentication with certificates and SASL EXTERNAL, but do not send correct stream headers. Notably Openfire versions since 3.7 or 3.8. (info: https://modules.prosody.im/mod_s2s_auth_compat)
+net-im/prosody-modules:s2s_auth_dane - This module implements DANE as described in Using DNS Security Extensions (DNSSEC) and DNS-based Authentication of Named Entities (DANE) as a Prooftype for XMPP Domain Name Associations. (info: https://modules.prosody.im/mod_s2s_auth_dane)
+net-im/prosody-modules:s2s_auth_fingerprint - This module allows you to manually pin certificate fingerprints of remote servers. (info: https://modules.prosody.im/mod_s2s_auth_fingerprint)
+net-im/prosody-modules:s2s_auth_monkeysphere - Monkeysphere is a project aiming to introduce PGP's web of trust to protocols such as SSH and TLS (which XMPP uses). (info: https://modules.prosody.im/mod_s2s_auth_monkeysphere)
+net-im/prosody-modules:s2s_blacklist - No documentation yet :( (info: https://modules.prosody.im/mod_s2s_blacklist)
+net-im/prosody-modules:s2s_idle_timeout - Some people find it preferable to close server-to-server connections after they have been silent for a while. (info: https://modules.prosody.im/mod_s2s_idle_timeout)
+net-im/prosody-modules:s2s_keepalive - This module periodically sends XEP-0199 ping requests to remote servers to keep your connection alive. (info: https://modules.prosody.im/mod_s2s_keepalive)
+net-im/prosody-modules:s2s_keysize_policy - This module sets the security status of s2s connections to invalid if their key is too small and their certificate was issued after 2014, per CA/B Forum guidelines. (info: https://modules.prosody.im/mod_s2s_keysize_policy)
+net-im/prosody-modules:s2s_log_certs - This module produces info level log messages with the certificate status and fingerprint every time an s2s connection is established. It can also optionally store this in persistant storage. (info: https://modules.prosody.im/mod_s2s_log_certs)
+net-im/prosody-modules:s2s_never_encrypt_blacklist - Let's you stop Prosody from sending <starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'> feature to choppy/buggy servers which therefore would fail to re-negotiate and use a secure stream. (e.g. OpenFire 3.7.0) (info: https://modules.prosody.im/mod_s2s_never_encrypt_blacklist)
+net-im/prosody-modules:s2s_reload_newcomponent - Currently, module:reload command in console doesn't load new components. This module will automatically load the new components (if any) when the config:reload command is run in the console. (info: https://modules.prosody.im/mod_s2s_reload_newcomponent)
+net-im/prosody-modules:s2s_whitelist - No documentation yet :( (info: https://modules.prosody.im/mod_s2s_whitelist)
+net-im/prosody-modules:s2soutinjection - This module is similar to mod_srvinjection but less of an hack. (info: https://modules.prosody.im/mod_s2soutinjection)
+net-im/prosody-modules:saslauth_muc - No documentation yet :( (info: https://modules.prosody.im/mod_saslauth_muc)
+net-im/prosody-modules:saslname - This module implements XEP-0233: Domain-Based Service Names in XMPP SASL Negotiation. (info: https://modules.prosody.im/mod_saslname)
+net-im/prosody-modules:seclabels - This module implements XEP-0258: Security Labels in XMPP. (info: https://modules.prosody.im/mod_seclabels)
+net-im/prosody-modules:secure_interfaces - Sometimes you might run clients without encryption on the same machine or LAN as Prosody - and you want Prosody to treat them as secure (e.g. allowing plaintext authentication) even though they are not encrypted. (info: https://modules.prosody.im/mod_secure_interfaces)
+net-im/prosody-modules:server_contact_info - This module implements XEP-0157: Contact Addresses for XMPP Services. (info: https://modules.prosody.im/mod_server_contact_info)
+net-im/prosody-modules:server_status - This module fetches the current status of configured hosts and/or stanza statistics from mod_stanza_counter. And outputs it in either XML or JSON format. (info: https://modules.prosody.im/mod_server_status)
+net-im/prosody-modules:service_directories - No documentation yet :( (info: https://modules.prosody.im/mod_service_directories)
+net-im/prosody-modules:sift - SIFT is a technology to allow clients to filter incoming traffic on the server. This helps save bandwidth, etc. (info: https://modules.prosody.im/mod_sift)
+net-im/prosody-modules:smacks - By default XMPP is as reliable as your network is. Unfortunately in some cases that is not very reliable - in some network conditions disconnects can be frequent and message loss can occur. (info: https://modules.prosody.im/mod_smacks)
+net-im/prosody-modules:smacks_offline - No documentation yet :( (info: https://modules.prosody.im/mod_smacks_offline)
+net-im/prosody-modules:sms_clickatell - This module provides and SMS gateway component which uses the Clickatell HTTP API to deliver text messages. See clickatell.com for details on their services. Note that at present, this is entirely one way: replies will either go nowhere or as sms to the source number you specify. (info: https://modules.prosody.im/mod_sms_clickatell)
+net-im/prosody-modules:srvinjection - This Prosody plugin lets you manually override SRV records used for a remote host. (info: https://modules.prosody.im/mod_srvinjection)
+net-im/prosody-modules:sslv3_warn - No documentation yet :( (info: https://modules.prosody.im/mod_sslv3_warn)
+net-im/prosody-modules:stanza_counter - This module counts incoming and outgoing stanzas from when the instance started, and makes the data available to other modules by creating a global prosody. object (info: https://modules.prosody.im/mod_stanza_counter)
+net-im/prosody-modules:statistics - No documentation yet :( (info: https://modules.prosody.im/mod_statistics)
+net-im/prosody-modules:statistics_auth - No documentation yet :( (info: https://modules.prosody.im/mod_statistics_auth)
+net-im/prosody-modules:statistics_cputotal - No documentation yet :( (info: https://modules.prosody.im/mod_statistics_cputotal)
+net-im/prosody-modules:statistics_mem - No documentation yet :( (info: https://modules.prosody.im/mod_statistics_mem)
+net-im/prosody-modules:statistics_statsd - No documentation yet :( (info: https://modules.prosody.im/mod_statistics_statsd)
+net-im/prosody-modules:statsd - No documentation yet :( (info: https://modules.prosody.im/mod_statsd)
+net-im/prosody-modules:storage_appendmap - This is an experimental storage driver where changed data is appended. Data is simply written as key = value pairs to the end of the file. This allows changes to individual keys to be written without needing to write out the entire object again, but reads would grow gradually larger as it still needs to read old overwritten keys. This may be suitable for eg rosters where individual contacts are changed at a time. In theory, this could also allow rolling back changes. (info: https://modules.prosody.im/mod_storage_appendmap)
+net-im/prosody-modules:storage_gdbm - This is a storage module using GNU DBM as backend. It supports archives. (info: https://modules.prosody.im/mod_storage_gdbm)
+net-im/prosody-modules:storage_ldap - See mod_lib_ldap for more information. (info: https://modules.prosody.im/mod_storage_ldap)
+net-im/prosody-modules:storage_lmdb - This is a storage module using OpenLDAP Lightning Memory-Mapped Database as backend. (info: https://modules.prosody.im/mod_storage_lmdb)
+net-im/prosody-modules:storage_memory - This module acts as a normal storage module for Prosody, but saves all data in memory only. All data is lost when the server stops. This makes it useful for testing, or certain specialized applications. (info: https://modules.prosody.im/mod_storage_memory)
+net-im/prosody-modules:storage_mongodb - This is a storage backend that uses MongoDB. Depends on luamongo bindings (info: https://modules.prosody.im/mod_storage_mongodb)
+net-im/prosody-modules:storage_muc_log - mod_muc_log provided logging of chatrooms running on the server to Prosody's data store. This module gives access to this data using the 0.10+ stanza archive API, allowing legacy log data to be used with mod_mam_muc and mod_http_muc_log. (info: https://modules.prosody.im/mod_storage_muc_log)
+net-im/prosody-modules:storage_multi - This module attemtps to provide a storage driver that is really multiple storage drivers. This could be used for storage error tolerance or caching of data in a faster storage driver. (info: https://modules.prosody.im/mod_storage_multi)
+net-im/prosody-modules:storage_xmlarchive - This module implements stanza archives using files, similar to the default "internal" storage. (info: https://modules.prosody.im/mod_storage_xmlarchive)
+net-im/prosody-modules:streamstats - No documentation yet :( (info: https://modules.prosody.im/mod_streamstats)
+net-im/prosody-modules:strict_https - This module implements HTTP Strict Transport Security and responds to all non-HTTPS requests with a 301 Moved Permanently redirect to the HTTPS equivalent of the path. (info: https://modules.prosody.im/mod_strict_https)
+net-im/prosody-modules:support_contact - This Prosody plugin adds a default contact to newly registered accounts. (info: https://modules.prosody.im/mod_support_contact)
+net-im/prosody-modules:swedishchef - This module does some conversions on message bodys passed through it causing them to look like our beloved swedish chef had typed them. (info: https://modules.prosody.im/mod_swedishchef)
+net-im/prosody-modules:tcpproxy - It happens occasionally that I would like to use the XMPP server as a generic proxy for connecting to another service. It is especially awkward in some environments, and impossible in (for example) Javascript inside a web browser. (info: https://modules.prosody.im/mod_tcpproxy)
+net-im/prosody-modules:telnet_tlsinfo - This module adds two commands to the telnet console, c2s:showtls() and s2s:showtls(). These commands shows TLS parameters, such as ciphers and key agreement protocols, of all c2s or s2s connections. (info: https://modules.prosody.im/mod_telnet_tlsinfo)
+net-im/prosody-modules:throttle_presence - For most people 'presence' (status changes) of contacts make up most of the traffic received by their client. However much of the time it is not essential to have highly accurate presence information. (info: https://modules.prosody.im/mod_throttle_presence)
+net-im/prosody-modules:throttle_unsolicited - This module limits the rate of outgoing unsolicited messages. A message counts as "unsolicited" if the receiving user hasn't added the sending user to their roster. (info: https://modules.prosody.im/mod_throttle_unsolicited)
+net-im/prosody-modules:tls_policy - This module arose from discussions at the XMPP Summit about enforcing better ciphers in TLS. It may seem attractive to disallow some insecure ciphers or require forward secrecy, but doing this at the TLS level would the user with an unhelpful "Encryption failed" message. This module does this enforcing at the application level, allowing better error messages. (info: https://modules.prosody.im/mod_tls_policy)
+net-im/prosody-modules:track_muc_joins - This module attempts to keep track of what MUC chat rooms users have joined. It's not very useful on its own, but can be used by other modules to influence decisions. (info: https://modules.prosody.im/mod_track_muc_joins)
+net-im/prosody-modules:turncredentials - No documentation yet :( (info: https://modules.prosody.im/mod_turncredentials)
+net-im/prosody-modules:twitter - Twitter has simple API to use, so I tried to deal with it via Prosody. I didn't manage to finish this module, but it is nice example of component that accepts registrations, unregistrations, does HTTP polling and so on. Maybe someone will finnish this idea. (info: https://modules.prosody.im/mod_twitter)
+net-im/prosody-modules:uptime_presence - This module simply responds to a presence probe sent to the server with a presence staza containing a timestamp from when the server started. (info: https://modules.prosody.im/mod_uptime_presence)
+net-im/prosody-modules:vjud - Basic implementation of XEP-0055: Jabber Search. (info: https://modules.prosody.im/mod_vjud)
+net-im/prosody-modules:watchuntrusted - Similar to mod_watchregistrations, this module warns admins when an s2s connection fails due for encryption or trust reasons. (info: https://modules.prosody.im/mod_watchuntrusted)
+net-im/prosody-modules:webpresence - Quite often you may want to publish your Jabber status to your blog or website. mod_webpresence allows you to do exactly this. (info: https://modules.prosody.im/mod_webpresence)