Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

4 files changed, 315 insertions, 17 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 43e99f00c606..8ab705b2fd30 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/ganeti
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.101 2015/04/08 07:30:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.102 2015/05/07 17:40:19 chutzpah Exp $
+
+*ganeti-2.12.3 (07 May 2015)
+
+  07 May 2015; Patrick McLean <chutzpah@gentoo.org>
+  +files/ganeti-2.12.3-daemon-util.patch, +ganeti-2.12.3.ebuild:
+  Version bump.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> ganeti-2.10.5-r4.ebuild,
   ganeti-2.11.6-r2.ebuild:
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 08ee512ce3d6..b36a1e97f50d 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -18,6 +18,7 @@ AUX ganeti-2.12-daemon-util.patch 1056 SHA256 6cc193cafbd1e05a4cca180ee3bf4c8472
 AUX ganeti-2.12-qemu-enable-kvm.patch 569 SHA256 0dffced71895e89433683f4dbbfec4c0e01dcd053f965a0a4480347adaaca749 SHA512 10aa94b625a9bfb64610fec282444f811e28200b0ea3e284c41def7990b901f4337be7e3cb9f355c6f021637f3ffb799cf8f28090a731410ec17ce0ae3f8200b WHIRLPOOL 4948625da760913ad8afdd0e8871748a48d75caf5a9452b667d99bd826fab72bd24d6936cfd8ed09d0cc005359c78ead02e1ef68a72eda4acff29bd73243a69c
 AUX ganeti-2.12-start-stop-daemon-args.patch 1310 SHA256 6865b90e4b6662d05e6a87b6369ffbfc3e2568796873ebfb6cad36f422ea9671 SHA512 dad3fdbecc1efcb01cd22ba277122f07c7193eb11ad5e45d5e6c82ccace5cf13f1d666241412a484ffbf5581d652329b8fd267ab0fdca4ae79966f3c40cd579e WHIRLPOOL 293f0bac532a5bbcd4daf75ee903ceddf48269c71efe0e2a2fd02c767f79ea35d1fcfb10415ea97fdf556525cc6240202309c17804f1000fa0aa6999151517af
 AUX ganeti-2.12-tests.patch 2576 SHA256 b0307e3532e1fc5e48a24ecc3add5a4d8ac96d3d7764956d25741143c52d9802 SHA512 af7a6883d25576ef1191e0ddce6eb469bf2c46e566e0f8d89e3e1ebe985a51d35b6cc95e4684c0035e30589849c27e39be51a7b8ebf94821ade7e996921021d1 WHIRLPOOL 816e7116ffeafb9adcfdfeac8475436c30b3a941478e1bd7efb3a08536ae4f040b80926b1e709aac97fd1d04f4ba61221fe42c5a82537b0bfbd9e58d519e908d
+AUX ganeti-2.12.3-daemon-util.patch 1056 SHA256 bf7a104ffda6974d916cc231d6ee04b362953c2a969b0e1570fb0740243d0dd7 SHA512 7fdad6f192d856982bd72177952119126635cd41878217ddfa19d89b910872df2e0b4dfe9fde5665c911efad2aa503dfd7b579a0e03374fe20958e67ece10a41 WHIRLPOOL 5594456f8dea8f72ca3ae425fb5bcef242adf14a08c7078be54b10c53807e3a6278ffa8231be0793c2fd7bf0932eab6fb097a5dde039f659aa7871fbc7a9ff36
 AUX ganeti-2.2.initd 2722 SHA256 5179b6350a35f8a2f854123fd3ef1ce0c95ccc4bd3c6fd5c464d67f04097a28d SHA512 d4986ee603470b3632607b0b8b5225abf2c98a037107cd8eda30990bbd9174a71f82415e127fa80fc431e8b342f4c35c9b41f9f943ab3803fcbde8133a8f4ea3 WHIRLPOOL d5dc5dca4d5f18d793c1da5361d80def382bc41ad6db0a9e98a43e2b6cb7612417062223abc86ef20f7bbe96e4197acd5f397a88cf97af77a06aaabf38cfa61d
 AUX ganeti-2.6-add-pgrep.patch 1266 SHA256 6a42a97d9f76170bab8f0ef0f99a1afe524fb659d253b05ba3d27f8d48e50d7b SHA512 72f766663f42778273e030239c94dcdf8059e233ddeafbf3d0b7b3dc815db88f2764adefe60d5a88abc9a5df3fa511583da8f4c9073d873b94f269d8b3572e89 WHIRLPOOL afaa7224b45cd09762daaf523d42c1d5fa6603b8aed4eea64abcc4f0c35d90f9fd10965eb1cc1cc8c9499544ed3b904f0168eaa9e42d9a2e2bfe5b874bbbdaf3
 AUX ganeti-2.6-fix-args.patch 1546 SHA256 1cc4e8176736eb42341b7b38575b4ab30c9b18cc1b9c2c7d1612a13833221704 SHA512 344cd96ddaea631d99937e419da8b7e0eb00a67415f71551b8786924fc6674cdda38128bd5a753b8bea8d6d263677e35632d724676990dd86c8b7f7b35d6e073 WHIRLPOOL 5d162f96f7eccf26212914c33b5b4e0094aaac72da4458f7fac2a18c5e41e6f3e54f6a0b0c33fa3671a419754227d1f68252c513dd6fbae42ae5561f0e8a51d8
@@ -37,29 +38,29 @@ AUX ganeti2.initd 1503 SHA256 6fd666648ac543ffcc3700821a36eba9a027eb04278e53f60e
 DIST ganeti-2.10.5.tar.gz 3855105 SHA256 7b66a0a13344f484bc1d1e90f84227438e2cdbb054f5667a9a4c216bce2b8532 SHA512 ab9fe4c18f975e13dcd403a086b725d4f5e4f84aaa5a2651cf4087b6abad59b38b470ed062f407e6783997f976eb217e755c9d7a3ebde1df63638c3ab63cd755 WHIRLPOOL 5bf83bae29f51cfd2980d3e57a03d25e598ae7495785646e8920d4ca7685d2e93cbac42624e86fbbf92236edd7311f724fa036580300f8ccc066818d3c9911a5
 DIST ganeti-2.11.6.tar.gz 4145886 SHA256 db11659ae7aaab5933b55b35f703236edc91ec763e443ac80679a057ba57af5e SHA512 c68ba0661f7598b2fbd67a96fd897e9a8fe7c3a79e914200c08a8e6cb78ad7ea8a85ce7cfee157e22c07d5f46ae6ed61d946cf2cc3852624cd303deb96f1e449 WHIRLPOOL 9bd0acd85ed86b8d05164d6ee70ea960fd42128f9144739c148e70917675d53c1d808d22df981a1ea0d843dfc5fd14fd516d6d39330634beec7eb0ecae4cbe5b
 DIST ganeti-2.12.1.tar.gz 4353529 SHA256 bd1b33d12485f4de25cca74dcf2e5354067cdda5ee36b56333d402aa1c5351e0 SHA512 92f66b45b5adcfd4cca47a1cbd592489d6c3ec595d3c6ba7b4a9401cb588a51994288499078513d6f4c0369f15a403c796a526945a2e874e8d561aac2b962b7a WHIRLPOOL 60f446b851f0bcee536791ed01d470c7a5caf02b120891e370f491f07194c1b0d9fe991a0342c7f77f3762c4aaea1ae7b7cf731644d061f43f4ba38af36cf699
+DIST ganeti-2.12.3.tar.gz 4373350 SHA256 e66fc4c3dde1e90d85749ceb5c1c90bd6eaed1d139796829833b74337d2d4148 SHA512 7715db8e472e4ac99bf184028cd9853495153485c6638bcddba2d05ce958b6b44d3be07290780bb27b22337ae646881d6b0a30bbe87b7249106ac34d22bdd6c2 WHIRLPOOL e24d695d5acc582905ae7ba003e3fe6e6aa6ea4f9135daf76b953864c392803cd1c6ed81eb0e96652038f289bf450f3ac1a428c46d7a2573bc39a9451a47694e
 DIST ganeti-2.4.5.tar.gz 1828118 SHA256 9141379f3802238fb209309ec12f7090d872b77d7a473c91fe766d1fcec97c89 SHA512 e3abc2fd7c031fbef41c6e993f4cb129fa1dd4cb8c44961a2574da23832fd8412b8b3664b2e05ba8236cb8e58e8d70c3c9081f3f1b6dba8ffdc28d298c8a5099 WHIRLPOOL 897c2b3cdf0c7b03232a4ec99314439dbd29afd65eb2502d21a9f197cc098323a4b9ec0671c24ef7aad44b5327316ee68731e7e5304c8730d03f8ca908b93b62
 EBUILD ganeti-2.10.5-r4.ebuild 4769 SHA256 18efc033129eecb462c3559d687be601e5a87e6a62ba7529dddb225585219529 SHA512 8a57c218c620bcbb9ff06c8b6890d27d2700bee874aa0384f684dabc812958ff7e115cc60bbd5f7a75fc83174b52571c46c849a3bc29c479a2ab7977e86aec7f WHIRLPOOL af3edcd223e25613039759f649a699d75493d2386873ce1fa1f93afcef553379f1a454026d2b4196af3f576626284d3d9bf7eed116262d0b86bb897f085ec8fe
 EBUILD ganeti-2.11.6-r2.ebuild 6230 SHA256 5c5347c10abb0a9a3283c28cba35555e04424242782fb55598dd1f9d756f9ccc SHA512 1be5877df3a58db0a1a1e37c0e5729df1cb7c516c90057e8da16ba428a3d9c2a8722f6cd5298c2d7d67ee15397a5b926e88872fb62e4a08fdbabbff7d5c2053a WHIRLPOOL 7d5daa1e608effe98af44131252469f75543ff75293e4df89725e1213d141d21a0a08f488e6b937395f43264e757059cba2f5e1cd7c46007dbb84f6df918d807
 EBUILD ganeti-2.12.1-r3.ebuild 7383 SHA256 47c38b6de11175b711448c916ebc8554041795064891721974c825ff2fe92699 SHA512 83702adaea8bc55f3433273d1a41b1bc638dff4157ef118f1c3e12bb517508d6c5d644c85d6bbbe2a2ebea99a012834b4920c2a4825d75a5a06e5ce58c711bfd WHIRLPOOL 9cbe5376bb22ef479438af93205bd210eaa97294e8160b054ce9271bb6a4a1858f63aba39851da3e78a6dd47b77d120116d80b4f5e6d535896e1592872cab6e4
+EBUILD ganeti-2.12.3.ebuild 7368 SHA256 ed94393992e4b84d216cbcce03f0d0ebb353ffd991b67d8549980672fc1f082f SHA512 c11588578350fa1660a276ccd06e85b70b8bd1cc1f64015d7470280a0251924abe3c2f5b12a9f25d0b7d2ba689adfcfd85d6929ac020b5c480bae59f96537f79 WHIRLPOOL 801cd8237aa9c93cb6985060bffda0ce8cbc9c580f3ce90ec5d4e00e007bf218de6395a7e435f663a54c02f31d3689470ede46abd292639114c8cf1d8b5ddf2e
 EBUILD ganeti-2.4.5-r1.ebuild 2540 SHA256 8024d6ba63f08762ec42f6acf8d3ad7f7f51ca4d221f780e7b86229e694dbea3 SHA512 85cce9aa0ccbfbfb889962b407eda507adaa5cbbf0630ddea6b86dc923c8b23dc4e881a41d0a63cf927f0b93b9427c10f428b36f534658ed8edec272e2559677 WHIRLPOOL 7a65b8e03cdf3ca189ea0cfd2ceeba597d45843df7c8a25f4c7de8224a16421f1235e9e7689c84b566c9eaeab815ef939259915e02b884beb1996595951a35bb
-MISC ChangeLog 22818 SHA256 01a5f27eb2ea0b6ee9a9913e1eb9f85eca245ccc7bcb404e9acb0273f20d86de SHA512 060f7070484a24af6f784eb333fc092a5fa201baef91bdcae59d7aa8cd5af8d72a7e5b476c5085cbb26d1b3699b5ebcfdb148c07e2a09206f243d81cc04dd2e3 WHIRLPOOL c3463411902b8d5772f25850afa6b8ebc34bb6eecd564b67bc80c77a6b69cbdca9296400aa6891d89a4fc9d94178f374ec3b8e699eb5eeadb0064c0a318ef3a6
+MISC ChangeLog 22984 SHA256 f6c9e390e75f62fd9226ba33e553132cce9758dae211511d3d81c9dba5b967ac SHA512 a2ea05c0a48cee6ce5512e21bd2da1ec07024d426e8364134f3b9a41ddf55085226888ff7efc42bf42444aa031a2c9408cfc6c0e4072788e0d504cfbb6a5488c WHIRLPOOL 03f5609d582878d19382a227a5e783abcc36a860024213f9f693e6063f468aba7dd780b3bc5912f4c1bfad620e9543adef216167017b984e8ae4d65ac6058f5b
 MISC metadata.xml 1666 SHA256 b30104372f656db1e16b213d141b9224208958df5231bb17214ad7897a759662 SHA512 85c98e126690eccd836d4d7472327edc588785c27d0da7f71ce562783e9d1685b5a2f681438bcb619831476443792a4ef272cc61d339bbb1e352b8921788ef98 WHIRLPOOL f66c5e39d6be4808d65cd21203255bc0b1a6ae3ccce3d0b84ec0ecd062e6e3dc682807f92f9b30fa3cb32bbaa67f35f1775a9a8974e2b295282c34e3cfa1293b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJNl4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOuLMP+QHmwMUq8zO5DnG3EJpZYTLs
-pmorVH6nSZKlBHRk1WPsws7Kl01UEvNfV9MkQ/mfR7Wyn4d5jo7fJTcNWbEIzcf8
-mTGe2vk+ziVq7MYiCORa+Q7cS0euJ1zE/+LhGVBGznGD75fyAwFqb8gMpV+xES20
-MemoooQPNjGo+IgFDSQRsQtCL7Dvz7jmsl9jy35if08yM+0GeL0Lz8kXvpEvdyyp
-Pe9nO7vK2Ut8nn5QSOA8e6R+4a1RLFoo0t7ydrHkAf8DoT1y1fghL85DbnCxB9uO
-mwsHQO90sV5s8B6aKnUfWd44hVR2KcHuYiNAh3gmxOcuAdP/b24CPSvJdi4kdPh6
-HXn4gENor4+Y+iGdjc+3NJ4t7pajcWfPj2RvOzgqhvhuk9IdelX4KE+Bl0qsBUN1
-FIRqMsBMewE1jDQQ9Ubs3k6Jp6w+3vBAYAA1ezYVBjc3r1LrSDK5RYpjdG42HA2Y
-G4QGiZ6IzMYDV+00+LFZpvM2HVSwvqGYoHC3fv9AjKryxfWHkLibOPZhO5hhJoZV
-x2HHjktAtCR4oCJaSctaOUIEY0W9dcdBJ6RR7YU6nTi+9wufz6vELPdemu3eglKE
-smG3rt+Xh2Ulsi3svXytZB64cGF8l7oxFiO+A4W3Pwa/kPCx4laDU3r9t75UU/SX
-mY2mkd10++tdGsSYSNlt
-=tBqt
+iQIcBAEBCAAGBQJVS6ORAAoJEHy/RO9cNQiDnmIP/09wUMJTc/ouHp7HyBK49q+8
+uFPIEmHZ3H7hDM1Ol34FVtk4oa9+O6YFm0N2JsrCM3G3ouoTIOVuGOEKRZ6SMAzQ
+UEfngGBsntEjxtGgBCrwqMUCMqBL8+0WzkQXUmrPv6IvRe2FYStXk2FcSVEnsMwQ
+kWiEG9tprFMcBrRArd7jUlwr6et7gBJHZrNu51eFigOppxDcuFAzosNJ2kTaUVFG
+5r5adqCAYv+I56wEJqO17z7eD8fKfFggFqm2GgGFxgl6cXK8LLP5swSYP20L4K/9
+kFah0wpHnzS5fyrAVtHVRc7ZRUmp6+zAkRQ9tGy/a0gWNIOA40RyULG87mUD4mho
+TZ055XIKsyQ0hLu/nVr5WPXpweURYa/0Ssg+Gt1OOmbMSmY2iDNfbbgUQBzDPbT8
+qivf80ZXbnybW8IOPlUxLQDu6x7okD17cWgwsLjPw57eSzZb0g3azMx3UXsPJWP/
+B3xHNSKThLJwOXuhurmkhRS44UthdhMAqwd6nI6lrCHi8B7Z4gx02JB7t/F+1m9Z
+2le2fd+TJO5TJxhpGOi9IiQXzesWqbY9kmLfP+u+qjTvE2pp4hQdSw494ZiRnA2K
+LANzGAj1Ko8lcJi1RK2FxZYuoDbgHGZmgXmw31QJa49lcY1jvrsoqeg4lwQ4lGWF
+of/nDoQ8hLda+LPcqnR2
+=YsMB
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti-2.12.3-daemon-util.patch b/app-emulation/ganeti/files/ganeti-2.12.3-daemon-util.patch
new file mode 100644
index 000000000000..2f6bfa3208d1
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.12.3-daemon-util.patch
@@ -0,0 +1,37 @@
+diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
+index 6a47253..d7afd84 100644
+--- a/daemons/daemon-util.in
++++ b/daemons/daemon-util.in
+@@ -31,18 +31,24 @@ set -e
+ 
+ @SHELL_ENV_INIT@
+ 
+-readonly defaults_file="$SYSCONFDIR/default/ganeti"
++readonly defaults_file="$SYSCONFDIR/conf.d/ganeti"
+ 
+ # This is a list of all daemons and the order in which they're started. The
+ # order is important as there are dependencies between them. On shutdown,
+ # they're stopped in reverse order.
+-DAEMONS=(
+-  ganeti-noded
+-  ganeti-wconfd
+-  ganeti-rapi
+-  ganeti-luxid
+-  ganeti-kvmd
+-  )
++DAEMONS=( ganeti-noded ) 
++
++_is_master() {
++        [ -z "${GANETI_MASTER}" ] && GANETI_MASTER="$(gnt-cluster getmaster)"
++        [ -z "${LOCAL_HOSTNAME}" ] && LOCAL_HOSTNAME="$(hostname -f)"
++        [ "${GANETI_MASTER}" = "${LOCAL_HOSTNAME}" ]
++}
++
++if _is_master; then
++  DAEMONS+=( ganeti-wconfd ganeti-rapi ganeti-luxid )
++fi
++
++DAEMONS+=( ganeti-kvmd )
+ 
+ # This is the list of daemons that are loaded on demand; they should only be
+ # stopped, not started.
diff --git a/app-emulation/ganeti/ganeti-2.12.3.ebuild b/app-emulation/ganeti/ganeti-2.12.3.ebuild
new file mode 100644
index 000000000000..ba811ed3db4e
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.12.3.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.12.3.ebuild,v 1.1 2015/05/07 17:40:19 chutzpah Exp $
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+use test && PYTHON_REQ_USE="ipv6"
+
+inherit eutils user confutils autotools bash-completion-r1 python-single-r1 versionator pax-utils
+
+MY_PV="${PV/_rc/~rc}"
+#MY_PV="${PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(get_version_component_range 1-2)"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
+	inherit git-2
+	KEYWORDS=""
+	# you will need to pull in the haskell overlay for pandoc
+	GIT_DEPEND="app-text/pandoc
+		dev-python/docutils
+		dev-python/sphinx
+		media-libs/gd[fontconfig,jpeg,png,truetype]
+		media-gfx/graphviz
+		media-fonts/urw-fonts"
+else
+	SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://code.google.com/p/ganeti/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen"
+REQUIRED_USE="|| ( kvm xen lxc )"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+# the haskell less-than atoms list are resolver hints, they aren't actual
+# direct dependencies, just hints to help the resolver fufill the dependency
+# on an older transformer.
+# these need to stay until 2.14.0
+DEPEND="
+	dev-libs/openssl:0
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/bitarray[${PYTHON_USEDEP}]
+	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-7.6.0:0=
+	>=dev-haskell/json-0.9:0=
+	<dev-haskell/monad-control-1.0.0.0:0=
+	<dev-haskell/transformers-0.4.0:0=
+	dev-haskell/curl:0=
+	dev-haskell/network:0=
+	dev-haskell/parallel:3=
+	>=dev-haskell/hslogger-1.2.6:0=
+	dev-haskell/snap-server:0=
+	dev-haskell/utf8-string:0=
+	dev-haskell/deepseq:0=
+	dev-haskell/attoparsec:0=
+	dev-haskell/crypto:0=
+	dev-haskell/vector:0=
+	dev-haskell/hinotify:0=
+	dev-haskell/regex-pcre-builtin:0=
+	dev-haskell/zlib:0=
+	>=dev-haskell/lifted-base-0.2.3.3:0=
+	<dev-haskell/lens-3.10:0=
+	dev-haskell/base64-bytestring:0=
+	<dev-haskell/mtl-2.2
+	<dev-haskell/contravariant-0.6
+	<dev-haskell/profunctors-4.3
+	<dev-haskell/distributive-0.4.4
+	<dev-haskell/comonad-4.2.2
+	<dev-haskell/transformers-compat-0.3
+	<dev-haskell/transformers-base-0.4.4
+	<dev-haskell/semigroupoids-4.0
+	<dev-haskell/semigroupoid-extras-4.0
+	<dev-haskell/groupoids-4.0
+	xen? ( >=app-emulation/xen-3.0 )
+	kvm? ( app-emulation/qemu )
+	lxc? ( app-emulation/lxc )
+	drbd? ( <sys-cluster/drbd-8.5 )
+	rbd? ( sys-cluster/ceph )
+	ipv6? ( net-misc/ndisc6 )
+	haskell-daemons? ( dev-haskell/text:0= )
+	${PYTHON_DEPS}
+	${GIT_DEPEND}"
+RDEPEND="${DEPEND}
+	!app-emulation/ganeti-htools"
+DEPEND+="sys-devel/m4
+	test? (
+		dev-python/mock
+		dev-python/pyyaml
+		dev-haskell/haddock:0=
+		dev-haskell/test-framework:0=
+		dev-haskell/test-framework-hunit:0=
+		dev-haskell/test-framework-quickcheck2:0=
+		dev-haskell/temporary:0=
+		sys-apps/fakeroot
+		net-misc/socat
+		dev-util/shelltestrunner
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+	"${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+	"${FILESDIR}/${PN}-2.12.3-daemon-util.patch"
+	"${FILESDIR}/${PN}-2.7-fix-tests.patch"
+	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+	"${FILESDIR}/${PN}-2.11-regex-builtin.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-useradd.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.12-tests.patch"
+)
+
+REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup () {
+	local user
+	confutils_use_depend_all haskell-daemons htools
+	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
+	epatch "${PATCHES[@]}"
+
+	# 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
+
+	[[ ${PV} == "9999" ]] && ./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 \
+		--docdir=/usr/share/doc/${P} \
+		--with-ssh-initscript=/etc/init.d/sshd \
+		--with-export-dir=/var/lib/ganeti-storage/export \
+		--with-os-search-path=/usr/share/${PN}/os \
+		$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+		$(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" '' '' '')
+}
+
+src_install () {
+	emake V=1 DESTDIR="${D}" install || die "emake install failed"
+
+	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}
+
+	newbashcomp doc/examples/bash_completion ganeti
+
+	dodoc INSTALL UPGRADE NEWS README doc/*.rst
+	dohtml -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}
+
+	keepdir /var/{lib,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"
+}