gentoo resync : 07.10.2018

4 files changed, 79 insertions, 3 deletions

diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index dd95c2c90fda..f0a3b555bf09 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1,2 +1,4 @@
-EBUILD bees-9999.ebuild 2001 BLAKE2B 7fa1c9d043a4334579dfad3560d1593717e548c0d31695cf8ccf8ffe45f2347584c7da43b47cad873745f3c843207433c6b892a0469c5618f107c68f78fd5fe2 SHA512 d49266e007895c049e1c9f7e28ec2f649b386a6441eccba02ee411f14ad395925eecdaa8a747962ccc526f9e1d3aba9fd68f4452a1d276d4e5b7d48c80102cd8
-MISC metadata.xml 600 BLAKE2B f772b28d500fc9e77397073dd0f09e2522dbe9c4c5a17236018f050e10057b02a471ac284f480b58592d315352776b08b57316856b914441e9842b7e2f0ff6c9 SHA512 c69131207ee3485d539024c9b2a34be233d4066320346744038a0ae5c1177790288a0ea4cd9319323c3f23230213b706e7841dc1b5000ffdcc620f52bf9b7b07
+DIST bees-0.6.tar.gz 124049 BLAKE2B 7a2d77366758325cebbc51767781a3eff4fa52180b53ebf5eb982433bfc1c80acd4f3befa5968c888be443815e6231625e9ecc2763c35e33e5ed55c13bd702bc SHA512 bb288da8d2e0fad100dc40e3f9060055220e0ec948bc571a1cb06a7d78d0d0e6db30164e7dbde040c264c496cb59d50bb0694dd9432a8229e04f2cdc33bab31d
+EBUILD bees-0.6.ebuild 2099 BLAKE2B ca8f34586b0005dff546cc251be3696a3415c120847026e1d719f7e463ea82f5069730402d609c3447f3902eae494b4ec3d85fad783160fba01fdf893af45db2 SHA512 5a0a8a7b5a11f2bd5e2695e595c5688793ac314f1e5bd96b4a69783e696ac40172a8cd6447474bbbd8c6cc6836863e5e8ed5c3f5a0dab09ee41b6c48cc51bd0a
+EBUILD bees-9999.ebuild 2099 BLAKE2B 88a9e370419db85e8f459626489a4dd06fbc55abd59ad367229d0aa4eb360bbbca0d4f46e4feada0d01d434a360bdac4015c3bfc063af3eb1940c3ada6a34665 SHA512 65745b2e09d1b7231a9ea29d78479f68f2d3a628353032ccaaf43245376e526721fae5f0a22a3586462634271a9798feb4608bc2349a48d2c5e7df7052bf5970
+MISC metadata.xml 591 BLAKE2B 8744c233c9718ce545165c6c8deaa455efe283cfe186aeee9876ad31195891b1255ae20851e5d5f52c19f4bb038558dffd7c2f3bd091af1b0b5c3d6e7a717975 SHA512 333a091d0869955cc3fce76c1d462b44715f8f1b89017c1b240cd5398e53ee1b370f7fc2d76407efa8a045c1088a195786da072d4d6ec30c1f09f42977839b20
diff --git a/sys-fs/bees/bees-0.6.ebuild b/sys-fs/bees/bees-0.6.ebuild
new file mode 100644
index 000000000000..dfda78fae30b
--- /dev/null
+++ b/sys-fs/bees/bees-0.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info
+
+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"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="tools"
+
+DEPEND="
+	>=sys-apps/util-linux-2.30.2
+	>=sys-fs/btrfs-progs-4.1
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~BTRFS_FS"
+ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
+
+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
+		elog "Bees recommends to run 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)
+		DEFAULT_MAKE_TARGET=all
+	EOF
+	if use tools; then
+		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
+	fi
+
+	# quickfix, will be removed when fixed upstream
+	sed -i "s/UNKNOWN/v${PV}/" src/Makefile || die
+}
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index 72fef108e72d..22a1b0a48880 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -60,6 +60,11 @@ src_configure() {
 		LIBDIR=$(get_libdir)
 		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/metadata.xml b/sys-fs/bees/metadata.xml
index ba18bd51ea03..1231725fe211 100644
--- a/sys-fs/bees/metadata.xml
+++ b/sys-fs/bees/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 <use>
-	<flag name="tools">Build extra tools useful for debugging (fiemap, feiwalk, beestop)</flag>
+	<flag name="tools">Build extra tools useful for debugging (fiemap, fiewalk)</flag>
 </use>
 <upstream>
 	<bugs-to>https://github.com/Zygo/bees/issues</bugs-to>