2 files changed, 12 insertions, 48 deletions
diff --git a/dev-lang/luajit/luajit-2.0.3.ebuild b/dev-lang/luajit/luajit-2.0.3.ebuild
index 90bc553..3814cf1 100644
--- a/dev-lang/luajit/luajit-2.0.3.ebuild
+++ b/dev-lang/luajit/luajit-2.0.3.ebuild
@@ -1,66 +1,30 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils multilib pax-utils versionator toolchain-funcs
+inherit eutils multilib pax-utils toolchain-funcs
 
-MY_PV="$(get_version_component_range 1-3)"
+MY_PV="$(ver_cut 1-3)"
 MY_P="LuaJIT-${MY_PV}"
-if [[ $(get_version_component_range 4) != "" ]]; then
-	HOTFIX="v${PV}"
-	HOTFIX="${HOTFIX/_p/_hotfix}.patch"
-fi
 
 DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
 HOMEPAGE="http://luajit.org/"
-SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
-	${HOTFIX:+http://luajit.org/download/${HOTFIX}}"
-
+SRC_URI="http://luajit.org/download/${MY_P}.tar.gz"
 LICENSE="MIT"
-# this should probably be pkgmoved to 2.0 for sake of consistency.
-SLOT="2"
+SLOT="2.0.3"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="lua52compat"
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare(){
-	if [[ -n ${HOTFIX} ]]; then
-		epatch "${DISTDIR}/${HOTFIX}"
-	fi
-	sed -i "s,PREFIX= /usr/local,PREFIX= ${EPREFIX}/usr," Makefile || die 'sed failed.'
-	sed -i "s,/lib,/$(get_libdir)," etc/${PN}.pc || die 'sed2 failed.'
-}
-
-src_compile() {
-	emake \
-		Q= \
-		PREFIX="${EPREFIX}/usr" \
-		DESTDIR="${D}" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		STATIC_CC="$(tc-getCC)" \
-		DYNAMIC_CC="$(tc-getCC) -fPIC" \
-		TARGET_LD="$(tc-getCC)" \
-		TARGET_AR="$(tc-getAR) rcus" \
-		TARGET_STRIP="true" \
-		INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \
-		XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
-}
+HTML_DOCS=( doc/ )
+PATCHES=( "${FILESDIR}"/${PN}-luaver.patch
+		  "${FILESDIR}"/${PN}-nosymlinks.patch )
 
 src_install(){
-	emake install \
-		DESTDIR="${D}" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		STATIC_CC="$(tc-getCC)" \
-		DYNAMIC_CC="$(tc-getCC) -fPIC" \
-		TARGET_LD="$(tc-getCC)" \
-		TARGET_AR="$(tc-getAR) rcus" \
-		TARGET_STRIP="true" \
-		INSTALL_LIB="${ED%/}/usr/$(get_libdir)"
+	default
 
 	pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
 
-	cd "${S}"/doc
-	dohtml -r *
+	einstalldocs
 }
diff --git a/dev-lang/luajit/luajit-2.0.5.ebuild b/dev-lang/luajit/luajit-2.0.5.ebuild
index 1db0ddd..22091b3 100644
--- a/dev-lang/luajit/luajit-2.0.5.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 HTML_DOCS=( doc/ )
 PATCHES=( "${FILESDIR}"/${PN}-luaver.patch
-		  "${FILESDIR}"/${PN}-nosymlinks.patch )
+		  "${FILESDIR}"/${PN}-205.patch )
 
 src_install(){
 	default