gentoo resync : 27.03.2021

4 files changed, 80 insertions, 1 deletions

diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 4c412d62e57c..74a9c23e8724 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1,4 +1,7 @@
+AUX raft-0.10.0-toggle-zfs.patch 955 BLAKE2B bb9f351a6b7d0b7d95b7cdb6cf89db8963d46c44bd2613c69c7f3bd2c910cc185c8409cd80d218cab1569fe4729f649ac922ad1eb2b5652e5eeba441642e9588 SHA512 907f50fd1dc907d2a9aa1a89601064205c26d48956ddf56389a843e8c81b00acbc461125cbea5caef315be4a4a1d3a8f9bfd0a45ff0dedbeef1e0851e899b277
 AUX raft-0.9.25-Always-skip-init-oom-test.patch 1140 BLAKE2B 03ee957f5fa7a1ef3c9a5223a5e67df07176110c601f790c905751cfcba7aeb4a160ac2a5547ff6440cd7c292a3e7d1913b3334f24151a288fd2c95e19865b86 SHA512 e138f113fef280fd8bbf8055be6410b81a163ee7813ac13f539e38923062306c6bf37831a298f56530a954d68f3975069af6e31f73679b4924274c5091ae7679
+DIST raft-0.10.0.tar.gz 315569 BLAKE2B 2365ee2ef4aca44257cf7631875013a6778d8858427946443ec02411783517f3ef129529c3302eceedbd43d9a57de9a3fc20a762b51ce8c7ed96045d4c8d27b0 SHA512 5039e2305c92f5002de4ef33f3c0b76dac1e72b8d983440ae0f5cb65d99213278e23a80401476617f32857c1913ab30bf257265d92f6bb5992d2701d4c25f977
 DIST raft-0.9.25.tar.gz 313444 BLAKE2B a2a15287cef28b03b012ea372d83e7d0b70bc561f5996eb36fb5ef898261188ee8dfef1aa1619333ada2c8f20a37aa1af3f68a1d97c11919d521544c89629e55 SHA512 8709a909c527b7062072165356dcc012cf7af6cf85e3a3be515220ea4a863637dd06e7c4376af4284006bce65034002d1639ca52ac1ce108be2efa0725a82b70
+EBUILD raft-0.10.0.ebuild 948 BLAKE2B b594180bd763206d959ed723aa4058a7a3a1349a97a6a1f3b5cc2efb0ab5a9b2acaf82ae5c24ce559b2120b539da09b724f44568fba25939fbd0bd33944c8b4c SHA512 d5fb44d9341600d522abfdab8f72b3fedbc458a883c481ca6adbae20f1eb4c24f8fa6edaf2e674d10a06d9e4b0043540d03ddc0dea7d55c862aab76dde29621d
 EBUILD raft-0.9.25.ebuild 1030 BLAKE2B 39e3e289802fde309d41d0a5ecf5484d58610db877e276bf3bc601c33f3060f9d8d968345f56868d3c653ab6192789761a972f2df2a16f00f4d4fa1e69b49658 SHA512 ae0f3446717543f20a52a54e143d16351758fe2377d6b38319a1d288a45dab0b1c2e78d5813a6a97c060ef9d1b04fc864a6c8fdabf6f525677018b8c9795118f
-MISC metadata.xml 755 BLAKE2B df2f0d028fa7b8e27b29facf058e32cfcd3352415ed4a682499a8a9bfccab115b174d30750a66d9a811da90fe5deb68ab9c2344f7c691d158d48c36d76da9db4 SHA512 95093f3a838955c8a109dfea975d73698bc5aade34bd54fc5dbbe9ec6e5ec9f092cdb939c4f91290babacdd6ae5ef72027201bd731955f8337ec21e49713a3c7
+MISC metadata.xml 812 BLAKE2B 677320549c30e675db900f01856b6ac4b86f18de7efd42a6008574edd7a14b762246b81aead5184e060734a53eb1eea007ecc5f79c9bae704763e483fe7fb7f9 SHA512 890676653a112bdde09b86488b99415f4cc10658809dd5e63ea3cecd197ba66b225d487f0f9557f38ccaedb50058940ab141871fc4a3e880dd8118e4b49d3fd6
diff --git a/dev-libs/raft/files/raft-0.10.0-toggle-zfs.patch b/dev-libs/raft/files/raft-0.10.0-toggle-zfs.patch
new file mode 100644
index 000000000000..f31b599b6101
--- /dev/null
+++ b/dev-libs/raft/files/raft-0.10.0-toggle-zfs.patch
@@ -0,0 +1,21 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2021-03-16 14:45:58.000000000 +0200
++++ b/configure.ac	2021-03-23 07:45:06.875557286 +0200
+@@ -47,13 +47,10 @@
+ # Checks for header files.
+ AC_CHECK_HEADERS([stdlib.h string.h stdio.h assert.h unistd.h linux/io_uring.h linux/aio_abi.h])
+ 
+-# Check if zfs >= 0.8.0 is available (for direct I/O support).
+-AC_CHECK_PROG(have_zfs, zfs, yes)
+-AS_IF([test x"$have_zfs" = x"yes"],
+-   [AX_COMPARE_VERSION($(cat /sys/module/zfs/version | cut -f 1 -d -), [ge], [0.8.0],
+-       [AC_DEFINE(RAFT_HAVE_ZFS_WITH_DIRECT_IO)], [])
+-   ],
+-   [])
++# zfs support. We have 0.8.6 as stable in Gentoo, which is plenty above the required minimum.
++AC_ARG_WITH([zfs], AS_HELP_STRING([--with-zfs], [Build with zfs support (default: disabled)]))
++AS_IF([test "x$with_zfs" = "xyes"],
++   [AC_DEFINE(RAFT_HAVE_ZFS_WITH_DIRECT_IO)], [])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_SIZE_T
diff --git a/dev-libs/raft/metadata.xml b/dev-libs/raft/metadata.xml
index c96395f90242..d1012a6417a7 100644
--- a/dev-libs/raft/metadata.xml
+++ b/dev-libs/raft/metadata.xml
@@ -9,6 +9,9 @@
     <email>virtualization@gentoo.org</email>
     <name>Gentoo Virtualization Project</name>
   </maintainer>
+  <use>
+    <flag name="zfs">ZFS support</flag>
+  </use>
   <longdescription>
     The library has modular design: its core part implements only the core 
     Raft algorithm logic, in a fully platform independent way. On top of that, 
diff --git a/dev-libs/raft/raft-0.10.0.ebuild b/dev-libs/raft/raft-0.10.0.ebuild
new file mode 100644
index 000000000000..ffd134995c1b
--- /dev/null
+++ b/dev-libs/raft/raft-0.10.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="C implementation of the Raft consensus protocol"
+HOMEPAGE="https://github.com/canonical/raft"
+SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test zfs"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libuv"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/raft-0.9.25-Always-skip-init-oom-test.patch
+	"${FILESDIR}"/raft-0.10.0-toggle-zfs.patch
+	)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-uv
+
+		--disable-benchmark
+		--disable-debug
+		--disable-example
+		--disable-sanitize
+		--disable-static
+
+		$(use_enable test fixture)
+
+		$(use_with zfs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}