mass fix

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

10 files changed, 78 insertions, 38 deletions

diff --git a/dev-lua/lua-cjson/lua-cjson-9999.ebuild b/dev-lua/lua-cjson/lua-cjson-9999.ebuild
index 4fe7a83..af98774 100644
--- a/dev-lua/lua-cjson/lua-cjson-9999.ebuild
+++ b/dev-lua/lua-cjson/lua-cjson-9999.ebuild
@@ -4,26 +4,33 @@
 
 EAPI="5"
 
-inherit cmake-utils multilib toolchain-funcs flag-o-matic git-2 eutils
+inherit cmake-utils git-2
 
 DESCRIPTION="Lua JSON Library, written in C"
 HOMEPAGE="http://www.kyne.com.au/~mark/software/lua-cjson.php"
 SRC_URI=""
 
-EGIT_REPO_URI="git://github.com/mpx/lua-cjson.git"
+EGIT_REPO_URI="git://github.com/msva/lua-cjson.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="examples"
+IUSE="examples luajit"
 
 RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )"
 DEPEND="${RDEPEND}"
 
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_use luajit)
+	)
+	cmake-utils_src_configure
+}
+
 src_install() {
 	if use examples; then
 		insinto /usr/share/doc/"${P}"
 		doins -r tests
 	fi
-	emake PREFIX="${D}/usr" install
+	default
 }
diff --git a/dev-lua/lua-fann/lua-fann-9999.ebuild b/dev-lua/lua-fann/lua-fann-9999.ebuild
index f77e54b..c164bc0 100644
--- a/dev-lua/lua-fann/lua-fann-9999.ebuild
+++ b/dev-lua/lua-fann/lua-fann-9999.ebuild
@@ -22,15 +22,10 @@ RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	LUABIN="lua"
+	local lua=lua;
+	use luajit && lua=luajit;
+	echo "LUA_IMPL=${lua}" > .config
 	default
-	epatch_user
-	use luajit && export LUA_INCLUDE_DIR="/usr/$(get_libdir)/luajit-2.0"
-	use luajit && export LUABIN="luajit"
-}
-
-src_test() {
-	emake test
 }
 
 src_install() {
diff --git a/dev-lua/lua-gd/files/lua-gd-9999-makefile.patch b/dev-lua/lua-gd/files/lua-gd-9999-makefile.patch
index dc2a035..ca94d97 100644
--- a/dev-lua/lua-gd/files/lua-gd-9999-makefile.patch
+++ b/dev-lua/lua-gd/files/lua-gd-9999-makefile.patch
@@ -22,8 +22,9 @@
  
  $(OUTFILE): gd.lo
 -	$(CC) -o $(OUTFILE) gd.lo $(LFLAGS)
+-	lua test_features.lua
 +	$(CC) -o $(OUTFILE) gd.lo $(LDFLAGS) $(LIBS)
- 	lua test_features.lua
++	$(LUAPKG) test_features.lua
  
  gd.lo: luagd.c
  	$(CC) -o gd.lo -c $(GDFEATURES) $(CFLAGS) luagd.c
diff --git a/dev-lua/lua-gd/lua-gd-9999.ebuild b/dev-lua/lua-gd/lua-gd-9999.ebuild
index 97584a9..4986385 100644
--- a/dev-lua/lua-gd/lua-gd-9999.ebuild
+++ b/dev-lua/lua-gd/lua-gd-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils toolchain-funcs versionator git-2
+inherit eutils toolchain-funcs git-2
 
 DESCRIPTION="Lua bindings to Thomas Boutell's gd library"
 HOMEPAGE="http://lua-gd.luaforge.net/"
@@ -14,7 +14,7 @@ EGIT_REPO_URI="git://github.com/ittner/lua-gd.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc examples"
+IUSE="doc examples luajit"
 
 RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
 	media-libs/gd[png]"
@@ -26,11 +26,15 @@ src_prepare() {
 }
 
 src_compile() {
-	emake LUAPKG=lua CC="$(tc-getCC)"
+	local lua=lua;
+	use luajit && lua=luajit;
+	emake LUAPKG="${lua}" CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake install LUAPKG=lua DESTDIR="${D}"
+	local lua=lua;
+	use luajit && lua=luajit;
+	emake install LUAPKG="${lua}" DESTDIR="${D}"
 	dodoc README
 
 	if use doc; then
diff --git a/dev-lua/lua-zlib/lua-zlib-9999.ebuild b/dev-lua/lua-zlib/lua-zlib-9999.ebuild
index 0bb4352..fee8a85 100644
--- a/dev-lua/lua-zlib/lua-zlib-9999.ebuild
+++ b/dev-lua/lua-zlib/lua-zlib-9999.ebuild
@@ -8,12 +8,12 @@ inherit cmake-utils git-2
 
 DESCRIPTION="Lua bindings to zlib"
 HOMEPAGE="http://github.com/brimworks/lua-zlib"
-EGIT_REPO_URI="git://github.com/brimworks/lua-zlib.git"
+EGIT_REPO_URI="git://github.com/msva/lua-zlib.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="luajit"
 
 RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
 		sys-libs/zlib"
@@ -25,6 +25,12 @@ src_prepare() {
 }
 
 src_configure() {
-	MYCMAKEARGS="-DINSTALL_CMOD='$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)'"
+	local lua=lua;
+	local myconf;
+	use luajit && lua="luajit";
+	mycmakeargs=(
+		-DINSTALL_CMOD=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua})
+		$(cmake-utils_use_use luajit)
+	)
 	cmake-utils_src_configure
 }
diff --git a/dev-lua/luacrypto/luacrypto-9999.ebuild b/dev-lua/luacrypto/luacrypto-9999.ebuild
index b1f90e0..92cee21 100644
--- a/dev-lua/luacrypto/luacrypto-9999.ebuild
+++ b/dev-lua/luacrypto/luacrypto-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 LANGS=" en ru"
 
-inherit multilib toolchain-funcs flag-o-matic eutils git-2
+inherit eutils git-2
 
 DESCRIPTION="Lua Crypto Library"
 HOMEPAGE="https://github.com/msva/lua-crypto"
@@ -17,13 +17,25 @@ EGIT_REPO_URI="git://github.com/msva/lua-crypto.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc"
+IUSE="doc luajit"
 IUSE+="${LANGS// / linguas_}"
 
-RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
-	>=dev-libs/openssl-0.9.7"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+RDEPEND="
+	|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
+	>=dev-libs/openssl-0.9.7
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/pkgconfig
+"
+
+src_prepare() {
+	local lua=lua;
+	use luajit && lua=luajit;
+	sed \
+		-e 's|LUA_IMPL := "lua"|LUA_IMPL := "'${lua}'"|' \
+		-i Makefile
+}
 
 src_install() {
 	if use doc; then
diff --git a/dev-lua/luancurses/luancurses-9999.ebuild b/dev-lua/luancurses/luancurses-9999.ebuild
index 7ea896c..6651936 100644
--- a/dev-lua/luancurses/luancurses-9999.ebuild
+++ b/dev-lua/luancurses/luancurses-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit multilib eutils git-2
+inherit eutils git-2
 
 DESCRIPTION="Lua NCurses Library"
 HOMEPAGE="https://github.com/msva/lua-ncurses"
@@ -15,9 +15,15 @@ EGIT_REPO_URI="git://github.com/msva/lua-ncurses.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="luajit"
 
 RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
 	sys-libs/ncurses"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
+
+src_prepare() {
+	local lua=lua;
+	use luajit && lua=luajit;
+	echo LUA_IMPL="${lua}" > .config
+}
\ No newline at end of file
diff --git a/dev-lua/luasignal/luasignal-9999.ebuild b/dev-lua/luasignal/luasignal-9999.ebuild
index cf12384..b3b91b5 100644
--- a/dev-lua/luasignal/luasignal-9999.ebuild
+++ b/dev-lua/luasignal/luasignal-9999.ebuild
@@ -15,12 +15,14 @@ EGIT_REPO_URI="git://github.com/msva/lua-signal.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="luajit"
 
 RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
-	sed -e "s#LUA_LIBDIR.*#LUA_LIBDIR=$($(tc-getPKG_CONFIG) lua --variable INSTALL_CMOD)#g" -i Make.config
+	local lua=lua;
+	use luajit && lua=luajit;
+	echo "LUA_IMPL=${lua}" > .config
 }
diff --git a/dev-lua/luaxml/luaxml-9999.ebuild b/dev-lua/luaxml/luaxml-9999.ebuild
index 0a233e0..14f78e4 100644
--- a/dev-lua/luaxml/luaxml-9999.ebuild
+++ b/dev-lua/luaxml/luaxml-9999.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils git-2
 
 DESCRIPTION="A minimal set of XML processing function in Lua, with simple mapping between XML and Lua tables"
 HOMEPAGE="http://github.com/LuaDist/luaxml"
-EGIT_REPO_URI="git://github.com/LuaDist/luaxml.git"
+EGIT_REPO_URI="git://github.com/msva/luaxml.git"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-lua/penlight/penlight-9999.ebuild b/dev-lua/penlight/penlight-9999.ebuild
index e3e7d7f..5856102 100644
--- a/dev-lua/penlight/penlight-9999.ebuild
+++ b/dev-lua/penlight/penlight-9999.ebuild
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://github.com/stevedonovan/Penlight git://github.com/stevedo
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc examples test luajit"
+IUSE="doc +examples test luajit"
 
 # TODO: Lua 5.2 handling
 
@@ -26,21 +26,28 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+DOCS=( README.md CHANGES.md CONTRIBUTING.md )
+
 src_test() {
-	# TODO LuaJIT handling
-	lua run.lua tests
+	local lua=lua;
+	use luajit && lua=luajit
+	${lua} run.lua tests
 }
 
 src_install() {
 	local lua=lua;
 	use luajit && lua=luajit
-	dodoc README.txt CHANGES.txt || die "dodoc failed"
+	use examples && {
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	}
 	use doc && (
-		cd docs
+		docompress -x /usr/share/doc/${PF}/html
+		cd doc
 		dodoc -r manual
-#doesn't work ATM
+# Still doesn't work
 #		luadoc . -d html
-#		dohtml -r html/*
+#		dohtml -r html
 	)
 	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})"
 	doins -r lua/pl