Revision bump, fix ganeti-rapi reference in init script (bug #512444).

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

6 files changed, 34 insertions, 204 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 73fd8e4eea7a..df8c15a8757f 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,14 @@
 # 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.87 2014/06/02 18:57:28 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.88 2014/06/05 00:32:21 chutzpah Exp $
+
+*ganeti-2.11.1-r1 (05 Jun 2014)
+*ganeti-2.10.5-r1 (05 Jun 2014)
+
+  05 Jun 2014; Patrick McLean <chutzpah@gentoo.org> -ganeti-2.10.4.ebuild,
+  -ganeti-2.10.5.ebuild, +ganeti-2.10.5-r1.ebuild, -ganeti-2.11.1.ebuild,
+  +ganeti-2.11.1-r1.ebuild, -files/ganeti.initd-r2, +files/ganeti.initd-r3:
+  Revision bump, fix ganeti-rapi reference in init script (bug #512444).
 
 *ganeti-2.10.5 (02 Jun 2014)
 
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 667cb9d34390..acf5a24ad08a 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -21,12 +21,11 @@ AUX ganeti-kvm-poweroff.initd 1621 SHA256 bb7b6ab5ac2899969bab52d9c5e1c5d9fd9629
 AUX ganeti.confd 364 SHA256 6aecb2dc014fe1b66b873f6198a08a3c88968dce6124bff8d39f241fbb7b4cc4 SHA512 c635bf231236fa5246317f4eb9759e33e8152268508931d54f1f52ae382d1d95238096ff378c85af634c4d529045c73f470f10517500b028730fd5c1760e85d2 WHIRLPOOL e65860fefe56c03346d3935468e78fbd705b2b81a7bcb0aff13fe82718869afeb9ac0bd2ce8b26daf2620efd8520c3ae7347ca239889fa4256753e7ea8159602
 AUX ganeti.confd-r2 422 SHA256 3b6b5ede7b617109d2356adbc906d33b22836816280ed84305d00abf0d12de09 SHA512 4ac93d7c252c3b4dbba4146e991fdb49f4cf832cc96c48425748d279c459c5e4a8a8e1bdbc719027a7bd751896b469b996ed324bc180c9c674030eeb0b7a0d9a WHIRLPOOL ff8ba2ca4cf364651630000a52d1051fbf342781c5f6de276f388f58f67039680b4a34ec3a7a44029599d408fbad7da560c83ba21c91d0c98e251a1b5a867910
 AUX ganeti.initd 1159 SHA256 86f30236349528647e7b78d2e72963e9cda5f6998ebb314e44387bef5eab1f66 SHA512 5d184e4064246613514c100206eb1f7b206a1cf51ebb0a7b8a85702e7c9e247a8f41cfa6adc8d055b32349a7a21e05194668f7657daabd9a06eb18369def7890 WHIRLPOOL 1e322f359c993fc43d21bafe336fb330f714e21fd9a96a0ae636e729ed0464c175d6bd3f70f34e5f8985f9e34337bcda493f8ad6607143dba2887eab01db55b8
-AUX ganeti.initd-r2 2009 SHA256 d6e894715ffd13ba070bdcfa4aaa3b0f20725a5ceee9aa77feb13cfcd2564b9c SHA512 3d0ebc6352177ab5f5d034305b68258ed7365a2d4296d8a0c018cf1e6b359160a4912d460a95ac26b29268f946f2c3e8d848f13b57b6f8fb9f6d66b57e945e1a WHIRLPOOL 02f6fb3be95890a846f20517af8710bb135a1e6abde33389801cebbfdb4413aa2ef76d4281cddca1f4c954cd7ed6bdef0fc6152008b37ad1b6a0f32ed702447f
+AUX ganeti.initd-r3 1987 SHA256 998addcff8a8608f17f6be47f7bd4bd7a6861add0057cae0409327705b792a03 SHA512 2c7573dbe0c1149360042c4f6dc42146d8c2fcd67dd0fcde6d8d35e9d0d55510d734cd806f881c4d113e535c021cadfb355613c8bcf8169241f681d89fa7957a WHIRLPOOL 119a370619e87e973a86095ffe98f4783e7862e52fe0e20d9eddaf04157111bd915e523159e19f71556e1b97d604d62fc8e546b91a30c6a7591fe0725d10da0d
 AUX ganeti2.initd 1503 SHA256 6fd666648ac543ffcc3700821a36eba9a027eb04278e53f60e07ce8989de3fb8 SHA512 d57e8ee4bcaa39314ca1760c15be5ea3f35148ee41116d5bd02f3ef1bbfe0a718ec7fe9a3247dd6a79a60d531abb4690f77328355888313f55b523b5662bf86e WHIRLPOOL 91ba636a9b01da8f99d08bdfd86f847705526ee17fe5a11e752b542ec63682bdf80f7b615142d95ffb98dcac590b68b5c3c2b88bed034569dfb282be082bb047
 DIST ganeti-1.2.9.tar.gz 847644 SHA256 1de2432281f127a2b19106ba04fd1f630c7868113f0665063ff10a147676b92b SHA512 6e98aa2141c05f80658523174c32d8acd165da80b73dcdd6af21dee71f53784fb3624070de826963ff98eb7e2b760901c0c6ca82ae2c29472f12d3f7a96404a8 WHIRLPOOL 8818fa39bdfa523efbe05bde10342254ffbf7b25b18adf490482d507f772a52b142469b50d4f1487415571b9ed61c640fd5be2cb78f7d69da275d7e19e2c0411
 DIST ganeti-2.0.6.tar.gz 684502 SHA256 f06433c567109ffa319ca23449eec670fb8b7bec7fa906edbf3c0cfc01f60043 SHA512 4c175e458a8d94b740de7cb63c09b91351711465b0bb2f68cb9236108bd8e04db851f3ad6edc827b6f63a67785c401a4b44d138a4b9836d7fc3110736164339f WHIRLPOOL 5803221f764751464f38f5c790289dff51ad385cb47ccd0cfd861945c9d00e3cb4616a698c90e69b4fc7078278a0fb27e33e3fb7af13baa4de2eb77fa11dd9fb
 DIST ganeti-2.1.8.tar.gz 1400262 SHA256 80fc2add2937bb7503a003d71b910ccac29e691c35e2febc5e05908a551908ad SHA512 2a4b19d3116608e5d44cb62d334bc3933ca06125159a53a974c6b6215aec02ddf39d1b4688d8077b83726169383356a8d52c4c0114654b819de43d0c6c39fb36 WHIRLPOOL e8812dfddb3282f9e3d28752b727c19270e8b3428145f34db225a5a918ceda010204e66cc5e6fa4f52f73e41dabe065149792c248607159b8c872ea82e968a49
-DIST ganeti-2.10.4.tar.gz 3850220 SHA256 2fe49a317830222bb818d9233bb9d5b72d7886a86b4d244fd4e88967f18c0a3e SHA512 7cd195faa033ba302044a6a3318a85c4888e1d1c4d40e1689c1ac132057af5e2db3cb2c99f6aa842f27a59d0633b2b85d7b8d17649f0f324e799aaf6cc951a68 WHIRLPOOL fd584f6ec8fa112693d3c7f778df74ed515e9815c0e76581d946a420f59d85650f95563cc5587f0a969707cdcf4496a5e5656773107386c3cc838cc99d7f14ce
 DIST ganeti-2.10.5.tar.gz 3855105 SHA256 7b66a0a13344f484bc1d1e90f84227438e2cdbb054f5667a9a4c216bce2b8532 SHA512 ab9fe4c18f975e13dcd403a086b725d4f5e4f84aaa5a2651cf4087b6abad59b38b470ed062f407e6783997f976eb217e755c9d7a3ebde1df63638c3ab63cd755 WHIRLPOOL 5bf83bae29f51cfd2980d3e57a03d25e598ae7495785646e8920d4ca7685d2e93cbac42624e86fbbf92236edd7311f724fa036580300f8ccc066818d3c9911a5
 DIST ganeti-2.11.1.tar.gz 4089003 SHA256 705cfeb4641288fcae1eb0363e6dfdf60712b460298266c22b53492cb5e91c98 SHA512 1b5863811bb328cd979d4201c93873a65b4d05a19e122d2721211e3470bad0b43eebc3e17d85f8ec70b5530ac8b8bb1c2f9d34557fb3502efefafc493de84e9d WHIRLPOOL a964530f97439800b202ed3814b71b24e3b96de6ab9b3c1eea02d9b0391fe440b10cf18547ef45cc7461b18cf1a0465f1839331136c3764e5635ac2a73244159
 DIST ganeti-2.2.2.tar.gz 1588569 SHA256 99e9aa7de0397fa8bb19f216851dbfdb181c539b8ca25a7bc557899d96c6628e SHA512 cf561e8397924476d8d945871c12f0a0b021b74f128b26421c9a3cfe192bb01b7e1e07b211ed721dd1f5312ad9238a9bba412e0e4cabd4bec947d06fd749b9fb WHIRLPOOL 84eebe5b32f06f4de8c8473e4ef485807c2e1127f167f3a9f6ee4c3ef6107f332f44a746a776c4ba8d59bf22864d5d2e6f2a43a960b4b2847c0332861fd5a382
@@ -39,9 +38,8 @@ DIST ganeti-2.9.5.tar.gz 3614501 SHA256 8fb94e526c862e851cc700bc2eb04387f2b33af5
 EBUILD ganeti-1.2.9.ebuild 1189 SHA256 952e74cc5ce51864eed55bd46204e09b082c51236176bb2121da1f407e507c13 SHA512 8b9c5cf1e828d55f4908a3525781d033c1636fd75c74adee0d0500ddca605490c4757559ee9d1f10ddd31043b14ad5adef7ad7ae35e704bdb207e6c7732235d1 WHIRLPOOL 82342ba9c52ee4014cd2fc0d2585641ef1b8c6331337e049b76d8f7058580fd2d332198bc1cc056d6c153a01ab963c690558c98022936de0a663b4137bc4076d
 EBUILD ganeti-2.0.6.ebuild 1752 SHA256 e78392e12f76adde3c42c4e587710f670fa9dd3928b11adf917aea24a14c23d8 SHA512 f96bceb15af5fca5f9457ea27eb4fcf57009366d1a918c04964315a4e872b0b379ee36f0ba2c30afe6ce9b21580e391402e90722a86ab7b8163eab442f19762e WHIRLPOOL 31a37195cf34d7c20810420c50d30a6b2637149e31f2b49a9d251565294d308eff81fdef1a53e9555bbcecd2bb2872753e33334bcbcfdbcf48b2ffdb18a43028
 EBUILD ganeti-2.1.8.ebuild 2022 SHA256 33bb15b7318d2976f46694796b6ca485a657a8c98887f14c1760f45f3fbace52 SHA512 8a56053dd94a0c116f92592c2cf641da4631f489db2725dd83abaf85844a36ba4e06d24a9362e8601052910cc1515d1aac750c9b3b06f9109fa91057e2f9298a WHIRLPOOL 200c4a630a655c7ea87e3d1a8794e00b50415ba7ee19214466169db0e473112f4336a2ca2476ab0c0fdfbcecc72908c6f4f8903321219af471b2b70fd36932cc
-EBUILD ganeti-2.10.4.ebuild 4741 SHA256 bd8b3be8382824ff8c621cc78864e5b468719a6f2e7c2769051f5ef1b7e0fd7e SHA512 70eebab7d540f136d774f6f2e7ad09319bd13b8f3d3ece1fc50618a598c9a13120dce770e4be59fb0b82914bd8d475bb9a0f4dbbe89268183dc04d07d27c340c WHIRLPOOL 7bb22b642fe3a6f6d3fef73caf5245e262cd6d664b352b09c0af456a665b7f36f7494f716b7b69db8c356df8c251fc4b385d3ad31b700e885eeda196c6544501
-EBUILD ganeti-2.10.5.ebuild 4741 SHA256 9f644d71bdf39647342961468b3458bdf613973693492933533910f10d980531 SHA512 a797234473970b5e991468b3e3fd91d810fdc599710332a51a8ea0c4023cec9dc2213ae1834f77cd5a8a94fd412da18defb41b46bc40cb49193abac7940d827d WHIRLPOOL d746ec45cf46b6527a5a8c9f1c38e051636f2f0742714b76e3876ccf47b2a3ffc61a973cb6d1cde853f6c782c245c2067ccf65c1db99a26f3081dcae3a93255d
-EBUILD ganeti-2.11.1.ebuild 4799 SHA256 e279ea9eb960c17a10aaea3e30755bd9ebbce5a3cb186768f80fcc0b72095548 SHA512 0f5eac6e6ec6f26e5d7faea2eb39f12f1960be50c3718882e2039a8a04b5acdd92d42777d46234033184caafc39a805cb398642c6a859f4f66b5a0f041ef1822 WHIRLPOOL 516ef45dde8241b27921eaa74d5109fc11fb6e4c155ae43b24639fef2bf43709635c098ee6412daf3639609982368c2d613f546ba5124c815b8e54aeabfe723f
+EBUILD ganeti-2.10.5-r1.ebuild 4744 SHA256 04db7c5ec8c5e283034522978be22328c13888c816e93522938b5923ba3c4e9b SHA512 58814dfe60ea30a6244190006aae61562350a9137e2cb456012a02ea05b2090fb4c79b7fa96f50c25acfbf9bd3fccf2f701b55da0947d03268ff0cc0623c7efc WHIRLPOOL d72f72c5f63fb8de3abf8a93eb703baa1c92d00be71b27132f28d835f91f128661162069445d4a0608c655840dde276e0202342a354442d7592abde2d92a986b
+EBUILD ganeti-2.11.1-r1.ebuild 4802 SHA256 3a78551a2ea73514fb75772ae3cb0363aa7b8feb67aa43443cccebd6f527ed3d SHA512 2dc7648a457a1538862cb3d60a0e143dbd0a1d5b3685d1689408753a52e9a121dec120a5e352a20b509e3e0f3700381734df9356d83251bf7f9c9713f55bc813 WHIRLPOOL ba523cefeb5a27c47503c7a6af299274c51c5dbe7a67dcf6e0e892fbf75f795f661d3a89a757ce66793b42812a7fb15e967875f97543beedf25d25fa65127609
 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
@@ -49,22 +47,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 17673 SHA256 293fdb1cfecc37a32df5c1acfcd007d14c566bef1761d93f7764b8fdc6b0ef01 SHA512 99102e80a4e331b7558d8b2252cb7f3f89aa694224696e769c92c3ac1ddfb98794e35caa5f30de1980e3e4ac72d2b0e85690f74101a4a374d0472b2cff5eda36 WHIRLPOOL 9baa0583070eff45bdbf524bc2921cbcf27a0fbd764feb29c6717b6979ef5d5a92c0a743de67629333ade0014d64b46a9409c71ceb2759105d4e080eb0b2cb40
+MISC ChangeLog 18037 SHA256 aecfa8d0f06121122c9925e4cc2599a8e1742681d764e4c29eb3b8ef275dd3f2 SHA512 1c57f78d42c22a3c125f2fffd7939bf52f7f337105c37f0be87b6fdd1a16c69be3fdccf5cd4aedb6b36e99d89a62bd95db847365203e047841fae6153d165a47 WHIRLPOOL 47de3c479f4ef528ba35d142c851d5785875322139d183ee2ee5f590bb03d0991b3f79fa8b5284d9f4c7c3d7ab1d0278abff103bba47fb057501f3e731beb25d
 MISC metadata.xml 1575 SHA256 b8b9531634759b7f388efeea55dcc70d94cbaeca25f063ed3a30dfda77c83c65 SHA512 28449dd837162e3f61e4f9fd8b66206cf1d3130b60997dd06f4987635ab4506bc082745822416cdbd8f1d3ff22a8935abff0b1bfa1fda569824734d5c4fcaec1 WHIRLPOOL 17475d0b41d4222a55ed26f5fcc0409d33ee34e272d36c015ac1e0742aa1945926d6782422484f5eeba602fae45cf4f94ebf9db394ceb26ac6a8f58d4149f990
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTjMkiAAoJEHy/RO9cNQiD2f8QAKkP3AjlXHme/NX6ysVFVKeC
-Bf/dvHzH66TEfLu0LyUIN/0wunNqfKEMMlrwoy38J04mY5yyf0ONnq9qa1u19SDe
-r4VCaOHWT0i85FtlS9knQNtr/gruwlcFAYQhjx38r9tls3eGI+AjZq0nCYfYxURG
-UFlmPCK7EZRJiCdFUuxRdQqosHnEbBhvRz8GwFwigllVUQ6QjUho1xf6Ssr+1zlP
-K0WjX+qhe71rIb5vvtW9qUU68of5MROozCA2aYMuhy3blf/AP/zX+KIYOoBDA1SW
-Hmc0AgqaIefmg++qaqoY+cYgHxNpAIwPW4GOahlXQy73m/yx7A1XJ781tLAGxoYy
-U9tQyy6DCcxK+C5xc6BSIg+DZdHn4plE3HtYl7bcnEDysb9WEENFnqYPzMcY6tLX
-qi3TJ24P8tmJbEgJJF+6NcSxZQbLuuIXgGpGCnsFaFKFvvAeN+UVllckvAF4PaUy
-6/Ue5s/DqHPwxwknTovPcbVq7bsFOV3Fe2MHudER14GZiRvzsgR0B/PByLeGxC6T
-K3id1ib5uiO6icCyJnOM64FSoK5S/JpC6I8e5WPiKoBOT43HiX4VAQcAi7iHAqj5
-m5xlU9aiBXtZgCNOJLMEOtZmFnxM+3pFu3aQoQEKhrGMjgVoibCZh8DzDzjbzza3
-auNKrSXXr1l9bY8wUWR7
-=fOWL
+iQIcBAEBCAAGBQJTj7rCAAoJEHy/RO9cNQiDZmsP/2EZyI9xJe8s27cRz1isN+0W
+97uk++LNPTKa0HNvTdvfmGL0JW8cM8y8jOA3UCrOeXdfW1kg/YJyQEFlL9zIFrlf
+dkhewkAtRJz7a52Azi5nYc2T9i6sUqeRVHrJYnv4jftsbjyerwT+TpeUS13OIJrp
+j5RU924Uvfu5OxK5TtaR02wIeW149Ity3yq088r77RPN0td7B0Ejlsn+9X4qp8dn
+9h+KxWGHBJPL/K17s9cG2/hAuXrEUa9071qWhU0OInquZMFdWuQb9jGN5vP1bhwC
+qiqOGtVALZ1zjcVN2YcX3Vo1IM598voDltWTKQJnNDyyzsqbVstScEGfx6j663xx
+2izGUfSshMkujBDqooovlcO1d//fMaIg+DP4RErn9TMqYZJlPShvlA4Vd/gIqHW1
+JhWFFEcE0uCURaeQsSWzLp7QKCbCuz7K5tUgjY6TRaa8/onopkLxvK5cetkrdfcX
+2pS+WYiWBpiN1FvVOepmFQiylD2wAGmR3WAtoZ8Hk8m01kCBrTbTBb+J5Pz1L6BA
+ql6bm10QF2X7g9AfPI+/4qikdmy/HKyfumXzk5ZQIWTyuwUz7iOsTNJx/3IoXTsa
+Ubue+XAekj8OZQMKS6ylaYCXhKa6pKEXzokACPzAXx3nuamZApBvx+NlISiqeUI8
+hdsmJeSu9zrRYIq2Agx4
+=bt15
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti.initd-r2 b/app-emulation/ganeti/files/ganeti.initd-r3
index 53a198187635..81b0e4165a09 100644
--- a/app-emulation/ganeti/files/ganeti.initd-r2
+++ b/app-emulation/ganeti/files/ganeti.initd-r3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r2,v 1.1 2014/05/30 22:07:23 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3,v 1.1 2014/06/05 00:32:23 chutzpah Exp $
 
 depend() {
 	need localmount logger
@@ -32,7 +32,7 @@ start() {
 		optsvar="${daemon//-/_}"
 
 		case "${daemon#ganeti-}" in
-			masterd|rapid|luxid) is_master || continue;;
+			masterd|rapi|luxid) is_master || continue;;
 		esac
 
 		eval daemon_opts=\"\$\{${optsvar^^*}_OPTS\}\"
@@ -68,10 +68,8 @@ stop() {
 	local daemon
 
 	for daemon in $(${DAEMON_UTIL} list-stop-daemons) ; do \
-		case "${daemon}" in
-			ganeti-masterd|ganeti-rapi|ganeti-luxid)
-				is_master || continue
-			;;
+		case "${daemon#ganeti-}" in
+			masterd|rapi|luxid) is_master || continue;;
 		esac
 		${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS}
 	done
diff --git a/app-emulation/ganeti/ganeti-2.10.4.ebuild b/app-emulation/ganeti/ganeti-2.10.5-r1.ebuild
index 73b04301f206..80960f902065 100644
--- a/app-emulation/ganeti/ganeti-2.10.4.ebuild
+++ b/app-emulation/ganeti/ganeti-2.10.5-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.10.4.ebuild,v 1.1 2014/05/30 22:12:57 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.10.5-r1.ebuild,v 1.1 2014/06/05 00:32:21 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_{6,7})
@@ -135,7 +135,7 @@ src_configure () {
 src_install () {
 	emake V=1 DESTDIR="${D}" install || die "emake install failed"
 
-	newinitd "${FILESDIR}"/ganeti.initd-r2 ${PN}
+	newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
 	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
 
 	use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
diff --git a/app-emulation/ganeti/ganeti-2.10.5.ebuild b/app-emulation/ganeti/ganeti-2.10.5.ebuild
deleted file mode 100644
index d2f0fc60b233..000000000000
--- a/app-emulation/ganeti/ganeti-2.10.5.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# 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.10.5.ebuild,v 1.1 2014/06/02 18:57:28 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
-
-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="
-
-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-haskell/hinotify:0=
-		dev-haskell/regex-pcre-builtin:0=
-		dev-haskell/vector: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.6-fix-args.patch"
-	"${FILESDIR}/${PN}-2.6-add-pgrep.patch"
-	"${FILESDIR}/${PN}-2.7-fix-tests.patch"
-	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
-	"${FILESDIR}/${PN}-2.9-regex-builtin.patch"
-	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
-	"${FILESDIR}/${PN}-2.10-rundir.patch"
-)
-
-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 () {
-	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-kvm' '') \
-		$(usex haskell-daemons "--enable-confd=haskell" '' '' '')
-}
-
-src_install () {
-	emake V=1 DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/ganeti.initd-r2 ${PN}
-	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
-	use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
-	use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
-	newbashcomp doc/examples/bash_completion ganeti
-	dodoc INSTALL UPGRADE NEWS README doc/*.rst
-	dohtml -r doc/html/*
-	rm -rf "${D}"/{usr/share/doc/${PN},run}
-
-	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}
-
-	python_fix_shebang "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-
-	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}"
-}
-
-src_test () {
-	emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.11.1.ebuild b/app-emulation/ganeti/ganeti-2.11.1-r1.ebuild
index 6b41ec3679b3..aafd4a21ab31 100644
--- a/app-emulation/ganeti/ganeti-2.11.1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.11.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2014/05/30 22:07:23 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.11.1-r1.ebuild,v 1.1 2014/06/05 00:32:21 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_{6,7})
@@ -137,7 +137,7 @@ src_configure () {
 src_install () {
 	emake V=1 DESTDIR="${D}" install || die "emake install failed"
 
-	newinitd "${FILESDIR}"/ganeti.initd-r2 ${PN}
+	newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
 	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
 
 	use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff