From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C24F315802E for ; Sun, 23 Jun 2024 19:49:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A427E2B85; Sun, 23 Jun 2024 19:49:42 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 01181E2B85 for ; Sun, 23 Jun 2024 19:49:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4BF15340815 for ; Sun, 23 Jun 2024 19:49:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 692721D48 for ; Sun, 23 Jun 2024 19:49:33 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1719172022.588adc3fc84b8e7d34d4f9b07521407c1395610f.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/lsyncd/files/, app-admin/lsyncd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/lsyncd/Manifest app-admin/lsyncd/files/lsyncd-2.3.1-cmake_lua_version.patch app-admin/lsyncd/lsyncd-2.3.1.ebuild X-VCS-Directories: app-admin/lsyncd/files/ app-admin/lsyncd/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 588adc3fc84b8e7d34d4f9b07521407c1395610f X-VCS-Branch: master Date: Sun, 23 Jun 2024 19:49:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0398843c-43ef-43d1-8ab5-1057f5f0f140 X-Archives-Hash: 55026db8911d60cd6c2e11f6bcd550ae commit: 588adc3fc84b8e7d34d4f9b07521407c1395610f Author: Michael Mair-Keimberger levelnine at> AuthorDate: Thu Jun 6 18:43:19 2024 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sun Jun 23 19:47:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=588adc3f app-admin/lsyncd: add 2.3.1 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/37059 Signed-off-by: Conrad Kostecki gentoo.org> app-admin/lsyncd/Manifest | 1 + .../files/lsyncd-2.3.1-cmake_lua_version.patch | 20 ++++++++++ app-admin/lsyncd/lsyncd-2.3.1.ebuild | 46 ++++++++++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/app-admin/lsyncd/Manifest b/app-admin/lsyncd/Manifest index f13b50eed67b..e57d9dcadd25 100644 --- a/app-admin/lsyncd/Manifest +++ b/app-admin/lsyncd/Manifest @@ -1 +1,2 @@ DIST lsyncd-2.2.3.tar.gz 85165 BLAKE2B 9b3ce9ad882f12a0cf800ca0418092807c5c30451fe273eae18486b2ab245fbdc77dee937983bf78f678e20448dda39771c4bca96d8efe010cc45d470a30eba3 SHA512 2193a342f8aa7d8cfb55378c9c59ca61d2d8e4026263fd6e6560c730c712cef1f189305a3f9bca58f5b9c9ffae5af12e1d75e5355d5bdae86a47ad9595b8169a +DIST lsyncd-2.3.1.tar.gz 125126 BLAKE2B b966e2ea1887c93fe26b4fbaeedec50c4d6fd2a66eee0fbafc859a49a4b85eddc20d78ae6483be7a8f9acc66c67da3199dad757bc7b772dead2cccc9d60e621d SHA512 195cc46e00c58301aca6afb027eb0ad663254b3028bcf3e5d4fb7709bbcf2a6eb8ba9a39cae62c951eb4562795e0a147efb1ddcdd22a0b46742ec7c17f478fbe diff --git a/app-admin/lsyncd/files/lsyncd-2.3.1-cmake_lua_version.patch b/app-admin/lsyncd/files/lsyncd-2.3.1-cmake_lua_version.patch new file mode 100644 index 000000000000..e5cf18b371f0 --- /dev/null +++ b/app-admin/lsyncd/files/lsyncd-2.3.1-cmake_lua_version.patch @@ -0,0 +1,20 @@ +--- a/cmake/FindLua.cmake ++++ b/cmake/FindLua.cmake +@@ -37,7 +37,7 @@ + #SET(_POSSIBLE_LUA_LIBRARY lua) + + # Determine possible naming suffixes (there is no standard for this) +-SET(_POSSIBLE_SUFFIXES "54" "5.4" "-5.4" "53" "5.3" "-5.3" "52" "5.2" "-5.2" "") ++SET(_POSSIBLE_SUFFIXES "${LUA_ABI_VERSION}") + + # Set up possible search names and locations + FOREACH(_SUFFIX IN LISTS _POSSIBLE_SUFFIXES) +@@ -54,7 +54,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.3.1.ebuild b/app-admin/lsyncd/lsyncd-2.3.1.ebuild new file mode 100644 index 000000000000..5986c0e42b44 --- /dev/null +++ b/app-admin/lsyncd/lsyncd-2.3.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{3,4} ) +LUA_REQ_USE="deprecated" + +inherit cmake lua-single + +DESCRIPTION="Live Syncing (Mirror) Daemon" +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+" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +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" + +PATCHES=( + "${FILESDIR}"/${P}-cmake_lua_version.patch +) + +src_prepare(){ + cmake_src_prepare + # fix examples directory + sed -i "s@examples DESTINATION doc@examples DESTINATION share/doc/${PF}/examples@" \ + CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DLUA_ABI_VERSION=$(ver_cut 1-2 $(lua_get_version)) + ) + cmake_src_configure +}