Version bump for 2.9 and 2.10. Add new version of init script that has a "use net" (bug #501238). Install HA examples to docs (bug #491558). Port over to subslot deps for haskell packages.

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

5 files changed, 475 insertions, 6 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index ed7b886ad497..20bd31fcbaca 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/ganeti
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.78 2013/12/23 15:58:43 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.79 2014/03/03 23:59:44 chutzpah Exp $
+
+*ganeti-2.10.0 (03 Mar 2014)
+*ganeti-2.9.5 (03 Mar 2014)
+
+  03 Mar 2014; Patrick McLean <chutzpah@gentoo.org> +ganeti-2.9.5.ebuild,
+  +ganeti-2.10.0.ebuild, +files/ganeti-2.2.initd:
+  Version bump for 2.9 and 2.10. Add new version of init script that has a "use
+  net" (bug #501238). Install HA examples to docs (bug #491558). Port over to
+  subslot deps for haskell packages.
 
   23 Dec 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #66351
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index ce97645f00d2..6820e5a9b1d4 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -3,6 +3,7 @@ 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.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
 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
@@ -21,6 +22,7 @@ AUX ganeti2.initd 1503 SHA256 6fd666648ac543ffcc3700821a36eba9a027eb04278e53f60e
 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.0.tar.gz 3827918 SHA256 d382f19f918be950770c3fbda959cf82f3adc907c3575264ce1c917d92daa92a SHA512 a75b6a5aef3a77715fd8de3834f318b9535e5d7bc5c1a4bf6a0b34026b56bd34ddb096761983b447664e4194208d6171b5ec068810ebeb1942aee68bd4c70c47 WHIRLPOOL c6ab744076c18c6bd667ba095a13ee802638f4a5871f2fe84ad16d11c3ec7b4b1b7395b2d3eb56e69425a365c56ca58cf1e06fa43ba953b37751cf7aaf8835be
 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
@@ -30,9 +32,11 @@ DIST ganeti-2.6.1.tar.gz 2760050 SHA256 bcaefe84f809d5687622a364c8812138639fdcc5
 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.1.tar.gz 3603288 SHA256 11853a87a68d072b4e6f07d13b8be486eacc42e5614267d485207ed6e78759c6 SHA512 c85324f053b74386d9205942a67b49e7dfa5bf4054a4703510105dd00df0a9245d66218314931b2936540149e4e7cd5518a9b68468cf0197a535f6965857f30d WHIRLPOOL df9399c31c7ddc75217fde24da71852194496fab8c40cb395e42f5feb31d8e2b0e87b74552bd3b5cc4983a5d2c66cfec430badb2c748fe17bb847da8e325f7ca
+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.0.ebuild 4644 SHA256 7fa82ec5918bf7848695c293b91861dda5817862e537ee6edaa03a2ce894d7fa SHA512 ae8c6d18bae3eba18e3ef322111032a6d9aec31509c2431172b283f6cf27e2fd558036d9725b5ffd76d4efe0a92b6d28c2e0f5e75f5a200a76563bfbf165f1b1 WHIRLPOOL 06dbce1a9c13763bee53dab6611a908c065f6c56a3525dad79d556d27b5679df75fb651a190b212b2311f51c195841ea90219a3551ab2e7d6fa24ea1ebaaac82
 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
@@ -42,12 +46,23 @@ EBUILD ganeti-2.6.1.ebuild 3739 SHA256 6ec8412fdaddeaace08489fdb83b3cc2613af2bc7
 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.1.ebuild 4511 SHA256 d0c103759edd061a2421d02df1eb499931c63057d8cfa433a8019bbe80881b71 SHA512 af5c1a0b51b945a99a7f0ea6417c228169849ec20dae2390fffdae76cf228c9246ed3f0615b7fa1a8d44afa3f19f3ce7c248a1671d19038544c8f85f7199b73b WHIRLPOOL db6894dc870f743fa482b733ec2c371cce13794ae761be8464148cc0a36dc4ec6fa83f223e8863bcf9a5497528297696b027defb0ffa5932b3f2ca5fd1b3a588
-MISC ChangeLog 15723 SHA256 8a9d7b27343b8d6a429e9347ebcff5e039fa892a3e7cff14fcb9f7f5a5625c3e SHA512 5413e0f941b47d6a89cbe5aa1b2ec7cf807d4a99d2ae978c3ea6773e2f80642d7b3ab92ae1aa62d0f73dc147fe01d829f070d503c3b07d9ed75e859ac1a2f444 WHIRLPOOL 080d07b963a7fd81d0fa1108f4ba5cacad7a96b049516dad704ffbeaccdadcd6bc4ee1f53d0c476c50eb71f389cb6132a8ddfb65533b53111b85b7bb9ee585ab
+EBUILD ganeti-2.9.5.ebuild 4627 SHA256 aac7ed28ee866d86283ab685d45d845267810aacf527708691876745011b5a0a SHA512 bb693411394837015c08af0a2beb43514c8417b40a240bc8bbf15e7d559044483a512c009c1a38bdc0e572a1baca0ea1a68c363259242d906ef74c87310e5e9c WHIRLPOOL 75dbf0d6adf591768b38677c820ed9b8b60d3e21f885d571d1e063166d90fd2a856c4f875fd00d88943e774ccf15c1bdc556caae22836b745a18d394550e7fe2
+MISC ChangeLog 16104 SHA256 43d0056790f639c6d9a205d80b7bb631eb7380084bc9b81df7588f31ca987e97 SHA512 95a8aec604967ad6cdf983918c8e12a51deca7729ede871e6669a0fd0960cf8da3ba6a9b93945718ee695702386f710cbf2d3d24926178a3321bbad011f2c48d WHIRLPOOL 0d8637a359b1f5ae37b1922c71a9d703ce2f726e03e17a883726390bfc733f9fe42a396dbaf10896a983f7fec56a8657c9e2d1e7be4775bd4b9f8bf94ad33541
 MISC metadata.xml 1575 SHA256 b8b9531634759b7f388efeea55dcc70d94cbaeca25f063ed3a30dfda77c83c65 SHA512 28449dd837162e3f61e4f9fd8b66206cf1d3130b60997dd06f4987635ab4506bc082745822416cdbd8f1d3ff22a8935abff0b1bfa1fda569824734d5c4fcaec1 WHIRLPOOL 17475d0b41d4222a55ed26f5fcc0409d33ee34e272d36c015ac1e0742aa1945926d6782422484f5eeba602fae45cf4f94ebf9db394ceb26ac6a8f58d4149f990
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK4XbQACgkQCaWpQKGI+9Sw6gCePK9dRpr5Vv0wQYGqD1OzXkpL
-OucAoITvMzF/rxs8Kl9dYOjWKlqRzd4A
-=0WJL
+iQIcBAEBCAAGBQJTFRdyAAoJEHy/RO9cNQiDT+EP/Rjeu++9aDIL4BgvTtSDbjgN
+USePDudI6yG1P8lhds4epoQfg+zF24jOgtwmTWZHhOn79ZIyWX6X45ZFzqMXeidk
+lBNaInfJmem8UvMF43Nf+EFdy/TBRzQjyONjToCsb4TFSrGr3ge5OL93zvSiiVt1
+XQrdzwdXhha5/5GYWNW32SzDdoiFeYeAZ4x2qNpsl0XxwhiFBY07JAqxDRsQq+SY
+MRjHnhDQb+oV3Fz17BpsjlqRJ9d16X1qcvnLnZluFr0pUW6mnrLorC1R1ykZWLG1
+wImDzpTUs+3fp9hFl4LPaWx8WvPbCMMPedaPU2G9Pre/0mLw4JMTnj4r5uZThqf6
+Ybx/1mPGcxwLA3l++M6KYLNEN4L5fUGzf9D1A78ThYqh9n5KtU0hnlYVQbhU4rk8
+moEY/ICXPazwtbDyQ+LdIJIrLGa4+x0fBGdNku1PGLJyCv9dCmWbe8b5ptHUvdn2
+jPMm8xO5xSQWEB901HmfRPt+mStCsmAYrAuEV0sHcWrIcF/01d8kSde1qZ+QmJ7T
+4Xdtwk/sFwi70/HTMz9u3Qp0zuvuVKbBivqEAqMKDWOfIP+9ejYr/aiLchm6uKSD
+lhDguTpp2OWJskZKL2+HoNO6jB6+cF57awUqb49CNQ5Wf3biG45ph0xhjWZds/g1
++TY3kIabrjurDjh4fxna
+=FrPz
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti-2.2.initd b/app-emulation/ganeti/files/ganeti-2.2.initd
new file mode 100644
index 000000000000..b43e458f1e29
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.2.initd
@@ -0,0 +1,113 @@
+#!/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-2.2.initd,v 1.1 2014/03/03 23:59:44 chutzpah Exp $
+
+depend() {
+    need localmount logger
+    after bootmisc
+	use net
+}
+
+DAEMON_UTIL="/usr/lib/ganeti/daemon-util"
+
+check_config() {
+    if ! $DAEMON_UTIL check-config ; then
+        eend 0 "Incomplete configuration, will not run."
+    fi
+}
+
+check_exitcode() {
+    RC=${1}
+    if errmsg=$(${DAEMON_UTIL} check-exitcode ${RC}) ; then
+        eend 0 "${errmsg}"
+    else
+        eend 1 "${errmsg}"
+    fi
+}
+
+start_action() {
+    # called as start_action daemon-name
+    local daemon="${1}"
+    ebegin "Starting ${daemon}"
+    ${DAEMON_UTIL} start "${@}"
+    check_exitcode ${?}
+}
+
+stop_action() {
+    # called as stop_action daemon-name
+    local daemon="${1}"
+    ebegin "Stopping ${daemon}"
+    ${DAEMON_UTIL} stop "${@}"
+    check_exitcode ${?}
+}
+
+maybe_do() {
+    requested="${1}"; shift
+    action="${1}"; shift
+    target="${1}"
+    if [ -z "${requested}" -o "${requested}" = "${target}" ] ; then
+        ${action} "${@}"
+    fi
+}
+
+get_master_node() {
+    MASTER_NODE="$(gnt-cluster getmaster)"
+    NODE_HOSTNAME="$(hostname -f)"
+    if [ "$MASTER_NODE" == "$NODE_HOSTNAME" ] ; then
+        MASTER=1
+    else
+        MASTER=0
+    fi
+}
+
+start_all() {
+    check_config
+    get_master_node
+    for i in $($DAEMON_UTIL list-start-daemons); do \
+        GANETI_START_OPTS="${GANETI_OPTS}"
+        case "${i}" in
+            ganeti-masterd)
+                GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_MASTERD_OPTS}"
+                ;;
+            ganeti-rapid)
+                GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_RAPI_OPTS}"
+                ;;
+            ganeti-noded)
+                GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_NODED_OPTS}"
+                ;;
+            ganeti-confd)
+                GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_CONFD_OPTS}"
+                ;;
+        esac
+        # Don't start if not master
+        if [ $MASTER = 0 -a $i = "ganeti-masterd" ] ; then
+            continue
+        elif [ $MASTER = 0 -a $i = "ganeti-rapi" ] ; then
+            continue
+        else
+            maybe_do "${1}" start_action ${i} ${GANETI_OPTS}
+        fi
+    done
+}
+
+stop_all() {
+    get_master_node
+    for i in $($DAEMON_UTIL list-stop-daemons) ; do \
+        if [ $MASTER = 0 -a $i = "ganeti-masterd" ] ; then
+            continue
+        elif [ $MASTER = 0 -a $i = "ganeti-rapi" ] ; then
+            continue
+        else
+            maybe_do "${1}" stop_action ${i} ${GANETI_OPTS}
+        fi
+    done
+}
+
+start() {
+    start_all
+}
+
+stop() {
+    stop_all
+}
diff --git a/app-emulation/ganeti/ganeti-2.10.0.ebuild b/app-emulation/ganeti/ganeti-2.10.0.ebuild
new file mode 100644
index 000000000000..11c5f38f1336
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.10.0.ebuild
@@ -0,0 +1,166 @@
+# 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.0.ebuild,v 1.1 2014/03/03 23:59:44 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}"
+
+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/$(get_version_component_range 1-2)/${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"
+)
+
+pkg_setup () {
+	confutils_use_depend_all haskell-daemons htools
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	has_version ">=sys-devel/automake-1.13" && epatch "${FILESDIR}/${PN}-2.9-automake-1.13.patch"
+	[[ ${PV} == "9999" ]] && ./autogen.sh
+	rm autotools/missing
+	eautoreconf
+}
+
+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 \
+		$(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-2.2.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
+	dohtml -r doc/html/*
+	rm -rf "${D}"/usr/share/doc/ganeti
+
+	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/sbin/ "${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}/
+
+	python_fix_shebang "${ED}"
+}
+
+src_test () {
+	emake check || die "emake check failed"
+}
diff --git a/app-emulation/ganeti/ganeti-2.9.5.ebuild b/app-emulation/ganeti/ganeti-2.9.5.ebuild
new file mode 100644
index 000000000000..8027b21397c3
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.9.5.ebuild
@@ -0,0 +1,166 @@
+# 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.9.5.ebuild,v 1.1 2014/03/03 23:59:44 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="
+
+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/crypto:0=
+		dev-haskell/text:0=
+		dev-haskell/hinotify:0=
+		dev-haskell/regex-pcre-builtin:0=
+		dev-haskell/attoparsec: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}
+	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"
+)
+
+pkg_setup () {
+	confutils_use_depend_all haskell-daemons htools
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	has_version ">=sys-devel/automake-1.13" && epatch "${FILESDIR}/${PN}-2.9-automake-1.13.patch"
+	[[ ${PV} == "9999" ]] && ./autogen.sh
+	rm autotools/missing
+	eautoreconf
+}
+
+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 \
+		$(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-2.2.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
+	dohtml -r doc/html/*
+	rm -rf "${D}"/usr/share/doc/ganeti
+
+	docinto examples
+	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 ${PN}
+
+	insinto /etc/logrotate.d
+	newins doc/examples/ganeti.logrotate ${PN}
+
+	python_fix_shebang "${D}"/usr/sbin/ "${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}/
+
+	python_fix_shebang "${ED}"
+}
+
+src_test () {
+	emake check || die "emake check failed"
+}