Version bump, rework the init script.

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

6 files changed, 317 insertions, 15 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 7bfe6868a4c3..e92d061dc8f8 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,13 @@
 # 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.84 2014/04/04 01:05:03 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.85 2014/05/30 22:07:23 chutzpah Exp $
+
+*ganeti-2.11.1 (30 May 2014)
+
+  30 May 2014; Patrick McLean <chutzpah@gentoo.org> +ganeti-2.11.1.ebuild,
+  +files/ganeti-2.11-regex-builtin.patch, +files/ganeti.confd-r2,
+  +files/ganeti.initd-r2:
+  Version bump, rework the init script.
 
 *ganeti-2.10.2 (04 Apr 2014)
 
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index f6b162c22cd3..ab18af6bb5b0 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -4,6 +4,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.10-rundir.patch 1305 SHA256 13783753b68a5dcb45a81653b449d085ff74ee812df8be45b3d043361f3e447c SHA512 67a475c8e4ed9fd7d28bcf514fff5dd3ea6a458f57e02138b9fe6b1288732dfb3fc4e2fe1586dc5f78c1cda5733b5163f723709f37c4ded1a99d8b0b2773f61d WHIRLPOOL a21467c23ebffe9cfbbdd9532d43a985d9d8dfdfc701585e4092c4967574ab3556bf3d0571025dc18f2745e4c8db4319f5bb5bd466cbfbe9cfa852d8a3b7c610
+AUX ganeti-2.11-regex-builtin.patch 616 SHA256 a93531f2d3c4257cd0e53b830a93a2e56260567b52cb42606d7342cc2e400cef SHA512 3a22b2d08f7b610f2790fb8e498811c13acd0c27b3fba60c213df35aee6944df9123a3fd2922d8d18c49f020025a86a057cb39dd30f4eaa009765bd107ebc134 WHIRLPOOL ad2a24526e9fc7fb74eb1a41bf1375a1c879620f3e2ca904ac9b4f2df67daff93946ec3558ad25271fc891311870ff6aa51251a38957766098db868b5ae3a766
 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
@@ -18,13 +19,16 @@ AUX ganeti-fix-start-stop.patch 1440 SHA256 5b2beddaa862cec4b7ea7a08c8d04fb3a42d
 AUX ganeti-kvm-poweroff.confd 186 SHA256 d811f1825351b03653aed4b6827b2b0c9dd1dc3340c980862c0758b3bf5ad21e SHA512 46f627446b24f811ce64e162e9ad24b117a4232eda17ea469c299f109467c42bce7b0608c0685de34fdc19e30ebaee14b3035867eb5f51d959c1e76802da190e WHIRLPOOL cc769a247f2beaf45f87a2a8176a38b079907aff420b440124deb172db02adaacc6eb86a5ca5489fdb0e1a1965ea0c1686d5908b0c9ab5f8502ace2cdf07b8f4
 AUX ganeti-kvm-poweroff.initd 1621 SHA256 bb7b6ab5ac2899969bab52d9c5e1c5d9fd9629d247563ff74e8b9f64a4478e28 SHA512 4b560af8ec3951067940b4f96b9228a135cbbbabf66a66006ee99caa33a0652abd45f3ccd7602dfeff2436a0fa853eb04509cf280533d50b3e594eee8ea23fc5 WHIRLPOOL f938e4cea39fd23d8c6df65f4f89cb443721ec72fa63a1f09cd25cf07bef4cb5b18f3322ff846353be21e93b62ab5cf32015cf9ecda14ac75d64a3ae0caf03e1
 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 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.1.tar.gz 3830115 SHA256 3401d5868bc8947f2350757242e4b15928cd22a35ecac1aef0f8669a1715a349 SHA512 696b3abc4262799c2f04eb62bebdd05c9bffdf3110e81706ebaf0ca5f777b123eaba666a65788cac936b4e551ea0233188ad8cf525db44e07f5c84cc280f4f10 WHIRLPOOL 4a9890f39d9de65cf04e12fe14f9d0954c8ef9eeb63568f8e6f911adc291d3add8279dcf5fd358e560911f6c03f0887deb9ab0743b8053351f9f6e7f75d62180
 DIST ganeti-2.10.2.tar.gz 3831534 SHA256 2d975ed0468cd2f540df0a2ec51c0fd000638818fb32c3e5423ef188aa4b44bf SHA512 0dc8bae85875c46579f8ecc6e303522a40604ba89ca7466999132a49b0e18651480c401932f477cd296ac19430b2cbc34d9040747a59498d31a7caf736b64b14 WHIRLPOOL db93e66c49a19f1c7011329f075394323c0ed523871c8a4880dde79acb8c321b439c51e72d46deca20bc679e6057b05aa56fa53d66fc396c7e1f1723284fd292
+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
 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
@@ -40,6 +44,7 @@ EBUILD ganeti-2.0.6.ebuild 1752 SHA256 e78392e12f76adde3c42c4e587710f670fa9dd392
 EBUILD ganeti-2.1.8.ebuild 2022 SHA256 33bb15b7318d2976f46694796b6ca485a657a8c98887f14c1760f45f3fbace52 SHA512 8a56053dd94a0c116f92592c2cf641da4631f489db2725dd83abaf85844a36ba4e06d24a9362e8601052910cc1515d1aac750c9b3b06f9109fa91057e2f9298a WHIRLPOOL 200c4a630a655c7ea87e3d1a8794e00b50415ba7ee19214466169db0e473112f4336a2ca2476ab0c0fdfbcecc72908c6f4f8903321219af471b2b70fd36932cc
 EBUILD ganeti-2.10.1.ebuild 4854 SHA256 98774ba85aa1b4b2c07cf4a6fe5860465f38efe895ba013121f985c724617fb6 SHA512 d79c968b3b5fb406c3b8bc6be7c1a9df999a07bccc4d591975cb890a07962777d0f39a92f8b651ef09504c23a63c536838e92ce62cde732c67c0731915eeabb8 WHIRLPOOL 2d93e6d5a7b251535556e8aac1ce2e1508192b71f90a49b44cff6ef81d105c11f13f2f1a41862583a6b718293a3889b76c0d92f67dc17224ebdc0db59617bd77
 EBUILD ganeti-2.10.2.ebuild 4854 SHA256 d06f6e75d4a475858b297781372aefa94ddd129bb39845cf9d28f5e7504a768f SHA512 7817b7f939ad46444bca2f77d13b78fc244509cfe57acb06b9f4fd7af0f39c7c4b9cdf2d54c21f4c8053e4e0159d121bef9901fd23a005f1edc1c6214e9bb244 WHIRLPOOL 435c245215041a829f72f740c7df35cfbcf5870651fbc1de790cce576a74089626e01876e85566bfad9b104fc775fe34d92a9bed16f1ef88c702b789a3bbd40f
+EBUILD ganeti-2.11.1.ebuild 4799 SHA256 e279ea9eb960c17a10aaea3e30755bd9ebbce5a3cb186768f80fcc0b72095548 SHA512 0f5eac6e6ec6f26e5d7faea2eb39f12f1960be50c3718882e2039a8a04b5acdd92d42777d46234033184caafc39a805cb398642c6a859f4f66b5a0f041ef1822 WHIRLPOOL 516ef45dde8241b27921eaa74d5109fc11fb6e4c155ae43b24639fef2bf43709635c098ee6412daf3639609982368c2d613f546ba5124c815b8e54aeabfe723f
 EBUILD ganeti-2.2.2.ebuild 2109 SHA256 b42afb32dd42830e9dee940e3f325e21005bc1c649bf3bef219a9ee9170c3e8c SHA512 2a11f78c726c857187f1ed8a654c84fe6a91423c25f2d7e3fb24cfa8a2ba9bc97191121792bbf1fbb5130b15938cefebd21d950c7e25d7dca351cc40b5edc0ed WHIRLPOOL 3dd5bdc9d9a350470c37ad7c23153340fdc9543e8efe39242a1817b7f7eaa0d94acc83945eeeef35d2f382f1df7619a6e28674858c8e0f8612e4cfccd2166d95
 EBUILD ganeti-2.3.1.ebuild 2141 SHA256 e3cc03ad4280d9b7816959929c021bc465b3688379dd1d933fd7b2e16bed543b SHA512 32f619cdec630130eaaada8445b448143576d084462de8e0ffbc368e39003091aec2f43a24dd758ff72a6fb2a1a476057c20c54f76c3ab1b2cd4bbf9d4a91fb4 WHIRLPOOL ae5d2103c6b560caa7cd7c03947bd759fc98f85841f8ecc5943cbc878cba78bf86ea14bdb4542c6187143a88726c8f0aa900112f091c709a2a27578c095515b9
 EBUILD ganeti-2.4.5-r1.ebuild 2538 SHA256 2c398580e858757045d1c74df1dcad80c1a687f92c4cdfead82a56921f41fe41 SHA512 9dbfb24086d41faf259de586257c1f79ef35bfa0521daffb637b9d8ea6e7ca598a8631713f3232e362d21f1ee9fa9ce83a614bb2a379325406e6b9a9711e6ed0 WHIRLPOOL ca248607ca5d623cd588a76a54293660cb69ba561b6fa798739201fac0e3ba4eddcd6d25b87fdef0ac7b2e3f52d157c62f886f51a7b97ca1e9fbbeed8123161a
@@ -50,22 +55,22 @@ EBUILD ganeti-2.6.2.ebuild 4397 SHA256 baeaee518ab03435dca205e90cf275ea40f54d797
 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
 EBUILD ganeti-2.9.5.ebuild 4646 SHA256 4bb9608f805b88b42a2cc839d0e8f38c9c3fbe1a181b59e5bfda5a0b0b9672d5 SHA512 eb56a60c17fdac309fd141bfe7cf564abf7acb65cc3435fd458e5441f6e1e631cb29111be679ba2da2416446c9c6f28f7ecdb662a1d744af58c3148d2f61d27f WHIRLPOOL 36a5ee43cbca96cc2f99dfda27654a8ef6ba6dab61840f3e9b255ae232220bdd33306aeee816df114a52d49876861df6da39aa289745ba1f10179a7be47f82c2
-MISC ChangeLog 16999 SHA256 0cb7e34e1a58e85f937310b9dd32d64b7b82c8ee26be32ce23620c91e640eb2e SHA512 ae0fab8af7c03eec8fbd0e772494eaed54f2cf7f5f99dbb6560c22e3d7ccb2ac26eadaaa53dde44755f24864acb77c3f64df202360dacca355401c7d2b92ee63 WHIRLPOOL 8c260fc0a1adf6ba86485c4e5acbf641ce45c4e408e8b7bfd5d1cd467f9131616593bb6e58d683949ad57d7e4147bbeb8082a069fa4a0fa19729eac758a7b10b
+MISC ChangeLog 17237 SHA256 2d8cf6ab200e79534e34a1ede6fdeecbf5856b6f53cd20370842d2d688daf322 SHA512 90e917d98725b8829d1363e4d8dc4a0a3eb3e1e3ee5cd5e9dc82f0904361a6b1d50a03458d65fd3e0eb5fb435ffa6095e775142351d0bc68b0363ef45cb2610e WHIRLPOOL 557963407f072815c5187160088804a098feacfd675833fa27ab3569c3fb259ec807b61371d13935300e27c6b2c806e1b8af3cb9410c4e3a070e1bdd7a2ec336
 MISC metadata.xml 1575 SHA256 b8b9531634759b7f388efeea55dcc70d94cbaeca25f063ed3a30dfda77c83c65 SHA512 28449dd837162e3f61e4f9fd8b66206cf1d3130b60997dd06f4987635ab4506bc082745822416cdbd8f1d3ff22a8935abff0b1bfa1fda569824734d5c4fcaec1 WHIRLPOOL 17475d0b41d4222a55ed26f5fcc0409d33ee34e272d36c015ac1e0742aa1945926d6782422484f5eeba602fae45cf4f94ebf9db394ceb26ac6a8f58d4149f990
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTPgVMAAoJEHy/RO9cNQiDSn4QAKTA5uX70WsjWOLpZgYh6b2v
-RaaLe7MoK1QMQuRKr+XbdXbjUVoiYm75rQ2T7/L4JZpWMwCBc0eO4GiNjzTH38IZ
-FFA8RPATSB85fU9C4qmalxilchNWlaL7Ue+jf3iobLZ/eyFx+xoi83LcL27Yogc0
-8D2K7ECwalSzv4wvqrgomIxoAemPvn6Lh+VFh7p42tBSCZldrCKQFshyEwr28xD/
-eBJDV62B9aO0jybwIgEIZPP5obUEpZ3bfpmSDyEGjaMTcwAwCQPZ94nXL4Zl3G22
-teR1TTZnL+GOwh4Ho49RLsUGgsGEQPYOV0osi4i08PR0SS2Hje83YJbqXChvqOg3
-06poMFv7+yYHy8f18LmtYcHzDBmE64Y2eda9/CDVPQaQr3ZXYxh2YkX4o/7ODohS
-MhjyEWKvlGAu2R0v25uksk4Ye/QqUwLYaiz135OV0VDKrqF0ROMYh29vFL2YYNlG
-Uuo5/6Ci4qbNHvDC8+Ri4/jnlzuHohMiBVBao7+QyO91e/Nv36//qkpibHM9I8Cr
-DlGawZWx2nBqzX+JE/tqxFK3K4vJm9xAgz+NTAgFs4AidH8D+UDFTK+NVIrkjEF8
-PDKuv7QP8cELPnnXtGYJLj14Ngaf7tXjA0v7oYQLZqouzwAnQENtsmb2liz9uWSt
-DzAGQ6ItKuONMiK41ugB
-=5bGQ
+iQIcBAEBCAAGBQJTiQEmAAoJEHy/RO9cNQiDGPEP+wS7CB11CKcy5FIcDwRyyrWX
+A0mpqS2Dl9eYPz5xHwHxoSxmiOb0uLl9V406D+msgFWmOb2qJLyq9q6zybE1+1Yk
+rmM/8y5/gjFcfUTVAmMno0z04lQi5VCOQreqoz6Vr67wTgyGWcxPdftrfIba5Qcm
+jzDuJPVgdIdNcD4BcT87lneV4/S+0+QpXU/aEQV2jSoCKom7WYXwVRlewfLkLaN1
+rnca5jLHslgViyzkYKdjcrPRJXbYwpRehPbOV2Y7zYGJseXPW2UwkNSSieHEalLu
+pH5CyF1iTE3VPouAzWO+XJuupEoyTYvOYIdp3yMqXc+J24JgW54q2Y03e1QIgc15
+LjEecZlIDSXRR5Z59jv0bxywuaqYXrYgiQ4tzfX8TyFXu1CYCXWzroJazM7gYJox
+eBkwwq/7OzLEqGiTO3Hg25//AjmRr3wMke6AveYux/2oXiDBs4CUb3ypRumkPlFx
+R/AXJE/sKENy7jYy92x7lRJpQQHielf+ZunTAHGJ6ZpN4gsKniRqsrrmitmN7s6p
+ZUzcKJZAZ89Wh1F8tFV+OuZluxjpjv7EnlEcXbCoHwfjdwmsPLuKqGHoLuQIdlZv
+ljx3TbnhzvDsoyfhbYUAHzguQISbUAvsIA+rMH11hO7PvlltcIchrxfAMeO8t37N
+fzUyU1l/VUpnGF0wAdtl
+=v3bH
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti-2.11-regex-builtin.patch b/app-emulation/ganeti/files/ganeti-2.11-regex-builtin.patch
new file mode 100644
index 000000000000..08ef3778ca53
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.11-regex-builtin.patch
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index d70db62..f94043f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -612,8 +612,8 @@ CONFD_PKG=
+ # if a new confd dependency is needed, add it here like:
+ # AC_GHC_PKG_CHECK([somepkg], [], [HS_NODEV=1; CONFD_PKG="$CONFD_PKG somepkg"])
+ HS_REGEX_PCRE=-DNO_REGEX_PCRE
+-AC_GHC_PKG_CHECK([regex-pcre], [HS_REGEX_PCRE=],
+-                 [HS_NODEV=1; CONFD_PKG="$CONFD_PKG regex-pcre"])
++AC_GHC_PKG_CHECK([regex-pcre-builtin], [HS_REGEX_PCRE=],
++                 [HS_NODEV=1; CONFD_PKG="$CONFD_PKG regex-pcre-builtin"])
+ 
+ has_confd=False
+ if test "$enable_confd" != no; then
diff --git a/app-emulation/ganeti/files/ganeti.confd-r2 b/app-emulation/ganeti/files/ganeti.confd-r2
new file mode 100644
index 000000000000..0f2e69f3d5ea
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti.confd-r2
@@ -0,0 +1,19 @@
+# /etc/conf.d/ganeti: config file for /etc/init.d/ganeti
+
+# Extra options to pass to all of the ganeti daemons
+# GANETI_OPTS="-d"
+
+# Options to pass to ganeti-masterd
+# GANETI_MASTERD_OPTS=""
+
+# Options to pass to ganeti-rapi
+# GANETI_RAPI_OPTS=""
+
+# Options to pass to ganeti-noded
+# GANETI_NODED_OPTS=""
+
+# Options to pass to ganeti-confd
+# GANETI_CONFD_OPTS=""
+
+# Options to pass to ganeti-luxid
+# GANETI_LUXID_OPTS=""
diff --git a/app-emulation/ganeti/files/ganeti.initd-r2 b/app-emulation/ganeti/files/ganeti.initd-r2
new file mode 100644
index 000000000000..53a198187635
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti.initd-r2
@@ -0,0 +1,80 @@
+#!/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 $
+
+depend() {
+	need localmount logger
+	after bootmisc sshd
+	use net
+}
+
+DAEMON_UTIL="/usr/lib/ganeti/daemon-util"
+
+is_master() {
+	[ -z "${ganeti_master}" ] && ganeti_master="$(gnt-cluster getmaster)"
+	[ -z "${local_hostname}" ] && local_hostname="$(hostname -f)"
+	[ "${ganeti_master}" = "${local_hostname}" ]
+}
+
+start() {
+	if ! [ -e ${DAEMON_UTIL} ]; then
+		eerror "Could not find daemon utility at ${DAEMON_UTIL}"
+		return 1
+	elif ! ${DAEMON_UTIL} check-config ; then
+		eerror "Incomplete configuration, will not run."
+		return 1
+	fi
+
+	local daemon retval=0 optsvar started_daemons daemon_opts
+
+	for daemon in $(${DAEMON_UTIL} list-start-daemons); do
+		optsvar="${daemon//-/_}"
+
+		case "${daemon#ganeti-}" in
+			masterd|rapid|luxid) is_master || continue;;
+		esac
+
+		eval daemon_opts=\"\$\{${optsvar^^*}_OPTS\}\"
+
+		ebegin "Starting ${daemon}"
+		eindent
+		${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})"
+
+			for daemon in ${started_daemons}; do
+				ebegin "Stopping ${daemon}"
+				${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS}
+				eend ${?}
+			done
+			eoutdent; eoutdent
+			return ${retval}
+		fi
+		eoutdent
+		started_daemons="${started_daemons} ${daemon}"
+	done
+}
+
+stop() {
+	if ! [ -e ${DAEMON_UTIL} ]; then
+		eerror "Could not find daemon utility at ${DAEMON_UTIL}"
+		return 1
+	fi
+
+	local daemon
+
+	for daemon in $(${DAEMON_UTIL} list-stop-daemons) ; do \
+		case "${daemon}" in
+			ganeti-masterd|ganeti-rapi|ganeti-luxid)
+				is_master || continue
+			;;
+		esac
+		${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS}
+	done
+}
+
+# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/app-emulation/ganeti/ganeti-2.11.1.ebuild b/app-emulation/ganeti/ganeti-2.11.1.ebuild
new file mode 100644
index 000000000000..6b41ec3679b3
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.11.1.ebuild
@@ -0,0 +1,176 @@
+# 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 $
+
+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"
+)
+
+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"
+}