From 27729dbc8f6331833947ceb8694d59cdd93da386 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Mon, 21 Jun 2021 16:30:27 -0400 Subject: dev-lua/luaossl: use binding := for dev-libs/openssl Needed for upcoming upgrade to OpenSSL 3.0.0 which has changed ABI. Acked-by: David Seifert Signed-off-by: Ionen Wolkens Signed-off-by: Sam James --- dev-lua/luaossl/luaossl-20200709-r101.ebuild | 97 ---------------------------- dev-lua/luaossl/luaossl-20200709-r102.ebuild | 97 ++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 97 deletions(-) delete mode 100644 dev-lua/luaossl/luaossl-20200709-r101.ebuild create mode 100644 dev-lua/luaossl/luaossl-20200709-r102.ebuild (limited to 'dev-lua/luaossl') diff --git a/dev-lua/luaossl/luaossl-20200709-r101.ebuild b/dev-lua/luaossl/luaossl-20200709-r101.ebuild deleted file mode 100644 index 9342f372653d..000000000000 --- a/dev-lua/luaossl/luaossl-20200709-r101.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} luajit ) -MY_P="${PN}-rel-${PV}" - -inherit lua toolchain-funcs - -DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe" -HOMEPAGE="https://github.com/wahern/luaossl" -SRC_URI="https://github.com/wahern/${PN}/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="examples" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND=" - dev-libs/openssl:0[-bindist(-)] - !dev-lua/lua-openssl - !dev-lua/luasec - ${LUA_DEPS} -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( "doc/." ) - -src_prepare() { - default - - # Remove Lua autodetection - # Respect users CFLAGS - sed -e '/LUAPATH :=/d' -e '/LUAPATH_FN =/d' -e '/HAVE_API_FN =/d' -e '/WITH_API_FN/d' -e 's/-O2//g' -i GNUmakefile || die - - lua_copy_sources -} - -lua_src_compile() { - pushd "${BUILD_DIR}" || die - - if [[ ${ELUA} != luajit ]]; then - LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))" - else - # This is a workaround for luajit, as it confirms to lua5.1 - # and the 'GNUmakefile' doesn't understand LuaJITs version. - LUA_VERSION="5.1" - fi - - local myemakeargs=( - "CC=$(tc-getCC)" - "ALL_CPPFLAGS=${CPPFLAGS} $(lua_get_CFLAGS)" - "libdir=" - ) - - emake "${myemakeargs[@]}" openssl${LUA_VERSION} - - popd -} - -src_compile() { - lua_foreach_impl lua_src_compile -} - -lua_src_install() { - pushd "${BUILD_DIR}" || die - - if [[ ${ELUA} != luajit ]]; then - LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))" - else - # This is a workaround for luajit, as it confirms to lua5.1 - # and the 'GNUmakefile' doesn't understand LuaJITs version. - LUA_VERSION="5.1" - fi - - local myemakeargs=( - "DESTDIR=${D}" - "lua${LUA_VERSION/./}cpath=$(lua_get_cmod_dir)" - "lua${LUA_VERSION/./}path=$(lua_get_lmod_dir)" - "prefix=${EPREFIX}/usr" - ) - - emake "${myemakeargs[@]}" install${LUA_VERSION} - - popd -} - -src_install() { - lua_foreach_impl lua_src_install - - use examples && dodoc -r "examples/." - einstalldocs -} diff --git a/dev-lua/luaossl/luaossl-20200709-r102.ebuild b/dev-lua/luaossl/luaossl-20200709-r102.ebuild new file mode 100644 index 000000000000..74281b29dac3 --- /dev/null +++ b/dev-lua/luaossl/luaossl-20200709-r102.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} luajit ) +MY_P="${PN}-rel-${PV}" + +inherit lua toolchain-funcs + +DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe" +HOMEPAGE="https://github.com/wahern/luaossl" +SRC_URI="https://github.com/wahern/${PN}/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="examples" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + dev-libs/openssl:0=[-bindist(-)] + !dev-lua/lua-openssl + !dev-lua/luasec + ${LUA_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( "doc/." ) + +src_prepare() { + default + + # Remove Lua autodetection + # Respect users CFLAGS + sed -e '/LUAPATH :=/d' -e '/LUAPATH_FN =/d' -e '/HAVE_API_FN =/d' -e '/WITH_API_FN/d' -e 's/-O2//g' -i GNUmakefile || die + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + if [[ ${ELUA} != luajit ]]; then + LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))" + else + # This is a workaround for luajit, as it confirms to lua5.1 + # and the 'GNUmakefile' doesn't understand LuaJITs version. + LUA_VERSION="5.1" + fi + + local myemakeargs=( + "CC=$(tc-getCC)" + "ALL_CPPFLAGS=${CPPFLAGS} $(lua_get_CFLAGS)" + "libdir=" + ) + + emake "${myemakeargs[@]}" openssl${LUA_VERSION} + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + if [[ ${ELUA} != luajit ]]; then + LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))" + else + # This is a workaround for luajit, as it confirms to lua5.1 + # and the 'GNUmakefile' doesn't understand LuaJITs version. + LUA_VERSION="5.1" + fi + + local myemakeargs=( + "DESTDIR=${D}" + "lua${LUA_VERSION/./}cpath=$(lua_get_cmod_dir)" + "lua${LUA_VERSION/./}path=$(lua_get_lmod_dir)" + "prefix=${EPREFIX}/usr" + ) + + emake "${myemakeargs[@]}" install${LUA_VERSION} + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + use examples && dodoc -r "examples/." + einstalldocs +} -- cgit v1.2.3-65-gdbad