From 34dea8e38f88007799629d0a56b12dec480b1d21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Jun 2021 14:45:01 +0100 Subject: gentoo resync : 20.06.2021 --- dev-lua/Manifest.gz | Bin 6971 -> 6967 bytes dev-lua/lua-openssl/Manifest | 2 +- dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild | 130 +++++++++++++++++++++ dev-lua/lua-openssl/lua-openssl-0.8.0_p6.ebuild | 130 --------------------- dev-lua/luaossl/Manifest | 2 +- dev-lua/luaossl/luaossl-20200709-r100.ebuild | 97 --------------- dev-lua/luaossl/luaossl-20200709-r101.ebuild | 97 +++++++++++++++ 7 files changed, 229 insertions(+), 229 deletions(-) create mode 100644 dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild delete mode 100644 dev-lua/lua-openssl/lua-openssl-0.8.0_p6.ebuild delete mode 100644 dev-lua/luaossl/luaossl-20200709-r100.ebuild create mode 100644 dev-lua/luaossl/luaossl-20200709-r101.ebuild (limited to 'dev-lua') diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz index 3f10a94b8aa5..1e5446c3cb19 100644 Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest index 0d9a2d39e750..92797d7e4f11 100644 --- a/dev-lua/lua-openssl/Manifest +++ b/dev-lua/lua-openssl/Manifest @@ -1,5 +1,5 @@ DIST lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz 3690 BLAKE2B 8e31e8ad75bcc5840223068fdc9b634c2cbc42d713bba0792a0b04f8e018e36e3bab16a07aaa725d8b2bbd55c3a74271a21366c2cde1b4c6bd735c9438efedec SHA512 c461c23cd50ef43aa37ce2c819a9a485ead1011ecb5ff083a092e49ac79d5398aff1631f441cb8e59acd820024ed51e74420b74da751c0fccd2cfce94f039952 DIST lua-compat-5.3-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d DIST lua-openssl-0.8.0_p6.tar.gz 418000 BLAKE2B 34474c607f6e39985c17f142b1067f2438b51c7e6f62861f65fa8c471722b56dee05a7a45eae277b368ee643a1820334de03c08f09c88a17e851925d575df6d4 SHA512 56125b8a88783b48bbeabd56be4732afe22ef54224b3f03f16e3cbc1ce94f554d6d8dea8236bff34786aad2720b53cbd05dcba85ca41497db61f339014fa3b95 -EBUILD lua-openssl-0.8.0_p6.ebuild 2859 BLAKE2B 678d1917f82675e9c728882b0a5224ed9643cd96c6fce24ead98b5462e913f1e2c72a6fcc17c2894247d79b4cd4c334f45f799cc005e04599243805558ab738e SHA512 b8b91fdaa951c10c0c21c1102533f0fb661652dcafe64409cd9cff6970faf34e7ed66bd679436a49127721c24f77cf5c36c62f370edc21459d7aede346c43894 +EBUILD lua-openssl-0.8.0_p6-r1.ebuild 2862 BLAKE2B 685e6636cd195f441e6967cd4c39a2d9ec9bf53f8a22c636db5679771b7dd15f6f8ce479fe9f72683104ce6737c9ef9674f0de85314979f4a329b89979115681 SHA512 b45dd578aed439c7c710b63eabb535eb605cd48919882d6ccf967267c740ce58cc099e436e6edf5026ae41ca48285b27c353dea46f37c9329075004fdfa3330f MISC metadata.xml 569 BLAKE2B 80e5dc0b568cfe18741e12d2df60301a9a8424a3043899bcada19052fb240b4207a9bd6bbbbb2b6c6cd7940e5af3c04ed4126dc89cfb40d3934403a442bcaa5d SHA512 e17108732d270894cb9ab3d99db60da6af3860604256f44a8ba86af7457fd8f94452ce333c7e86dcfc99c6edc652d58ad19bfcd5c081968dd2af24f9d0e591dd diff --git a/dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild b/dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild new file mode 100644 index 000000000000..c91859384d35 --- /dev/null +++ b/dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2" +LUA_COMPAT=( lua5-{1..4} luajit ) +MY_PN_AUX="lua-auxiliar" +MY_PN_COMPAT="lua-compat-5.3" +MY_PV="${PV//_p/-}" +MY_PV_COMPAT="0.10" + +inherit lua toolchain-funcs + +DESCRIPTION="OpenSSL binding for Lua" +HOMEPAGE="https://github.com/zhaozg/lua-openssl" +SRC_URI=" + https://github.com/zhaozg/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz + https://github.com/zhaozg/${MY_PN_AUX}/archive/${EGIT_COMMIT_AUX}.tar.gz -> ${MY_PN_AUX}-${EGIT_COMMIT_AUX}.tar.gz + https://github.com/keplerproject/${MY_PN_COMPAT}/archive/v${MY_PV_COMPAT}.tar.gz -> ${MY_PN_COMPAT}-${MY_PV_COMPAT}.tar.gz +" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="MIT openssl PHP-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + !dev-lua/luaossl + !dev-lua/luasec + dev-libs/openssl:0=[-bindist(-)] + ${LUA_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +DOCS=( "README.md" "samples/." ) + +src_prepare() { + default + + # Allow override of LUA* variables + sed -e '/LUA /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die + + # Disable TestCMS and TestCRL test suite, as it fails + # See: https://github.com/zhaozg/lua-openssl/issues/230 + # See: https://github.com/zhaozg/lua-openssl/issues/231 + sed -e '/6.cms.lua/d' -e '/5.x509_crl.lua/d' -i test/test.lua || die + + # Prepare needed dependencies (source code files only) + rm -r deps/{auxiliar,lua-compat} || die + mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die + mv "${WORKDIR}/${MY_PN_COMPAT}-${MY_PV_COMPAT}" deps/lua-compat || die + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "AR=$(tc-getAR)" + "CC=$(tc-getCC)" + "LUA=" + "LUA_CFLAGS=${CFLAGS} $(lua_get_CFLAGS)" + "LUA_LIBS=${LDFLAGS}" + "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" + "TARGET_SYS=${CTARGET:-${CHOST}}" + ) + + emake "${myemakeargs[@]}" + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "LUA=${ELUA}" + "LUA_CFLAGS=" + "LUA_LIBS=" + "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" + "TARGET_SYS=${CTARGET:-${CHOST}}" + ) + + emake "${myemakeargs[@]}" test + + popd +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "LUA=" + "LUA_CFLAGS=" + "LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)" + "LUA_LIBS=" + "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" + "TARGET_SYS=${CTARGET:-${CHOST}}" + ) + + emake "${myemakeargs[@]}" install + + insinto "$(lua_get_lmod_dir)" + doins -r "lib/." + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/lua-openssl/lua-openssl-0.8.0_p6.ebuild b/dev-lua/lua-openssl/lua-openssl-0.8.0_p6.ebuild deleted file mode 100644 index 486c9582b329..000000000000 --- a/dev-lua/lua-openssl/lua-openssl-0.8.0_p6.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2" -LUA_COMPAT=( lua5-{1..4} luajit ) -MY_PN_AUX="lua-auxiliar" -MY_PN_COMPAT="lua-compat-5.3" -MY_PV="${PV//_p/-}" -MY_PV_COMPAT="0.10" - -inherit lua toolchain-funcs - -DESCRIPTION="OpenSSL binding for Lua" -HOMEPAGE="https://github.com/zhaozg/lua-openssl" -SRC_URI=" - https://github.com/zhaozg/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz - https://github.com/zhaozg/${MY_PN_AUX}/archive/${EGIT_COMMIT_AUX}.tar.gz -> ${MY_PN_AUX}-${EGIT_COMMIT_AUX}.tar.gz - https://github.com/keplerproject/${MY_PN_COMPAT}/archive/v${MY_PV_COMPAT}.tar.gz -> ${MY_PN_COMPAT}-${MY_PV_COMPAT}.tar.gz -" -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="MIT openssl PHP-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="test" -REQUIRED_USE="${LUA_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - !dev-lua/luaossl - !dev-lua/luasec - dev-libs/openssl:0=[-bindist] - ${LUA_DEPS} -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - test? ( ${RDEPEND} ) -" - -DOCS=( "README.md" "samples/." ) - -src_prepare() { - default - - # Allow override of LUA* variables - sed -e '/LUA /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die - - # Disable TestCMS and TestCRL test suite, as it fails - # See: https://github.com/zhaozg/lua-openssl/issues/230 - # See: https://github.com/zhaozg/lua-openssl/issues/231 - sed -e '/6.cms.lua/d' -e '/5.x509_crl.lua/d' -i test/test.lua || die - - # Prepare needed dependencies (source code files only) - rm -r deps/{auxiliar,lua-compat} || die - mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die - mv "${WORKDIR}/${MY_PN_COMPAT}-${MY_PV_COMPAT}" deps/lua-compat || die - - lua_copy_sources -} - -lua_src_compile() { - pushd "${BUILD_DIR}" || die - - local myemakeargs=( - "AR=$(tc-getAR)" - "CC=$(tc-getCC)" - "LUA=" - "LUA_CFLAGS=${CFLAGS} $(lua_get_CFLAGS)" - "LUA_LIBS=${LDFLAGS}" - "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" - "TARGET_SYS=${CTARGET:-${CHOST}}" - ) - - emake "${myemakeargs[@]}" - - popd -} - -src_compile() { - lua_foreach_impl lua_src_compile -} - -lua_src_test() { - pushd "${BUILD_DIR}" || die - - local myemakeargs=( - "LUA=${ELUA}" - "LUA_CFLAGS=" - "LUA_LIBS=" - "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" - "TARGET_SYS=${CTARGET:-${CHOST}}" - ) - - emake "${myemakeargs[@]}" test - - popd -} - -src_test() { - lua_foreach_impl lua_src_test -} - -lua_src_install() { - pushd "${BUILD_DIR}" || die - - local myemakeargs=( - "LUA=" - "LUA_CFLAGS=" - "LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)" - "LUA_LIBS=" - "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" - "TARGET_SYS=${CTARGET:-${CHOST}}" - ) - - emake "${myemakeargs[@]}" install - - insinto "$(lua_get_lmod_dir)" - doins -r "lib/." - - popd -} - -src_install() { - lua_foreach_impl lua_src_install - - einstalldocs -} diff --git a/dev-lua/luaossl/Manifest b/dev-lua/luaossl/Manifest index d253558c3970..32cab9ba6bfa 100644 --- a/dev-lua/luaossl/Manifest +++ b/dev-lua/luaossl/Manifest @@ -1,3 +1,3 @@ DIST luaossl-rel-20200709.tar.gz 352960 BLAKE2B f4cd53937d7a9c724ab9f2f6a13f1da8fa54216f01fe2af7e65cf7ebdad1f8740491ba1fc6bcc2bf4ac377bde0d2e370433e76a5105c6226e0d9745e12bec0ea SHA512 324175f65e9d292ecb1343cfa9e111f1fd17f15e67037bd705d3db95d32b859c039a6e70620d649f446a8e7043a125a75c64de1714f0fe18e077fb9c017bea34 -EBUILD luaossl-20200709-r100.ebuild 2072 BLAKE2B 0d30b8da038b2c8c706fc66e6742c3397a3d65df7dfd04ae45b1adc376c95ebead91ecdf9c6c7cc5f6fcdcad04240f2e6938b63c14c2ecfd4ce5fb9ee19d8da7 SHA512 a023ee6da2f666fe234058b6c71061d4ce4eae676693333a05a426b7f1a5b14f8b6f7bffa83c210e5d64bf468c2a38f433784b42d21d3be489adb23d7fdef5ab +EBUILD luaossl-20200709-r101.ebuild 2075 BLAKE2B 49ed2a691cfcd82da7ba213c84fa7d201ffaec8b69c79fd94620e302140ca49786e8b48bd649572b005ce3fd53307852934f16598e31ab60a156161d8650c896 SHA512 a8ca335b24c9651ff1b99fff13afab756bde3654719998e3c40b791c5c0a51a8fbf3cfeb910f72c2944356900e2a0a04b9aefe3707529b8079cfae1b907d7c0c MISC metadata.xml 587 BLAKE2B 3ee9997a19052c385351d3703fe3c7a2a3f5c5a1d48e82dd83ce3ccbe10483c4851815b01d97f0cd48c106a64521d3f6a8004a0361817c6083696f8de146f7d2 SHA512 9076d6429743c14c0fa94bbe9527c86b29d2ef0cddb29828616df1ac260dd5e9aee106060189f536ae7c08a3249e9eeaacb8c33002c1758280f11c77df8294ec diff --git a/dev-lua/luaossl/luaossl-20200709-r100.ebuild b/dev-lua/luaossl/luaossl-20200709-r100.ebuild deleted file mode 100644 index 9b396bab129f..000000000000 --- a/dev-lua/luaossl/luaossl-20200709-r100.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-r101.ebuild b/dev-lua/luaossl/luaossl-20200709-r101.ebuild new file mode 100644 index 000000000000..9342f372653d --- /dev/null +++ b/dev-lua/luaossl/luaossl-20200709-r101.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