Revision bump, some minor ebuild cleanups. Add a --wait to start-stop-daemon arguments in daemon-util to make sure that the ganeti daemons actually start. Add patch contributed by 'Zentoo' for daemon-util to make restart-all handle master/node differences properly (bug #513600).

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

6 files changed, 318 insertions, 15 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 21d8bfbe9aa9..0e2a9870bbeb 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/ganeti
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.90 2014/06/14 23:25:41 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.91 2014/06/18 18:50:58 chutzpah Exp $
+
+*ganeti-2.11.2-r2 (18 Jun 2014)
+
+  18 Jun 2014; Patrick McLean <chutzpah@gentoo.org> +ganeti-2.11.2-r2.ebuild,
+  +files/ganeti-2.11-add-pgrep.patch, +files/ganeti-2.11-daemon-util.patch,
+  +files/ganeti-2.11-start-stop-daemon-args.patch:
+  Revision bump, some minor ebuild cleanups. Add a --wait to start-stop-daemon
+  arguments in daemon-util to make sure that the ganeti daemons actually start.
+  Add patch contributed by 'Zentoo' for daemon-util to make restart-all handle
+  master/node differences properly (bug #513600).
 
 *ganeti-2.11.2-r1 (14 Jun 2014)
 *ganeti-2.10.5-r2 (14 Jun 2014)
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 75a68a4a9a7d..0e556877496f 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -4,8 +4,11 @@ Hash: SHA256
 AUX ganeti-2.0.3-gentoo-brctl-path.patch 741 SHA256 8362692d1af5b264a9681d63137bd010be29047419718b8daaa320dfb0979965 SHA512 a210c6637f2526111d56773b5ed13b36c3843a07aca44f80e1e8626182d4cdc92e34b2296f70cd06091ce42e4edf7831293c4cfbe5d34f57cfed0b4478710300 WHIRLPOOL cb7b68ca1d08bb80c811ab9294c1789f9eaad6232d11c51fd856ee37aab0bb881950590f6da04b14caa4b3f015af3a7c4e3c38ea99aed1e49a1a16a8d4a9f90f
 AUX ganeti-2.1.initd 2715 SHA256 b56dfab540977f17f2e80e30ba49d3b0848cb58f031a5c7b388c967870ea2d29 SHA512 c61b10393264feef03bb237f739a344912b5e22620818a25e8bb0a774e38aadccf6585a800edc7e37895016d73be1cf318a04fcc64f71d9d53d2004e917df614 WHIRLPOOL c03d82b844e9004ad3bf1bc48ffa01e37a25f3c94d0dabcb6dab4e94cca2d8178ee140957f9b7704427e089913c7992db51942c93d739d80f2e012d3317cdeea
 AUX ganeti-2.10-rundir.patch 1305 SHA256 13783753b68a5dcb45a81653b449d085ff74ee812df8be45b3d043361f3e447c SHA512 67a475c8e4ed9fd7d28bcf514fff5dd3ea6a458f57e02138b9fe6b1288732dfb3fc4e2fe1586dc5f78c1cda5733b5163f723709f37c4ded1a99d8b0b2773f61d WHIRLPOOL a21467c23ebffe9cfbbdd9532d43a985d9d8dfdfc701585e4092c4967574ab3556bf3d0571025dc18f2745e4c8db4319f5bb5bd466cbfbe9cfa852d8a3b7c610
+AUX ganeti-2.11-add-pgrep.patch 760 SHA256 498d54af60e65a0036a092733b4a77902ce2245b1e48a9753ac7a69aac1a762b SHA512 2916e9207104a33027b5024e262863d8f6413558e866b0822c801d9dbfa9d0350553b51e855dbaea372257ee7b3158823c45dbe5594b786d6d9327977a12f57c WHIRLPOOL 4901ee3e609205c052c8d8c66214295b92746d2830557f2a06eef0a03d9d9eb94701f20bc4beb8b065c79c2345fe84c7406c1d1bc68f7823d226d1d818ddc4a1
+AUX ganeti-2.11-daemon-util.patch 1019 SHA256 904d0820eb26ce584c980aac49296534873f1c55fb03c2662895df2c87290a52 SHA512 92a558ddadb50d6e2faa88f349fdc27aab22443defbe5e3c7e0e25b1376bee427c0750d7d7ba4843add8501124f319d2ab683fcd2c43dc238a6bdf36d5b4b55a WHIRLPOOL 9c0e79c1a14fce3b99b182bae4615ff9615a606ebf7c36b08712dfbf76a975b7fad36689c4890cdfc6d7286c8652bdf3fa81bb1be9ecfd0927280cc75309005d
 AUX ganeti-2.11-qemu-enable-kvm.patch 483 SHA256 14f79903275c1cb0136537635f6a673e91b385394a273f4929146567edb47457 SHA512 ea317923cad453b82dec9a1a214348c9c10414361efb6257a1f67d4483d1656c9838a6b528050648ea336a6442e501bc5d82f65ed52259bff4b7869bbd611466 WHIRLPOOL 4804143f058a39a9425a99af060c62957cc5bd1087d3b8073445084b87701a839fa68484a0aa33105c3c18c40e52b13e8d3a4e3c46f3b88760c98c9f9a928e1f
 AUX ganeti-2.11-regex-builtin.patch 616 SHA256 a93531f2d3c4257cd0e53b830a93a2e56260567b52cb42606d7342cc2e400cef SHA512 3a22b2d08f7b610f2790fb8e498811c13acd0c27b3fba60c213df35aee6944df9123a3fd2922d8d18c49f020025a86a057cb39dd30f4eaa009765bd107ebc134 WHIRLPOOL ad2a24526e9fc7fb74eb1a41bf1375a1c879620f3e2ca904ac9b4f2df67daff93946ec3558ad25271fc891311870ff6aa51251a38957766098db868b5ae3a766
+AUX ganeti-2.11-start-stop-daemon-args.patch 934 SHA256 68f6f71adb4c7e005adab120fe467e34386cc333f2911b61cf9453102ba5cebc SHA512 264922cb135dfe30aa84f25a32d79d628620910d65f6f308d2ff903645082d72176388fe3c229bd923f1c7ceb29c19c3b24fbdf18e92d0120e680bf645019d6f WHIRLPOOL f25a7f13c28e0e0d864e6f42f1b63b4be5caa763f62bbb7fde3cf83b9392e38e8794a56bb5bee85d1c31e8e9f50240bf618ef202deabda30087539574e5fb517
 AUX ganeti-2.11-tests.patch 427 SHA256 25f3ea7607fca041003e509dca9c8b037a542a918311d0dec3ef5ad1ab3fe489 SHA512 34d72b16a302ae89c58ca02e01adb90b586a50dde8e847964919f11ef353e8cd17bb737ea4180072cd7800a348f88ad47bc6871831d008559c69975257f1e815 WHIRLPOOL 8e8f0c14a838a5f740fdcabb59c1d50bd281bf2af1084780a601d36dd81efb3ca0074b9f5311d8d8aae327c53da6bd05550075da8fe496bea01c94a3bb8e134f
 AUX ganeti-2.2.initd 2722 SHA256 5179b6350a35f8a2f854123fd3ef1ce0c95ccc4bd3c6fd5c464d67f04097a28d SHA512 d4986ee603470b3632607b0b8b5225abf2c98a037107cd8eda30990bbd9174a71f82415e127fa80fc431e8b342f4c35c9b41f9f943ab3803fcbde8133a8f4ea3 WHIRLPOOL d5dc5dca4d5f18d793c1da5361d80def382bc41ad6db0a9e98a43e2b6cb7612417062223abc86ef20f7bbe96e4197acd5f397a88cf97af77a06aaabf38cfa61d
 AUX ganeti-2.5-gentoo-start-stop-daemon.patch 1226 SHA256 981dded2c1b8560ef7cc6207d36abaca809f7ebfdfa7fe2e4a0e287fb9a45324 SHA512 58357bbe50e716d5cececa148578dd067c342729ca03f9df25ea9c7b3ee28b8a15976fd5357a0d6254f705af78d29a015ab859d86618d08cf159140f66798102 WHIRLPOOL b0a5e5ed0259f14e04b433df84d2a7af33cffe1f91f04cb77a6bb2310a4144e0df7a4ed25580ca866fc354cb2ac15dacde0cf6d9bad0ebcbb86bf4a5de66506e
@@ -43,6 +46,7 @@ EBUILD ganeti-2.0.6.ebuild 1752 SHA256 e78392e12f76adde3c42c4e587710f670fa9dd392
 EBUILD ganeti-2.1.8.ebuild 2022 SHA256 33bb15b7318d2976f46694796b6ca485a657a8c98887f14c1760f45f3fbace52 SHA512 8a56053dd94a0c116f92592c2cf641da4631f489db2725dd83abaf85844a36ba4e06d24a9362e8601052910cc1515d1aac750c9b3b06f9109fa91057e2f9298a WHIRLPOOL 200c4a630a655c7ea87e3d1a8794e00b50415ba7ee19214466169db0e473112f4336a2ca2476ab0c0fdfbcecc72908c6f4f8903321219af471b2b70fd36932cc
 EBUILD ganeti-2.10.5-r2.ebuild 4779 SHA256 00c52ce78849b866c27f3fe2602ad3dbb9e63c4a00ddc4d3398817c7b06cbbf8 SHA512 9dbbd460e93ef22c3c4469ee07cc982d5baf67cd3c9566d68110764cd7f57d5142cdd9346aab9b45d263b445caf9faad838f056b7e096d01216610b79e7bc855 WHIRLPOOL ef3fa5f63c15d77ef383b09096102307b73f43a70993e68af3a2faab5d239c5bc7982a29a68018bd39298ca3280a40356827e1e594730580ac0f90b8040c4959
 EBUILD ganeti-2.11.2-r1.ebuild 5228 SHA256 b68fe781bcb1e61e1f7779d7718336a0e116eeb8dff39b6ebcf86d9dce1ebfa6 SHA512 56f71c7ab0c5ffe6b13ce9ab63a69b59523f636feac37493f34336c9588b15a3acdee1bf18a4ff117b5967078cac93adb134bc4d5ff6e1f717f903a816e59895 WHIRLPOOL c09559daa26218b20917b0f222af845dc9314870885272ec74f8e86a70163376981b7382a34a84b08dfbec2c8d1a961c79c634b5acd2ac32ed07760ec6bd6b11
+EBUILD ganeti-2.11.2-r2.ebuild 5352 SHA256 64c4d48e99d1615c66661823eeb155d5ce5a35d1647ce2795b121c889611ee78 SHA512 b434729a5c5197d33d832aa0383eb81452f7ec2448a698523d1ba4c339901f66df433776fcffc8de278cd74b452c127ffd027d045991d3e21eaa80c1efdbd974 WHIRLPOOL f93e892b9cea1b040e54ea8e04347dc7f623e8289ad62fb4acf3269773574bde2d714c7e10df777fd9f9df1a5d1938f69519ba403bbf2538b58eea7ac7b0e116
 EBUILD ganeti-2.2.2.ebuild 2109 SHA256 b42afb32dd42830e9dee940e3f325e21005bc1c649bf3bef219a9ee9170c3e8c SHA512 2a11f78c726c857187f1ed8a654c84fe6a91423c25f2d7e3fb24cfa8a2ba9bc97191121792bbf1fbb5130b15938cefebd21d950c7e25d7dca351cc40b5edc0ed WHIRLPOOL 3dd5bdc9d9a350470c37ad7c23153340fdc9543e8efe39242a1817b7f7eaa0d94acc83945eeeef35d2f382f1df7619a6e28674858c8e0f8612e4cfccd2166d95
 EBUILD ganeti-2.3.1.ebuild 2141 SHA256 e3cc03ad4280d9b7816959929c021bc465b3688379dd1d933fd7b2e16bed543b SHA512 32f619cdec630130eaaada8445b448143576d084462de8e0ffbc368e39003091aec2f43a24dd758ff72a6fb2a1a476057c20c54f76c3ab1b2cd4bbf9d4a91fb4 WHIRLPOOL ae5d2103c6b560caa7cd7c03947bd759fc98f85841f8ecc5943cbc878cba78bf86ea14bdb4542c6187143a88726c8f0aa900112f091c709a2a27578c095515b9
 EBUILD ganeti-2.4.5-r1.ebuild 2538 SHA256 2c398580e858757045d1c74df1dcad80c1a687f92c4cdfead82a56921f41fe41 SHA512 9dbfb24086d41faf259de586257c1f79ef35bfa0521daffb637b9d8ea6e7ca598a8631713f3232e362d21f1ee9fa9ce83a614bb2a379325406e6b9a9711e6ed0 WHIRLPOOL ca248607ca5d623cd588a76a54293660cb69ba561b6fa798739201fac0e3ba4eddcd6d25b87fdef0ac7b2e3f52d157c62f886f51a7b97ca1e9fbbeed8123161a
@@ -50,22 +54,22 @@ EBUILD ganeti-2.5.2-r2.ebuild 3833 SHA256 b8e526ddb60ffacebbffa82b28e4f08a3d25aa
 EBUILD ganeti-2.6.2.ebuild 4397 SHA256 baeaee518ab03435dca205e90cf275ea40f54d79734e5d82670ec7a025219e36 SHA512 5ad31f9d36bcb1ba09947f729308d32660053b0444023cda1c3dd030c911047aa38d585d12954e04fefaa7dcbe3ac378fa906360be8881690991578d04d9362f WHIRLPOOL 0740ccef8800aaeea44c19b8b24c847abca3d4cdd52dfdf420f095039c67fb4a45b3369b529c8720630ef1180e6c72af9d16a20795bc2e7cc2c2835ff610659f
 EBUILD ganeti-2.7.2.ebuild 4329 SHA256 ba3ee62061cca5e433436926cda872ace275ef379182ac2de6ef8a1c83cb7e48 SHA512 c98cd64f6315c8bb2eb12b885b0e610e2a933da0ce9288a929d9c00875139c95ecb89929c244c8ad81f672753b9dc66fc0cc889f25a3224d0e5cce196dce150c WHIRLPOOL 0eb0c43df9466f042a5361619218403ba440810218fa5740eb85ec8465bd1eef5ab67f8435faf400f904f86f8de3e3535e13a8eff56130f0ff2ee3a2424b9cf9
 EBUILD ganeti-2.9.5.ebuild 4646 SHA256 4bb9608f805b88b42a2cc839d0e8f38c9c3fbe1a181b59e5bfda5a0b0b9672d5 SHA512 eb56a60c17fdac309fd141bfe7cf564abf7acb65cc3435fd458e5441f6e1e631cb29111be679ba2da2416446c9c6f28f7ecdb662a1d744af58c3148d2f61d27f WHIRLPOOL 36a5ee43cbca96cc2f99dfda27654a8ef6ba6dab61840f3e9b255ae232220bdd33306aeee816df114a52d49876861df6da39aa289745ba1f10179a7be47f82c2
-MISC ChangeLog 18683 SHA256 9c62ae43463bbee8dee592cf762b6befd77d81e8a904ab374a32ab296c9b848a SHA512 f2ed5732d1e7c8fd76a0867f43ac4c55382697daedb10220042c84832f8d87e6262e7ad0ce7ca91dc496e1409f98f04d70df5ae5c729210f38ed377739f3f297 WHIRLPOOL 63133c9da9b53bdcaf90c71c7f8e138180bedba567cb343ab036bb7b754ce9999d3042ab3672fe92ce5cdda12eb47dedc1ae9fd823d86aac6b6363aa8d946b49
+MISC ChangeLog 19210 SHA256 057411ed269754fa4698abf5dc80aca7ffd67f74c7b09412a4e45097ed652b07 SHA512 680da66a6ecfe6ec4fdd6d6bdd914747fd11983e1b6b65ef4dc497fde8c21a0cd49f578e3f480be7b691128c2906484f07cf26464613c8b651d249a109f3a67c WHIRLPOOL dc1d4ce2d5e64f350643acfa2aa756f4b405b560447c487cb67fde19a5a385083959175dce3cdf5f08f79e69b0bdf9cc275baf465d46992e38d2a4b74434f4eb
 MISC metadata.xml 1575 SHA256 b8b9531634759b7f388efeea55dcc70d94cbaeca25f063ed3a30dfda77c83c65 SHA512 28449dd837162e3f61e4f9fd8b66206cf1d3130b60997dd06f4987635ab4506bc082745822416cdbd8f1d3ff22a8935abff0b1bfa1fda569824734d5c4fcaec1 WHIRLPOOL 17475d0b41d4222a55ed26f5fcc0409d33ee34e272d36c015ac1e0742aa1945926d6782422484f5eeba602fae45cf4f94ebf9db394ceb26ac6a8f58d4149f990
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTnNoAAAoJEHy/RO9cNQiD2+0P/irIHTEuhrH+Ui6BgigE9ZUc
-/YRRxSntkwBSElxucYl3F0DvSoglqbmpRXZewa36LbbHMy7aZkkgTi7V6WV1yTMI
-5TAka7J+jZhyEajqR6l6mfrskPqLJfOTMu4EJ6baChtGDgyvIKsqhvzD7P2vqxpB
-A2Q4n2bcac6H4NBAUrVvD+Oe/yiYcdaVPVcvnoL5+7kx1cIGsb6BbKC8W2yLIM9a
-Y4+DBqUSWDutPV/1TRO1spumaj6HaHTlXK4KvkR978kRfIxHP9b9xUWOelLlYZsi
-BVtZoeONpgc1wO/SUA/c4wScR+YbpEMtDobsp7l6Ex2CmhnksN0fQyUqDfrcJwU1
-SFciabAD9aNVdvKGn0/o7GRBm+Q7KOxP4oLxoUrtMKni2LhcsajmM6X/GW+pwKAl
-bQR6tGMDifkzdWxS1aPuT8+zesNON9lxLf5cuA9GBfSroqxAcdLnlcbVSAH+1l2y
-K75K10PCQx1/h8i8bejVo6JF96+yQjmHpy6o5cFW3KGBH8Q07kAsoWtEBuhksHZR
-osIk5UTzCmUBmDyqQohz/ja6eiMltAVA0UFD0Zjr2JTK2eBUAEdrScIMe3Kgu/Zs
-gZq7R6V8YdMP116SyYDVzpqWCYi8cN2/zLbd2PbVXJVWJX1Q65k8tHLk2j8Jl/Wm
-7xLuLOfneUcxhZQKKY4M
-=Ln0o
+iQIcBAEBCAAGBQJTod+TAAoJEHy/RO9cNQiDwP4P/jodSiNd4mrkIn+3dUpkChOB
+5xmEH2fsThVYasE7ZOblFDiXYJde56P3S/3ryLctI56Ddmxzcs1T81p0jNZNT/B2
++8hwCZbouMUxixALbNjFT94Mrwq0FdAHQP1bPxXyMYDTQu5wgkekKu4Eqm/WZ2M8
+VwFZLBoKnRDI8awWI1SzyyfoPDZoLZvo4npxpzcYwenrdFwo/vixo80VdhqHMw41
+5pXOz7hHIJrVD4wuvI3Crx4MapKWz57tvlOVAAKSqj2xVBRdUhnaeZvAO6MqpWbF
+ePAECTWKNXZ3GWxlssIG9Pf0efMH03+bmqOSt0uFqBg4Zl26GwrAl11itzCMLZlD
+mxlJ8BJsskd15kdVa83KXC/wRt3h0bYUDu0pH3DZ3o75eC9agWbmcrXOX001vpD5
+rzyq1ptqj58eCKKYX4cVj5Uuxj/lHDKkELj0NmXVDYzBe88vdnjAfvoYVYxJOiHG
+aOJNFRIe85pP2V9s6goalW35XJtM+oFd07QQpuqUkc6e8tphnyuzvAQH3MU8xPFM
+K3Rx7lfK4T6XdvTsjmTxRGIus00S9V2JLxy27jRc/9HcTOSnZou8IwuNJxaoUTST
+T0Sm2dWntm/JKoNCcDbzaNn2AbcH81YkuDhE06btZwawoTDK6d7PTcZkJRLBiqG3
+c1envw375AaFtqqdqwgP
+=AL8F
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti-2.11-add-pgrep.patch b/app-emulation/ganeti/files/ganeti-2.11-add-pgrep.patch
new file mode 100644
index 000000000000..b0a8bd99cc0a
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.11-add-pgrep.patch
@@ -0,0 +1,25 @@
+diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
+index 656dc95..01f2cbb 100644
+--- a/daemons/daemon-util.in
++++ b/daemons/daemon-util.in
+@@ -246,12 +246,14 @@ start() {
+   @PKGLIBDIR@/ensure-dirs
+ 
+   if type -p start-stop-daemon >/dev/null; then
+-    start-stop-daemon --start --quiet \
+-      --pidfile $pidfile \
+-      --exec $daemonexec \
+-      --user $usergroup \
+-      --wait 300 \
+-      -- $args "$@"
++    if ! ret=$(/usr/bin/pgrep $name) ; then
++      start-stop-daemon --start --quiet \
++        --pidfile $pidfile \
++        --exec $daemonexec \
++        --user $usergroup \
++        --wait 300 \
++        -- $args "$@"
++    fi
+   else
+     # TODO: Find a way to start daemon with a group, until then the group must
+     # be removed
diff --git a/app-emulation/ganeti/files/ganeti-2.11-daemon-util.patch b/app-emulation/ganeti/files/ganeti-2.11-daemon-util.patch
new file mode 100644
index 000000000000..09b10cd3354d
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.11-daemon-util.patch
@@ -0,0 +1,38 @@
+diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
+index 01f2cbb..de4e396 100644
+--- a/daemons/daemon-util.in
++++ b/daemons/daemon-util.in
+@@ -22,18 +22,25 @@ 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-masterd
+-  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-masterd ganeti-rapi ganeti-luxid )
++fi
++
++DAEMONS+=( ganeti-kvmd )
+ 
+ _confd_enabled() {
+   [[ "@CUSTOM_ENABLE_CONFD@" == True ]]
diff --git a/app-emulation/ganeti/files/ganeti-2.11-start-stop-daemon-args.patch b/app-emulation/ganeti/files/ganeti-2.11-start-stop-daemon-args.patch
new file mode 100644
index 000000000000..09efd3cf90b4
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.11-start-stop-daemon-args.patch
@@ -0,0 +1,28 @@
+diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
+index 4d1d7c5..3deeab7 100644
+--- a/daemons/daemon-util.in
++++ b/daemons/daemon-util.in
+@@ -246,10 +246,11 @@ start() {
+   @PKGLIBDIR@/ensure-dirs
+ 
+   if type -p start-stop-daemon >/dev/null; then
+-    start-stop-daemon --start --quiet --oknodo \
++    start-stop-daemon --start --quiet \
+       --pidfile $pidfile \
+-      --startas $daemonexec \
+-      --chuid $usergroup \
++      --exec $daemonexec \
++      --user $usergroup \
++      --wait 300 \
+       -- $args "$@"
+   else
+     # TODO: Find a way to start daemon with a group, until then the group must
+@@ -273,7 +274,7 @@ stop() {
+   local pidfile=$(_daemon_pidfile $name)
+ 
+   if type -p start-stop-daemon >/dev/null; then
+-    start-stop-daemon --stop --quiet --oknodo --retry 30 \
++    start-stop-daemon --stop --quiet --retry 30 \
+       --pidfile $pidfile
+   else
+     _ignore_error killproc -p $pidfile $name
diff --git a/app-emulation/ganeti/ganeti-2.11.2-r2.ebuild b/app-emulation/ganeti/ganeti-2.11.2-r2.ebuild
new file mode 100644
index 000000000000..b3d7b66de9d2
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.11.2-r2.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.11.2-r2.ebuild,v 1.1 2014/06/18 18:50:58 chutzpah Exp $
+
+EAPI=5
+PYTHON_COMPAT=(python2_{6,7})
+use test && PYTHON_REQ_USE="ipv6"
+
+inherit eutils 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="kvm xen lxc drbd htools syslog ipv6 haskell-daemons rbd test"
+REQUIRED_USE="|| ( kvm xen lxc )"
+
+S="${WORKDIR}/${MY_P}"
+
+HASKELL_DEPS=">=dev-lang/ghc-6.12:0=
+		dev-haskell/json:0=
+		dev-haskell/curl:0=
+		dev-haskell/network:0=
+		dev-haskell/parallel
+		dev-haskell/hslogger: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/base64-bytestring:0="
+
+DEPEND="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? (
+		${HASKELL_DEPS}
+		dev-haskell/text:0=
+	)
+	dev-libs/openssl
+	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
+	${PYTHON_DEPS}
+	${GIT_DEPEND}"
+RDEPEND="${DEPEND}
+	!app-emulation/ganeti-htools"
+DEPEND+="${HASKELL_DEPS}
+	sys-devel/m4
+	test? (
+		dev-python/mock
+		dev-python/pyyaml
+		dev-haskell/test-framework:0=
+		dev-haskell/test-framework-hunit:0=
+		dev-haskell/test-framework-quickcheck2:0=
+		dev-haskell/temporary:0=
+		sys-apps/fakeroot
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.11-start-stop-daemon-args.patch"
+	"${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+	"${FILESDIR}/${PN}-2.11-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.11-qemu-enable-kvm.patch"
+	"${FILESDIR}/${PN}-2.11-tests.patch"
+	"${FILESDIR}/${PN}-lockdir.patch"
+)
+
+REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
+
+pkg_setup () {
+	confutils_use_depend_all haskell-daemons htools
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	[[ ${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 \
+		$(use_enable syslog) \
+		$(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}
+}
+
+src_test () {
+	emake check || die "emake check failed"
+}