gentoo resync : 25.04.2020

3 files changed, 83 insertions, 6 deletions

diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index 98d7fea0db10..edf2ab991212 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -2,10 +2,12 @@ AUX 0001-fix-libressl-compat.patch 14675 BLAKE2B a90784a7925c5f3eca792d54e60f6b2
 DIST lua-openssl-0.7.3.tar.gz 383743 BLAKE2B 2709eed607e6d752488cacd5b96ee4a845f1ec13948fc7e40e45af968f240579b5d96ab69380f87d7edfc8a55aa44b099e9a592891f78a7928d172f5abcbc9fb SHA512 00eea8d4d04e167456a7602ae111cb768db61f7bdf9e0056c424bdcd67618811cd304543f95ecb273c66c6b41779e2fe721cb43bc332765ce77effb6245edbe2
 DIST lua-openssl-0.7.7_p0.tar.gz 395094 BLAKE2B a4f8efdce1ad76879f85cd1b467c4cfaa6d4444da60e337a850bf8a521b02e93e3252f0a77c39bfa6bbb01ff1f9af76b63db9e257499278e2f6789c1d0c4965c SHA512 5c659bced2801b9a42a20894261bb10f516ae2cf66206a68249e1c24b73af9df32280640f1379db1a24648852b2a4be1a4b52baee1e18862b538bfff8232fa6d
 DIST lua-openssl-0.7.7_p1.tar.gz 396946 BLAKE2B 58d3bbf0b90a4437d989c5b786e2a44dac86dc40009688753daa81b1e17a14f6a8506e6330ec4a2c360645826c85f83c5ff38642315806b8c5b902206f13510b SHA512 1e470ca0b899fb647215f9c5ed11f8f0e52e662d6ef01c27fe86b9fd1eb833c878d6022455e1867ef844f252d07597eaf6326c686e2eb290c1a98772614ec145
+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
 DIST lua-openssl-compat-daebe77a2f498817713df37f0bb316db1d82222f.tar.gz 51418 BLAKE2B 1d04684e6b6d850bdf6bd3165a90c6a08bd93b757d91e387da152bcb3fc4756db5c16f3cc12ecf33bcdd647742c7923cc2e72627beb5527c5e9dfbfd63c147ba SHA512 60ec9ecfc4e4ad47b6a8189ffb1e7c83fe8b9e9df13cb91bf33725905ab72bff3d3009e8ad04fb73fd7255facdbb8279f20bfd160aee89b12c25431786eaca14
 EBUILD lua-openssl-0.7.3.ebuild 1830 BLAKE2B 1ecfaaa56fd83dfa222fdd53a78c37674b3c3907af61d22707cbf55ab6dcb07b2f011852bc286f2bd1390fb01cf4677cac1a76bab8813916e16acc74ed65a3f9 SHA512 f05c8db1f70cb24e591d45a800da2503cc81488d11dfb88ed19703b6734cffbe5a42c0b87c8fbea12b07590b7b4f20db5faca70a79263ff29e722de99b4876de
 EBUILD lua-openssl-0.7.7_p0-r1.ebuild 2019 BLAKE2B 5aefff7f13ca51aee96dce850cd46143045207b6224e43972987796f3e8256ddc5e09a3a89d1acf3c2c5f0f75e02df3ae345fc9122beac163465d0f65250d972 SHA512 161a29faf38036c15a5b8e0af74c82606cb79bd5839d27d99992904d5171428ad012b2c59dc831133fdd3d94adca1d42db4bcd3ebc8de7e992938b00b7568924
 EBUILD lua-openssl-0.7.7_p1.ebuild 2157 BLAKE2B ce43de29c6c88df441640e80880f0ed33db62572f4743f874639e818eea1c7266bc1e48bf134b24209d4b2620de3f37301c6a877b52d2fb2fcd2b7d36b44b51b SHA512 abb0f7a542c91c1712ff796bb21bee85a97ddec59198a37616fd948a0badc014ee0c4b2c74f46afb27b6d7650b81841bc5ac302aa362c6c61a349ceb5f5cafbb
-MISC metadata.xml 450 BLAKE2B 6308bdf6f3938b3fef9178572471418882e1777bcb740c537023e03f007d46459bb4142783315376d4c9ae59d7884e138381c91e9517e07c5fb061152f11730e SHA512 9bd34c3cce2d9e9ec2ad4529afd569161416e6ae4e519c392957bd735e398ed4445a4ffaad8215bed2073481390d1f2a61b4ade3879de28152196db1107764e9
+EBUILD lua-openssl-0.7.8_p0.ebuild 2204 BLAKE2B 33c0975faadfc890f329136db205cdcb6bd7cf91814ee7430e5a74ced8c4ef573d162b32446fd69c2b964175632a47a7f20802df92a285fcb07042fe001d3cf4 SHA512 2c307a6f6d7c7225237bee3cc38e47cedda52d3a88de54411a920e33a6947b7b1de72045c9e41685a5a225acfad41216520f070e70e5586ee6cdd4b0cbae2744
+MISC metadata.xml 444 BLAKE2B 10922399060a76c4ec3dbb4c11925c2674a65d5bc23d06d76d51aeafe8f885620d647e0054ffbfed39083f8bd54972486dbc1a1a019a1206d8966918aa336ef9 SHA512 248cd6f3e2ca5ed82b4f571aa8c3fc642ea7b0cd94ed14e012bddd81b00363125cadb235261fd45e2366f72d34135fe8476b33d7d2d0d2ce1e1dc029702cc8d3
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0.ebuild
new file mode 100644
index 000000000000..ec062ec6de51
--- /dev/null
+++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0.ebuild
@@ -0,0 +1,75 @@
+# 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/luaossl
+	!dev-lua/luacrypto
+"
+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/metadata.xml b/dev-lua/lua-openssl/metadata.xml
index 731dad42e18a..d0cab8078d2a 100644
--- a/dev-lua/lua-openssl/metadata.xml
+++ b/dev-lua/lua-openssl/metadata.xml
@@ -2,12 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>crito@fnordpipe.org</email>
-		<name>Matthias Hauber</name>
+		<email>vpayno+gentoo@gmail.com</email>
+		<name>Victor Payno</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">zhaozg/lua-openssl</remote-id>