From: Joonas Niilola <juippis@gentoo.org>
Date: Fri, 15 May 2020 08:30:19 +0000 (+0300)
Subject: app-emulation/lxd: copy zfs fix from 3.16 ebuild to 4 LTS
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d2b71f562ab76e38974cb928567b3acd12d795c;p=gentoo.git

app-emulation/lxd: copy zfs fix from 3.16 ebuild to 4 LTS

Closes: https://bugs.gentoo.org/723208
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
---

diff --git a/app-emulation/lxd/lxd-4.0.1.ebuild b/app-emulation/lxd/lxd-4.0.1.ebuild
index 876dcde968a3..020974b79e2e 100644
--- a/app-emulation/lxd/lxd-4.0.1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.1.ebuild
@@ -79,13 +79,15 @@ common_op() {
 src_prepare() {
 	default
 
+	export GOPATH="${S}/_dist"
+
 	sed -i \
 		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
 		-e "s:make:make ${MAKEOPTS}:g" \
 		Makefile || die
 
-	cd "${GOPATH}"/deps/libco || die
-	sed -i 's#lib$#lib/lxd#' Makefile || die
+	sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
+	sed -i 's#zfs version | cut -f 2#< /sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die
 
 	common_op eautoreconf
 }