gentoo resync : 14.12.2020

5 files changed, 216 insertions, 80 deletions

diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index 277fb994bdaf..b4ef7a6e5fd0 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -1,5 +1,6 @@
+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.7.8_p0.tar.gz 397072 BLAKE2B 048ae34c195f6f0ff252f33d14a7151b629d5b9ba828c331459e58f23f0ee62e66f00b8fdbe5665eb7f247d4bb97986e158ea89107189aba4199fcb878f2d724 SHA512 a23b5010633aec70639903fe4d0473101e42c2690456ff2d730c45ef4710134058bc6b3e364c79d3cf3dd4c323a89bd98f07a17d23f226b0bb7e0bb1f2be32c5
-DIST lua-openssl-aux-b56f6937096acea34ddf241ec7ea08ac52414d18.tar.gz 3684 BLAKE2B 78e92c6cc1c2a29b00a9179db71a9404aff40a0e844f2f092b7868bbf98b6f3fa9519c63a2c38304ce2928b007bd4c015c5afa66ca32b1646035ebb949b3c655 SHA512 ba1eaf7c6b58fde48f47146d6c773368484ea10a229d6a45f317bda8d8cc21829ceda68071685f1b071e150936362b934b90532344ebb266febcc0efa45904f4
-DIST lua-openssl-compat-a1735f6e6bd17588fcaf98720f0548c4caa23b34.tar.gz 51950 BLAKE2B 16dbf5eb444393f093a5f2cc0fa2a8b394a8b2d62ca36882d02202304a2906b4e2bb87814c1ca198e4b77a9bc27d85627da75244ce9c68c3fd1e06e9262fa970 SHA512 2a8e1d3bb6475225f311995f70417c0620c5efa7384400b2002166daa6fc1baedb32f492dc65cc5b92bf63e850c293a36c1f8aed6e7cf0985e582aa0e52141a8
-EBUILD lua-openssl-0.7.8_p0-r1.ebuild 2221 BLAKE2B 108f0be285519ace2a4216f920a714661c8988213f3d47a3f488fc0ebb596e00b294e2a8f6e0560b29bdbe31253cab050e1653fe9685406203bc56ce791f0320 SHA512 2f75a5b7af5819431ffd301bd79a78da6cf9c037e68a1b097c2427f653f1039f19d4a9dd34ddbf9b48958c83be4e5c9859a4ccd67a63c08ea86442ed55a8ffdf
-MISC metadata.xml 444 BLAKE2B 10922399060a76c4ec3dbb4c11925c2674a65d5bc23d06d76d51aeafe8f885620d647e0054ffbfed39083f8bd54972486dbc1a1a019a1206d8966918aa336ef9 SHA512 248cd6f3e2ca5ed82b4f571aa8c3fc642ea7b0cd94ed14e012bddd81b00363125cadb235261fd45e2366f72d34135fe8476b33d7d2d0d2ce1e1dc029702cc8d3
+EBUILD lua-openssl-0.7.8_p0-r100.ebuild 2449 BLAKE2B b7469b721fbc35db1e2bc9bccfa4f92e4b6b6b3ba18af5821e1ff973d5b550538f90a381a79bc0b07345e691e497f9f33dfc67cea36df85577856f32e41fb9db SHA512 20d039165bc638f24ab7275a02cfbb64f887fdf25a05613094450e27cc122e3dffb2238766ffadd98e2d65d041cae20fff1ac5c4a1798f50c57330772e2fdd3a
+EBUILD lua-openssl-0.7.8_p0-r2.ebuild 2510 BLAKE2B baf5e8d6b7015c761ada5e63a4c219b7efdb6b09012b298edab2db61f9c855c72147a4863bb9ae43feab4718b837b780dd2c50dd59c32949fc0fa56e5bdb8241 SHA512 c8bf27ce0796c1ddfb59c78308713865913a49c4f87ca7776541112aea85a6973292959944de034eeec2e122b0f3e07435a5fd29cb6976be4db70ac76a13b185
+MISC metadata.xml 555 BLAKE2B 3f448f76d768881d14d1ec6514ee525aac2acffa168943bab1b72f9f86889b5ba434d53e774ef296ec76cfa689f86935e40ad752617cdf43b3b534c4a74350ff SHA512 235a3193b4ced9f5515bd89ed60f32e06d32dbfced30cc05f9c67dd46ab3521cd916da1a46e96457abf2f9e1fd11df1d4d2874775ffeea3ad156db8cef118202
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r1.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r1.ebuild
deleted file mode 100644
index 3f4cf467fa9a..000000000000
--- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="${PV//_p/-}"
-
-DESCRIPTION="OpenSSL binding for Lua"
-HOMEPAGE="https://github.com/zhaozg/lua-openssl"
-LUA_AUX_COMMIT="b56f6937096acea34ddf241ec7ea08ac52414d18"
-LUA_COMPAT_COMMIT="a1735f6e6bd17588fcaf98720f0548c4caa23b34"
-SRC_URI="https://github.com/zhaozg/lua-openssl/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/zhaozg/lua-auxiliar/archive/${LUA_AUX_COMMIT}.tar.gz -> ${PN}-aux-${LUA_AUX_COMMIT}.tar.gz
-	https://github.com/keplerproject/lua-compat-5.3/archive/${LUA_COMPAT_COMMIT}.tar.gz -> ${PN}-compat-${LUA_COMPAT_COMMIT}.tar.gz"
-
-LICENSE="MIT openssl PHP-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:0 )
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	!dev-lua/luacrypto
-	!dev-lua/luaossl
-	!dev-lua/luasec
-"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	rmdir deps/auxiliar deps/lua-compat || die
-	mv "${WORKDIR}/lua-auxiliar-${LUA_AUX_COMMIT}" deps/auxiliar || die
-	mv "${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_COMMIT}" deps/lua-compat || die
-
-	# fixes: deps/auxiliar/auxiliar.c:11:10: fatal error: c-api/compat-5.3.h: No such file or directory
-	ln -sv lua-compat/c-api deps/c-api
-
-	default
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-	LUA_VERSION="$(${PKG_CONFIG} --variable=$(usex luajit abiver V) $(usex luajit luajit lua))"
-	LUA_CFLAGS="$(${PKG_CONFIG} $(usex luajit luajit lua) --cflags) ${CFLAGS}"
-	LUA_LIBS="$(${PKG_CONFIG} $(usex luajit luajit lua) --libs) ${LDFLAGS}"
-	INSTALL_CMOD="$(${PKG_CONFIG} $(usex luajit luajit lua) --variable=INSTALL_CMOD)"
-	INSTALL_LMOD="$(${PKG_CONFIG} $(usex luajit luajit lua) --variable=INSTALL_LMOD)"
-
-	export LUA_VERSION LUA_CFLAGS LUA_LIBS
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_test() {
-	TZ=UTC emake CC="$(tc-getCC)" test
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" LUA_LIBDIR="${ED}/${INSTALL_CMOD}" install
-
-	# install lua code as well
-	insinto "${INSTALL_LMOD}"
-	doins -r lib/*
-
-	einstalldocs
-}
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild
new file mode 100644
index 000000000000..f8e40f03140f
--- /dev/null
+++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2"
+LUA_COMPAT=( lua5-{1..3} 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/${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 ~x86"
+IUSE="libressl test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!dev-lua/luaossl
+	!dev-lua/luasec
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+DOCS=( "README.md" "samples/." )
+
+src_prepare() {
+	default
+
+	# 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_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_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_LIBDIR=${ED}/$(lua_get_cmod_dir)"
+		"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.7.8_p0-r2.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild
new file mode 100644
index 000000000000..c8c126b8cb44
--- /dev/null
+++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2"
+MY_PN_AUX="lua-auxiliar"
+MY_PN_COMPAT="lua-compat-5.3"
+MY_PV="${PV//_p/-}"
+MY_PV_COMPAT="0.10"
+
+inherit toolchain-funcs
+
+DESCRIPTION="OpenSSL binding for Lua"
+HOMEPAGE="https://github.com/zhaozg/lua-openssl"
+SRC_URI="
+	https://github.com/zhaozg/${PN}/archive/${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 ~x86"
+IUSE="libressl luajit test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!dev-lua/luaossl
+	!dev-lua/luasec
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1:0 )
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+DOCS=( "README.md" "samples/." )
+
+src_prepare() {
+	default
+
+	# 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
+}
+
+src_compile() {
+	local myemakeargs=(
+		"AR=$(tc-getAR)"
+		"CC=$(tc-getCC)"
+		"LUA_CFLAGS=${CFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
+		"LUA_LIBS=${LDFLAGS}"
+		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
+		"TARGET_SYS=${CTARGET:-${CHOST}}"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	local myemakeargs=(
+		"LUA=$(usex luajit 'luajit' 'lua')"
+		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
+		"TARGET_SYS=${CTARGET:-${CHOST}}"
+	)
+
+	emake "${myemakeargs[@]}" test
+}
+
+src_install() {
+	local myemakeargs=(
+		"LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
+		"TARGET_SYS=${CTARGET:-${CHOST}}"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
+	doins -r "lib/."
+
+	einstalldocs
+}
diff --git a/dev-lua/lua-openssl/metadata.xml b/dev-lua/lua-openssl/metadata.xml
index d0cab8078d2a..d23128cb52b3 100644
--- a/dev-lua/lua-openssl/metadata.xml
+++ b/dev-lua/lua-openssl/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>