gentoo resync : 15.12.2019

7 files changed, 10 insertions, 1047 deletions

diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index df3487edf8fc..5800c89b9cfe 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -34,12 +34,8 @@ DIST ganeti-2.15.2.tar.gz 4723007 BLAKE2B d49d2ed9df515514a99d42303799e5ffc751eb
 DIST ganeti-2.15_2.15.2-11.debian.tar.xz 67652 BLAKE2B d10f83a59a1c2d05fa6704dfdc46867f0e3eed276086de9ad2e86def1e7894012b89f3f9c111076c37ef37b857967e4bae5cf769eaabf5907b3a42bc806b4472 SHA512 1c992b9842f1a8492eeaaab8950939c96cc03abf679234211753b92f4753278b086a0a77e2e32b912d4a69635c11e8305d350cda8285734d706cce741d897aa3
 DIST ganeti-2.16.0~rc1.tar.gz 4794934 BLAKE2B 867d7d48e98d4490db8279b83b44006e0afc1a421592d523db2d04b4b04636090686773ef890c89df41f0311cbf3c4d5a2c314c39c4429f50b07a7a6d1a9616f SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be
 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 9757 BLAKE2B caaa94ddb315b7b4ea5f93ce6015521c3e70d835f6aa339ead3a9f1c1da3645e0d603cb6dfa94339822c63bc85c095a88e630c34ba08df2bb6361dba95127c83 SHA512 ae8d599d9338b10e7fdfb22ae8a0c89a76380fee6a03692508294144953e5acc18ba76a9052824e22c09fc00f76a357aca5b0bb4afe5b0bfc25e971fef5f0499
-EBUILD ganeti-2.15.2-r6.ebuild 10209 BLAKE2B 17fe1545ce1866c40f188ec54b86f2cf709cdf6637a4227eaa633ddd00a565cf6b87ee99a152af1e426ce2b1fe4ce2cd765028dc108bb27ddc1e565ab5b14cdf SHA512 446cd91e65c576cb827f2b66f01d7cec1cd9ff57022d664fb2bfbb8b93cb4e02a9d57aacd4ddc2c4d691c3d7b730d751ec3d4c54e26ec2d07869f309f7d931ad
-EBUILD ganeti-2.15.2-r7.ebuild 11657 BLAKE2B c7961e5bf8ea1906e9dff5598f1bbaac496cd8b64d4ebb3f999f75a5d59f60bb6bf597958ddf6579129b1fbba65026cdf9d204fe81c49ef03022ca66f1cf7a1b SHA512 df09969e05a989261487f95af64962f5393714a9ebf33fe3df300e3ca35ee709d2bade6f58c409c8aca1aa158932f1f84881e7131ba5f167b9adccbdfda989aa
-EBUILD ganeti-2.15.2-r8.ebuild 12089 BLAKE2B 1d53ade7cb9f0d6a2c978bbb51a748267c2f3b326adc1af13cd8508dc7e034c5addb8c3acdf654e91fc0dba4d066cd157b51e69f9008a579479363fb8400d39f SHA512 f4bebbc46c0a4bd112af927201c59bf16a1796e33037fe9ed71451caa6ad349bcc3004e761f515799a3ca2bee8a832dcebca97da135d25e091289a00f8e21d35
-EBUILD ganeti-2.16.0_rc1.ebuild 10489 BLAKE2B d048e2ad9a3be59a865f763553c40d15d3c389dc501751769e8d4b320b638c0ef1db9e5a25c034d3f4ca391695bd32e9ed7630bc6aa83a16ec96eef416d7db73 SHA512 d5dc99300beaea18735a8d7987e059603eacd19a57707949f64ca0802edeb99602b5cda6a2570ae21077f39b9ef773ad278b2fd4fdd5b6c9f73db8a485084a30
-EBUILD ganeti-2.17.0_beta1.ebuild 10516 BLAKE2B b7439ef3b177ea60e2d3ebcf517480b582aedb484e895091fab1c9d684e80c6e56dd9050382f377a72b3df6477d1bca66388573fdd534f01d906fbd24806932b SHA512 fbca06fe26098d69c144754b1a81ba5c72631456e8d2033a3fd5b5c33b7a5a0c7d347114e995f6f2a86b20c2747257572b5e1e4b97b7c080dd5cf8cd6cc14052
+EBUILD ganeti-2.15.2-r8.ebuild 12087 BLAKE2B cbb379c5f4c623d29abb52c8d1d6c886c2acc1737846f100e1832293bfd4043feaf7832baf3ff0e1de8d30e32f8b81de16146500f2b20c8ad9131d26a657f85e SHA512 cb6f2e13214938cb249d32545e81fe98c79db597523205950ba94da317863bd96981ff8acfec6afbf41f6bb80820221f9ff5a43ecabb9d7c66564179afb6738d
+EBUILD ganeti-2.16.0_rc1.ebuild 10488 BLAKE2B 73c9dd53f4b4c2450aabf3b89c54c90aadb81b325194b4adfee83b19c63f8a50eeddd61f492ec4e0a4ba88567b30b61f2cd6af51ff7ac5970581279ad51aa755 SHA512 24f0b88d8540f3c0b96e89540c60f80896a4891c29c0e6e2c786046f30a3b6220529b0c212fef89b3a7e9754e0db18ee08a8232696fb6159a3bb4c61cdff1f6b
+EBUILD ganeti-2.17.0_beta1.ebuild 10515 BLAKE2B d528f54fa7cd81c2831b6f20d3aa9a89b8f5398417fe930fbca0bd04e51bf1c57e40a04b65dc3e1d3f6deb8de83a5abbc87c6de0525bc8af8935548c30898e4a SHA512 ac17b3840f87b2e8261579a2075f705c1ceb0bf6ea39758e027d9d1725352ab5f81852db51532ffe9bb55b45c83db36a7f5589aead7adef965eb198d9d0a9490
 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
deleted file mode 100644
index c1a37b6d764d..000000000000
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit user autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
-
-DEBIAN_PATCH=4
-SRC_URI="
-	http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
-	mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
-"
-KEYWORDS="amd64 x86"
-PATCHES=(
-	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
-	"${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
-	"${WORKDIR}"/debian/patches/relax-deps
-	"${WORKDIR}"/debian/patches/zlib-0.6-compatibility
-	"${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
-	"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
-)
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
-
-REQUIRED_USE="|| ( kvm xen lxc )
-	test? ( ipv6 )
-	kvm? ( || ( amd64 x86 ) )
-	${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DEPEND="
-	dev-libs/openssl:0
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/bitarray[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/fdsend[${PYTHON_USEDEP}]
-	|| (
-		net-misc/iputils[arping]
-		net-analyzer/arping
-	)
-	net-analyzer/fping
-	net-misc/bridge-utils
-	net-misc/curl[ssl]
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	sys-fs/lvm2
-	>=sys-apps/baselayout-2.0
-	dev-lang/ghc:0=
-	dev-haskell/cabal:0=
-	dev-haskell/cabal-install:0=
-	>=dev-haskell/mtl-2.1.1:0=
-	>=dev-haskell/old-time-1.1.0.0:0=
-	>=dev-haskell/random-1.0.1.1:0=
-	haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
-	>=dev-haskell/transformers-0.3.0.0:0=
-
-	>=dev-haskell/attoparsec-0.10.1.1:0=
-	<dev-haskell/attoparsec-0.14:0
-	>=dev-haskell/base64-bytestring-1.0.0.1:0=
-	<dev-haskell/base64-bytestring-1.1:0=
-	>=dev-haskell/crypto-4.2.4:0=
-	<dev-haskell/crypto-4.3:0=
-	>=dev-haskell/curl-1.3.7:0=
-	<dev-haskell/curl-1.4:0=
-	>=dev-haskell/hinotify-0.3.2:0=
-	<dev-haskell/hinotify-0.4:0=
-	>=dev-haskell/hslogger-1.1.4:0=
-	<dev-haskell/hslogger-1.3:0=
-	>=dev-haskell/json-0.5:0=
-	>=dev-haskell/lens-3.10:0=
-	>=dev-haskell/lifted-base-0.2.0.3:0=
-	<dev-haskell/lifted-base-0.3:0=
-	>=dev-haskell/monad-control-0.3.1.3:0=
-	<dev-haskell/monad-control-1.1:0=
-	>=dev-haskell/network-2.3.0.13:0=
-	<dev-haskell/network-2.7:0=
-	>=dev-haskell/parallel-3.2.0.2:3=
-	<dev-haskell/parallel-3.3:3=
-	>=dev-haskell/temporary-1.1.2.3:0=
-	<dev-haskell/temporary-1.3:0=
-	>=dev-haskell/regex-pcre-0.94.2:0=
-	<dev-haskell/regex-pcre-0.95:0=
-	>=dev-haskell/transformers-base-0.4.1:0=
-	<dev-haskell/transformers-base-0.5:0=
-	>=dev-haskell/utf8-string-0.3.7:0=
-	>=dev-haskell/zlib-0.5.3.3:0=
-	<dev-haskell/zlib-0.7:0=
-
-	>=dev-haskell/psqueue-1.1:0=
-	<dev-haskell/psqueue-1.2:0=
-	>=dev-haskell/snap-core-0.8.1:0=
-	<dev-haskell/snap-core-0.10:0=
-	>=dev-haskell/snap-server-0.8.1:0=
-	<dev-haskell/snap-server-0.10:0=
-	>=dev-haskell/case-insensitive-0.4.0.1
-
-	dev-haskell/vector:0=
-	xen? ( >=app-emulation/xen-3.0 )
-	kvm? (
-		dev-python/psutil
-		app-emulation/qemu
-	)
-	lxc? ( app-emulation/lxc )
-	drbd? ( sys-cluster/drbd-utils )
-	rbd? ( sys-cluster/ceph )
-	ipv6? ( net-misc/ndisc6 )
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	!app-emulation/ganeti-htools"
-DEPEND+="
-	sys-devel/m4
-	app-text/pandoc
-	<=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
-	media-fonts/urw-fonts
-	media-gfx/graphviz
-	>=dev-haskell/test-framework-0.6:0=
-	<dev-haskell/test-framework-0.9:0=
-	>=dev-haskell/test-framework-hunit-0.2.7:0=
-	<dev-haskell/test-framework-hunit-0.4:0=
-	>=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
-	<dev-haskell/test-framework-quickcheck2-0.4:0=
-	test? (
-		dev-python/mock
-		dev-python/pyyaml
-		dev-haskell/haddock:0=
-		>=dev-haskell/hunit-1.2.4.2:0=
-		<dev-haskell/hunit-1.3:0=
-		>=dev-haskell/quickcheck-2.4.2:2=
-		<dev-haskell/quickcheck-2.8.3:2=
-		sys-apps/fakeroot
-		>=net-misc/socat-1.7
-		dev-util/shelltestrunner
-	)"
-
-PATCHES+=(
-	"${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
-	"${FILESDIR}/${PN}-2.11-add-pgrep.patch"
-	"${FILESDIR}/${PN}-2.15-daemon-util.patch"
-	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
-	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
-	"${FILESDIR}/${PN}-2.10-rundir.patch"
-	"${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
-	"${FILESDIR}/${PN}-2.11-tests.patch"
-	"${FILESDIR}/${PN}-lockdir.patch"
-	"${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
-	"${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
-	"${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
-	"${FILESDIR}/${PN}-2.13-process_unittest.patch"
-	"${FILESDIR}/${PN}-2.15-python-mock.patch"
-	"${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
-	"${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
-	"${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
-	"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
-	usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
-	usr/lib*/${PN}/${SERIES}/usr/bin/htools
-"
-
-pkg_setup () {
-	local user
-	python-single-r1_pkg_setup
-
-	if use multiple-users; then
-		for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
-			enewgroup ${user}
-			enewuser ${user} -1 -1 -1 ${user}
-		done
-	fi
-}
-
-src_prepare() {
-	local testfile
-	if has_version '>=dev-lang/ghc-7.10'; then
-		# Breaks the build on 7.8
-		PATCHES+=(
-			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
-		)
-	fi
-	eapply "${PATCHES[@]}"
-	# Upstream commits:
-	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
-	# 24618882737fd7c189adf99f4acc767d48f572c3
-	sed -i \
-		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
-		cabal/ganeti.template.cabal
-	# Neuter -Werror
-	sed -i \
-		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
-		Makefile.am
-
-	# not sure why these tests are failing
-	# should remove this on next version bump if possible
-	for testfile in test/py/import-export_unittest.bash; do
-		printf '#!/bin/bash\ntrue\n' > "${testfile}"
-	done
-
-	# take the sledgehammer approach to bug #526270
-	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
-	eapply_user
-
-	[[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
-	rm autotools/missing
-	eautoreconf
-}
-
-src_configure () {
-	# this is kind of a hack to work around the removal of the qemu-kvm wrapper
-	local kvm_arch
-
-	if use amd64; then
-		kvm_arch=x86_64
-	elif use x86; then
-		kvm_arch=i386
-	elif use kvm; then
-		die "Could not determine qemu system to use for kvm"
-	fi
-
-	econf --localstatedir=/var \
-		--sharedstatedir=/var \
-		--disable-symlinks \
-		--with-ssh-initscript=/etc/init.d/sshd \
-		--with-export-dir=/var/lib/ganeti-storage/export \
-		--with-os-search-path=/usr/share/${PN}/os \
-		$(use_enable restricted-commands) \
-		$(use_enable test haskell-tests) \
-		$(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
-		$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
-		$(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
-		$(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
-		$(use_enable syslog) \
-		$(use_enable monitoring) \
-		$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
-		$(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
-		--with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
-		--enable-socat-escape \
-		--enable-socat-compress
-}
-
-src_install () {
-	emake V=1 DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
-	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
-	if use kvm; then
-		newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
-		newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
-	fi
-
-	# ganeti installs it's own docs in a generic location
-	rm -rf "${D}"/{usr/share/doc/${PN},run}
-
-	sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
-	newbashcomp doc/examples/bash_completion gnt-instance
-	bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
-		h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
-		gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
-	use monitoring && bashcomp_alias gnt-instance mon-collector
-
-	dodoc INSTALL UPGRADE NEWS README doc/*.rst
-
-	docinto html
-	dodoc -r doc/html/* doc/css/*.css
-
-	docinto examples
-	dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
-	docinto examples/hooks
-	dodoc doc/examples/hooks/{ipsec,ethers}
-
-	insinto /etc/cron.d
-	newins doc/examples/ganeti.cron ${PN}
-
-	insinto /etc/logrotate.d
-	newins doc/examples/ganeti.logrotate ${PN}
-
-	# need to dodir rather than keepdir here (bug #552482)
-	dodir /var/lib/${PN}
-
-	keepdir /var/log/${PN}/
-	keepdir /usr/share/${PN}/${SERIES}/os/
-	keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
-	dosym ${SERIES} "/usr/share/${PN}/default"
-	dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
-	python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-}
-
-pkg_postinst() {
-	if use multiple-users; then
-		elog "You have enable multiple user support, the users for this must"
-		elog "be created. You can use the provided tool for this, which is"
-		elog "located at:"
-		elog "    /usr/$(get_libdir)/${PN}/tools/users-setup"
-	fi
-}
-
-src_test () {
-	PATH="${S}/scripts:${S}/src:${PATH}" \
-		TMPDIR="/tmp" \
-		GANETI_MASTER="$(hostname -f)" \
-		emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
deleted file mode 100644
index 646ff4ff3a53..000000000000
--- a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit user autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
-
-DEBIAN_PATCH=4
-SRC_URI="
-	http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
-	mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
-"
-KEYWORDS="~amd64 ~x86"
-PATCHES=(
-	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
-	"${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
-	"${WORKDIR}"/debian/patches/relax-deps
-	"${WORKDIR}"/debian/patches/zlib-0.6-compatibility
-	"${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
-	"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
-)
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
-
-REQUIRED_USE="|| ( kvm xen lxc )
-	test? ( ipv6 )
-	kvm? ( || ( amd64 x86 ) )
-	${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DEPEND="
-	dev-libs/openssl:0
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/bitarray[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/fdsend[${PYTHON_USEDEP}]
-	|| (
-		net-misc/iputils[arping]
-		net-analyzer/arping
-	)
-	net-analyzer/fping
-	net-misc/bridge-utils
-	net-misc/curl[ssl]
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	sys-fs/lvm2
-	>=sys-apps/baselayout-2.0
-	dev-lang/ghc:0=
-	dev-haskell/cabal:0=
-	dev-haskell/cabal-install:0=
-	>=dev-haskell/mtl-2.1.1:0=
-	>=dev-haskell/old-time-1.1.0.0:0=
-	>=dev-haskell/random-1.0.1.1:0=
-	haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
-	>=dev-haskell/transformers-0.3.0.0:0=
-
-	>=dev-haskell/attoparsec-0.10.1.1:0=
-	<dev-haskell/attoparsec-0.14:0
-	>=dev-haskell/base64-bytestring-1.0.0.1:0=
-	<dev-haskell/base64-bytestring-1.1:0=
-	>=dev-haskell/crypto-4.2.4:0=
-	<dev-haskell/crypto-4.3:0=
-	>=dev-haskell/curl-1.3.7:0=
-	<dev-haskell/curl-1.4:0=
-	>=dev-haskell/hinotify-0.3.2:0=
-	<dev-haskell/hinotify-0.4:0=
-	>=dev-haskell/hslogger-1.1.4:0=
-	<dev-haskell/hslogger-1.3:0=
-	>=dev-haskell/json-0.5:0=
-	>=dev-haskell/lens-3.10:0=
-	>=dev-haskell/lifted-base-0.2.0.3:0=
-	<dev-haskell/lifted-base-0.3:0=
-	>=dev-haskell/monad-control-0.3.1.3:0=
-	<dev-haskell/monad-control-1.1:0=
-	>=dev-haskell/network-2.3.0.13:0=
-	<dev-haskell/network-2.7:0=
-	>=dev-haskell/parallel-3.2.0.2:3=
-	<dev-haskell/parallel-3.3:3=
-	>=dev-haskell/temporary-1.1.2.3:0=
-	<dev-haskell/temporary-1.3:0=
-	>=dev-haskell/regex-pcre-0.94.2:0=
-	<dev-haskell/regex-pcre-0.95:0=
-	>=dev-haskell/transformers-base-0.4.1:0=
-	<dev-haskell/transformers-base-0.5:0=
-	>=dev-haskell/utf8-string-0.3.7:0=
-	>=dev-haskell/zlib-0.5.3.3:0=
-	<dev-haskell/zlib-0.7:0=
-
-	>=dev-haskell/psqueue-1.1:0=
-	<dev-haskell/psqueue-1.2:0=
-	>=dev-haskell/snap-core-0.8.1:0=
-	<dev-haskell/snap-core-0.10:0=
-	>=dev-haskell/snap-server-0.8.1:0=
-	<dev-haskell/snap-server-0.10:0=
-	>=dev-haskell/case-insensitive-0.4.0.1
-
-	dev-haskell/vector:0=
-	xen? ( >=app-emulation/xen-3.0 )
-	kvm? (
-		dev-python/psutil
-		app-emulation/qemu
-	)
-	lxc? ( app-emulation/lxc )
-	drbd? ( sys-cluster/drbd-utils )
-	rbd? ( sys-cluster/ceph )
-	ipv6? ( net-misc/ndisc6 )
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	!app-emulation/ganeti-htools"
-DEPEND+="
-	sys-devel/m4
-	app-text/pandoc
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	media-fonts/urw-fonts
-	media-gfx/graphviz
-	>=dev-haskell/test-framework-0.6:0=
-	<dev-haskell/test-framework-0.9:0=
-	>=dev-haskell/test-framework-hunit-0.2.7:0=
-	<dev-haskell/test-framework-hunit-0.4:0=
-	>=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
-	<dev-haskell/test-framework-quickcheck2-0.4:0=
-	test? (
-		dev-python/mock
-		dev-python/pyyaml
-		dev-haskell/haddock:0=
-		>=dev-haskell/hunit-1.2.4.2:0=
-		<dev-haskell/hunit-1.3:0=
-		>=dev-haskell/quickcheck-2.4.2:2=
-		<dev-haskell/quickcheck-2.8.3:2=
-		sys-apps/fakeroot
-		>=net-misc/socat-1.7
-		dev-util/shelltestrunner
-	)"
-
-PATCHES+=(
-	"${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
-	"${FILESDIR}/${PN}-2.11-add-pgrep.patch"
-	"${FILESDIR}/${PN}-2.15-daemon-util.patch"
-	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
-	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
-	"${FILESDIR}/${PN}-2.10-rundir.patch"
-	"${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
-	"${FILESDIR}/${PN}-2.11-tests.patch"
-	"${FILESDIR}/${PN}-lockdir.patch"
-	"${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
-	"${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
-	"${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
-	"${FILESDIR}/${PN}-2.13-process_unittest.patch"
-	"${FILESDIR}/${PN}-2.15-python-mock.patch"
-	"${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
-	"${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
-	"${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
-	"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
-	"${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
-	usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
-	usr/lib*/${PN}/${SERIES}/usr/bin/htools
-"
-
-pkg_setup () {
-	local user
-	python-single-r1_pkg_setup
-
-	if use multiple-users; then
-		for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
-			enewgroup ${user}
-			enewuser ${user} -1 -1 -1 ${user}
-		done
-	fi
-}
-
-src_prepare() {
-	local testfile
-	if has_version '>=dev-lang/ghc-7.10'; then
-		# Breaks the build on 7.8
-		PATCHES+=(
-			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
-		)
-	fi
-	if use experimental; then
-		ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
-		PATCHES+=(
-			# QEMU Agent accepted upstream for 2.16, not yet in a tagged release
-			# backport available for 2.15, but refused upstream due to RPC breakage.
-			"${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
-		)
-	fi
-	eapply "${PATCHES[@]}"
-	# Upstream commits:
-	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
-	# 24618882737fd7c189adf99f4acc767d48f572c3
-	sed -i \
-		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
-		cabal/ganeti.template.cabal
-	# Neuter -Werror
-	sed -i \
-		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
-		Makefile.am
-
-	# not sure why these tests are failing
-	# should remove this on next version bump if possible
-	for testfile in test/py/import-export_unittest.bash; do
-		printf '#!/bin/bash\ntrue\n' > "${testfile}"
-	done
-
-	# take the sledgehammer approach to bug #526270
-	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
-	eapply_user
-
-	[[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
-	rm autotools/missing
-	eautoreconf
-}
-
-src_configure () {
-	# this is kind of a hack to work around the removal of the qemu-kvm wrapper
-	local kvm_arch
-
-	if use amd64; then
-		kvm_arch=x86_64
-	elif use x86; then
-		kvm_arch=i386
-	elif use kvm; then
-		die "Could not determine qemu system to use for kvm"
-	fi
-
-	econf --localstatedir=/var \
-		--sharedstatedir=/var \
-		--disable-symlinks \
-		--with-ssh-initscript=/etc/init.d/sshd \
-		--with-export-dir=/var/lib/ganeti-storage/export \
-		--with-os-search-path=/usr/share/${PN}/os \
-		$(use_enable restricted-commands) \
-		$(use_enable test haskell-tests) \
-		$(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
-		$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
-		$(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
-		$(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
-		$(use_enable syslog) \
-		$(use_enable monitoring) \
-		$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
-		$(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
-		--with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
-		--enable-socat-escape \
-		--enable-socat-compress
-}
-
-src_install () {
-	emake V=1 DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
-	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
-	if use kvm; then
-		newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
-		newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
-	fi
-
-	# ganeti installs it's own docs in a generic location
-	rm -rf "${D}"/{usr/share/doc/${PN},run}
-
-	sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
-	newbashcomp doc/examples/bash_completion gnt-instance
-	bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
-		h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
-		gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
-	use monitoring && bashcomp_alias gnt-instance mon-collector
-
-	dodoc INSTALL UPGRADE NEWS README doc/*.rst
-
-	docinto html
-	dodoc -r doc/html/* doc/css/*.css
-
-	docinto examples
-	dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
-	docinto examples/hooks
-	dodoc doc/examples/hooks/{ipsec,ethers}
-
-	insinto /etc/cron.d
-	newins doc/examples/ganeti.cron ${PN}
-
-	insinto /etc/logrotate.d
-	newins doc/examples/ganeti.logrotate ${PN}
-
-	# need to dodir rather than keepdir here (bug #552482)
-	dodir /var/lib/${PN}
-
-	keepdir /var/log/${PN}/
-	keepdir /usr/share/${PN}/${SERIES}/os/
-	keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
-	dosym ${SERIES} "/usr/share/${PN}/default"
-	dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
-	python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-}
-
-pkg_postinst() {
-	if use multiple-users; then
-		elog "You have enable multiple user support, the users for this must"
-		elog "be created. You can use the provided tool for this, which is"
-		elog "located at:"
-		elog "    /usr/$(get_libdir)/${PN}/tools/users-setup"
-	fi
-}
-
-src_test () {
-	PATH="${S}/scripts:${S}/src:${PATH}" \
-		TMPDIR="/tmp" \
-		GANETI_MASTER="$(hostname -f)" \
-		emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r7.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r7.ebuild
deleted file mode 100644
index 22e58cde08e7..000000000000
--- a/app-emulation/ganeti/ganeti-2.15.2-r7.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit user autotools bash-completion-r1 python-single-r1
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(ver_cut 1-2)"
-
-DEBIAN_PATCH=11
-SRC_URI="
-	http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
-	mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
-"
-KEYWORDS="~amd64 ~x86"
-PATCHES=(
-	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
-	"${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
-	"${WORKDIR}"/debian/patches/relax-deps
-	"${WORKDIR}"/debian/patches/zlib-0.6-compatibility
-	"${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
-	"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
-	"${WORKDIR}"/debian/patches/use-proper-cabal-dev.patch
-	"${WORKDIR}"/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch
-	"${WORKDIR}"/debian/patches/0001-GHC-8-support.patch
-	"${WORKDIR}"/debian/patches/ghc8-fixes
-	"${WORKDIR}"/debian/patches/snap-server-1.0-compat
-	"${WORKDIR}"/debian/patches/non-DSA-SSH-key-support.patch
-	"${WORKDIR}"/debian/patches/fix-ssh-key-renewal-on-single-node-clusters.patch
-	"${WORKDIR}"/debian/patches/set-defaults-for-ssh-type-bits.patch
-	"${WORKDIR}"/debian/patches/use-hv-class-to-check-for-migration.patch
-	"${WORKDIR}"/debian/patches/do-not-specify-socat-ssl-method.patch
-	"${WORKDIR}"/debian/patches/fix-ftbfs-with-sphinx-1.5.patch
-	"${WORKDIR}"/debian/patches/fix-failover-from-dead-node.patch
-	"${WORKDIR}"/debian/patches/fix-cpu-affinity.patch
-	"${WORKDIR}"/debian/patches/fix-fcntl-i386.patch
-	"${WORKDIR}"/debian/patches/fix-ovf-test-path.patch
-	"${WORKDIR}"/debian/patches/fix-qa-ssconf-race.patch
-	"${WORKDIR}"/debian/patches/relax-sphinx-version-check.patch
-	#"${WORKDIR}"/debian/patches/THH-2.12.patch
-	"${WORKDIR}"/debian/patches/sphinx-1.7.patch
-	"${WORKDIR}"/debian/patches/ca-use-sha256-md.patch
-	"${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat.patch
-	"${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat-2.patch
-)
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
-
-REQUIRED_USE="|| ( kvm xen lxc )
-	test? ( ipv6 )
-	kvm? ( || ( amd64 x86 ) )
-	${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DEPEND="
-	dev-libs/openssl:0
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/bitarray[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/fdsend[${PYTHON_USEDEP}]
-	|| (
-		net-misc/iputils[arping]
-		net-analyzer/arping
-	)
-	net-analyzer/fping
-	net-misc/bridge-utils
-	net-misc/curl[ssl]
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	>=sys-fs/lvm2-2.02.181
-	>=sys-apps/baselayout-2.0
-	>=dev-lang/ghc-8.0:0=
-	<dev-lang/ghc-8.1:0=
-	dev-haskell/cabal:0=
-	dev-haskell/cabal-install:0=
-	!<app-emulation/ganeti-instance-image-0.6-r1
-	>=dev-haskell/mtl-2.1.1:0=
-	>=dev-haskell/old-time-1.1.0.0:0=
-	>=dev-haskell/random-1.0.1.1:0=
-	haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
-	>=dev-haskell/transformers-0.3.0.0:0=
-
-	>=dev-haskell/attoparsec-0.10.1.1:0=
-	<dev-haskell/attoparsec-0.14:0
-	>=dev-haskell/base64-bytestring-1.0.0.1:0=
-	<dev-haskell/base64-bytestring-1.1:0=
-	>=dev-haskell/crypto-4.2.4:0=
-	<dev-haskell/crypto-4.3:0=
-	>=dev-haskell/curl-1.3.7:0=
-	<dev-haskell/curl-1.4:0=
-	>=dev-haskell/hinotify-0.3.2:0=
-	<dev-haskell/hinotify-0.4:0=
-	>=dev-haskell/hslogger-1.1.4:0=
-	<dev-haskell/hslogger-1.3:0=
-	>=dev-haskell/json-0.5:0=
-	>=dev-haskell/lens-3.10:0=
-	>=dev-haskell/lifted-base-0.2.0.3:0=
-	<dev-haskell/lifted-base-0.3:0=
-	>=dev-haskell/monad-control-1.0.1.0:0=
-	<dev-haskell/monad-control-1.0.2:0=
-	>=dev-haskell/network-2.3.0.13:0=
-	<dev-haskell/network-2.7:0=
-	>=dev-haskell/parallel-3.2.0.2:3=
-	<dev-haskell/parallel-3.3:3=
-	>=dev-haskell/temporary-1.1.2.3:0=
-	<dev-haskell/temporary-1.3:0=
-	>=dev-haskell/regex-pcre-0.94.2:0=
-	<dev-haskell/regex-pcre-0.95:0=
-	>=dev-haskell/transformers-base-0.4:0=
-	<dev-haskell/transformers-base-0.5:0=
-	>=dev-haskell/utf8-string-0.3.7:0=
-	>=dev-haskell/zlib-0.5.3.3:0=
-	<dev-haskell/zlib-0.7:0=
-
-	>=dev-haskell/psqueue-1.1:0=
-	<dev-haskell/psqueue-1.2:0=
-	>=dev-haskell/snap-core-1.0.1:0=
-	<dev-haskell/snap-core-1.1:0=
-	>=dev-haskell/snap-server-1.0.1:0=
-	<dev-haskell/snap-server-1.1:0=
-	>=dev-haskell/case-insensitive-0.4.0.1
-
-	dev-haskell/vector:0=
-	xen? ( >=app-emulation/xen-3.0 )
-	kvm? (
-		dev-python/psutil
-		app-emulation/qemu
-	)
-	lxc? ( app-emulation/lxc )
-	drbd? ( sys-cluster/drbd-utils )
-	rbd? ( sys-cluster/ceph )
-	ipv6? ( net-misc/ndisc6 )
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	!app-emulation/ganeti-htools"
-DEPEND+="
-	sys-devel/m4
-	app-text/pandoc
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	media-fonts/urw-fonts
-	media-gfx/graphviz
-	>=dev-haskell/test-framework-0.6:0=
-	<dev-haskell/test-framework-0.9:0=
-	>=dev-haskell/test-framework-hunit-0.2.7:0=
-	<dev-haskell/test-framework-hunit-0.4:0=
-	>=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
-	<dev-haskell/test-framework-quickcheck2-0.4:0=
-	test? (
-		dev-python/mock
-		dev-python/pyyaml
-		dev-haskell/haddock:0=
-		>=dev-haskell/hunit-1.2.4.2:0=
-		<dev-haskell/hunit-1.3:0=
-		>=dev-haskell/quickcheck-2.4.2:2=
-		<dev-haskell/quickcheck-2.8.3:2=
-		sys-apps/fakeroot
-		>=net-misc/socat-1.7
-		dev-util/shelltestrunner
-	)"
-
-PATCHES+=(
-	"${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
-	"${FILESDIR}/${PN}-2.11-add-pgrep.patch"
-	"${FILESDIR}/${PN}-2.15-daemon-util.patch"
-	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
-	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
-	"${FILESDIR}/${PN}-2.10-rundir.patch"
-	"${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
-	"${FILESDIR}/${PN}-2.11-tests.patch"
-	"${FILESDIR}/${PN}-lockdir.patch"
-	"${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
-	"${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
-	"${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
-	"${FILESDIR}/${PN}-2.13-process_unittest.patch"
-	"${FILESDIR}/${PN}-2.15-python-mock.patch"
-	"${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
-	"${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
-	"${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
-	"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
-	"${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
-	"${FILESDIR}/ganeti-2.15.2-bdev_py.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
-	usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
-	usr/lib*/${PN}/${SERIES}/usr/bin/htools
-"
-
-pkg_setup () {
-	local user
-	python-single-r1_pkg_setup
-
-	if use multiple-users; then
-		for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
-			enewgroup ${user}
-			enewuser ${user} -1 -1 -1 ${user}
-		done
-	fi
-}
-
-src_prepare() {
-	local testfile
-	if has_version '>=dev-lang/ghc-7.10'; then
-		# Breaks the build on 7.8
-		PATCHES+=(
-			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
-		)
-	fi
-	if use experimental; then
-		ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
-		PATCHES+=(
-			# QEMU Agent accepted upstream for 2.16, not yet in a tagged release
-			# backport available for 2.15, but refused upstream due to RPC breakage.
-			"${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
-		)
-	fi
-	eapply "${PATCHES[@]}"
-	# Upstream commits:
-	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
-	# 24618882737fd7c189adf99f4acc767d48f572c3
-	sed -i \
-		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
-		cabal/ganeti.template.cabal
-	# Neuter -Werror
-	sed -i \
-		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
-		Makefile.am
-
-	# not sure why these tests are failing
-	# should remove this on next version bump if possible
-	for testfile in test/py/import-export_unittest.bash; do
-		printf '#!/bin/bash\ntrue\n' > "${testfile}"
-	done
-
-	# take the sledgehammer approach to bug #526270
-	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
-	eapply_user
-
-	[[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
-	rm autotools/missing
-	eautoreconf
-}
-
-src_configure () {
-	# this is kind of a hack to work around the removal of the qemu-kvm wrapper
-	local kvm_arch
-
-	if use amd64; then
-		kvm_arch=x86_64
-	elif use x86; then
-		kvm_arch=i386
-	elif use kvm; then
-		die "Could not determine qemu system to use for kvm"
-	fi
-
-	econf --localstatedir=/var \
-		--sharedstatedir=/var \
-		--disable-symlinks \
-		--with-ssh-initscript=/etc/init.d/sshd \
-		--with-export-dir=/var/lib/ganeti-storage/export \
-		--with-os-search-path=/usr/share/${PN}/os \
-		$(use_enable restricted-commands) \
-		$(use_enable test haskell-tests) \
-		$(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
-		$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
-		$(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
-		$(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
-		$(use_enable syslog) \
-		$(use_enable monitoring) \
-		$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
-		$(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
-		--with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
-		--enable-socat-escape \
-		--enable-socat-compress
-}
-
-src_install () {
-	emake V=1 DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
-	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
-	if use kvm; then
-		newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
-		newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
-	fi
-
-	# ganeti installs it's own docs in a generic location
-	rm -rf "${D}"/{usr/share/doc/${PN},run}
-
-	sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
-	newbashcomp doc/examples/bash_completion gnt-instance
-	bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
-		h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
-		gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
-	use monitoring && bashcomp_alias gnt-instance mon-collector
-
-	dodoc INSTALL UPGRADE NEWS README doc/*.rst
-
-	docinto html
-	dodoc -r doc/html/* doc/css/*.css
-
-	docinto examples
-	dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
-	docinto examples/hooks
-	dodoc doc/examples/hooks/{ipsec,ethers}
-
-	insinto /etc/cron.d
-	newins doc/examples/ganeti.cron ${PN}
-
-	insinto /etc/logrotate.d
-	newins doc/examples/ganeti.logrotate ${PN}
-
-	# need to dodir rather than keepdir here (bug #552482)
-	dodir /var/lib/${PN}
-
-	keepdir /var/log/${PN}/
-	keepdir /usr/share/${PN}/${SERIES}/os/
-	keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
-	dosym ${SERIES} "/usr/share/${PN}/default"
-	dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
-	python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-}
-
-pkg_postinst() {
-	if use multiple-users; then
-		elog "You have enable multiple user support, the users for this must"
-		elog "be created. You can use the provided tool for this, which is"
-		elog "located at:"
-		elog "    /usr/$(get_libdir)/${PN}/tools/users-setup"
-	fi
-}
-
-src_test () {
-	PATH="${S}/scripts:${S}/src:${PATH}" \
-		TMPDIR="/tmp" \
-		GANETI_MASTER="$(hostname -f)" \
-		emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
index 579f39cb3711..6e00659d3fde 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 	http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
 	mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
 "
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 PATCHES=(
 	"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
 	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
@@ -56,6 +56,7 @@ HOMEPAGE="http://www.ganeti.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="|| ( kvm xen lxc )
 	test? ( ipv6 )
@@ -374,5 +375,5 @@ src_test () {
 	PATH="${S}/scripts:${S}/src:${PATH}" \
 		TMPDIR="/tmp" \
 		GANETI_MASTER="$(hostname -f)" \
-		emake check || die "emake check failed"
+		emake check
 }
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index 7902fba92c36..bd24dd3fff74 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -41,6 +41,7 @@ HOMEPAGE="http://www.ganeti.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="|| ( kvm xen lxc )
 	test? ( ipv6 )
@@ -345,5 +346,5 @@ src_test () {
 	PATH="${S}/scripts:${S}/src:${PATH}" \
 		TMPDIR="/tmp" \
 		GANETI_MASTER="$(hostname -f)" \
-		emake check || die "emake check failed"
+		emake check
 }
diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
index 053c5aff28a1..d4baca0d24bf 100644
--- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@@ -41,6 +41,7 @@ HOMEPAGE="http://www.ganeti.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="|| ( kvm xen lxc )
 	test? ( ipv6 )
@@ -345,5 +346,5 @@ src_test () {
 	PATH="${S}/scripts:${S}/src:${PATH}" \
 		TMPDIR="/tmp" \
 		GANETI_MASTER="$(hostname -f)" \
-		emake check || die "emake check failed"
+		emake check
 }