gentoo resync : 29.08.2018

3 files changed, 30 insertions, 10 deletions

diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest
index c3487bde4d5c..5334448c891a 100644
--- a/app-emulation/containers-storage/Manifest
+++ b/app-emulation/containers-storage/Manifest
@@ -1,4 +1,4 @@
 DIST containers-storage-0_pre20180730.tar.gz 1410155 BLAKE2B 24595693e9f5706130dd5e9bf38d11b2b267a64924cb854ad2d9db8c0a3d7c47fec5a00fa100be67ceaf35ea1a08fada7314d5fbe114fe7508f54e8bfc4f64b4 SHA512 25c5c3c16bb9f0da4e590cf658e56cc2ce1dbc81751f984b426b5e09a95ee816632b0267c8f3028254e88fcd39f5d087f0357862b34379180b33ff38d7028453
 DIST github.com-pquerna-ffjson-af8b230fcd2007c7095168ca8ab94c68b60840c6.tar.gz 103474 BLAKE2B 66b456484cec51106e328a6d2c58a8597c1208956fca0c9f0ea45108b8d0942561882004a1ed5b90daa21509c9e0bc090dc9beed89b5a161f52ee8cf58e5d48f SHA512 243d8aed943dbadf3b127e07ad29a830ecded24aa80bb3bcc101db90ba8f3bfa03832e9d1f452e94b3eaccd683a044d0687a168e7e41979eb470442e689659c9
-EBUILD containers-storage-0_pre20180730.ebuild 3204 BLAKE2B 5ac3a1b3093bc05753575324f86e95eaf928a6e25f3cc9f04f1b5c53d2ec061a384acca9fdb749017a2eae2aeb043037cba8a2600bddb6cb4cd5e548eee99405 SHA512 face9ac4e8a746236ef45ce8e0b893cdfa863accb3abf6476a7544041c9af40ee17dbd3916421b28d6b077958363ee870c6dbeca470bf1b0d071689c95734eee
-MISC metadata.xml 430 BLAKE2B 98f0935e3a4888ab76042f212ac7fb4e30f90527bde170428b85ba52bc0585d3a9039b158a0b3796ad51dc23b4c1042cd6728dc528a96a00133835f79372a956 SHA512 2a43a27f6ce611f7ab0952cad51129eb0f049ebc5de18e8bf4410e4f34e217b77be1069674bf5f9d0b3be2d1efcd40ebf364c9758dc42f941f3d6eed2eddb63e
+EBUILD containers-storage-0_pre20180730.ebuild 3688 BLAKE2B 967aea99877e6f30d2100739390a73da5393e4a93d63a8c545122ffcfd4705afa257f917c6a37b739642619a4e4ba5513a184df141574f4dc939714be08296e0 SHA512 99217cbf6b5ebbbce066821a23a05d44fbbe585be04da4d7d8158ecbdda92361740b22665dc0876b0ef1ce1c6f0f0cd7645137e842bb3cd0be87dd47f2c39e26
+MISC metadata.xml 691 BLAKE2B 512255d8e2d91d64a04fcd5da04fa6db20fbaf66c580491f001716a06c0ff81ff572491cb9b4274229f2312c7235abcbe8e32b6de9e2344b418015c253866f26 SHA512 eeb059ee40101e47a81d4ff871a55295c68891c9bb6a5a2f87d7855e3aea36648f2db77317f3660602d338d6f3f8cf1018cc61f2722fcd6cb78f7f32ac62989b
diff --git a/app-emulation/containers-storage/containers-storage-0_pre20180730.ebuild b/app-emulation/containers-storage/containers-storage-0_pre20180730.ebuild
index ab4de85d15b6..cd2ef64ffa54 100644
--- a/app-emulation/containers-storage/containers-storage-0_pre20180730.ebuild
+++ b/app-emulation/containers-storage/containers-storage-0_pre20180730.ebuild
@@ -14,19 +14,25 @@ DESCRIPTION="containers/storage library"
 HOMEPAGE="https://github.com/containers/storage"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="ostree test"
+IUSE="btrfs +device-mapper ostree test"
 EGO_PN="${HOMEPAGE#*//}"
 EGIT_COMMIT="17c7d1fee5603ccf6dd97edc14162fc1510e7e23"
 SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
-RDEPEND="sys-fs/lvm2:=
+RDEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	device-mapper? ( sys-fs/lvm2:= )
 	ostree? (
 		dev-libs/glib:=
 		dev-util/ostree:=
 	)"
 DEPEND="${RDEPEND}
 	dev-go/go-md2man
-	test? ( sys-apps/util-linux )"
+	test? (
+		sys-fs/btrfs-progs
+		sys-fs/lvm2
+		sys-apps/util-linux
+	)"
 RESTRICT="test? ( userpriv ) !test? ( test )"
 
 src_unpack() {
@@ -36,6 +42,14 @@ src_unpack() {
 src_prepare() {
 	default
 
+	[[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
+	use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
+		"${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
+
+	[[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
+	use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
+		"${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
+
 	[[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
 	use ostree || { echo -e "#!/bin/sh\ntrue" > \
 		"${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
@@ -65,8 +79,6 @@ src_prepare() {
 		-e 's:TestCopyCaseH(:_\0:' \
 		-e 's:TestCopyCaseHFSym(:_\0:' \
 		-e 's:TestCopyCaseJ(:_\0:' \
-		-e 's:TestCopyCaseEFSym(:_\0:' \
-		-e 's:TestCopyCaseG(:_\0:' \
 		-e 's:TestCopyCaseJFSym(:_\0:' \
 		-i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
 	sed -e 's:TestMount(:_\0:' \
@@ -78,9 +90,9 @@ src_compile() {
 	ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
 	mkdir -p "${S}/bin" || die
 	cd "${S}/bin" || die
-	GOPATH="${S}" GOBIN="${S}/bin" \
+	GOPATH="${S}" GOBIN="${S}/bin" GOCACHE=off \
 		go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
-	GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
+	GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" GOCACHE=off \
 		emake -C "${S}/src/${EGO_PN}" containers-storage docs
 }
 
@@ -93,5 +105,5 @@ src_install() {
 }
 
 src_test() {
-	GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" local-test-unit
+	GOPATH="${S}" GOCACHE=off unshare -m emake -C "${S}/src/${EGO_PN}" local-test-unit
 }
diff --git a/app-emulation/containers-storage/metadata.xml b/app-emulation/containers-storage/metadata.xml
index 5bf567e579a9..17371971e525 100644
--- a/app-emulation/containers-storage/metadata.xml
+++ b/app-emulation/containers-storage/metadata.xml
@@ -6,6 +6,14 @@
 		<name>Zac Medico</name>
 	</maintainer>
 	<use>
+		<flag name="btrfs">
+			Enables dependencies for the "btrfs" graph driver, including
+			necessary kernel flags.
+		</flag>
+		<flag name="device-mapper">
+			Enables dependencies for the "devicemapper" graph driver, including
+			necessary kernel flags.
+		</flag>
 		<flag name="ostree">
 			Enables dependencies for handling of OSTree images.
 		</flag>