Revision bump, make failure to start ganeti-kvmd not fatal since it fails if user shutdowns are disabled. Clean out older versions.

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

14 files changed, 50 insertions, 897 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 0e2a9870bbeb..0b8b5f70b00f 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,17 @@
 # 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.91 2014/06/18 18:50:58 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.92 2014/07/02 23:57:25 chutzpah Exp $
+
+*ganeti-2.11.2-r3 (02 Jul 2014)
+*ganeti-2.10.5-r3 (02 Jul 2014)
+
+  02 Jul 2014; Patrick McLean <chutzpah@gentoo.org> -ganeti-1.2.9.ebuild,
+  -ganeti-2.0.6.ebuild, -ganeti-2.1.8.ebuild, -ganeti-2.2.2.ebuild,
+  -ganeti-2.3.1.ebuild, -ganeti-2.5.2-r2.ebuild, -ganeti-2.6.2.ebuild,
+  -ganeti-2.10.5-r2.ebuild, +ganeti-2.10.5-r3.ebuild, -ganeti-2.11.2-r1.ebuild,
+  -ganeti-2.11.2-r2.ebuild, +ganeti-2.11.2-r3.ebuild, files/ganeti.initd-r3:
+  Revision bump, make failure to start ganeti-kvmd not fatal since it fails if
+  user shutdowns are disabled. Clean out older versions.
 
 *ganeti-2.11.2-r2 (18 Jun 2014)
 
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 0e556877496f..3c3b9669638b 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -27,49 +27,34 @@ AUX ganeti-lockdir.patch 468 SHA256 a3977ea2cf063421cf2bc3b2a1e2071999a03355d9eb
 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-r3 1987 SHA256 998addcff8a8608f17f6be47f7bd4bd7a6861add0057cae0409327705b792a03 SHA512 2c7573dbe0c1149360042c4f6dc42146d8c2fcd67dd0fcde6d8d35e9d0d55510d734cd806f881c4d113e535c021cadfb355613c8bcf8169241f681d89fa7957a WHIRLPOOL 119a370619e87e973a86095ffe98f4783e7862e52fe0e20d9eddaf04157111bd915e523159e19f71556e1b97d604d62fc8e546b91a30c6a7591fe0725d10da0d
+AUX ganeti.initd-r3 2122 SHA256 eea9162fca1d4c27b0b8d755b299c7556f7410077d691cd78bdcd6f7b593b071 SHA512 c94fde7fd18e15167896a0173871afd20322358fbe8c08cef272ca0f8024b5070321f3a8b1589a1f815f349209377c4d7bf8fe8d5c48fae8701a511c1bb9e021 WHIRLPOOL 44584f867630ab53d3375add96bfb6a3a4e7132c6d415efa2d911c88d511d814c237ba294c9927ff1459e16ab4e42ac71efbe766c53530943602b1caf6d6419a
 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.5.tar.gz 3855105 SHA256 7b66a0a13344f484bc1d1e90f84227438e2cdbb054f5667a9a4c216bce2b8532 SHA512 ab9fe4c18f975e13dcd403a086b725d4f5e4f84aaa5a2651cf4087b6abad59b38b470ed062f407e6783997f976eb217e755c9d7a3ebde1df63638c3ab63cd755 WHIRLPOOL 5bf83bae29f51cfd2980d3e57a03d25e598ae7495785646e8920d4ca7685d2e93cbac42624e86fbbf92236edd7311f724fa036580300f8ccc066818d3c9911a5
 DIST ganeti-2.11.2.tar.gz 4102630 SHA256 1ff4eb669cae420c0f46862724ddc6cc8a329b5ab425b846c30dede5a12a6714 SHA512 26433226ed0c21c45d6ad3bddd43489c0b8cdd2f64af3e138c559df421d76859876ef7cfd7e00ab75c8041b3c3f10fbdf290782b23a3b3989d79589c44e8d6dd WHIRLPOOL adc9a3126968b5ecb17c1e9bbc0f17c7eb3f8af427efe60b19fb600728e63d4c87338bc226cae82a19c6309efe2567d8f4ee381387450c006a56033231f95eaa
-DIST ganeti-2.2.2.tar.gz 1588569 SHA256 99e9aa7de0397fa8bb19f216851dbfdb181c539b8ca25a7bc557899d96c6628e SHA512 cf561e8397924476d8d945871c12f0a0b021b74f128b26421c9a3cfe192bb01b7e1e07b211ed721dd1f5312ad9238a9bba412e0e4cabd4bec947d06fd749b9fb WHIRLPOOL 84eebe5b32f06f4de8c8473e4ef485807c2e1127f167f3a9f6ee4c3ef6107f332f44a746a776c4ba8d59bf22864d5d2e6f2a43a960b4b2847c0332861fd5a382
-DIST ganeti-2.3.1.tar.gz 1679030 SHA256 3d644eea35f1caed9e38246f21fa79f4d4d783f396078b5872b14934a47c2d8e SHA512 df4a5b198e93bbe7a4da1a4b8d0670ef2dafc0ec0f3bb86396f3eb213a5d73126300e6d5e60727570cc289b44debb6e69d2d23febc5067fec600a9b5deced4b2 WHIRLPOOL 593b30d4d3c26ab582665ed32e083cafec25c74d5766aa8d8c79a9bc434aa8bf2da394da607eac63ccaa68283d133ed72cd8533ba3fc9080993c0e7f0449fda2
 DIST ganeti-2.4.5.tar.gz 1828118 SHA256 9141379f3802238fb209309ec12f7090d872b77d7a473c91fe766d1fcec97c89 SHA512 e3abc2fd7c031fbef41c6e993f4cb129fa1dd4cb8c44961a2574da23832fd8412b8b3664b2e05ba8236cb8e58e8d70c3c9081f3f1b6dba8ffdc28d298c8a5099 WHIRLPOOL 897c2b3cdf0c7b03232a4ec99314439dbd29afd65eb2502d21a9f197cc098323a4b9ec0671c24ef7aad44b5327316ee68731e7e5304c8730d03f8ca908b93b62
-DIST ganeti-2.5.2.tar.gz 2294366 SHA256 356a50fb847003c05a493888192912a3079de928ec73d9b4c5cb887968d6d6b4 SHA512 58f9b93fd75bcd94dd351cd46754f6516eaaf6d85807a1a26a394f9ba48a73abd13e8355bb3b91c0f7e7a0f4dfd38fc3a1533ccf6b043507a59ea58e8cfe679f WHIRLPOOL 5e76ff14850e2e349211b144bd6a7a8813408bf8eff379a7826814be1bb8ecaaea72da7226d24a9e0ce7a39ee45b93a0fa1500ce083aed289200d8f19311b030
-DIST ganeti-2.6.2.tar.gz 2759827 SHA256 d8ee78c52f72a290d76b63430fa42a5d530e5e064cb985d807f5afda5935d932 SHA512 bac669fe4384db58a2c5fcbc4f1e84bfb43d28cef63dcaa5f98a03b1a53e13ad0695e19d5e80702ec7eb23e73e154ed3be522e653a71028653426ea2bb905f53 WHIRLPOOL df0e6092ffa7fe9bf536149f82dd719afd4566539cec2c45bcb57db8b2e0c003cca039cf50d317fdd48ec1ffdbff4f689162f91d31ef1ef72b450100582d4d8d
 DIST ganeti-2.7.2.tar.gz 3222364 SHA256 ea4178817df0d1352c2c2da292f0fc0fc17f0818ce5a48816b020dda03608481 SHA512 c868408605aec0c6a39af7924baf3ea04e8c855f4a702ed2025aff6bb539ea824a69e25e65f855ab6b56d4b1b5426ed31355eda496897964d2314f7d5cd3e010 WHIRLPOOL 8b1b48bb9b9ead37fc5d0eea3de333d05d09777828e5d5c224f1ff9fb0611888718d90be67186881f8caa1fbb7887057ccb848f9a370d68cb76dd60c990db9ce
 DIST ganeti-2.9.5.tar.gz 3614501 SHA256 8fb94e526c862e851cc700bc2eb04387f2b33af5bdf451c3133c44bc3996b7bc SHA512 6b483aeedfb80501640adb222157f86098b7996b9e47a64eddbc7a5ab216fd67955ab23a0b52ea1c3afb8b2c15b1407b35faa4550822d6af2169898a5fc16332 WHIRLPOOL 6b60a90b45bc7a202bc4b7787ed1e7a0baf9eb12216b17390713d39c71deacb13a0d12ae63280b992074c0fe1b1a05501c0ffed01fbce2c82e2819d6c99966d1
-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.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
-EBUILD ganeti-2.5.2-r2.ebuild 3833 SHA256 b8e526ddb60ffacebbffa82b28e4f08a3d25aa591c542273b0c2b110d0630000 SHA512 cc8096d8728239ea76ec3e9ace9c32c0920c34c38b22adbd0f83427a2a44aa9ba9c0a33a9c53785e9ea62d057cb3be03567301a232a5e8f88515ff8e8c916627 WHIRLPOOL de004b4ef5c15ee45a667e2982e5a3c24914af31d94d6db8226e7c6f49146053eca10e02273521c8c5278237f191da9ba90015a298a4f594f3787b4fd16b8c90
-EBUILD ganeti-2.6.2.ebuild 4397 SHA256 baeaee518ab03435dca205e90cf275ea40f54d79734e5d82670ec7a025219e36 SHA512 5ad31f9d36bcb1ba09947f729308d32660053b0444023cda1c3dd030c911047aa38d585d12954e04fefaa7dcbe3ac378fa906360be8881690991578d04d9362f WHIRLPOOL 0740ccef8800aaeea44c19b8b24c847abca3d4cdd52dfdf420f095039c67fb4a45b3369b529c8720630ef1180e6c72af9d16a20795bc2e7cc2c2835ff610659f
+EBUILD ganeti-2.10.5-r3.ebuild 4779 SHA256 69f63c3c44fd5aec39a32b2ce0949093d9c9f25e1eb0391666abc093798d6dbd SHA512 5a883661c4ff5f6e14c01480fca87bac44c96d54f1d63e34964ea217fd91c37b6a56b6a3b7df0a35b38e829c957592267d0893e6d39f56017d1f78c5ea9434c8 WHIRLPOOL d5fb0807ab81ca3afea2f74c16aace40578955f61ab555b067cc3d5739ef96dc13cf0f75c71e47ab8d31634a730714fc51eb405bf57b87810051b511b7519d29
+EBUILD ganeti-2.11.2-r3.ebuild 5352 SHA256 853237ff17cd23a0302ee2bb959bf8eb605e94beed379f0813bce4b7fba39fb6 SHA512 c7ad635ae4d2951e4376ebb8a81ec07c71c0404b3bfa2fb4cac79196f1872dafe3c5aa48cc3f5b3ad436518b51e54d7667fa7a88d119bcbdcf7b72a1e186f13c WHIRLPOOL 975fc2c629253cad97de6574772d29b3bab364c02fa3a3a31229ba91e1b4bf5f9bd4a024bdda9bcbc84ec323d7c23e5287a70a557daaa9a680a4845e8a913f14
+EBUILD ganeti-2.4.5-r1.ebuild 2540 SHA256 8024d6ba63f08762ec42f6acf8d3ad7f7f51ca4d221f780e7b86229e694dbea3 SHA512 85cce9aa0ccbfbfb889962b407eda507adaa5cbbf0630ddea6b86dc923c8b23dc4e881a41d0a63cf927f0b93b9427c10f428b36f534658ed8edec272e2559677 WHIRLPOOL 7a65b8e03cdf3ca189ea0cfd2ceeba597d45843df7c8a25f4c7de8224a16421f1235e9e7689c84b566c9eaeab815ef939259915e02b884beb1996595951a35bb
 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 19210 SHA256 057411ed269754fa4698abf5dc80aca7ffd67f74c7b09412a4e45097ed652b07 SHA512 680da66a6ecfe6ec4fdd6d6bdd914747fd11983e1b6b65ef4dc497fde8c21a0cd49f578e3f480be7b691128c2906484f07cf26464613c8b651d249a109f3a67c WHIRLPOOL dc1d4ce2d5e64f350643acfa2aa756f4b405b560447c487cb67fde19a5a385083959175dce3cdf5f08f79e69b0bdf9cc275baf465d46992e38d2a4b74434f4eb
+MISC ChangeLog 19782 SHA256 ca4fbfadc624c87cf1223bfabb6ad4c2959f768f2f463e686d8191871ee80cb1 SHA512 eee7bdc3e65264086367970023b4b486321e7ec6290bd80d1001c1f54932adf3b5bdc8a071ddfc42416cafbe0ac6bd22b67df90f36bb6067082c3b766d0eb24e WHIRLPOOL 1b0d51c07e874db56d70b2f10da059c42047dcf08cf375835d757292ae020c80902e2c791d4a113e43689bbb5928f6be4478a1b7d87fc50bb8d0995e86e1f273
 MISC metadata.xml 1575 SHA256 b8b9531634759b7f388efeea55dcc70d94cbaeca25f063ed3a30dfda77c83c65 SHA512 28449dd837162e3f61e4f9fd8b66206cf1d3130b60997dd06f4987635ab4506bc082745822416cdbd8f1d3ff22a8935abff0b1bfa1fda569824734d5c4fcaec1 WHIRLPOOL 17475d0b41d4222a55ed26f5fcc0409d33ee34e272d36c015ac1e0742aa1945926d6782422484f5eeba602fae45cf4f94ebf9db394ceb26ac6a8f58d4149f990
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJTtJxoAAoJEHy/RO9cNQiDCiQQAJz5fm1GZFiTmIMNJF/7duy1
+AyqxYnpYEunAefBYbgrWDC0bZkgAhihPElyDFVtiMiZ72quWsXDMyQlv+HTNML79
+LSBE78Vpi4ejFs5S1fJBXJGL8J2rQDmk8nTUqLlWDtdssgHtW3xZYGyDCTwRuydX
+eLDrvX74Lhk8HYuwmLSL5xaM4ssFsva1BjzdBd9u4yJwmiN/9jCozR0ly58Gg/l/
+8Iq3f5SoeiSnbDI5GfQ4cHvTTKs50AnTQXscMhRatcLVCukiFmyjtG+HJlAKfeLE
+ZJ+aJEqOmD3c5KsmsXr9laVh6B+9peoaPcYjCppV1ALmeC8rGeeG2eCDa4dW7cgz
+wCVBV+bc0a6gDaaoiUOtaABLoieMjyxUN0bvKd4oVTXszMO51nNKlySxq4CgR+2a
+3GxYMJj0mH2j7IQ3DQy8EXATnzWXDiH2B5/aBCrBVFzTalLKDqTx9QaqgLrapM91
+idpvFFDGqpzgvjrE8BdnstehoUCCiJsOIN0GPhtIb5/CgjEwxhHe66Ak0M4G/lC9
+i8QXThmObcGfsyUn5q1YmUOSRwJJ+AmAmvtQQaw6UrJViCnIotI9de9u2ryPVtEn
+nkL8uHliWWsw5BJmfMPSTbRgejmFtEfNPrv8i9ThJrvX5ltDlgm+dqTELKAbFxlk
+YsQBYHIKDdHNgZN+PAEc
+=8vFK
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti.initd-r3 b/app-emulation/ganeti/files/ganeti.initd-r3
index 81b0e4165a09..9e0fc170695f 100644
--- a/app-emulation/ganeti/files/ganeti.initd-r3
+++ 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-r3,v 1.1 2014/06/05 00:32:23 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3,v 1.2 2014/07/02 23:57:25 chutzpah Exp $
 
 depend() {
 	need localmount logger
@@ -42,17 +42,22 @@ start() {
 		${DAEMON_UTIL} start ${daemon} ${GANETI_OPTS} ${daemon_opts} || retval=${?}
 
 		if [ ${retval} != 0  ] && [ -n "${started_daemons}" ]; then
-			eerror "Stopping already started daemons"
-			eindent
-			eend ${code} "$(${DAEMON_UTIL} check-exitcode ${code})"
+			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}
+					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}"
diff --git a/app-emulation/ganeti/ganeti-1.2.9.ebuild b/app-emulation/ganeti/ganeti-1.2.9.ebuild
deleted file mode 100644
index f99bb8f76973..000000000000
--- a/app-emulation/ganeti/ganeti-1.2.9.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-1.2.9.ebuild,v 1.5 2013/09/12 22:29:37 mgorny Exp $
-
-PYTHON_DEPEND="2"
-
-inherit python autotools eutils
-
-MY_P=${P/_beta/b}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Ganeti is a virtual server management software tool built upon Xen"
-HOMEPAGE="http://code.google.com/p/ganeti/"
-SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=app-emulation/xen-3.0
-	dev-libs/openssl
-	dev-python/pyopenssl
-	dev-python/pyparsing
-	dev-python/simplejson
-	dev-python/twisted-core
-	net-analyzer/arping
-	net-misc/bridge-utils
-	net-misc/openssh
-	sys-apps/iproute2
-	sys-cluster/drbd
-	sys-fs/lvm2
-	sys-fs/mdadm"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	eautoreconf
-}
-
-src_compile() {
-	econf --localstatedir=/var --with-ssh-initscript=/etc/init.d/sshd
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}/ganeti.initd" ganeti
-
-	keepdir /var/{lib,log,run}/ganeti/
-	keepdir /srv/ganeti/{os,export}/
-}
diff --git a/app-emulation/ganeti/ganeti-2.0.6.ebuild b/app-emulation/ganeti/ganeti-2.0.6.ebuild
deleted file mode 100644
index 977c667483e6..000000000000
--- a/app-emulation/ganeti/ganeti-2.0.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.0.6.ebuild,v 1.6 2013/09/12 22:29:37 mgorny Exp $
-
-EAPI=2
-
-inherit eutils confutils bash-completion-r1
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://code.google.com/p/ganeti/"
-SRC_URI="http://ganeti.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kvm xen drbd"
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
-	kvm? ( app-emulation/qemu )
-	drbd? ( >=sys-cluster/drbd-8.0 )
-	dev-libs/openssl
-	dev-python/pyopenssl
-	dev-python/pyparsing
-	dev-python/simplejson
-	net-analyzer/arping
-	net-misc/bridge-utils
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	sys-fs/lvm2"
-RDEPEND="${DEPEND}"
-
-src_prepare () {
-	epatch "${FILESDIR}/${PN}-2.0.3-gentoo-brctl-path.patch"
-}
-
-pkg_setup () {
-	confutils_require_any kvm xen
-}
-
-src_configure () {
-	econf --localstatedir=/var \
-		--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/ganeti/os \
-		--with-file-storage-dir=/var/lib/ganeti-storage/file
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/ganeti2.initd ganeti
-	newbashcomp doc/examples/bash_completion ganeti
-	dodoc DEVNOTES INSTALL NEWS README doc/*.rst doc/*.txt
-	rm -rf "${D}"/usr/share/doc/ganeti
-	docinto examples
-	dodoc doc/examples/dumb-allocator doc/examples/ganeti.cron
-
-	keepdir /var/{lib,log,run}/ganeti/
-	keepdir /usr/share/ganeti/os/
-	keepdir /var/lib/ganeti-storage/{export,file}/
-}
-
-pkg_postinst () {
-	bash-completion_pkg_postinst
-}
diff --git a/app-emulation/ganeti/ganeti-2.1.8.ebuild b/app-emulation/ganeti/ganeti-2.1.8.ebuild
deleted file mode 100644
index 2450c0a3459e..000000000000
--- a/app-emulation/ganeti/ganeti-2.1.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.1.8.ebuild,v 1.6 2013/09/12 22:29:37 mgorny Exp $
-
-EAPI=2
-
-inherit eutils confutils bash-completion-r1
-
-MY_PV="${PV/_rc/~rc}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://code.google.com/p/ganeti/"
-SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kvm xen drbd +filestorage syslog"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
-	kvm? ( app-emulation/qemu )
-	drbd? ( >=sys-cluster/drbd-8.0 )
-	dev-libs/openssl
-	dev-python/pyopenssl
-	dev-python/pyparsing
-	dev-python/pyinotify
-	dev-python/simplejson
-	net-analyzer/arping
-	net-misc/bridge-utils
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	sys-fs/lvm2"
-RDEPEND="${DEPEND}"
-
-pkg_setup () {
-	confutils_require_any kvm xen
-}
-
-src_configure () {
-	local myconf
-	if use filestorage ; then
-		myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file"
-	else
-		myconf="--with-file-storage-dir=no"
-	fi
-	econf --localstatedir=/var \
-		--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/ganeti/os \
-		$(use_enable syslog) \
-		${myconf}
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
-	newconfd "${FILESDIR}"/ganeti.confd ganeti
-	newbashcomp doc/examples/bash_completion ganeti
-	dodoc INSTALL NEWS README doc/*.rst
-	rm -rf "${D}"/usr/share/doc/ganeti
-	docinto examples
-	dodoc doc/examples/{dumb-allocator,ganeti.cron,gnt-config-backup}
-	docinto examples/hooks
-	dodoc doc/examples/hooks/{ipsec,ethers}
-
-	keepdir /var/{lib,log,run}/ganeti/
-	keepdir /usr/share/ganeti/os/
-	keepdir /var/lib/ganeti-storage/{export,file}/
-}
-
-pkg_postinst () {
-	bash-completion_pkg_postinst
-}
diff --git a/app-emulation/ganeti/ganeti-2.10.5-r2.ebuild b/app-emulation/ganeti/ganeti-2.10.5-r3.ebuild
index cff8533711be..33fe840accbd 100644
--- a/app-emulation/ganeti/ganeti-2.10.5-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.10.5-r3.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.5-r2.ebuild,v 1.1 2014/06/14 23:25:41 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.10.5-r3.ebuild,v 1.1 2014/07/02 23:57:25 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_{6,7})
diff --git a/app-emulation/ganeti/ganeti-2.11.2-r1.ebuild b/app-emulation/ganeti/ganeti-2.11.2-r1.ebuild
deleted file mode 100644
index fbc300f59398..000000000000
--- a/app-emulation/ganeti/ganeti-2.11.2-r1.ebuild
+++ /dev/null
@@ -1,192 +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.11.2-r1.ebuild,v 1.1 2014/06/14 23:25:41 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=
-		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.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.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}
-
-	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.2-r2.ebuild b/app-emulation/ganeti/ganeti-2.11.2-r3.ebuild
index b3d7b66de9d2..124b66e59990 100644
--- a/app-emulation/ganeti/ganeti-2.11.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.11.2-r3.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.2-r2.ebuild,v 1.1 2014/06/18 18:50:58 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.11.2-r3.ebuild,v 1.1 2014/07/02 23:57:25 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_{6,7})
diff --git a/app-emulation/ganeti/ganeti-2.2.2.ebuild b/app-emulation/ganeti/ganeti-2.2.2.ebuild
deleted file mode 100644
index f8f1b7a05122..000000000000
--- a/app-emulation/ganeti/ganeti-2.2.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.2.2.ebuild,v 1.7 2013/09/12 22:29:37 mgorny Exp $
-
-EAPI=2
-
-inherit eutils confutils bash-completion-r1
-
-MY_PV="${PV/_rc/~rc}"
-#MY_PV="${PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://code.google.com/p/ganeti/"
-SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kvm xen drbd +filestorage syslog"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
-	kvm? ( app-emulation/qemu )
-	drbd? ( >=sys-cluster/drbd-8.3 )
-	dev-libs/openssl
-	dev-python/paramiko
-	dev-python/pyopenssl
-	dev-python/pyparsing
-	dev-python/pycurl
-	dev-python/pyinotify
-	dev-python/simplejson
-	net-analyzer/arping
-	net-misc/bridge-utils
-	net-misc/curl[ssl]
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	sys-fs/lvm2"
-RDEPEND="${DEPEND}"
-
-pkg_setup () {
-	confutils_require_any kvm xen
-}
-
-src_configure () {
-	local myconf
-	if use filestorage ; then
-		myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file"
-	else
-		myconf="--with-file-storage-dir=no"
-	fi
-	econf --localstatedir=/var \
-		--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/ganeti/os \
-		$(use_enable syslog) \
-		${myconf}
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
-	newconfd "${FILESDIR}"/ganeti.confd ganeti
-	newbashcomp doc/examples/bash_completion ganeti
-	dodoc INSTALL NEWS README doc/*.rst
-	rm -rf "${D}"/usr/share/doc/ganeti
-	docinto examples
-	dodoc doc/examples/{dumb-allocator,ganeti.cron,gnt-config-backup}
-	docinto examples/hooks
-	dodoc doc/examples/hooks/{ipsec,ethers}
-
-	keepdir /var/{lib,log,run}/ganeti/
-	keepdir /usr/share/ganeti/os/
-	keepdir /var/lib/ganeti-storage/{export,file}/
-}
-
-pkg_postinst () {
-	bash-completion_pkg_postinst
-}
diff --git a/app-emulation/ganeti/ganeti-2.3.1.ebuild b/app-emulation/ganeti/ganeti-2.3.1.ebuild
deleted file mode 100644
index 0c0ae409598d..000000000000
--- a/app-emulation/ganeti/ganeti-2.3.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.3.1.ebuild,v 1.6 2013/09/12 22:29:37 mgorny Exp $
-
-EAPI=2
-
-inherit eutils confutils bash-completion-r1
-
-MY_PV="${PV/_rc/~rc}"
-#MY_PV="${PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://code.google.com/p/ganeti/"
-SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kvm xen drbd +filestorage syslog ipv6"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
-	kvm? ( app-emulation/qemu )
-	drbd? ( >=sys-cluster/drbd-8.3 )
-	ipv6? ( net-misc/ndisc6 )
-	dev-libs/openssl
-	dev-python/paramiko
-	dev-python/pyopenssl
-	dev-python/pyparsing
-	dev-python/pycurl
-	dev-python/pyinotify
-	dev-python/simplejson
-	net-analyzer/arping
-	net-misc/bridge-utils
-	net-misc/curl[ssl]
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	sys-fs/lvm2"
-RDEPEND="${DEPEND}"
-
-pkg_setup () {
-	confutils_require_any kvm xen
-}
-
-src_configure () {
-	local myconf
-	if use filestorage ; then
-		myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file"
-	else
-		myconf="--with-file-storage-dir=no"
-	fi
-	econf --localstatedir=/var \
-		--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/ganeti/os \
-		$(use_enable syslog) \
-		${myconf}
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
-	newconfd "${FILESDIR}"/ganeti.confd ganeti
-	newbashcomp doc/examples/bash_completion ganeti
-	dodoc INSTALL NEWS README doc/*.rst
-	rm -rf "${D}"/usr/share/doc/ganeti
-	docinto examples
-	dodoc doc/examples/{dumb-allocator,ganeti.cron,gnt-config-backup}
-	docinto examples/hooks
-	dodoc doc/examples/hooks/{ipsec,ethers}
-
-	keepdir /var/{lib,log,run}/ganeti/
-	keepdir /usr/share/ganeti/os/
-	keepdir /var/lib/ganeti-storage/{export,file}/
-}
-
-pkg_postinst () {
-	bash-completion_pkg_postinst
-}
diff --git a/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild b/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild
index 974b6ad47164..20a0019dedf0 100644
--- a/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.4.5-r1.ebuild,v 1.6 2013/09/12 22:29:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild,v 1.7 2014/07/02 23:57:25 chutzpah Exp $
 
 EAPI=4
 
diff --git a/app-emulation/ganeti/ganeti-2.5.2-r2.ebuild b/app-emulation/ganeti/ganeti-2.5.2-r2.ebuild
deleted file mode 100644
index 94f113ffee61..000000000000
--- a/app-emulation/ganeti/ganeti-2.5.2-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.5.2-r2.ebuild,v 1.4 2013/09/12 22:29:37 mgorny Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit eutils confutils bash-completion-r1 python
-
-MY_PV="${PV/_rc/~rc}"
-#MY_PV="${PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-
-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://ganeti.googlecode.com/files/${MY_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 +filestorage sharedstorage htools syslog ipv6"
-REQUIRED_USE="|| ( kvm xen lxc )"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
-	kvm? ( app-emulation/qemu )
-	lxc? ( app-emulation/lxc )
-	drbd? ( >=sys-cluster/drbd-8.3 )
-	ipv6? ( net-misc/ndisc6 )
-	htools? (
-		>=dev-lang/ghc-6.10
-		dev-haskell/json
-		dev-haskell/curl
-		dev-haskell/network
-		dev-haskell/parallel )
-	dev-libs/openssl
-	dev-python/paramiko
-	dev-python/pyopenssl
-	dev-python/pyparsing
-	dev-python/pycurl
-	dev-python/pyinotify
-	dev-python/simplejson
-	net-analyzer/arping
-	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/python-2.6
-	${GIT_DEPEND}"
-RDEPEND="${DEPEND}
-	!app-emulation/ganeti-htools"
-
-pkg_setup () {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		./autogen.sh
-	fi
-	epatch "${FILESDIR}/${PN}-fix-start-stop.patch"
-	epatch "${FILESDIR}/${PN}-2.5-gentoo-start-stop-daemon.patch"
-
-	# Force Ganeti to use python2
-	python_convert_shebangs -r 2 tools
-	python_convert_shebangs 2 daemons/import-export
-}
-
-src_configure () {
-	local myconf
-	if use filestorage ; then
-		myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file"
-	else
-		myconf="--with-file-storage-dir=no"
-	fi
-	if use sharedstorage ; then
-		myconf="--with-shared-file-storage-dir=/var/lib/ganeti-storage/shared"
-	else
-		myconf="--with-shared-file-storage-dir=no"
-	fi
-	if use kvm && [ -f /usr/bin/qemu-kvm ] ; then
-		myconf="--with-kvm-path=/usr/bin/qemu-kvm"
-	fi
-	econf --localstatedir=/var \
-		--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/ganeti/os \
-		$(use_enable syslog) \
-		$(use_enable htools) \
-		$(use_enable htools htools-rapi) \
-		${myconf}
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
-	newconfd "${FILESDIR}"/ganeti.confd ganeti
-	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
-	rm -rf "${D}"/usr/share/doc/ganeti
-	docinto examples
-	#dodoc doc/examples/{basic-oob,ganeti.cron,gnt-config-backup}
-	dodoc doc/examples/{ganeti.cron,gnt-config-backup}
-	docinto examples/hooks
-	dodoc doc/examples/hooks/{ipsec,ethers}
-	insinto /etc/cron.d
-	newins doc/examples/ganeti.cron ganeti
-	# Force Ganeti to use python2
-	python_convert_shebangs -r 2 "${D}"/usr/sbin/
-	python_convert_shebangs 2 "${D}"/usr/"$(get_libdir)"/ganeti/ensure-dirs
-
-	keepdir /var/{lib,log,run}/ganeti/
-	keepdir /usr/share/ganeti/os/
-	keepdir /var/lib/ganeti-storage/{export,file,shared}/
-}
diff --git a/app-emulation/ganeti/ganeti-2.6.2.ebuild b/app-emulation/ganeti/ganeti-2.6.2.ebuild
deleted file mode 100644
index ad1a562979d5..000000000000
--- a/app-emulation/ganeti/ganeti-2.6.2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.6.2.ebuild,v 1.5 2013/09/12 22:29:37 mgorny Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils confutils bash-completion-r1 python
-
-MY_PV="${PV/_rc/~rc}"
-#MY_PV="${PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-
-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://ganeti.googlecode.com/files/${MY_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 +filestorage sharedstorage htools syslog ipv6
-	haskell-daemons rbd test"
-REQUIRED_USE="|| ( kvm xen lxc )"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
-	kvm? ( app-emulation/qemu )
-	lxc? ( app-emulation/lxc )
-	drbd? ( >=sys-cluster/drbd-8.3 )
-	rbd? ( sys-cluster/ceph )
-	ipv6? ( net-misc/ndisc6 )
-	htools? (
-		>=dev-lang/ghc-6.10
-		dev-haskell/json
-		dev-haskell/curl
-		dev-haskell/network
-		dev-haskell/parallel )
-	haskell-daemons? (
-		dev-haskell/hslogger
-		dev-haskell/crypto
-		dev-haskell/text
-		dev-haskell/hinotify )
-	dev-libs/openssl
-	dev-python/paramiko
-	dev-python/pyopenssl
-	dev-python/pyparsing
-	dev-python/pycurl
-	dev-python/pyinotify
-	dev-python/simplejson
-	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
-	${GIT_DEPEND}"
-RDEPEND="${DEPEND}
-	!app-emulation/ganeti-htools"
-DEPEND+=" test? ( || ( dev-lang/python:2.7[ipv6] dev-lang/python:2.6[ipv6] ) )"
-
-pkg_setup () {
-	confutils_use_depend_all haskell-daemons htools
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		./autogen.sh
-	fi
-	epatch "${FILESDIR}/${PN}-2.6-fix-args.patch"
-	epatch "${FILESDIR}/${PN}-2.6-add-pgrep.patch"
-
-	if use !test ; then
-		# Force Ganeti to use python2
-		python_convert_shebangs -r 2 tools
-		python_convert_shebangs 2 daemons/import-export lib/ovf.py
-	fi
-}
-
-src_configure () {
-	local myconf
-	if use filestorage ; then
-		myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file"
-	else
-		myconf="--with-file-storage-dir=no"
-	fi
-	if use sharedstorage ; then
-		myconf="--with-shared-file-storage-dir=/var/lib/ganeti-storage/shared"
-	else
-		myconf="--with-shared-file-storage-dir=no"
-	fi
-	if use kvm && [ -f /usr/bin/qemu-kvm ] ; then
-		myconf="--with-kvm-path=/usr/bin/qemu-kvm"
-	fi
-	if use haskell-daemons ; then
-		myconf="--enable-confd=haskell"
-	fi
-	econf --localstatedir=/var \
-		--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/ganeti/os \
-		$(use_enable syslog) \
-		$(use_enable htools) \
-		$(use_enable htools htools-rapi) \
-		${myconf}
-}
-
-src_install () {
-	emake V=1 DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
-	newconfd "${FILESDIR}"/ganeti.confd ganeti
-	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 doc/*.png
-	dohtml -r doc/html/*
-	rm -rf "${D}"/usr/share/doc/ganeti
-	docinto examples
-	#dodoc doc/examples/{basic-oob,ganeti.cron,gnt-config-backup}
-	dodoc doc/examples/{ganeti.cron,gnt-config-backup}
-	docinto examples/hooks
-	dodoc doc/examples/hooks/{ipsec,ethers}
-	insinto /etc/cron.d
-	newins doc/examples/ganeti.cron ganeti
-
-	# Force Ganeti to use python2
-	python_convert_shebangs -r 2 "${D}"/usr/sbin/
-	python_convert_shebangs 2 "${D}"/usr/"$(get_libdir)"/ganeti/ensure-dirs
-
-	keepdir /var/{lib,log,run}/ganeti/
-	keepdir /usr/share/ganeti/os/
-	keepdir /var/lib/ganeti-storage/{export,file,shared}/
-}
-
-src_test () {
-	# work around patches to make tests work
-	epatch "${FILESDIR}/${PN}-2.6-fix-tests.patch"
-	emake check || die "emake check failed"
-}