gentoo resync : 29.08.2018

13 files changed, 106 insertions, 40 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 3f7d7ad281ae..7666231e96bd 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 21e5396c4e39..3a2422c8992d 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,5 +1,7 @@
 DIST buildah-1.2.tar.gz 4403310 BLAKE2B df3a1d12a41e9d585d3191103140fc232a2c247283996f394bd151f61615057b15d934e165be47794465c30217c32b3e6b53fbf4d2ef5a2f3349840dadad8171 SHA512 0aac0a80c3c50f0171199e549c0321ce1a756ca838dd9d92b0b0d58bd6b4e212390642c8a4a2aea794616292058624ab0c8707d2ea0cdcbcc555b387df611dc2
+DIST buildah-1.3-issue-966-containers-storage-c7ba5749d44a65fde2daf114c16fb0272d82d73b.patch 4507 BLAKE2B 85a02751a91a73f1f99a1ae138e712304feeb46a40c792f4ec4ac895ce074d15eab4d76bf5e9be759254d0a023371c074a633607a689b42d238ac3f32b4e1d3d SHA512 63c74989dc649582170fc6657c9bfc805bcec6c4aa31017d53c4fa0f86acf00986adf05a8101605963eb3a358d237aad43c124ebcb5be635cff85efe4aa1eaa4
 DIST buildah-1.3.tar.gz 4486873 BLAKE2B 35fb62626d2466495da47579cf4ab23603797ef42a9308245fa97c87a91fcb978f4d02724ce79c2b4ac620d9868ca8974e4701ba6a96ccf739e5ccb4e6d9693a SHA512 c8e161254495cb652caf9a54a051155008e41575487d26aacd38355f0a447ae0e8973b33a978e6a2d5a6c8105400d49dae46878c5f3631ab51aa3556d5033ccd
 EBUILD buildah-1.2.ebuild 1407 BLAKE2B b57e8bf75b9db19b56b8a9f4bda2cf0c9347a2919b41c22194b17a88880ea98b7e3e75f00bdc4bea61b314ad90d511c64732fe7dd0f37409b9cc727a394f2ca3 SHA512 3a69febb77c2a22d93e5bf868db42b498b5d464e73182916f4754fabe7e55f91033cfc302c025ac45519f559f48f32524daad04e0ee89ded3b964d6481035f90
+EBUILD buildah-1.3-r1.ebuild 2054 BLAKE2B 0451a2f5b941d833d4df6568bd0cfbbe631c80bd17d76c13fad1c522997957656f6133b030ee005c1f2c107188d2f24fc22b48af971065a096ba2c5025e9e994 SHA512 e5d7586db5cd9b3af24c04a147ec48d3d000dc73910fcd4222b44df94d02a92ebb37bd4cc2cc71b65dc9f452208033a5ac4633fe042fadc103b1e503bebfd865
 EBUILD buildah-1.3.ebuild 1418 BLAKE2B ade5ca1b6c9a5d3d2d8ef4f5c7335b5826f9ad671593b064bdf2b297b546a10b6139c2a937817acf820c3a5f67d610d50f8bfe5d48a8f41fece8c9b2e6e2b716 SHA512 7638b2557ca122a566026e2fb7d7050d13d16c6623bb958edb1895b08e02c32cd9754760bae3c7d8a31f1a611e27cece6038a6000b796bd48101790d1f6671d7
 MISC metadata.xml 433 BLAKE2B 5b06389433033a1cf28f5fcae5dd41f4ebe0582d9537e8e163fad82046a66477a6ac3ed26ea63e60ea392919afcd3f0f45ae8ddabefd3a518707d5adff04e9d6 SHA512 3ab67ceda6ca0c8bd10f8868172d9686c8eeaa856760453be1c3ba907abb734ba37f5e9885547a16f69c67aa8d96e576de1ddf3208c08f4d44c2d90b081c74a6
diff --git a/app-emulation/buildah/buildah-1.3-r1.ebuild b/app-emulation/buildah/buildah-1.3-r1.ebuild
new file mode 100644
index 000000000000..ff5716f00454
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.3-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit bash-completion-r1 golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/projectatomic/buildah"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ostree selinux"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="4888163"
+CONTAINERS_STORAGE_PATCH=c7ba5749d44a65fde2daf114c16fb0272d82d73b.patch
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/containers/storage/commit/${CONTAINERS_STORAGE_PATCH} -> buildah-1.3-issue-966-containers-storage-${CONTAINERS_STORAGE_PATCH}"
+RDEPEND="app-crypt/gpgme:=
+	app-emulation/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+REQUIRED_USE="!selinux? ( !ostree )"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	# Apply "layer not known" corruption fix for https://github.com/projectatomic/buildah/issues/966.
+	sed 's:[ab]/:\0vendor/github.com/containers/storage/:g' < \
+		"${DISTDIR}/buildah-1.3-issue-966-containers-storage-${CONTAINERS_STORAGE_PATCH}" > \
+		"${T}/buildah-1.3-issue-966-containers-storage-${CONTAINERS_STORAGE_PATCH}" || die
+	eapply "${T}/buildah-1.3-issue-966-containers-storage-${CONTAINERS_STORAGE_PATCH}"
+
+	default
+	sed -e 's|^\(GIT_COMMIT := \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
+
+	[[ -f ostree_tag.sh ]] || die
+	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
+		ostree_tag.sh || die; }
+
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" emake all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin ${PN} imgtype
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" emake test-unit
+}
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>
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index bf0740cb0e2f..a907298d64c5 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -32,8 +32,8 @@ DIST ganeti-2.16.0~rc1.tar.gz 4794934 BLAKE2B 867d7d48e98d4490db8279b83b44006e0a
 DIST ganeti-2.17.0~beta1.tar.gz 4880091 BLAKE2B bd094ac421b8b49abcd7643641aa4c2d62aa2f8a4ab55289711cef8c47cc32634bf06b99adbf9383de3945766112a1838d2191dfb51013dc4fba81676e264e64 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e
 DIST ganeti_2.15.2-4.debian.tar.xz 42440 BLAKE2B 5c329baa90bd801a3e4b550da0a4c8bb59f3d17801ff0d66a35ae0383f34a5c1cc7f3d6d67a5e07157085290019b22c6b5349224ed43b5ec40fbdc37ded77e88 SHA512 e405f54996236fe5166c89190c529256899458594d30e4daee85a9381400e618bc8cc578c43a166ed6d868ed3c5118e4bddc5103b596db89a504de3ba3a1f403
 DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4d312c23392f428e1e0452f17f48140b6df5193447dd0fa1b5185d6866cfe48c8eb3dd6d22f01f930499471eab7044ca9b7268 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af
-EBUILD ganeti-2.15.2-r5.ebuild 9797 BLAKE2B 01b892f3363735639abb0a56af713db430ed625ec4a44d395528528435295d49d6b248b773d87ef9cabd60d83eca84e062b6e26c495386fb165d6f621beaadb8 SHA512 a62058c0a7dcb218eab8881690c3a1cc560d4f244ee6d40344b06e2864f60ade56f15f52b1510cc62b08f23ce81bf004575fcb774eb67100c92df35d74f88711
-EBUILD ganeti-2.15.2-r6.ebuild 10249 BLAKE2B 90db253679828a1b31d9936524f268c7f2997f021573e6244096a3e589f561f9a2aa11dd790c8d82e7f8b224f36c6dfc59f1f3771bc6f1f8ed1daad45fe907da SHA512 cca4bf742ce5bf279eb0e44aabcc718d34945237ce14afb1d5651dcda9065e824c4e46844fb5f9d36ea47204339ad43e367045662d05721ccdc0f15f92cff337
-EBUILD ganeti-2.16.0_rc1.ebuild 10495 BLAKE2B 5f8f4bfeb74adc10623e57fc649e72f9decd672d31a12f0405939a5ba83a92202acb5d19d46a27736e186da737be9daef58f3955374e9e23da8f34400b6da6e7 SHA512 0608feee816184e5c5403e923ef3f062c717d5c38889aaf5dad349192fe0ad9d16da2005c34f38b038aa68cda33dd9826829ae47cd89bee38f6b102d89df871e
-EBUILD ganeti-2.17.0_beta1.ebuild 10522 BLAKE2B a3534952889687a0c61cbb6575742c5117b03c911d2abdfd6784a50abb2fea8237e368213686919637ad014b66147cc430e61fe4179007f2a3c21b631c46673c SHA512 3ad4e6c3994bd3d7d3c325f344099a6f073ca830c94fac2ede314ef5a067a334ba3fe21b97456ddcefdc20815f1906f29b2153a75e72e8ef21739558a04aeb66
+EBUILD ganeti-2.15.2-r5.ebuild 9757 BLAKE2B caaa94ddb315b7b4ea5f93ce6015521c3e70d835f6aa339ead3a9f1c1da3645e0d603cb6dfa94339822c63bc85c095a88e630c34ba08df2bb6361dba95127c83 SHA512 ae8d599d9338b10e7fdfb22ae8a0c89a76380fee6a03692508294144953e5acc18ba76a9052824e22c09fc00f76a357aca5b0bb4afe5b0bfc25e971fef5f0499
+EBUILD ganeti-2.15.2-r6.ebuild 10209 BLAKE2B 17fe1545ce1866c40f188ec54b86f2cf709cdf6637a4227eaa633ddd00a565cf6b87ee99a152af1e426ce2b1fe4ce2cd765028dc108bb27ddc1e565ab5b14cdf SHA512 446cd91e65c576cb827f2b66f01d7cec1cd9ff57022d664fb2bfbb8b93cb4e02a9d57aacd4ddc2c4d691c3d7b730d751ec3d4c54e26ec2d07869f309f7d931ad
+EBUILD ganeti-2.16.0_rc1.ebuild 10455 BLAKE2B 27e2d97c7e53ec58790b84596ac9915735c049bd196caf75e85a719f2bd7779a5bb4e51c2f5595c724ff11bc46c13072949813cd01d3897d8a4f63be49f2d853 SHA512 1dfd0c29731e02a453e79c72c112e85ad0f95ff51d486dc28bd9685640b6459a0dade98dff3ca2305790134f87973fbecf11e56edba41712974b3f6aa7b3e3a1
+EBUILD ganeti-2.17.0_beta1.ebuild 10482 BLAKE2B c1e4aa4ee3ec0bf191f29d8b63537ec96a8f411517bd274b3872c5a9fc394bc8944cde3fcb0670f678be1c2382860a21adb5f9d76265288b6d7b427317109a39 SHA512 22111278c2ec0491876eaafc45dc3ff401b93298c5caf1f1fe039094cffbbb6e3c74092c04569cdb1c748edbe69111257f2ef965181473394e4fd7148218191b
 MISC metadata.xml 1961 BLAKE2B 1c7cc03a3dd655f75b8f9249c3b0b70a738af06a9a0529afb7c73abf6344b112e5daf610f6f6780acf0c3b14e916590c20c6f8837bb333e7da0cad6df7ba8520 SHA512 547dcaaf4392b13c5629e5555d17ba2d4e504b6ce0e043fdf440fce3d857477009aeab0af52cb92cc494ecb3e6e1a7e026fabbe6e24b9323fe47c2fc15175896
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index 002bd0085cab..c1a37b6d764d 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -122,12 +122,7 @@ DEPEND="
 		app-emulation/qemu
 	)
 	lxc? ( app-emulation/lxc )
-	drbd? (
-		|| (
-			<sys-cluster/drbd-8.5
-			sys-cluster/drbd-utils
-		)
-	)
+	drbd? ( sys-cluster/drbd-utils )
 	rbd? ( sys-cluster/ceph )
 	ipv6? ( net-misc/ndisc6 )
 	${PYTHON_DEPS}"
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
index 39a61a1f54f7..646ff4ff3a53 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
@@ -122,12 +122,7 @@ DEPEND="
 		app-emulation/qemu
 	)
 	lxc? ( app-emulation/lxc )
-	drbd? (
-		|| (
-			<sys-cluster/drbd-8.5
-			sys-cluster/drbd-utils
-		)
-	)
+	drbd? ( sys-cluster/drbd-utils )
 	rbd? ( sys-cluster/ceph )
 	ipv6? ( net-misc/ndisc6 )
 	${PYTHON_DEPS}"
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index 1ae893ae5ef9..e1a45367e939 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -127,12 +127,7 @@ DEPEND="
 		app-emulation/qemu
 	)
 	lxc? ( app-emulation/lxc )
-	drbd? (
-		|| (
-			<sys-cluster/drbd-8.5
-			sys-cluster/drbd-utils
-		)
-	)
+	drbd? ( sys-cluster/drbd-utils )
 	rbd? ( sys-cluster/ceph )
 	ipv6? ( net-misc/ndisc6 )
 	${PYTHON_DEPS}"
diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
index 61994d1d5374..8e3045974703 100644
--- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@@ -127,12 +127,7 @@ DEPEND="
 		app-emulation/qemu
 	)
 	lxc? ( app-emulation/lxc )
-	drbd? (
-		|| (
-			<sys-cluster/drbd-8.5
-			sys-cluster/drbd-utils
-		)
-	)
+	drbd? ( sys-cluster/drbd-utils )
 	rbd? ( sys-cluster/ceph )
 	ipv6? ( net-misc/ndisc6 )
 	${PYTHON_DEPS}"
diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index 4e7d1a0e0b3b..36a8371c9865 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -1,5 +1,5 @@
 DIST virt-viewer-6.0.tar.gz 922916 BLAKE2B 1c2246369474d06188dc2191b9756dbe69cff2d5f997ffb58bdab1143a0e4d6cda0e43b4b082d7921125caa4348635762070fa8e6686ccf7728a90e4e6fc3a18 SHA512 656d48f8ab387d025c406cb5f56164d79104c6c377fae37d9c524b90e512fe873d5d1d6c435d4ea95e71468b7d3384b89789495075cafb1a9e67f583f7d49ec2
 DIST virt-viewer-7.0.tar.gz 924475 BLAKE2B 003efaf88445ec6f523e678459ed1e11562d0cd87fb4811105df9ac1e3129f4a97170c5b783f1d504d157055ae51ac8dc23ffa8f3f79dd6cd55707d962e1d9ad SHA512 e0558c9138877f546add6a3df9721e100cadb6953815be82b2376b0521b82cf14052bdc29c42bb03b198b6e9d129a55d33531a153207d7f29b5c1c3402ebc904
 EBUILD virt-viewer-6.0-r1.ebuild 916 BLAKE2B c43af1747c961f6e90bfc6d472047ba056ba60417a8252adbadc89d3cf15438efda23bc98da745fa26d4e3fc779821d7fc6aa756623e6ed6e84266245f51f6f9 SHA512 995db1ae9baad0d2fa3407c85da1d278706ad04a6a7d5d2dd2ad0e046b465242a31921e52e7712875cd582d0c7abccc111ad11be5b344ce1b89e7364fef571e7
-EBUILD virt-viewer-7.0.ebuild 918 BLAKE2B 9e5aa923c51e223fbbf050a79f75e07f0ae306d616b4261dc46fc8ac81c0a574496c3456a6ad63beff7475be868d1993d22b56c340da7d5fc3c25760824b66aa SHA512 8ec6e90b0e7c852d48e76099410ae46ded70c1650a9fcb2c1b358117451b69b91ce0dde0fdb14180d87859ecf6672caebc47f24f6f44c110e177ace13142b9ca
+EBUILD virt-viewer-7.0.ebuild 918 BLAKE2B d46fa7fe7e06ecfef0a979538e934bca9e07c083204d76c739ca9c3e50f12f62340952a26bc535c8a77cb6bda5e880133b450a484cc26f0e881ead531dbd9d8f SHA512 bd4daacb419940d9507058be47318153a07cb762dc5021d07651e4e0bb09a2b3c0ba81a5ad9d54540cad388b0057ba29c6152d4241234236b09f1532ef1083f7
 MISC metadata.xml 452 BLAKE2B cb307dd6593ae8c96ca9c6925783e0b26335f1d1b11c21ccbf7e54003ef2e9e32701304464380afea75a642914e2334c053417aa5e18de5737443b2b60f65d0d SHA512 c97651a4477db1452310d3b53efec56c596963827d1b13385bdbaee5bd8725774b40edc88dc5389b5c0a4ac50f9801de5f649d8f941d315f1e28b6ebf1c9cb79
diff --git a/app-emulation/virt-viewer/virt-viewer-7.0.ebuild b/app-emulation/virt-viewer/virt-viewer-7.0.ebuild
index 1e5a8852a7e0..e6f2db9562db 100644
--- a/app-emulation/virt-viewer/virt-viewer-7.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-7.0.ebuild
@@ -17,7 +17,7 @@ RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
 	app-emulation/libvirt-glib
 	>=dev-libs/libxml2-2.6
 	x11-libs/gtk+:3
-	spice? ( >=net-misc/spice-gtk-0.33[sasl?,gtk3] )
+	spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] )
 	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )"
 DEPEND="${RDEPEND}
 	dev-lang/perl