gentoo resync : 10.02.2019

5 files changed, 492 insertions, 2 deletions

diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 9b35fafaa360..805e05703320 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -16,6 +16,7 @@ AUX ganeti-2.15-kvmd-run-as-daemon-user.patch 1267 BLAKE2B ec993c7eefca32eea4515
 AUX ganeti-2.15-noded-must-run-as-root.patch 1652 BLAKE2B ed019d793ede24eef2edf3e525bd1c859edfd71cb814b75b84565547e63df64bd21999f4c9a181209b98539b5c6c3aaad92a93b8ad10ace103480795a95758db SHA512 6c055cd56088762e143fdcc1903943f2bcd565b46d9669b8905128b9885db27819f65d0c80dfd2ff05776bb8e38f23fc055597343e5a7eeb41821653e08a0f3a
 AUX ganeti-2.15-python-mock.patch 869 BLAKE2B 0be8ccb3c193cb363a71175022f2c31554acd0383f1cf1ec2494aaf92c077a4d557ac1d9cb0e38b0368ae4a141e57552ff0260748698bbd763a055ee19e55c00 SHA512 7b375daba2ff0ebe866ff0640d4a96d3fc1257d581404781bb7b103f6d1c79ce35aa8fd4abc40d664763f5ea51881abe441630ec6337aaad0c1db7b8c683034b
 AUX ganeti-2.15-respect-HFLAGS.patch 332 BLAKE2B 360b7473870d9e803aa958f58ddad8e5de1e5c33f6d669014ebd71fc9e3b96608987ea3e7357e26782a3b9fcd62fb7b84b9024e8c68c1db0067fc92c8dc45c6a SHA512 f9d223a072ca7c842ca688b9d7ab6ab2d514647c9346d01fed4f8c5e1111e1531a0a16cfa2f6b1600a8e72cba06abc7d81f0789f1c68c48991c260b8d6a88f94
+AUX ganeti-2.15-use-balloon-device.patch 711 BLAKE2B 23eb3434a0a24905fb3fdc49e129bdb6d044f2ee0b72bc9ec1994e355fa4df662b04194c20829f9afbdd93635bfd34c8c0a3a6bd32d64052a875dfd38bfb48f6 SHA512 e3f90d71dc595de554ead6ec21a79404b6a1098f3157fb3c6bcb95e8f27044c78451531e5e38ffc04b19e26ccd89ff14672d35b6a5e61c180e43fe95425d0794
 AUX ganeti-2.15.2-bdev_py.patch 601 BLAKE2B 95ee87cf14344a5fdb224e8972ac64431beed8b7d90d08e615d4012d11d23c6df55a8c6bde1d217e86b926bd5d2a939ccabb81a0ed9080b8e9e2b110d4b783fa SHA512 b8c4ab1d67c8b1a0ef4b9581776b5f70178f501d476c3b1a3891a7d4633fd0146b2ac3f95e2a19584e7cc3422c67ef1169a65a57498ccd5d5c18b5196060201f
 AUX ganeti-2.15.2-remove-sandbox-failing-tests.patch 2641 BLAKE2B ecf41445e52160a754fb9a433fad59141ae0058ed5a86d9cd0981b7ee952015528b85467b77226d70f4cd1847dbc813efbd8198e6424b1405835ea256e983448 SHA512 51e8f10a8a20100dbe290023d3cfd9d585052f441d79daeb18188940977f19401ffe46924df88118b662a26b2423ca119968e8de9c8664cde531b9d7ea23af93
 AUX ganeti-2.16-kvmd-run-as-daemon-user.patch 1257 BLAKE2B 43766f2cf5fd18ca23ed4072258a3973c343dd92fbfcba51e62b3a7533b720092042a8bbc2f371cfab515085c54d349eecbd13f044cd18e3ee99c3869e848333 SHA512 c913ea0ba2af8d73342f105990234b4cfe4060a41cee1530d3dfe828a3e048d5c7cb473de22094330ab3efe9d2ade64bc15d98585a56d1d0f10e0b13b95485a5
@@ -27,7 +28,8 @@ AUX ganeti-kvm-poweroff.confd 186 BLAKE2B 3f82aea50562d181f2f84616a6d1c5f7bf59a7
 AUX ganeti-kvm-poweroff.initd 1502 BLAKE2B baeef3110b3e16e7aba443b4e1cb0b15869492c5f4e779199ac4c12ef0ceabfd4fa1fa2d84b2d8e009bf3e22dbec06e7350c1ee0185fc53e02baebf73eb6d571 SHA512 ae2e9f9342bbbe7ae3f1ce5f1a2b44943e6cee7371de12bef36522acc180430af8f9eef37a0f3fdd2fdfd8ec959ca1691571e654cc4c9017e7b3fd2fa777f4f6
 AUX ganeti-lockdir.patch 468 BLAKE2B b3684c79376ab468b4162de9104291c89f73cf69fed9fb452ee9a0073de69c49458d115694b9bcc53d308751a3c4a6a84bda07b93a2431f357df238061f514b4 SHA512 1581e4e60dcd2f615a7c6366550dd367b1aba8e422e70db17cb02fb1ed109827d4e8ef9898f417680c4377235cf8dd4770fab21895ca26f3f490ea54f1c0e3f6
 AUX ganeti.confd-r2 422 BLAKE2B 384e4e479fcf3fe57c45c18cf16bfca84f03eda2e7a60e5512dbb5122a33c300469c3315cd41b621e86e850ed3bcb49822de93b35f40a156f7e7e38aef228619 SHA512 4ac93d7c252c3b4dbba4146e991fdb49f4cf832cc96c48425748d279c459c5e4a8a8e1bdbc719027a7bd751896b469b996ed324bc180c9c674030eeb0b7a0d9a
-AUX ganeti.initd-r3 2602 BLAKE2B 4a8ebd292cfd922aed63c7db739cbcc51924c85b3074afd5adab32376a1ce5ba5f4954ea2d299aaff5af009fc0fa6344c04de7f7cb1a45b5ff5f804cfd207017 SHA512 e4dd9cfe5ee41b70ecb45786991e22e3d1dac92c1ee14a9020fc4c62b94ae6f0a2a79c20e685e880b5d83c959cc759a3500f3f78b5f57c1ae3c6261b57c16928
+AUX ganeti.initd-r3 2599 BLAKE2B 4f6d4d8f72022fe56590491818fb884fd58d7fef59e021cb06433a15f346f7716b52f4a6fe109176a9d8bd21c7819a85f7ddf1aa9ce25f161602c54df2f30239 SHA512 d52b1d0e726fd24427aa6b6b764d62597220fa9b353d2281e3cbac0d9b6df500fd9d586715e0c8bd81462755276c68aa405434a6fe1bba605fc456e152387e14
+AUX ganeti.initd-r4 2604 BLAKE2B 5a7eb8946c5240e72358d7c99c430dad7217de03518678dd87ea0f4e9db4a360a6e05f088443106d6c48a353e930a7f276b3b0b5d8ac3624d22b06410145a20e SHA512 d929f0a7b2d6db2e4129a3bc1e78c4753a4dd621549c3343af663b90c15fd779b9d2c998758b3990f17aaf760430b32e3ca34fa6969b7fd536e02662b0084265
 DIST ganeti-2.15.2.tar.gz 4723007 BLAKE2B d49d2ed9df515514a99d42303799e5ffc751eb8e6b397f86174cb3d48ec846fd3d146737240eea9ec0ce6fd9d07e04a27831a45a4354d3d49597b9f5cff33d7b SHA512 e0707aa535857779622e0eb18cccb89bc34fe4acf373628c30524e3f7e572c4b3d628946ad219149c14615d6471c4d72dbd0c6e3e1855a9f3644b4605544df85
 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
@@ -37,6 +39,7 @@ DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4
 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 12090 BLAKE2B 89fb227d99927247747a5a2fa95606a7df4a1a81f04c75aa1e94622de076b1e5b8f3f105552bd69b2967dd64c4fecb25353b53445fbf5fb7e6b69709c94add58 SHA512 15e40b4713b3cd55617f668b090eb891d094954c5cc41deb94fb46df94826c738564cdf6c4008a6a6bf2f76d47645aca07224ffd0f71819cf385ec873fe28895
 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/files/ganeti-2.15-use-balloon-device.patch b/app-emulation/ganeti/files/ganeti-2.15-use-balloon-device.patch
new file mode 100644
index 000000000000..ae57a213fc00
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-use-balloon-device.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/hypervisor/hv_kvm/__init__.py b/lib/hypervisor/hv_kvm/__init__.py
+index 174621fcc..1f598e7ef 100644
+--- a/lib/hypervisor/hv_kvm/__init__.py
++++ b/lib/hypervisor/hv_kvm/__init__.py
+@@ -1094,7 +1094,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+     # Add id to ballon and place to the first available slot (3 or 4)
+     addr = utils.GetFreeSlot(pci_reservations, reserve=True)
+     pci_info = ",bus=pci.0,addr=%s" % hex(addr)
+-    kvm_cmd.extend(["-balloon", "virtio,id=balloon%s" % pci_info])
++    kvm_cmd.extend(["-device", "virtio-balloon,id=balloon%s" % pci_info])
+     kvm_cmd.extend(["-daemonize"])
+     if not instance.hvparams[constants.HV_ACPI]:
+       kvm_cmd.extend(["-no-acpi"])
diff --git a/app-emulation/ganeti/files/ganeti.initd-r3 b/app-emulation/ganeti/files/ganeti.initd-r3
index 6869f48313db..18b3116a517f 100644
--- a/app-emulation/ganeti/files/ganeti.initd-r3
+++ b/app-emulation/ganeti/files/ganeti.initd-r3
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="forcestart is_master"
diff --git a/app-emulation/ganeti/files/ganeti.initd-r4 b/app-emulation/ganeti/files/ganeti.initd-r4
new file mode 100644
index 000000000000..6393de8e2803
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti.initd-r4
@@ -0,0 +1,96 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="forcestart is_master"
+
+depend() {
+	need localmount logger
+	after bootmisc sshd
+	use net
+}
+
+DAEMON_UTIL="/usr/%LIBDIR%/ganeti/daemon-util"
+
+is_master() {
+	[ -z "${ganeti_master}" ] && ganeti_master="$(gnt-cluster getmaster)"
+	[ -z "${local_hostname}" ] && local_hostname="$(hostname -f)"
+	[ "${ganeti_master}" = "${local_hostname}" ]
+}
+
+# This exists specifically for restarting a 2-node cluster where quorum might
+# not be available.
+forcestart() {
+	ewarn "Forcing non-quorum Ganeti master start"
+	GANETI_WCONFD_OPTS="${GANETI_WCONFD_OPTS} --no-voting --yes-do-it"
+	GANETI_LUXID_OPTS="${GANETI_LUXID_OPTS} --no-voting --yes-do-it"
+	GANETI_MASTERD_OPTS="${GANETI_LUXID_OPTS} --no-voting --yes-do-it"
+	export GANETI_WCONFD_OPTS GANETI_LUXID_OPTS GANETI_MASTERD_OPTS
+	start
+}
+
+start() {
+	if ! [ -e ${DAEMON_UTIL} ]; then
+		eerror "Could not find daemon utility at ${DAEMON_UTIL}"
+		return 1
+	elif ! ${DAEMON_UTIL} check-config ; then
+		eerror "Incomplete configuration, will not run."
+		return 1
+	fi
+
+	local daemon retval=0 optsvar started_daemons daemon_opts
+
+	for daemon in $(${DAEMON_UTIL} list-start-daemons); do
+		optsvar="$(printf "${daemon}_OPTS" | tr - _ | LC_ALL=C tr '[:lower:]' '[:upper:]')"
+
+		case "${daemon#ganeti-}" in
+			masterd|rapi|luxid) is_master || continue;;
+		esac
+
+		eval daemon_opts=\"\$\{${optsvar}\}\"
+
+		ebegin "Starting ${daemon}"
+		eindent
+		veinfo ${DAEMON_UTIL} start ${daemon} ${GANETI_OPTS} ${daemon_opts}
+		${DAEMON_UTIL} start ${daemon} ${GANETI_OPTS} ${daemon_opts} || retval=${?}
+
+		if [ ${retval} != 0  ] && [ -n "${started_daemons}" ]; then
+			case ${daemon} in
+				*-kvmd) retval=0; ewarn "Failed to start kvmd, continuing anyway";;
+				*)
+					eerror "Stopping already started daemons"
+					eindent
+					eend ${code} "$(${DAEMON_UTIL} check-exitcode ${code})"
+
+					for daemon in ${started_daemons}; do
+						ebegin "Stopping ${daemon}"
+						${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS}
+						eend ${?}
+					done
+					eoutdent; eoutdent
+					return ${retval}
+				;;
+			esac
+		fi
+		eoutdent
+		started_daemons="${started_daemons} ${daemon}"
+	done
+}
+
+stop() {
+	if ! [ -e ${DAEMON_UTIL} ]; then
+		eerror "Could not find daemon utility at ${DAEMON_UTIL}"
+		return 1
+	fi
+
+	local daemon
+
+	for daemon in $(${DAEMON_UTIL} list-stop-daemons) ; do \
+		case "${daemon#ganeti-}" in
+			masterd|rapi|luxid) is_master || continue;;
+		esac
+		${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS}
+	done
+}
+
+# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
new file mode 100644
index 000000000000..0d2eaac25e1b
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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=(
+	"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
+	"${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
+"
+# haskell...
+QA_FLAGS_IGNORED="
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-metad
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-wconfd
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-confd
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-luxid
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-kvmd
+	/usr/lib64/ganeti/2.15/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'
+
+	sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/ganeti.initd-r4" \
+		> "${T}/ganeti.initd"
+
+	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 "${T}"/ganeti.initd ${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"
+}