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

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

3 files changed, 19 insertions, 56 deletions

diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
deleted file mode 100644
index 63e4e94..0000000
--- a/dev-lua/luarocks/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST luarocks-2.0.4.1.tar.gz 75904 SHA256 f8da04e43952b8a3047465e45df95fd4d76539fcb546a0c5b2ecf89b00c82d71 SHA512 2dd233ce5d9342cf640e8aebc597747f4e85a43d55affb7a6d9b3cc9ab8940ff13b2c3aa502152f39e832ace57179794db13c2786578a73ac6edd08ec3581fe9 WHIRLPOOL c860144973cae0c92d810655a951984b7c897a6d5843aa31af5576f27e6bfbfc8d6cfc383b937f91d9b7559a90c23f6de60d40f29d53a8c926e7ba6ea0a3a2a2
diff --git a/dev-lua/luarocks/luarocks-2.0.4.1.ebuild b/dev-lua/luarocks/luarocks-2.0.4.1.ebuild
deleted file mode 100644
index 84a3b12..0000000
--- a/dev-lua/luarocks/luarocks-2.0.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: This ebuild is from Lua overlay; Bumped by mva; $
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A deployment and management system for Lua modules"
-HOMEPAGE="http://www.luarocks.org"
-SRC_URI="http://luarocks.org/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="curl openssl"
-
-DEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
-		curl? ( net-misc/curl )
-		openssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}
-		app-arch/unzip"
-
-src_configure() {
-	USE_MD5="md5sum"
-	USE_FETCH="wget"
-	use openssl && USE_MD5="openssl"
-	use curl && USE_FETCH="curl"
-
-	# econf doesn't work b/c it passes variables the custom configure can't
-	# handle
-	./configure \
-			--prefix=/usr \
-			--with-lua=/usr \
-			--with-lua-lib=/usr/$(get_libdir) \
-			--rocks-tree=/usr/lib/lua/luarocks \
-			--with-downloader=$USE_FETCH \
-			--with-md5-checker=$USE_MD5 \
-			--force-config || die "configure failed"
-}
-
-pkg_preinst() {
-	find "${D}" -type f | xargs sed -i -e "s:${D}::g" || die "sed failed"
-}
diff --git a/dev-lua/luarocks/luarocks-9999.ebuild b/dev-lua/luarocks/luarocks-9999.ebuild
index bd82a75..d159160 100644
--- a/dev-lua/luarocks/luarocks-9999.ebuild
+++ b/dev-lua/luarocks/luarocks-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils git-r3
+inherit eutils toolchain-funcs git-r3
 
 DESCRIPTION="A deployment and management system for Lua modules"
 HOMEPAGE="http://www.luarocks.org"
@@ -13,19 +13,25 @@ EGIT_REPO_URI="git://github.com/keplerproject/luarocks.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="curl openssl"
+IUSE="curl openssl luajit"
 
-DEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
+DEPEND="
+		!luajit? ( >=dev-lang/lua-5.1 )
+		luajit? ( dev-lang/luajit:2 )
 		curl? ( net-misc/curl )
-		openssl? ( dev-libs/openssl )"
+		openssl? ( dev-libs/openssl )
+"
 RDEPEND="${DEPEND}
-		app-arch/unzip"
+		app-arch/unzip
+		dev-util/pkg-config
+"
 
 src_configure() {
-	USE_MD5="md5sum"
-	USE_FETCH="wget"
-	use openssl && USE_MD5="openssl"
-	use curl && USE_FETCH="curl"
+	local lua=lua md5="md5sum" downloader="wget"
+
+	use curl && downloader="curl"
+	use openssl && md5="openssl"
+	use luajit && lua="luajit"
 
 	# econf doesn't work b/c it passes variables the custom configure can't
 	# handle
@@ -34,8 +40,10 @@ src_configure() {
 			--with-lua=/usr \
 			--with-lua-lib=/usr/$(get_libdir) \
 			--rocks-tree=/usr \
-			--with-downloader=$USE_FETCH \
-			--with-md5-checker=$USE_MD5 \
+			--with-downloader="${downloader}" \
+			--with-md5-checker="${md5}" \
+			$(use luajit && echo "--lua-suffix=jit") \
+			--with-lua-include="$($(tc-getPKG_CONFIG) --variable includedir ${lua})" \
 			--force-config || die "configure failed"
 }