gentoo auto-resync : 09:11:2023 - 10:28:50

3 files changed, 59 insertions, 80 deletions

diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 2ac1bd09d942..beb4dcaaf863 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1,7 +1,8 @@
 AUX raft-0.10.0-toggle-zfs.patch 955 BLAKE2B bb9f351a6b7d0b7d95b7cdb6cf89db8963d46c44bd2613c69c7f3bd2c910cc185c8409cd80d218cab1569fe4729f649ac922ad1eb2b5652e5eeba441642e9588 SHA512 907f50fd1dc907d2a9aa1a89601064205c26d48956ddf56389a843e8c81b00acbc461125cbea5caef315be4a4a1d3a8f9bfd0a45ff0dedbeef1e0851e899b277
-AUX raft-0.11.3-disable-automagic-check-for-lz4.patch 2819 BLAKE2B 132e07bd4dc447bb67b2521c89e06c697dce9554d1f2b737aa460a22be9f7a2999f39ebd1b25f81863ebd764ef127856dceeadcb2a12aecdb01cf01f1cc22bc0 SHA512 9de7af38c778366e63e03991fa147844695dd0b4cd2e62559c5f82a0a2e914abf1bab5b905ad3cf26512d6d48670bfdb40a0683ef7dd1383eb0229f6718a70a4
 DIST raft-0.18.0.tar.gz 365558 BLAKE2B 57fc8c144a45eb101f53c8dd3a1eb896c733b7c5c369300852bea1474b8178b46c943c29e81107758bfa527d8fc1a9c80c4ca1bfc599dfc5ace090a18c693f11 SHA512 c6ab125a4841c5241310ea9785bb6ae3860c0a2ff39487499c2caa0b387729f7f7e54fa0de3aad3a99bdf5ec7d4a12c68a69244c6d8b8dcdf846c1cdfeb11b3b
 DIST raft-0.18.1.tar.gz 334308 BLAKE2B 6518914435129573fe03368bb653b42bb6424cfe6d96ea47164bb77c62ab229dcc977c59ad8004d269d7a44fdfec3a852b4dc0309129ccff7fcfc1fe425806f9 SHA512 73f8a7eb4d38e02ec888bc1062a8b8c419b17f87a09d9bdffac5c015077a42c28d92c285571a5c49d2a1d8ddd6b972469a7baa0f19a839faf6c17a02968f805a
+DIST raft-0.18.2.tar.gz 335089 BLAKE2B 5e6221f3977a28b7c2bbc8b80e047b455b586b0c8dd3cb9dc31f43c48d745d017f8a7220f3b3072a7aabacb86751ea4ad02f7c00d9d9c59a419354416cca65b3 SHA512 bac167aaf02f121f6d5de9103b366591bdb0a40ee08bc20b9f4fadae4606631b1a8dec514009596601a79a91c63373c524ba59710a167a1259f1d3802fb1e341
 EBUILD raft-0.18.0.ebuild 993 BLAKE2B a3bb3cd66d1eaf10f07d19f8cc26ab7d62a142daeda369fc7ffb8014e5d115f52fa1ec6cc83c2de515ffce0e7542a14841b5ff15bcfea1d73a8c21c451b2bfe8 SHA512 01cfe9ec3efc40da0edb937866446c16d05fdcf7093e80c535865b2cca84ec44ad1a30d716bd0b312ffeb7787925bc77a614a54b35f275d6e6b95f3568092663
 EBUILD raft-0.18.1.ebuild 1068 BLAKE2B 896d296974bd5946eb670ba7d50175cddd25abb460fc24530e2df93f18136fc75eb7209cf773f6bbc476d3263d70d4644543ab37e7fc29f2379993bbe5043494 SHA512 eee12dd5a7497f799dd146fe8e1dec8972ad529f9d1d6778c13f51273da10c7d3cb4010f362c3e49e3ab6e6739431d4ca20bb00244b3a5f1f7733bed75ab0b11
+EBUILD raft-0.18.2.ebuild 1068 BLAKE2B 896d296974bd5946eb670ba7d50175cddd25abb460fc24530e2df93f18136fc75eb7209cf773f6bbc476d3263d70d4644543ab37e7fc29f2379993bbe5043494 SHA512 eee12dd5a7497f799dd146fe8e1dec8972ad529f9d1d6778c13f51273da10c7d3cb4010f362c3e49e3ab6e6739431d4ca20bb00244b3a5f1f7733bed75ab0b11
 MISC metadata.xml 894 BLAKE2B f5f18621f9238af58d307f4e7ab675efc2da37172c395362c0a15f4595fcd67bb67eaedbdb789396e5bd515ca1d10ef466bc80b5f5d07d8835d83700ec451930 SHA512 8a8b1021d4b9d3007c47d20471a90fbf9fc25a4fe7123717bc6a74742b3eae54bc779326776f0fd6e2126bf05d7be0d2d47e458b0bd99adc87298c51deeea8cc
diff --git a/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch b/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch
deleted file mode 100644
index 7cd81e53cea9..000000000000
--- a/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index e0dbfc8..e595cb7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -80,7 +80,9 @@ libraft_la_LDFLAGS += $(LZ4_LIBS)
- endif # LZ4_AVAILABLE
- if LZ4_ENABLED
- test_unit_core_CFLAGS += -DLZ4_ENABLED
-+test_unit_core_LDFLAGS = $(LZ4_LIBS)
- libraft_la_CFLAGS += -DLZ4_ENABLED
-+libraft_la_LDFLAGS += $(LZ4_LIBS)
- endif # LZ4_ENABLED
- 
- if FIXTURE_ENABLED
-@@ -210,6 +212,7 @@ test_integration_uv_LDFLAGS += $(LZ4_LIBS)
- endif # LZ4_AVAILABLE
- if LZ4_ENABLED
- test_integration_uv_CFLAGS += -DLZ4_ENABLED
-+test_integration_uv_LDFLAGS += $(LZ4_LIBS)
- endif # LZ4_ENABLED
- 
- endif # UV_ENABLED
-diff --git a/configure.ac b/configure.ac
-index df7bea9..0e2949f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,47 +23,13 @@ AM_CONDITIONAL(UV_ENABLED, test "x$have_uv" = "xyes")
- # explicitly disabled.
- AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [do not use lz4 compression]))
- 
--# Thanks to the OpenVPN configure.ac file for this part.
--# If this fails, we will do another test next.
--# We also add set LZ4_LIBS otherwise linker will not know about the lz4 library
--PKG_CHECK_MODULES(LZ4, [liblz4 >= 1.7.1], [have_lz4="yes"], [LZ4_LIBS="-llz4"])
--if test "${have_lz4}" != "yes" ; then
--    AC_CHECK_HEADERS([lz4.h],
--                     [have_lz4h="yes"],
--                     [])
--    if test "${have_lz4h}" = "yes" ; then
--        AC_MSG_CHECKING([additionally if system LZ4 version >= 1.7.1])
--        AC_COMPILE_IFELSE(
--        [AC_LANG_PROGRAM([[
--#include <lz4.h>
--                         ]],
--                         [[
--/* Version encoding: MMNNPP (Major miNor Patch) - see lz4.h for details */
--#if LZ4_VERSION_NUMBER < 10701L
--#error LZ4 is too old
--#endif
--                         ]]
--                        )],
--         [
--             AC_MSG_RESULT([ok])
--             have_lz4="yes"
--         ],
--         [
--             AC_MSG_RESULT([system LZ4 library is too old])
--             have_lz4="no"
--         ]
--        )
--    fi
--fi
--
--AS_IF([test "x$enable_lz4" != "xno" -a "x$have_lz4" != "xyes"],
--      [AC_MSG_ERROR([liblz4 required but not found])], [])
--# LZ4 Can be available without being enabled, this allows a user to activate
--# it at a later stage through an API call.
--AM_CONDITIONAL(LZ4_AVAILABLE, test "x$have_lz4" = "xyes")
-+AS_IF([test "x$enable_lz4" != "xno"], [
-+	PKG_CHECK_MODULES(LZ4, [liblz4 >= 1.7.1], [LZ4_LIBS="-llz4"])
-+])
- # `LZ4_ENABLED` will cause the libuv snapshot implementation to use lz4
- # compression by default.
--AM_CONDITIONAL(LZ4_ENABLED, test "x$enable_lz4" != "xno" -a "x$have_lz4" = "xyes")
-+AM_CONDITIONAL(LZ4_ENABLED, test "x$enable_lz4" != "xno")
-+AM_CONDITIONAL(LZ4_AVAILABLE, test "x$enable_lz4" != "xno")
- 
- # The fake I/O implementation and associated fixture is built by default, unless
- # explicitly disabled.
diff --git a/dev-libs/raft/raft-0.18.2.ebuild b/dev-libs/raft/raft-0.18.2.ebuild
new file mode 100644
index 000000000000..d576a08a3ca8
--- /dev/null
+++ b/dev-libs/raft/raft-0.18.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="C implementation of the Raft consensus protocol"
+HOMEPAGE="https://github.com/cowsql/raft"
+SRC_URI="https://github.com/cowsql/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3-with-linking-exception"
+
+# Upstream change from canonical to cowsql resetted SONAME, 3 -> 0. bgo#915960
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="lz4 test zfs"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libuv:=
+	lz4? ( app-arch/lz4:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/raft-0.10.0-toggle-zfs.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-uv
+
+		--disable-backtrace
+		--disable-benchmark
+		--disable-debug
+		--disable-example
+		--disable-sanitize
+		--disable-static
+
+		$(use_enable test fixture)
+
+		$(use_with lz4)
+		$(use_with zfs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}