From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 27E0F158094 for ; Mon, 11 Jul 2022 23:12:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6FA7CE103C; Mon, 11 Jul 2022 23:12:56 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 52307E103C for ; Mon, 11 Jul 2022 23:12:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8AB36335D35 for ; Mon, 11 Jul 2022 23:12:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18843105 for ; Mon, 11 Jul 2022 23:12:54 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1657581150.bf7c65c8da35efb0d83eae503a884c88cd78f8f0.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lua/luaossl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lua/luaossl/Manifest dev-lua/luaossl/luaossl-20220711.ebuild X-VCS-Directories: dev-lua/luaossl/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: bf7c65c8da35efb0d83eae503a884c88cd78f8f0 X-VCS-Branch: master Date: Mon, 11 Jul 2022 23:12:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dd864694-1d71-4222-b105-682fb7997350 X-Archives-Hash: 367c33137afe8ae5a7ff2c30a5101467 commit: bf7c65c8da35efb0d83eae503a884c88cd78f8f0 Author: Conrad Kostecki gentoo org> AuthorDate: Mon Jul 11 23:11:28 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Mon Jul 11 23:12:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf7c65c8 Revert "dev-lua/luaossl: drop 20220711" This reverts commit 19a953464725d83207324fc51b947f3bf770a99c. Signed-off-by: Conrad Kostecki gentoo.org> dev-lua/luaossl/Manifest | 1 + dev-lua/luaossl/luaossl-20220711.ebuild | 97 +++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/dev-lua/luaossl/Manifest b/dev-lua/luaossl/Manifest index db230bd70a4e..0242e7046364 100644 --- a/dev-lua/luaossl/Manifest +++ b/dev-lua/luaossl/Manifest @@ -1 +1,2 @@ DIST luaossl-rel-20200709.tar.gz 352960 BLAKE2B f4cd53937d7a9c724ab9f2f6a13f1da8fa54216f01fe2af7e65cf7ebdad1f8740491ba1fc6bcc2bf4ac377bde0d2e370433e76a5105c6226e0d9745e12bec0ea SHA512 324175f65e9d292ecb1343cfa9e111f1fd17f15e67037bd705d3db95d32b859c039a6e70620d649f446a8e7043a125a75c64de1714f0fe18e077fb9c017bea34 +DIST luaossl-rel-20220711.tar.gz 505174 BLAKE2B be8736c9198c2c602ab4495f5498e96c90c66ac2712c4c299e3279fa5acd9168fcac29730f1db000eb908ca5f0a2215856c75bbd4a2cf3927cbdf82615160467 SHA512 13c51881218a5a9995d195d4781f6871f0dfe58f061b85dd997b98ec970a38302ac6b057b7987bff5f7719bfdb826aae09f602ea8db5e4b2d462648ad0236909 diff --git a/dev-lua/luaossl/luaossl-20220711.ebuild b/dev-lua/luaossl/luaossl-20220711.ebuild new file mode 100644 index 000000000000..0cbaf9a0b4ed --- /dev/null +++ b/dev-lua/luaossl/luaossl-20220711.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 +}