sys-fs/bees: drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans@posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/18587
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

5 files changed, 0 insertions, 330 deletions

diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index c43cefc6e650..ebf679a12743 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1,2 +1 @@
-DIST bees-0.6.1.tar.gz 124411 BLAKE2B fd6c875334cb610da94a4633351b7edc5a4ecf4ff467bb93c8559a1698fd29667d43955e0031498401ceeb3d8db13b5aeb80d2f16cd61e4d5a6607e432082c79 SHA512 cd44d21959d3ab4dda255f0a4a57bd3aeecfb9fee6ea26d68a1b5f84d407f75bd0b442ecf4fefc5ac856dcd9af035f44ceeff77a8926b164f97a15350efcee33
 DIST bees-0.6.4.tar.gz 126064 BLAKE2B 562f0cfd63d15978a26f859548eb36cea0bf1be8e363c7ee5d2294e3c6407b4a93d865ffe2d15fabaeb2b3e136ad2d48cab3210c00e5fe39432985186ad62c55 SHA512 ce0eb66ac0770838e13ba6007fd765c02aea3f5eefc09e2834118d420e71693c37b8aa8511cfc9577ca09ab82d37787a1854edbed090c059759b29c70d834672
diff --git a/sys-fs/bees/bees-0.6.1-r2.ebuild b/sys-fs/bees/bees-0.6.1-r2.ebuild
deleted file mode 100644
index 70bf39d08a69..000000000000
--- a/sys-fs/bees/bees-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd
-
-DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
-HOMEPAGE="https://github.com/Zygo/bees"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="tools"
-
-DEPEND="
-	>=sys-apps/util-linux-2.30.2
-	>=sys-fs/btrfs-progs-4.20.2
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~BTRFS_FS"
-ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
-
-PATCHES=(
-	"${FILESDIR}/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch"
-	"${FILESDIR}/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch"
-	"${FILESDIR}/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch"
-	"${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch"
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if kernel_is -lt 4 4 3; then
-			ewarn "Kernel versions below 4.4.3 lack critical features needed for bees to"
-			ewarn "properly operate, so it won't work. It's recommended to run at least"
-			ewarn "kernel version 4.11 for best performance and reliability."
-			ewarn
-		elif kernel_is -lt 4 11; then
-			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
-			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
-			ewarn "running, it's recommended to run at least kernel 4.11."
-			ewarn
-		elif kernel_is -lt 4 14 29; then
-			ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()"
-			ewarn "messages in the kernel log. These messages can be ignored and this is fixed"
-			ewarn "with more recent kernels:"
-			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
-			ewarn
-		fi
-
-		if kernel_is -lt 5 3 4; then
-			ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running"
-			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
-			ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
-			ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
-			ewarn "the device RO without writing corrupted meta-data. More details:"
-			ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
-			ewarn
-		fi
-
-		if kernel_is -lt 5 0 4; then
-			ewarn "IMPORTANT: With kernel versions below 5.0.4, you may experience data corruption"
-			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
-			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
-			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
-			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
-			ewarn
-		fi
-
-		elog "Bees recommends running the latest current kernel for performance and"
-		elog "reliability reasons, see README.md."
-	fi
-}
-
-src_configure() {
-	cat >localconf <<-EOF || die
-		LIBEXEC_PREFIX=/usr/libexec
-		PREFIX=/usr
-		LIBDIR="$(get_libdir)"
-		SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
-		DEFAULT_MAKE_TARGET=all
-	EOF
-	if [[ ${PV} != "9999" ]] ; then
-		cat >>localconf <<-EOF || die
-			BEES_VERSION=v${PV}
-		EOF
-	fi
-	if use tools; then
-		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
-	fi
-}
diff --git a/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch b/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch
deleted file mode 100644
index 60ab748eb2b6..000000000000
--- a/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 566df54a3f7458559b75455a95b1991b515ba6bf Mon Sep 17 00:00:00 2001
-From: Zygo Blaxell <zblaxell@thirteen.furryterror.org>
-Date: Wed, 12 Jun 2019 21:27:50 -0400
-Subject: [PATCH 1/2] lib: fix non-local lambda expression cannot have a
- capture-default
-
-We got away with this because GCC 4.8 (and apparently every GCC prior
-to 9) didn't notice or care, and because there is nothing referenced
-inside the lambda function body that isn't accessible from any other
-kind of function body (i.e. the capture wasn't needed at all).
-
-GCC 9 now enforces what the C++ standard said all along:  there is
-no need to allow capture-default in this case, so it is not.
-
-Fix by removing the offending capture-default.
-
-Fixes: https://github.com/Zygo/bees/issues/112
-Signed-off-by: Zygo Blaxell <bees@furryterror.org>
----
- lib/error.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/error.cc b/lib/error.cc
-index f2a6db0..1d16a0a 100644
---- a/lib/error.cc
-+++ b/lib/error.cc
-@@ -32,7 +32,7 @@ namespace crucible {
- 
- 	// FIXME:  could probably avoid some of these levels of indirection
- 	static
--	function<void(string s)> current_catch_explainer = [&](string s) {
-+	function<void(string s)> current_catch_explainer = [](string s) {
- 		cerr << s << endl;
- 	};
- 
--- 
-2.23.0
-
diff --git a/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch b/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch
deleted file mode 100644
index 6d8d2ea530d5..000000000000
--- a/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From f731ea8016c570243c783adef96681b535d9c927 Mon Sep 17 00:00:00 2001
-From: Zygo Blaxell <bees@furryterror.org>
-Date: Tue, 19 Nov 2019 16:01:31 -0500
-Subject: [PATCH 2/2] context: workaround to prevent LOGICAL_INO and btrfs
- balance from running concurrently
-
-This avoids some kernel bugs.  One of them is fixed in 5.3.4 and later:
-
-	efad8a853a "Btrfs: fix use-after-free when using the tree modification log"
-
-There are apparently others in current kernels, so for now just put bees
-on pause until the balance is done.
-
-At some point we may want to provide an option to disable this
-workaround; however, running bees and balance at the same time makes
-neither particularly fast, so maybe we'll just leave it this way.
-
-Signed-off-by: Zygo Blaxell <bees@furryterror.org>
----
- src/bees-context.cc | 31 +++++++++++++++++++++++++++++++
- src/bees.h          |  4 ++++
- 2 files changed, 35 insertions(+)
-
-diff --git a/src/bees-context.cc b/src/bees-context.cc
-index 4e0a43e..0665019 100644
---- a/src/bees-context.cc
-+++ b/src/bees-context.cc
-@@ -760,11 +760,42 @@ BeesResolveAddrResult::BeesResolveAddrResult()
- {
- }
- 
-+void
-+BeesContext::wait_for_balance()
-+{
-+	Timer balance_timer;
-+	BEESNOTE("WORKAROUND: waiting for balance to stop");
-+	while (true) {
-+		btrfs_ioctl_balance_args args;
-+		memset_zero<btrfs_ioctl_balance_args>(&args);
-+		const int ret = ioctl(root_fd(), BTRFS_IOC_BALANCE_PROGRESS, &args);
-+		if (ret < 0) {
-+			// Either can't get balance status or not running, exit either way
-+			break;
-+		}
-+
-+		if (!(args.state & BTRFS_BALANCE_STATE_RUNNING)) {
-+			// Balance not running, doesn't matter if paused or cancelled
-+			break;
-+		}
-+
-+		BEESLOGDEBUG("WORKAROUND: Waiting " << balance_timer << "s for balance to stop");
-+		sleep(BEES_BALANCE_POLL_INTERVAL);
-+	}
-+}
-+
- BeesResolveAddrResult
- BeesContext::resolve_addr_uncached(BeesAddress addr)
- {
- 	THROW_CHECK1(invalid_argument, addr, !addr.is_magic());
- 	THROW_CHECK0(invalid_argument, !!root_fd());
-+
-+	// Is there a bug where resolve and balance cause a crash (BUG_ON at fs/btrfs/ctree.c:1227)?
-+	// Apparently yes, and more than one.
-+	// Wait for the balance to finish before we run LOGICAL_INO
-+	wait_for_balance();
-+
-+	// Time how long this takes
- 	Timer resolve_timer;
- 
- 	// There is no performance benefit if we restrict the buffer size.
-diff --git a/src/bees.h b/src/bees.h
-index da87d88..5c9375c 100644
---- a/src/bees.h
-+++ b/src/bees.h
-@@ -114,6 +114,9 @@ const size_t BEES_TRANSID_FACTOR = 10;
- // The actual limit in LOGICAL_INO seems to be 2730, but let's leave a little headroom
- const size_t BEES_MAX_EXTENT_REF_COUNT = 2560;
- 
-+// Wait this long for a balance to stop
-+const double BEES_BALANCE_POLL_INTERVAL = 60.0;
-+
- // Flags
- const int FLAGS_OPEN_COMMON   = O_NOFOLLOW | O_NONBLOCK | O_CLOEXEC | O_NOATIME | O_LARGEFILE | O_NOCTTY;
- const int FLAGS_OPEN_DIR      = FLAGS_OPEN_COMMON | O_RDONLY | O_DIRECTORY;
-@@ -708,6 +711,7 @@ class BeesContext : public enable_shared_from_this<BeesContext> {
- 	void set_root_fd(Fd fd);
- 
- 	BeesResolveAddrResult resolve_addr_uncached(BeesAddress addr);
-+	void wait_for_balance();
- 
- 	BeesFileRange scan_one_extent(const BeesFileRange &bfr, const Extent &e);
- 	void rewrite_file_range(const BeesFileRange &bfr);
--- 
-2.23.0
-
diff --git a/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch b/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch
deleted file mode 100644
index 9f53e5b37da3..000000000000
--- a/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 0b7cf9c0f11722c7cb8a816e9118602b43d9a3f5 Mon Sep 17 00:00:00 2001
-From: Zygo Blaxell <bees@furryterror.org>
-Date: Tue, 29 Oct 2019 23:34:36 -0400
-Subject: [PATCH 3/3] process: Fix gettid() ambiguity with glibc >= 2.30
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In version 2.30 glibc added it's own gettid() function. This resulted in
-"error: call of overloaded ‘gettid()’ is ambiguous" because gettid()
-now exists in both namespace crucible and std.
-
-For now, use explicit references to namespace crucible.  This continues
-to work with new and old libc without having to test specific library
-versions.
-
-At some point, glibc gettid() will be deployed widely enough that we can
-remove the crucible version entirely.
-
-Signed-off-by: Zygo Blaxell <bees@furryterror.org>
----
- include/crucible/lockset.h | 4 ++--
- lib/chatter.cc             | 4 ++--
- src/bees.cc                | 6 +++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/include/crucible/lockset.h b/include/crucible/lockset.h
-index 856c55e..99500b7 100644
---- a/include/crucible/lockset.h
-+++ b/include/crucible/lockset.h
-@@ -117,7 +117,7 @@ namespace crucible {
- 		while (full() || locked(name)) {
- 			m_condvar.wait(lock);
- 		}
--		auto rv = m_set.insert(make_pair(name, gettid()));
-+		auto rv = m_set.insert(make_pair(name, crucible::gettid()));
- 		THROW_CHECK0(runtime_error, rv.second);
- 	}
- 
-@@ -129,7 +129,7 @@ namespace crucible {
- 		if (full() || locked(name)) {
- 			return false;
- 		}
--		auto rv = m_set.insert(make_pair(name, gettid()));
-+		auto rv = m_set.insert(make_pair(name, crucible::gettid()));
- 		THROW_CHECK1(runtime_error, name, rv.second);
- 		return true;
- 	}
-diff --git a/lib/chatter.cc b/lib/chatter.cc
-index cbd5adb..e5a24f9 100644
---- a/lib/chatter.cc
-+++ b/lib/chatter.cc
-@@ -69,14 +69,14 @@ namespace crucible {
- 			DIE_IF_ZERO(strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &ltm));
- 
- 			header_stream << buf;
--			header_stream << " " << getpid() << "." << gettid() << "<" << m_loglevel << ">";
-+			header_stream << " " << getpid() << "." << crucible::gettid() << "<" << m_loglevel << ">";
- 			if (!m_name.empty()) {
- 				header_stream << " " << m_name;
- 			}
- 		} else {
- 			header_stream << "<" << m_loglevel << ">";
- 			header_stream << (m_name.empty() ? "thread" : m_name);
--			header_stream << "[" << gettid() << "]";
-+			header_stream << "[" << crucible::gettid() << "]";
- 		}
- 
- 		header_stream << ": ";
-diff --git a/src/bees.cc b/src/bees.cc
-index 08c3fd7..aa55af0 100644
---- a/src/bees.cc
-+++ b/src/bees.cc
-@@ -115,9 +115,9 @@ BeesNote::~BeesNote()
- 	tl_next = m_prev;
- 	unique_lock<mutex> lock(s_mutex);
- 	if (tl_next) {
--		s_status[gettid()] = tl_next;
-+		s_status[crucible::gettid()] = tl_next;
- 	} else {
--		s_status.erase(gettid());
-+		s_status.erase(crucible::gettid());
- 	}
- }
- 
-@@ -128,7 +128,7 @@ BeesNote::BeesNote(function<void(ostream &os)> f) :
- 	m_prev = tl_next;
- 	tl_next = this;
- 	unique_lock<mutex> lock(s_mutex);
--	s_status[gettid()] = tl_next;
-+	s_status[crucible::gettid()] = tl_next;
- }
- 
- void
--- 
-2.23.0
-