gentoo resync : 25.11.2020

6 files changed, 102 insertions, 67 deletions

diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index b94803760112..af1e0d05d4e3 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,6 +1,5 @@
-DIST luasec-0.7.tar.gz 47965 BLAKE2B 5bd19cfb5c2529a6fbee221442730c87394f1bf3d5089dd83d18e91ef1a2b88cde19c59988e438eb37e50c02c40a8906ad11ce9b3247b03ea11ed6d9e890b7d6 SHA512 6adf5241aa5a0d92c9dd7fc7f7e426969475548f47979ccc28187471b3bad4132c215de6da1f471d21b05c6558d36309264512c9c4ac70a53d6f6e204cac1358
 DIST luasec-0.9.tar.gz 52163 BLAKE2B fa95ae63b36f138f923dc412f527ff527e4f7562ad177ca7f450ef889e75c204d1bfec3773523fb68865c3846a0edc583cbf903db5233ff080074147f33bfb30 SHA512 ea601016328232ca0ff12be72897eeedac88a78834a63e1c36d2828a3187039665a2c60597b5af1fa6917b6fe87cd292fbcdfabcd67bab968f587e038d52a933
-EBUILD luasec-0.7.ebuild 1110 BLAKE2B 8776d00d3c3b5e437b70f91a0785a655ec95e2981321ec4002b207da2a1e2581f27b93471d08f527a16e032424a824e613c82ffc57297f3f74a4578072977761 SHA512 3aa16b8fd2c58a95ef4e1744ca4b96ecabd5d82a34121e3dabe394548d7ee92ff0e17249cc3120c12ae093c9ebb68e8bbdb96901f9dafd0123c9a685702e43f4
-EBUILD luasec-0.9.ebuild 994 BLAKE2B 680eaffcf974bcd70d01133f95ef4df3d375effe55aef2b7756030624431c4e2c51a13ef81a5651b2430379eaddb7e6d4f05b12222807ca10a95964c538699d2 SHA512 9c8c944fabaf6053ddbe4ebe6bda040b95c4ee2093a18c344e397c642fcaa227f3eb3a5390187e3573fdeb054385be60c57af0b8dd43735e09768ee60efad7b2
-EBUILD luasec-9999.ebuild 1096 BLAKE2B 9ae3ac525136b70a4e21a287ac5be40ecd89f03824adbb003d43d8f2d3d7c11daf8c2ae51e397ad86deb16ac3ad919b845d385ed1b178cec5723d07cbbfcf259 SHA512 404162d929093dc74d606c729823dddc357cd6388e0a004c5543389a03f92c74c05b284d61dca5309633ba7986591b50ce42326d5170095735f3e802c53ec43e
-MISC metadata.xml 471 BLAKE2B 678f1c3e123d5690a1f7c68ee5b4c0bba74f48762692e9fc27739bdfa79e609ca9c140cb2eed1548b8c9f08f29bd828f805b28ca8b99ec51f301c77e52e41113 SHA512 8b5bd42751700ef9893f73111e8014c116b4a6e07891346602c42485c7daf4de63388936c95182bc6d2a9506353a48354e1a1e56e7ef299643206ced57d506df
+EBUILD luasec-0.9-r100.ebuild 1685 BLAKE2B 9c11015228dff2c453c9b5433ec96a751142b01a6cf4c00d51d72c2ff5f34d61a0809fbcafc72619976e1c4e396640621ebd4163e5720597aca451db962b9b90 SHA512 184f598125ac692d389a25c46bcd7c36bd039d1b933cf2afa2d957d0177752ddd6fdf1bf12149d0e64893b7787cd332e6b70a81f4b32f86d49d9bb3fc9b3fa33
+EBUILD luasec-0.9.ebuild 997 BLAKE2B 5e7ce2c2a4a1168fb844890fc586b6ee5a3d87651910b8d5c70bd3309cd8ae8796b1b77f9ea3a6c42accd4c912048b9de7ed320c2e2147ed000d1aa9a70260af SHA512 ca19f37bc58becf4f8b592f223c5588146cec6821f6c5ca0c9689419ca57795b6fa4b636841bf9f44efaec4aa751230a9f695d9faabb20e1e9acc7f7d25764b2
+EBUILD luasec-9999.ebuild 1103 BLAKE2B 8d32013bb83b774b57beaeebcdd2687c769c34672be5cbf343155954417850592071591b985fd1771fa7633888a2977c0d92326f5e31732ff7ea141b43f55c3d SHA512 c6c9f13f1b8e62b3f1b4ae06374cdfdd6a99fedbcc61fb4bce8911254e9d295fbdd0f7637ef220a0acc2250a7658e29fb91e0182bc50542e49de51b03bc0cc60
+MISC metadata.xml 566 BLAKE2B 2a450b74b0f44833f841b701e215721f4055b44a66e43f649e69a4f1c9757985a09a99f8798e7f219349c190f2614733aad757d81e11f610885dbc0fe08b6e6e SHA512 f02b7d7234f4a6d93cd9c734c1b8a8a09b48fb73998d240925329357a6e9dac590aff6ccde697d18698fdbd6f2c69e4d6f5e983affba91b5a84f4f3108e3d660
diff --git a/dev-lua/luasec/luasec-0.7.ebuild b/dev-lua/luasec/luasec-0.7.ebuild
deleted file mode 100644
index 4dc8f5927ae9..000000000000
--- a/dev-lua/luasec/luasec-0.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
-HOMEPAGE="https://github.com/brunoos/luasec"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/brunoos/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
-	KEYWORDS="amd64 arm x86"
-	S=${WORKDIR}/${PN}-${P}
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="libressl"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:0[deprecated]
-	dev-lua/luasocket
-	!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i -e "s/-O2//" src/Makefile || die
-	lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.h || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" LD="$(tc-getCC)" LIB_PATH="" \
-		linux
-}
-
-src_install() {
-	emake \
-		LUAPATH="${D}/$(pkg-config --variable INSTALL_LMOD lua)" \
-		LUACPATH="${D}/$(pkg-config --variable INSTALL_CMOD lua)" \
-		install
-}
diff --git a/dev-lua/luasec/luasec-0.9-r100.ebuild b/dev-lua/luasec/luasec-0.9-r100.ebuild
new file mode 100644
index 000000000000..d908b664a4c5
--- /dev/null
+++ b/dev-lua/luasec/luasec-0.9-r100.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+LUA_REQ_USE="deprecated"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
+HOMEPAGE="https://github.com/brunoos/luasec"
+SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-lua/luasocket-3.0_rc1_p20200328-r100
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-O2//g' -i src/Makefile || die
+}
+
+lua_src_compile() {
+	# Clean project, to compile it for every lua slot
+	emake clean
+
+	# Generate SSL options
+	${ELUA} src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LD=$(tc-getCC)"
+		"INC_PATH=-I$(lua_get_include_dir)"
+		"LIB_PATH=$(lua_get_CFLAGS)"
+		"MYCFLAGS=${CFLAGS}"
+		"MYLDFLAGS=${LDFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}" linux
+
+	# Copy module to match the choosen LUA implementation
+	cp "src/ssl.so" "src/ssl-${ELUA}.so" || die
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	# Use correct module for the choosen LUA implementation
+	cp "src/ssl-${ELUA}.so" "src/ssl.so" || die
+
+	local emakeargs=(
+		"DESTDIR=${ED}"
+		"LUAPATH=$(lua_get_lmod_dir)"
+		"LUACPATH=$(lua_get_cmod_dir)"
+	)
+
+	emake "${emakeargs[@]}" install
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luasec/luasec-0.9.ebuild b/dev-lua/luasec/luasec-0.9.ebuild
index 013a9b13d85e..49603d3ef4c2 100644
--- a/dev-lua/luasec/luasec-0.9.ebuild
+++ b/dev-lua/luasec/luasec-0.9.ebuild
@@ -8,7 +8,7 @@ inherit multilib toolchain-funcs
 DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
 HOMEPAGE="https://github.com/brunoos/luasec"
 SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-lua/luasec/luasec-9999.ebuild b/dev-lua/luasec/luasec-9999.ebuild
index df666e66d836..0023fbd9de48 100644
--- a/dev-lua/luasec/luasec-9999.ebuild
+++ b/dev-lua/luasec/luasec-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/${PN}-${P}
 fi
 
diff --git a/dev-lua/luasec/metadata.xml b/dev-lua/luasec/metadata.xml
index e33b533b4b13..67fc375b3b4a 100644
--- a/dev-lua/luasec/metadata.xml
+++ b/dev-lua/luasec/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>azamat.hackimov@gmail.com</email>
-    <name>Azamat H. Hackimov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">brunoos/luasec</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">brunoos/luasec</remote-id>
+	</upstream>
 </pkgmetadata>