gentoo resync : 25.11.2020

5 files changed, 60 insertions, 34 deletions

diff --git a/dev-lua/lua-zlib/Manifest b/dev-lua/lua-zlib/Manifest
index 86812580eaaf..877f8aa662b7 100644
--- a/dev-lua/lua-zlib/Manifest
+++ b/dev-lua/lua-zlib/Manifest
@@ -1,5 +1,4 @@
-DIST lua-zlib-1.1.tar.gz 16572 BLAKE2B 22f504230616ea0df505c4aa00fc562c2cdfebd9f8e40b6000fdda883dbdefbeb10d22a2466386f1bfb314672aa17524420d047498346e5c980ebc6f5e175b41 SHA512 df9768efb96be8175b6afe1fd347b268565ecd93a71dd0f1f7ec1b710fd52bbd7a7c37a89f7c3d939906c7ac1578e9bdb542a0052673b6ac6eec7285d7f75633
 DIST lua-zlib-1.2.tar.gz 16612 BLAKE2B ca2ff51c97929fac0918de3902a175eda583da3ca415f9eff5e68a9c3ba0414827c3a96b968e9fcbccbe9612b1ade3fdc4498e50c4df53b0fa768912f428a287 SHA512 da13239089c1027b0bfb4ee463043b326ef5586206c5d76af8707736da3c03622b2fc38e732761a5b7a6422ad81a09557abc8548f37fef07ada0d4064eabfcf4
-EBUILD lua-zlib-1.1.ebuild 565 BLAKE2B ac5f7d1ea868cfd2215de7772f071c2b33d3712e0cefd7bcb4bd41e574fe00f72efedcb0843bbcc52f3438a6f4353f567bd6cfe594b1b2c8edaa3e82f01410cb SHA512 49d7e482d1d7af71df1a9866e2354d34ec82f70c94da387887261e4dac10e7cf4eed6b60c28a1cd700492644ed3a8519ff6fd941c3c66700928b7368385de0a4
-EBUILD lua-zlib-1.2.ebuild 666 BLAKE2B 17bd0666214ee732ec6200649b000d82a9ef1e127ff59715e35539a8d7f64584acee39cf4cdf9fe8ef063aa4f45a2cbb88156fe69e760f71879aa687e3bac08b SHA512 194d5b50aa7c2c0d27b3f2d56a0a73294bc42a7699ce83a4a5daa44145fb62a5fbcac64748cdd21bb506f2cc5aa2d9b8a5ad699874b34e0c60cb2af0e83a6167
-MISC metadata.xml 255 BLAKE2B 820ddc4489fc6c4387305bcbc3b339e13be1230d100ef3e9b45e13dfb850c2be0e7968c9cbe1c15e8cf3a4887b05637615ca11d3358aa032f96f23edfccc5cd1 SHA512 3d46a3689375944f47933ce2af13543ecb79bce6a7eaad56083931111c277da45d3b8120bdc1643985cd746be3ffc84017da34038adc05367e90601e883e5b92
+EBUILD lua-zlib-1.2-r100.ebuild 905 BLAKE2B 293c3d92f72dd30b850da97df405ee7f3356b415cab9495bd6dc7ca2b9a7f33760b10b904ecfcae8b8b8bf4abf98b6a628b12268f8636a90bbbeab010d948092 SHA512 09523f5bc1c99db7aabbeffe29c6e59d27cba440e141b9185fd2de98c1fed5b312156abee303ab28b7034678709a025238c3c0308d32bea0a692f80005134ac2
+EBUILD lua-zlib-1.2.ebuild 669 BLAKE2B ee74b9e5ae1a0fa181a577918d8068a1ea833322aaeced3ea0f6a4f1e1adc71e8abed2fc38f5ce10cdfdd7e331976170b42c2e7bbfda812b7e62cc0e4c9f0e71 SHA512 dd59320eac58f73c6e632bca41cd680c77d2a236a74adbddff13380a2a076a97da879bc78b821ac6fd737bb0e6c9fcdd7db9c8d8a98e3584cb57d6ab38571276
+MISC metadata.xml 333 BLAKE2B f65699b0f49f67c857500010ae12d8416cdb0c7d5817b445aed9de46000bc80186ff7d84f8eafcc63d760c8b95713561eedfe24f0500781866b294f9086ba30e SHA512 9473337d43cd76c8d23c3d4c300412f06b296afa9ca59d51b46d4c880a0b5e36523f71eb86a5d0bb856b29aa1cb936ee611aceae81a9d2d4907b9392e51b282b
diff --git a/dev-lua/lua-zlib/lua-zlib-1.1.ebuild b/dev-lua/lua-zlib/lua-zlib-1.1.ebuild
deleted file mode 100644
index b51a835e97de..000000000000
--- a/dev-lua/lua-zlib/lua-zlib-1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Lua bindings to zlib"
-HOMEPAGE="https://github.com/brimworks/lua-zlib"
-SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-RDEPEND="dev-lang/lua:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(-DINSTALL_CMOD="$(pkg-config --variable INSTALL_CMOD lua)")
-	cmake-utils_src_configure
-}
diff --git a/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild b/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild
new file mode 100644
index 000000000000..1fbf98752889
--- /dev/null
+++ b/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit cmake lua
+
+DESCRIPTION="Simple streaming interface to zlib for Lua"
+HOMEPAGE="https://github.com/brimworks/lua-zlib"
+SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	sys-libs/zlib
+	${LUA_DEPS}
+
+"
+DEPEND="${RDEPEND}"
+
+lua_src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_CMOD="$(lua_get_cmod_dir)"
+		-DUSE_LUA_VERSION="$(lua_get_version)"
+	)
+
+	if [[ ${ELUA} == luajit ]]; then
+		mycmakeargs+=( -DUSE_LUAJIT="ON" )
+	fi
+
+	cmake_src_configure
+}
+
+src_configure() {
+	lua_foreach_impl lua_src_configure
+}
+
+src_compile() {
+	lua_foreach_impl cmake_src_compile
+}
+
+src_install() {
+	lua_foreach_impl cmake_src_install
+}
diff --git a/dev-lua/lua-zlib/lua-zlib-1.2.ebuild b/dev-lua/lua-zlib/lua-zlib-1.2.ebuild
index 243df12a0a09..6c5c6083b3af 100644
--- a/dev-lua/lua-zlib/lua-zlib-1.2.ebuild
+++ b/dev-lua/lua-zlib/lua-zlib-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 RDEPEND="dev-lang/lua:0
 	sys-libs/zlib"
diff --git a/dev-lua/lua-zlib/metadata.xml b/dev-lua/lua-zlib/metadata.xml
index b89e350d8c26..0cc17802b297 100644
--- a/dev-lua/lua-zlib/metadata.xml
+++ b/dev-lua/lua-zlib/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">brimworks/lua-zlib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">brimworks/lua-zlib</remote-id>
+	</upstream>
 </pkgmetadata>