9 files changed, 49 insertions, 115 deletions
diff --git a/app-admin/lsyncd/Manifest b/app-admin/lsyncd/Manifest
index daef9d30145a..f13b50eed67b 100644
--- a/app-admin/lsyncd/Manifest
+++ b/app-admin/lsyncd/Manifest
@@ -1,4 +1 @@
-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
diff --git a/app-admin/lsyncd/files/lsyncd-2.2.0-mandir.patch b/app-admin/lsyncd/files/lsyncd-2.2.0-mandir.patch
deleted file mode 100644
index 76e01d5bcacb..000000000000
--- a/app-admin/lsyncd/files/lsyncd-2.2.0-mandir.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,4 +92,4 @@
- target_link_libraries( lsyncd ${LUA_LIBRARIES} )
- 
- install( TARGETS lsyncd RUNTIME DESTINATION bin )
--install( FILES doc/manpage/lsyncd.1 DESTINATION man )
-+install( FILES doc/manpage/lsyncd.1 DESTINATION share/man/man1 )
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/files/lsyncd-2.3.3-mandir.patch b/app-admin/lsyncd/files/lsyncd-2.2.3-mandir.patch
index 240ad6dce8fa..240ad6dce8fa 100644
--- a/app-admin/lsyncd/files/lsyncd-2.3.3-mandir.patch
+++ b/app-admin/lsyncd/files/lsyncd-2.2.3-mandir.patch
diff --git a/app-admin/lsyncd/lsyncd-2.2.0.ebuild b/app-admin/lsyncd/lsyncd-2.2.0.ebuild
deleted file mode 100644
index 3819d4699463..000000000000
--- a/app-admin/lsyncd/lsyncd-2.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
-inherit cmake-utils
-
-DESCRIPTION="Live Syncing (Mirror) Daemon"
-HOMEPAGE="https://github.com/axkibe/lsyncd"
-SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-lang/lua-5.1[deprecated]"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	net-misc/rsync"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-mandir.patch
-)
-
-S=${WORKDIR}/${PN}-release-${PV}
diff --git a/app-admin/lsyncd/lsyncd-2.2.1.ebuild b/app-admin/lsyncd/lsyncd-2.2.1.ebuild
deleted file mode 100644
index fe75a2d6c540..000000000000
--- a/app-admin/lsyncd/lsyncd-2.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
-inherit cmake-utils
-
-DESCRIPTION="Live Syncing (Mirror) Daemon"
-HOMEPAGE="https://github.com/axkibe/lsyncd"
-SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-lang/lua-5.1[deprecated]"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	net-misc/rsync"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.0-mandir.patch
-)
-
-S=${WORKDIR}/${PN}-release-${PV}
diff --git a/app-admin/lsyncd/lsyncd-2.2.2.ebuild b/app-admin/lsyncd/lsyncd-2.2.2.ebuild
deleted file mode 100644
index fe75a2d6c540..000000000000
--- a/app-admin/lsyncd/lsyncd-2.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
-inherit cmake-utils
-
-DESCRIPTION="Live Syncing (Mirror) Daemon"
-HOMEPAGE="https://github.com/axkibe/lsyncd"
-SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-lang/lua-5.1[deprecated]"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	net-misc/rsync"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.0-mandir.patch
-)
-
-S=${WORKDIR}/${PN}-release-${PV}
diff --git a/app-admin/lsyncd/lsyncd-2.2.3.ebuild b/app-admin/lsyncd/lsyncd-2.2.3.ebuild
index 67ccfb4ab94d..afa60bc84968 100644
--- a/app-admin/lsyncd/lsyncd-2.2.3.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.3.ebuild
@@ -1,28 +1,40 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
-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"
-SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/lsyncd/lsyncd"
+SRC_URI="https://github.com/lsyncd/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
 
-CDEPEND=">=dev-lang/lua-5.2[deprecated]"
-DEPEND="${CDEPEND}
+DEPEND="${LUA_DEPS}"
+RDEPEND="${LUA_DEPS}
+	net-misc/rsync"
+# Both lua and luac are invoked at build time
+BDEPEND="${LUA_DEPS}
 	app-text/asciidoc
 	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	net-misc/rsync"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.3-mandir.patch
+	"${FILESDIR}"/${PN}-2.2.3-cmake_lua_version.patch
+	"${FILESDIR}"/${PN}-2.2.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
+}
diff --git a/app-admin/lsyncd/metadata.xml b/app-admin/lsyncd/metadata.xml
index 50d67664f488..106e2736434c 100644
--- a/app-admin/lsyncd/metadata.xml
+++ b/app-admin/lsyncd/metadata.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">lsyncd</remote-id>
-		<remote-id type="github">axkibe/lsyncd</remote-id>
+		<remote-id type="github">lsyncd/lsyncd</remote-id>
 	</upstream>
 </pkgmetadata>