diff options
| -rw-r--r-- | dev-lang/luajit/luajit-2.0.3-r1.ebuild | 55 | ||||
| -rw-r--r-- | dev-lang/luajit/luajit-2.0.5-r1.ebuild | 4 |
2 files changed, 14 insertions, 45 deletions
diff --git a/dev-lang/luajit/luajit-2.0.3-r1.ebuild b/dev-lang/luajit/luajit-2.0.3-r1.ebuild index fbf1323..4e0430b 100644 --- a/dev-lang/luajit/luajit-2.0.3-r1.ebuild +++ b/dev-lang/luajit/luajit-2.0.3-r1.ebuild @@ -1,61 +1,30 @@ -# Copyright 1999-2015 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 [[ -n $(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" -KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="lua52compat" +SLOT="2.0.3-r1" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" -src_prepare(){ - if [[ -n ${HOTFIX} ]]; then - epatch "${DISTDIR}/${HOTFIX}" - fi -} - -_emake() { - emake \ - Q= \ - PREFIX="${EPREFIX}/usr" \ - MULTILIB="$(get_libdir)" \ - 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)" \ - "$@" -} - -src_compile() { - _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" -} +HTML_DOCS=( doc/ ) +PATCHES=( "${FILESDIR}"/${PN}-luaver.patch + "${FILESDIR}"/${PN}-nosymlinks.patch ) src_install(){ - _emake install + 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-r1.ebuild b/dev-lang/luajit/luajit-2.0.5-r1.ebuild index 1db0ddd..35f8725 100644 --- a/dev-lang/luajit/luajit-2.0.5-r1.ebuild +++ b/dev-lang/luajit/luajit-2.0.5-r1.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Just-In-Time Compiler for the Lua programming language" HOMEPAGE="http://luajit.org/" SRC_URI="http://luajit.org/download/${MY_P}.tar.gz" LICENSE="MIT" -SLOT="2.0.5" +SLOT="2.0.5-r1" KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" @@ -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 |