gentoo resync : 14.12.2020

6 files changed, 50 insertions, 14 deletions

diff --git a/app-admin/lsyncd/Manifest b/app-admin/lsyncd/Manifest
index 7693b05efda0..60a9d0ac4e73 100644
--- a/app-admin/lsyncd/Manifest
+++ b/app-admin/lsyncd/Manifest
@@ -1,11 +1,12 @@
 AUX lsyncd-2.2.0-mandir.patch 284 BLAKE2B b133a436c6c1b3186fc1c4c8f01ec87423cd63620e54589913d35bbe1ff2867c807fb7ce3eabade31936c70c54e7b1c115e1ee20591c82073396f029068e36b9 SHA512 c46043b4938b42bc4bd8d0f9387dff4561ee103e9a7847825a57415aa2c91b7902059f3f103834958bcf1c0132785c44e729cfb0af82d63cf94d3782f1b6f501
+AUX lsyncd-2.2.3-cmake_lua_version.patch 553 BLAKE2B a99c302a70c71b877fa9169138ff3789db21e3313b20c90ac8036bc07e33dd4a049481a27a10438754256d4c2be1981697e14967ba795fdce4c1769548d2cc56 SHA512 0ce7336f99224384a86bb3123a73cd79229d98049c117dd93a40501d10b86f4bb5656b31b495abf589990a709bb033febf05c1df7cb81b5e22b8bc182614c099
 AUX lsyncd-2.3.3-mandir.patch 327 BLAKE2B a201734f5e93f33b39c175a98bba22c847761f667d0ffcf96c14c52e8fafe14718fb33ddf30f50bd5fb46af388283f23274e7ab6106885ffc0cec5cb5b9f8626 SHA512 a66a8d5469378917b9f6fce55ceb9b041d8973cb581a21c985eb39a682af5e04cfae30b8b1104a7664a3b918641eafbba38a4b323ecef7e6ca0e23a9506c8370
 DIST lsyncd-2.2.0.tar.gz 81034 BLAKE2B 26666d04729e31d60ec340c207d5c22b2f53571a146d3f548bf7a33061bcec59aabafae40242f79a971297780fb7de56b5ff1fbccdb4c2152878f1b318a058b9 SHA512 75a138c2e85c4c5a3d6b215cb8df1668e5ffb6c8099f79caf555369d12348e2bdff29c1b01d62613bddd5b5a67f2a44e2fe86412048bc622088912e3fa783e81
 DIST lsyncd-2.2.1.tar.gz 81005 BLAKE2B 797c225b484139df53d3d1173d0cc3b4ba632a076e937902799247e422643f0bcefe22570d311afb4c8fb98151467a1ab624a97f728c851c02bc0dbc601f2238 SHA512 c07c322fb802911a2bb78221ff20ac1c0658cea27a23d34a95de45902211784d3bdc79c246ce0809e6167ddd20a3573c1ca6a81cabc46a29622a200c8d3ddfa5
 DIST lsyncd-2.2.2.tar.gz 82231 BLAKE2B 44cb269e1b726595b4332471335dc2a600efa2ebd39d7857d9c0c4adebefed923f60b177511e9e06113a4ff3400e45a979315bcd61169a7a2b9945b1aa944a86 SHA512 489d4fc91787a53f1480749fce6a281406aedb7e3617cd5f383b30c47870b2a8a912317a3faee5ad5f6358c10a136a69e07ee854f753846be1e11023cea5fed0
 DIST lsyncd-2.2.3.tar.gz 85165 BLAKE2B 9b3ce9ad882f12a0cf800ca0418092807c5c30451fe273eae18486b2ab245fbdc77dee937983bf78f678e20448dda39771c4bca96d8efe010cc45d470a30eba3 SHA512 2193a342f8aa7d8cfb55378c9c59ca61d2d8e4026263fd6e6560c730c712cef1f189305a3f9bca58f5b9c9ffae5af12e1d75e5355d5bdae86a47ad9595b8169a
-EBUILD lsyncd-2.2.0.ebuild 638 BLAKE2B f6f8dd5cdc9ca629695b65d5a91ab31209b87595875566cfc77d0d344a4d9186a26ca14346eedef21c4a1fa35290a2e66ad86aaf69f1f6f4085056cb82c99798 SHA512 5eecd4fcc4dd9baed5b609e46be61a5ad0b6aa022d2da5d2522036bba712b97fa5ec3600ba96d21966d1354bac3d36e6ce2bf4fb71c12f82498c914074557067
-EBUILD lsyncd-2.2.1.ebuild 647 BLAKE2B f54878a524e42e948f4356be0d36e636ac26fad18bf0705f8df062d75c4b1c83178031566848a1b1be2847a76e55e4cef298a740f17e628f41b50ad1742485ed SHA512 2c415734bd2a6f6861217a23788708efa0c3e4fb7fc11243ff3a64041d48b09716488ac28a13d279e7513433cb50840fa261784c375648ad232921481c70a330
-EBUILD lsyncd-2.2.2.ebuild 647 BLAKE2B f54878a524e42e948f4356be0d36e636ac26fad18bf0705f8df062d75c4b1c83178031566848a1b1be2847a76e55e4cef298a740f17e628f41b50ad1742485ed SHA512 2c415734bd2a6f6861217a23788708efa0c3e4fb7fc11243ff3a64041d48b09716488ac28a13d279e7513433cb50840fa261784c375648ad232921481c70a330
-EBUILD lsyncd-2.2.3.ebuild 646 BLAKE2B 91484f129466a25b597c4c82019adae4a4f5a2c57bcd6a6306cc4c102f7cd0cc35995af90abd8260469e9c20e330a77d1ceb41ed86f6d10d6f1e020df7e78431 SHA512 6be302edb2b64c73527f8c6e19a07117fee8d652943250ea86c67fd453d78fea13ec62233d755eafae9039cb9766b7213b012291930f52c7686740416bfd7b8a
+EBUILD lsyncd-2.2.0.ebuild 638 BLAKE2B 1f579e5958bd7c6d1c6b5900db6fee21a81eeb5f9a48de015165755c94414a6c46ba13a153545540392309832a69f1d0746cd7b5d9b40921ce0c28b40ab74f43 SHA512 1b66a5556a68575f45cdea2ffc2c430d5e433ebb409ab8c39d88882d7f40ce500248d442edd7fddad4d344174ad475d6497732736f1723e93b3a732310073b79
+EBUILD lsyncd-2.2.1.ebuild 647 BLAKE2B e022fd924cf8cb5ecf53f7438adf16eb7babb765a67b5860a88ed345c328509b3e522e514a6aa0f0aafc7aa94392d61e32e7ff81dfb8c3dfd12c7599e1a6dfff SHA512 a415f81f33aee8adc4faa459290836768414705558066b47392e0da7b35583f9f9f9fa09a13d04b482dff4d6d1bc116c6f2b25d40f7e1a6152996209db9e093a
+EBUILD lsyncd-2.2.2.ebuild 647 BLAKE2B e022fd924cf8cb5ecf53f7438adf16eb7babb765a67b5860a88ed345c328509b3e522e514a6aa0f0aafc7aa94392d61e32e7ff81dfb8c3dfd12c7599e1a6dfff SHA512 a415f81f33aee8adc4faa459290836768414705558066b47392e0da7b35583f9f9f9fa09a13d04b482dff4d6d1bc116c6f2b25d40f7e1a6152996209db9e093a
+EBUILD lsyncd-2.2.3.ebuild 956 BLAKE2B 66d4ba92e963f908a45e5a98d09d9251f998478d558be497b4d982d97f58e9c38ee410464ea800f64a8977aa7a4129d3e4a69d748ef5476e398188dccf5c6fec SHA512 3ce4261fa4b053aad943a06ec7bd499fb5787b42aa7b177642c0eb31a8534641a1f333fe00b69151389f0f8a51f13d56cc30f311d45479113d192473993e1d29
 MISC metadata.xml 376 BLAKE2B 17c9b5e1f29ac7b0ced5031f797ed2d85bdb25df6af44a1d257b75256325371a8290e0e1c20cb535c58326fcd67372a727cf170ca200803ca693670f2c729511 SHA512 1d7d76eea9ec7bb6d1e453675d56610abdcd78801b3d12eee37f082698cdb03aa7775d160b473ec4f67d8e95c6dded3319b74449f4aad97fbb6c91fab5bcd641
diff --git a/app-admin/lsyncd/files/lsyncd-2.2.3-cmake_lua_version.patch b/app-admin/lsyncd/files/lsyncd-2.2.3-cmake_lua_version.patch
new file mode 100644
index 000000000000..7a6cccb1445d
--- /dev/null
+++ b/app-admin/lsyncd/files/lsyncd-2.2.3-cmake_lua_version.patch
@@ -0,0 +1,20 @@
+--- a/cmake/FindLua.cmake
++++ b/cmake/FindLua.cmake
+@@ -36,7 +36,7 @@
+ #SET(_POSSIBLE_LUA_LIBRARY lua)
+ 
+ # Determine possible naming suffixes (there is no standard for this)
+-SET(_POSSIBLE_SUFFIXES "52" "5.2" "-5.2" "53" "5.3" "-5.3" "")
++SET(_POSSIBLE_SUFFIXES "${LUA_ABI_VERSION}")
+ 
+ # Set up possible search names and locations
+ FOREACH(_SUFFIX ${_POSSIBLE_SUFFIXES})
+@@ -53,7 +53,7 @@
+ 
+ # Find the lua executable
+ FIND_PROGRAM(LUA_COMPILER
+-  NAMES luac5.3 ${_POSSIBLE_LUA_COMPILER}
++  NAMES ${_POSSIBLE_LUA_COMPILER}
+ )
+ 
+ # Find the lua header
diff --git a/app-admin/lsyncd/lsyncd-2.2.0.ebuild b/app-admin/lsyncd/lsyncd-2.2.0.ebuild
index 3819d4699463..6fcf0da3b934 100644
--- a/app-admin/lsyncd/lsyncd-2.2.0.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
-CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+CDEPEND=">=dev-lang/lua-5.1:0=[deprecated]"
 DEPEND="${CDEPEND}
 	app-text/asciidoc
 	virtual/pkgconfig"
diff --git a/app-admin/lsyncd/lsyncd-2.2.1.ebuild b/app-admin/lsyncd/lsyncd-2.2.1.ebuild
index fe75a2d6c540..13a978ad2fdb 100644
--- a/app-admin/lsyncd/lsyncd-2.2.1.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+CDEPEND=">=dev-lang/lua-5.1:0=[deprecated]"
 DEPEND="${CDEPEND}
 	app-text/asciidoc
 	virtual/pkgconfig"
diff --git a/app-admin/lsyncd/lsyncd-2.2.2.ebuild b/app-admin/lsyncd/lsyncd-2.2.2.ebuild
index fe75a2d6c540..13a978ad2fdb 100644
--- a/app-admin/lsyncd/lsyncd-2.2.2.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+CDEPEND=">=dev-lang/lua-5.1:0=[deprecated]"
 DEPEND="${CDEPEND}
 	app-text/asciidoc
 	virtual/pkgconfig"
diff --git a/app-admin/lsyncd/lsyncd-2.2.3.ebuild b/app-admin/lsyncd/lsyncd-2.2.3.ebuild
index 67ccfb4ab94d..705a0e4067e6 100644
--- a/app-admin/lsyncd/lsyncd-2.2.3.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.3.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
-inherit cmake-utils
+LUA_COMPAT=( lua5-{2,3} )
+LUA_REQ_USE="deprecated"
+
+inherit cmake lua-single
 
 DESCRIPTION="Live Syncing (Mirror) Daemon"
 HOMEPAGE="https://github.com/axkibe/lsyncd"
@@ -14,15 +17,27 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-CDEPEND=">=dev-lang/lua-5.2[deprecated]"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+CDEPEND="${LUA_DEPS}"
 DEPEND="${CDEPEND}
 	app-text/asciidoc
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
 	net-misc/rsync"
+# Both lua and luac are invoked at build time
+BDEPEND="${CDEPEND}"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.3-cmake_lua_version.patch
 	"${FILESDIR}"/${PN}-2.3.3-mandir.patch
 )
 
 S=${WORKDIR}/${PN}-release-${PV}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLUA_ABI_VERSION=$(ver_cut 1-2 $(lua_get_version))
+	)
+	cmake_src_configure
+}