From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- dev-lang/luajit/Manifest | 6 +-- dev-lang/luajit/luajit-2.0.5-r2.ebuild | 67 ------------------------- dev-lang/luajit/luajit-2.0.5-r3.ebuild | 74 ++++++++++++++++++++++++++++ dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild | 56 --------------------- dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild | 63 +++++++++++++++++++++++ dev-lang/luajit/metadata.xml | 4 +- 6 files changed, 142 insertions(+), 128 deletions(-) delete mode 100644 dev-lang/luajit/luajit-2.0.5-r2.ebuild create mode 100644 dev-lang/luajit/luajit-2.0.5-r3.ebuild delete mode 100644 dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild create mode 100644 dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild (limited to 'dev-lang/luajit') diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest index 81fdf0181a28..bfd9c5c3b5b7 100644 --- a/dev-lang/luajit/Manifest +++ b/dev-lang/luajit/Manifest @@ -2,6 +2,6 @@ AUX CVE-2020-15890.patch 660 BLAKE2B ac615accba8c2d914ff9db2bd2306e1f37df6b35f95 AUX luajit-2-ldconfig.patch 1099 BLAKE2B f18beb00b703aa4fd5c6d959b72469c34fb67ba9dd1513831c36d5bdd21144457d70a58948bfc47660eadb130bb4f77d55858cd4e4b7c33860df749b22b727bd SHA512 a86be88b8cf65c5a11defeeb16dab92c7d3fe774b2ecd289d9485342236e14c99b78700082c024b703179b55aedeee98bef43d624af23673cfa7ac68a492c6b1 DIST LuaJIT-2.0.5.tar.gz 849845 BLAKE2B 961c8622e19b0e66a76a875cb46ad149cb2559b5af41f360dc41dd0d6bb924583e6477dd1329f67c2ac6ea4b8dc42c5e2f4d63ea49400aba4d9e7c7e85e4b085 SHA512 2636675602b4a060b0571c05220db2061dd2f38568e35b2be346a0f5e3128d87057d11d3d0d7567d8cc4e0817b5e4cf2c52a17a48065520962b157816465a9fe DIST LuaJIT-2.1.0-beta3.tar.gz 1025180 BLAKE2B ac3d12e25bd9946ba41aed6672c66884e7256e6be99d7ee8d1260d697453c966b24d60387f278f47233bad44cda61085c9059e6f62c0bc7cfdaaefde282346c5 SHA512 c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12 -EBUILD luajit-2.0.5-r2.ebuild 1503 BLAKE2B ae88e870209a2887ec07b67f6494d9ef35df9bb1e03f4dab7df2fe6dbac1403d3db022427d8d51d24db86e4a89f3eccc3bb42e61fbf976029353fdff4ca3b395 SHA512 5efb5f0fb79c2ad3caa627c5b98916b8d572deed99ecaa34e41e7a257dd13e5bd5708f8499358b409e1d096dec3b1adc5fd3899a36195cd638934d6dc8bcf496 -EBUILD luajit-2.1.0_beta3-r1.ebuild 1247 BLAKE2B a6ce90048bcfd990ed3ae385fd49af67a34c841a76b060b01e35a8ead21331f61200621deb60beb95114872057ae2ca915e48f27bd439f9ec9cd3ea3a3b3c5d2 SHA512 bf77bf3c715357fe6bddc32f37c3f3dacc453dca53c245446aaab88f9afd5748e498f32d238004592bcff9e38f13b03a2cbcaadf3333e1c1bc2da0938282fc79 -MISC metadata.xml 429 BLAKE2B 548e36b00c4acfa2ec05cc3b07b59deaa3b0de8424813656333ff2c0113afb4f888bf95e4605f6a42c01926c6dcd0eeefc1b8815483fe479073aa1d231a98541 SHA512 2535c6675adae6718977d183375412d1504e6c299f4157f3a1dbeb36b1f68aa7352271223e9c631bbd8e3e9906d8f43cbcce2e694a4a44c62c3686bd0526317e +EBUILD luajit-2.0.5-r3.ebuild 1665 BLAKE2B 940b2f3dfcf1c3de8cdec27cbae98ab6ac00c63a96adbf4cbc3e5834c0a8e061e6ef6ca215e64d8743b73c46909c46c58ca20ffc91f11639dcd7ebc1b704a7c6 SHA512 86f5092ba5c47d34fd94d6906bfefe1a5d5d5b322a29897eda81ddc92eeb330366fbbf6faa16b2c3368aa301a25995bc830e2d81493141970266276cfae1be4d +EBUILD luajit-2.1.0_beta3-r2.ebuild 1428 BLAKE2B 1df90f99244388196d226cfa25a8e2e293815513c79d49347a38df92566c00721548a04dc915201bfbe902fa3bcebf83784056e58a25953f7f8bb0f424364631 SHA512 07775875628ae30756cf79a440fed219dda30058ebc4e2277926b20606da37f752a9802f4a6ecfa7493ae776e0860745b03d004af58573f011d6985b6fac72c4 +MISC metadata.xml 420 BLAKE2B f15c26c6e5888598c830aaae0e038cd8cc7c2188d51d0094f237df1c59fe6f19774aa97ecccc0e3d117f7be6476f60caf35858d5fa62a9fb4da343aa0b134ad3 SHA512 0fb1a4a107458096448a75298bbb36f0af16f302633dd290b2dbee5f0363a17d4157c3af311724ce1a982f6423d20e5fd0583eb9ccdb91ecf7b11f76b5d29a6e diff --git a/dev-lang/luajit/luajit-2.0.5-r2.ebuild b/dev-lang/luajit/luajit-2.0.5-r2.ebuild deleted file mode 100644 index d9fa1d7fbc36..000000000000 --- a/dev-lang/luajit/luajit-2.0.5-r2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit pax-utils toolchain-funcs versionator - -MY_PV="$(get_version_component_range 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}}" - -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 static-libs" - -PATCHES=( - "${FILESDIR}/${PN}-2-ldconfig.patch" - "${FILESDIR}/CVE-2020-15890.patch" -) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - if [[ -n ${HOTFIX} ]]; then - eapply "${DISTDIR}/${HOTFIX}" - fi - default -} - -_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" \ - BUILDMODE="$(usex static-libs mixed dynamic)" \ - TARGET_STRIP="true" \ - INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \ - "$@" -} - -src_compile() { - _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" -} - -src_install() { - _emake install - - pax-mark m "${ED}usr/bin/luajit-${MY_PV}" - - HTML_DOCS="doc/." einstalldocs -} diff --git a/dev-lang/luajit/luajit-2.0.5-r3.ebuild b/dev-lang/luajit/luajit-2.0.5-r3.ebuild new file mode 100644 index 000000000000..5816d1feccfe --- /dev/null +++ b/dev-lang/luajit/luajit-2.0.5-r3.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit pax-utils toolchain-funcs + +MY_PV="$(ver_cut 1-3)" +MY_P="LuaJIT-${MY_PV}" +if [[ -n $(ver_cut 4) ]]; then + HOTFIX="v${PV}" + HOTFIX="${HOTFIX/_p/_hotfix}.patch" +fi + +DESCRIPTION="Just-In-Time Compiler for the Lua programming language" +HOMEPAGE="https://luajit.org/" +SRC_URI="https://luajit.org/download/${MY_P}.tar.gz + ${HOTFIX:+https://luajit.org/download/${HOTFIX}}" + +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 static-libs" + +PATCHES=( + "${FILESDIR}/${PN}-2-ldconfig.patch" + "${FILESDIR}/CVE-2020-15890.patch" +) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + if [[ -n ${HOTFIX} ]]; then + eapply "${DISTDIR}/${HOTFIX}" + fi + default +} + +_emake() { + emake \ + Q= \ + PREFIX="${EPREFIX}/usr" \ + MULTILIB="$(get_libdir)" \ + DESTDIR="${D}" \ + CFLAGS="" \ + LDFLAGS="" \ + HOST_CC="$(tc-getBUILD_CC)" \ + HOST_CFLAGS="${BUILD_CPPFLAGS} ${BUILD_CFLAGS}" \ + HOST_LDFLAGS="${BUILD_LDFLAGS}" \ + STATIC_CC="$(tc-getCC)" \ + DYNAMIC_CC="$(tc-getCC) -fPIC" \ + TARGET_LD="$(tc-getCC)" \ + TARGET_CFLAGS="${CPPFLAGS} ${CFLAGS}" \ + TARGET_LDFLAGS="${LDFLAGS}" \ + TARGET_AR="$(tc-getAR) rcus" \ + BUILDMODE="$(usex static-libs mixed dynamic)" \ + TARGET_STRIP="true" \ + INSTALL_LIB="${ED}/usr/$(get_libdir)" \ + "$@" +} + +src_compile() { + tc-export_build_env + _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" +} + +src_install() { + _emake install + + pax-mark m "${ED}/usr/bin/luajit-${MY_PV}" + + HTML_DOCS="doc/." einstalldocs +} diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild deleted file mode 100644 index 104a81af7aae..000000000000 --- a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit pax-utils toolchain-funcs versionator - -MY_PV="$(get_version_component_range 1-4)" -MY_PV="${MY_PV/_beta/-beta}" -MY_P="LuaJIT-${MY_PV}" - -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" -# this should probably be pkgmoved to 2.0 for sake of consistency. -SLOT="2" -KEYWORDS="~arm64" -IUSE="lua52compat static-libs" - -PATCHES=( - "${FILESDIR}/${PN}-2-ldconfig.patch" - "${FILESDIR}/CVE-2020-15890.patch" -) - -S="${WORKDIR}/${MY_P}" - -_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" \ - BUILDMODE="$(usex static-libs mixed dynamic)" \ - TARGET_STRIP="true" \ - INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \ - "$@" -} - -src_compile() { - _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" -} - -src_install() { - _emake install - - pax-mark m "${ED}usr/bin/luajit-${MY_PV}" - - HTML_DOCS="doc/." einstalldocs -} diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild b/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild new file mode 100644 index 000000000000..ebfafe94fabf --- /dev/null +++ b/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit pax-utils toolchain-funcs + +MY_PV="$(ver_cut 1-5)" +MY_PV="${MY_PV/_beta/-beta}" +MY_P="LuaJIT-${MY_PV}" + +DESCRIPTION="Just-In-Time Compiler for the Lua programming language" +HOMEPAGE="https://luajit.org/" +SRC_URI="https://luajit.org/download/${MY_P}.tar.gz" + +LICENSE="MIT" +# this should probably be pkgmoved to 2.0 for sake of consistency. +SLOT="2" +KEYWORDS="~arm64" +IUSE="lua52compat static-libs" + +PATCHES=( + "${FILESDIR}/${PN}-2-ldconfig.patch" + "${FILESDIR}/CVE-2020-15890.patch" +) + +S="${WORKDIR}/${MY_P}" + +_emake() { + emake \ + Q= \ + PREFIX="${EPREFIX}/usr" \ + MULTILIB="$(get_libdir)" \ + DESTDIR="${D}" \ + CFLAGS="" \ + LDFLAGS="" \ + HOST_CC="$(tc-getBUILD_CC)" \ + HOST_CFLAGS="${BUILD_CPPFLAGS} ${BUILD_CFLAGS}" \ + HOST_LDFLAGS="${BUILD_LDFLAGS}" \ + STATIC_CC="$(tc-getCC)" \ + DYNAMIC_CC="$(tc-getCC) -fPIC" \ + TARGET_LD="$(tc-getCC)" \ + TARGET_CFLAGS="${CPPFLAGS} ${CFLAGS}" \ + TARGET_LDFLAGS="${LDFLAGS}" \ + TARGET_AR="$(tc-getAR) rcus" \ + BUILDMODE="$(usex static-libs mixed dynamic)" \ + TARGET_STRIP="true" \ + INSTALL_LIB="${ED}/usr/$(get_libdir)" \ + "$@" +} + +src_compile() { + tc-export_build_env + _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" +} + +src_install() { + _emake install + + pax-mark m "${ED}/usr/bin/luajit-${MY_PV}" + + HTML_DOCS="doc/." einstalldocs +} diff --git a/dev-lang/luajit/metadata.xml b/dev-lang/luajit/metadata.xml index 29897b942522..ef8e19ce5906 100644 --- a/dev-lang/luajit/metadata.xml +++ b/dev-lang/luajit/metadata.xml @@ -2,8 +2,8 @@ - rafaelmartins@gentoo.org - Rafael G. Martins + williamh@gentoo.org + William Hubbs -- cgit v1.2.3