Version bump. Add myself to maintainers list.

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

5 files changed, 206 insertions, 18 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index b3067e7946c3..a3d892fd84d0 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,12 @@
 # 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.73 2013/09/12 22:29:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.74 2013/09/18 21:15:20 chutzpah Exp $
+
+*ganeti-2.7.1 (18 Sep 2013)
+
+  18 Sep 2013; Patrick McLean <chutzpah@gentoo.org> +ganeti-2.7.1.ebuild,
+  +files/ganeti-2.7-fix-tests.patch:
+  Version bump. Add myself to maintainers list.
 
   12 Sep 2013; Michał Górny <mgorny@gentoo.org> ganeti-1.2.9.ebuild,
   ganeti-2.0.6.ebuild, ganeti-2.1.8.ebuild, ganeti-2.2.2.ebuild,
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 2720b00fdc4e..f78ec0808603 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -7,6 +7,7 @@ AUX ganeti-2.5-gentoo-start-stop-daemon.patch 1226 SHA256 981dded2c1b8560ef7cc62
 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
 AUX ganeti-2.6-fix-tests.patch 2081 SHA256 002994e94a015227e29d21f1300131f0e3268c577e321b9f7faf4c96f1ca32da SHA512 cbf9a08c55978773f3f1097841f9f03368b57b71cf7039ca5b8bf6c747542d494e803051ef1c35f3423a0d91e9ae5d8b1093d7afbd8a5a40c7e07f0646f19c74 WHIRLPOOL 50bae1e77fe4b29ac69b0aaa28972b13d9e789add093ced1bce6b669db3ef7920d3ffc6a040ebabdf4c3dd0b729d02abde36c3560ace7d3c389710a2cb5792da
+AUX ganeti-2.7-fix-tests.patch 1451 SHA256 cc514bde65b9c51b0fdaa158fd21076fc017cf0c2c3cf2e22017d8d019b521f0 SHA512 58517da9ccdea1d9c02c18168475462c9105b1667780e51694e1c36dfd58a2156e7c6f6f1d3123086534ea6bba5036b29c6002b85618b919ed3ef6929ec20d24 WHIRLPOOL ba446d4ee7efc2bd666d61809afefe42914bd9f0dfa0cd5e3fd35343c94b96bea9a40df545fd41b02ff4beb6881c45adc0fb8c4d450bf2d8761b31289a67aa73
 AUX ganeti-fix-start-stop.patch 1440 SHA256 5b2beddaa862cec4b7ea7a08c8d04fb3a42db1df0d632f5d158e9ecbf4b47af3 SHA512 08f5d6e4d9bf8bc98fd5208223bc57cab59884872b0f6c3a27e8fc81dc72336a7600bf62094b4806ef411a0a6dc5f99d1e80751b9a2ee75b137395c488ebf053 WHIRLPOOL 4334736c79e1ea760483ef941e4738e435d920450801237e6ef4a834eb13a1f7937b10516c26a704618024985847fbd36b6eeb2dc9b429878812e8901d480936
 AUX ganeti-kvm-poweroff.confd 186 SHA256 d811f1825351b03653aed4b6827b2b0c9dd1dc3340c980862c0758b3bf5ad21e SHA512 46f627446b24f811ce64e162e9ad24b117a4232eda17ea469c299f109467c42bce7b0608c0685de34fdc19e30ebaee14b3035867eb5f51d959c1e76802da190e WHIRLPOOL cc769a247f2beaf45f87a2a8176a38b079907aff420b440124deb172db02adaacc6eb86a5ca5489fdb0e1a1965ea0c1686d5908b0c9ab5f8502ace2cdf07b8f4
 AUX ganeti-kvm-poweroff.initd 1621 SHA256 bb7b6ab5ac2899969bab52d9c5e1c5d9fd9629d247563ff74e8b9f64a4478e28 SHA512 4b560af8ec3951067940b4f96b9228a135cbbbabf66a66006ee99caa33a0652abd45f3ccd7602dfeff2436a0fa853eb04509cf280533d50b3e594eee8ea23fc5 WHIRLPOOL f938e4cea39fd23d8c6df65f4f89cb443721ec72fa63a1f09cd25cf07bef4cb5b18f3322ff846353be21e93b62ab5cf32015cf9ecda14ac75d64a3ae0caf03e1
@@ -23,6 +24,7 @@ DIST ganeti-2.5.2.tar.gz 2294366 SHA256 356a50fb847003c05a493888192912a3079de928
 DIST ganeti-2.6.0.tar.gz 2752108 SHA256 015f0e425924ef5ea7db06a198991f95ca8aeea407bee4e7c68ef8cc0591b29e SHA512 bfaa3fbea99ba2b57fab0fe4ef0d909259e289e9cfe126b28b3ac6277d46aa357a27144d189d4f9af57f9683fd9bbab9f7af6376f9724d7f252f9c1236ed8ab0 WHIRLPOOL 46a42135d6b6b887b131c02c7b16f2dfe5fc5241c61d1d13de8f2743622ed313cca59beb424e529baa978c43900b2d11970c5646f7e661fa7b3e9a0718340237
 DIST ganeti-2.6.1.tar.gz 2760050 SHA256 bcaefe84f809d5687622a364c8812138639fdcc5f3e40defcdf8926d1fd9107e SHA512 8f140a637fe2be267bf82280eae83b7e7e3deaad3f1dffbc14107defbc5e81b8405fd739fa5a872eab5f6770957f1c8f18eb0845a69a856cf227f9241c4532b9 WHIRLPOOL c88f806f84445752d573ec46ecb24b7cce2c51638901cc41686fd481a1de9edb6b2a382a42d16ad805bb094f5ebfedfc32bbcd34e2aaf62292a14c7c317c4712
 DIST ganeti-2.6.2.tar.gz 2759827 SHA256 d8ee78c52f72a290d76b63430fa42a5d530e5e064cb985d807f5afda5935d932 SHA512 bac669fe4384db58a2c5fcbc4f1e84bfb43d28cef63dcaa5f98a03b1a53e13ad0695e19d5e80702ec7eb23e73e154ed3be522e653a71028653426ea2bb905f53 WHIRLPOOL df0e6092ffa7fe9bf536149f82dd719afd4566539cec2c45bcb57db8b2e0c003cca039cf50d317fdd48ec1ffdbff4f689162f91d31ef1ef72b450100582d4d8d
+DIST ganeti-2.7.1.tar.gz 3221178 SHA256 5a8e1be9c864ec7ecb7e8da45c860637c2df7e4b60ff3c9f769060b70b84cf56 SHA512 50f27368ad7fcdcc7656c024565cc641291024cce7f9cefc7e1a8f9a28d99dd36a669e2b0c9ef6159acc8d71526b1f523de6496221dcbec347ad5192e2b66c4b WHIRLPOOL 5040034390d6894683cee1a624d613efcae295f8a4078757857da9797f7f02624ba23e4620bd707284708dcf4fce8663b9a622aa1719c6ae68c6e90c0e4c049b
 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
@@ -33,24 +35,23 @@ EBUILD ganeti-2.5.2-r2.ebuild 3833 SHA256 b8e526ddb60ffacebbffa82b28e4f08a3d25aa
 EBUILD ganeti-2.6.0.ebuild 3739 SHA256 ed32dd33a44955e59bba3ad2c8ef8f84bca8249dadf6c39929f083b089089af3 SHA512 94d6caeee6c5adca892f5b515e2a7bb130a456af59dbc8e46bff7ed4cfb9dbd6b0b7f8029f9e61958c5f9816e49af98affc65ed91ed2cbed390fb7be7f54d432 WHIRLPOOL e14f5a41f259661553af48d480de0f486b9824559cfcc6071f201da2f856255be43f50bf440f1d755fba50182485a4bfb5301770689c92bc8f294b920cfa8e65
 EBUILD ganeti-2.6.1.ebuild 3739 SHA256 6ec8412fdaddeaace08489fdb83b3cc2613af2bc72ef60c2ec1c994bff410553 SHA512 ef896f15dd52e82f261ca4c2522e528ef6d33a2b2c99fef91639ca9460af723932869be7f24272fc6da6b4f7f3fde614071b87efd035beb90b7fc9264bfb7c3e WHIRLPOOL 581cbcffeba32f0d713b0eff31c1ef9c8307465bd9ceae72f8c03f6a860689423f00f4deb3d973a0e12b8e3c8e16da1a39ebbe3c7dbf8c59eeb51b3b1fe86dfb
 EBUILD ganeti-2.6.2.ebuild 4397 SHA256 baeaee518ab03435dca205e90cf275ea40f54d79734e5d82670ec7a025219e36 SHA512 5ad31f9d36bcb1ba09947f729308d32660053b0444023cda1c3dd030c911047aa38d585d12954e04fefaa7dcbe3ac378fa906360be8881690991578d04d9362f WHIRLPOOL 0740ccef8800aaeea44c19b8b24c847abca3d4cdd52dfdf420f095039c67fb4a45b3369b529c8720630ef1180e6c72af9d16a20795bc2e7cc2c2835ff610659f
-MISC ChangeLog 14777 SHA256 e218c9a3777f7cb869c2967f6d9cc0c557998aae064c90f76ccd0438e74e634f SHA512 ac797a9fdcf5aed8b742655b569035986350acb9afd0c2311c2735b48f285e375860b9fd3fb5cd7df7cdf69b5b2f2cd6a08aaf3f8e49d4b1f9e8e66a7f4215f3 WHIRLPOOL 56a0a2e5ad0e542e64165208950dfe9d2b2a6ca1ef3da33aa857f7bc8909617b0f3e7209e6d376e35bb223b9a16c0a3e845835bc205a02ec94b5c8bdaf22114d
-MISC metadata.xml 1576 SHA256 6658d9da18761ed1a7709e087692355cdeb98f0cb7a67e124900335b8d48cbae SHA512 a4dd8876e15e98aa08ec4e9d4859b0a81acf427ec5e9be4067bad6579044601601af39d4cd5509f5b7d3e158040c3e2a6f14ed902aea7d1d5ec06dcafc4bdfa8 WHIRLPOOL 9b8894c29fb219420bd45701ba1eb1d374154cf2f9185055d5bfdfcae4aa7afe2d69e7b6823fd60b05601e030ffcb570f470bae287137dfdaafd0b5c4bd085b2
+EBUILD ganeti-2.7.1.ebuild 4360 SHA256 a8890cc0a7126e233299e67d72d8cf553e2f185922f34bb401b815c954047383 SHA512 116975ada9f63b1708177426bca216ac2716f2eeb6a973a4232b281997e042587b2ccf3eca0010ddf78ed36d93439916943c8a01be39bfa0d179efd9ffa0dff2 WHIRLPOOL 6a22aa5cb475c8a66f7200ac1380ad954f61668b5b7be847a04cc1791818776b7daf4a4c4d2752d77550ce59a220a8ac7c359632499bb1f2b60f15f2b1a2a80e
+MISC ChangeLog 14968 SHA256 ed08e4bcde1e173aeebeb791bd4b158a9dbc8aec888f320b966d50031a71e5cb SHA512 8edacfe5d5e15439e97e5e8783364b427d601dfa0ffee9a84464edce11640a64d71a4d9615474860f259488d663bbe329b65ef1550b47ab4db83c781106dc262 WHIRLPOOL f6d14329e84454ba9a7636308d1fceb9f597084668d09dbba25232d033a3a28e354003d374101e6af09161394ca85d653b154a61320fc37a7416b3c0b6a08913
+MISC metadata.xml 1672 SHA256 1c99a6285596d6c82cdafae945dc1d827f0c2f64e0a94171ddbf1285cad505f2 SHA512 51a26b3f371d183c00dfae19edf523f2f1207a65223a84213324c4b8d6b6d57144c5f30e0bb5c78061a9782691843a905dc7adf48118cac6eea9f8631e4d6097 WHIRLPOOL f1b2e6ade08ee53c8e0e97e578aef1843666ab205130a24cc05b8f74712756b29c2291374b3eaf99b6735c6d20c0229609aa70633bc1f5dbad9439acdf01080a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSMkB2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO1s4QAKUMWVVkzpfltszavRLFD0g7
-hoQcgcckrBOsccLUrF+1zDQFpXhfyv11dxr/AwQdwpLfECvlzo0GOp0n3vtToDiH
-IBAO/7l5YtCygCfn1lUuTyDM4aOKrF+ye3yMIwOVW0pOxr8I8QiRiMRqoXw4ITnx
-tWL7/41kTs1CwuVV9SijnWUxRwSgskF5suoBm6vS19NpfD9NloYBGWjvV2tovQYr
-ULeWrYTES0o73aR8ppSTZTK0+d5DX4NnOzSjY381sLLqfZ2a3Qm2X65K1JJPpC2G
-ceTNCTaNOkvzuq1CE1xipkVoo9J/1BTrYG/2fxL+/YQ9R+cufkcwSyk9PFkzHpIL
-qzbs1sK9j6F7v5TSb2YkHy0zAaAoduetd6N4Z74d0f+y40eFxXFOB66CWHX4Hl5E
-Av98PrQrminVwLJhcybLR5Mppmb0RzSQk9hVnl806b/e5Ld+065E45r0rDYPiZXu
-V0mCvRRQsHbEgayk+NHhQaOqy0/k7GDDIHZkAGAyYKhi5tiQJW+FHy4hbjDVOtbY
-u07p5Vc+y45F6xqKlvJTiM8up1gnNslTOAZuQlTn1R01/s1HJp5S7wxXAjQp6Zta
-Y0FDNsXd/4pVdgmuCGjYqs5XxYxBaPZqowa+dUgB/1spaFiKdMeK1bvBpxsCk1er
-3rigjv4a/zyk3RHxj1gO
-=GMLc
+iQIcBAEBCAAGBQJSOhgXAAoJEHy/RO9cNQiDY/AP/3WyLCwKyHmIlTT1/8vzNMjb
+KtR+1i1UdKgZlgT6ss4SUWQwlKYnjMsdyBomu5QtaAwLSB2kUcpHD+LtV/skiXrt
+ZmYsyOYwflpC90CZ3mClDAQnIr3+QQnmpaKvOEKXCl+2gi+KTe4GFmEsNd7oTNHM
+RLCFWpScuUOWaT5KkOkMNRuAJNNMdyM3O3hhWJhgHsuseSsvWJ9EaOITikt+1H77
+/xFCSzmxgvi0oKkUq0Nms90RmohA1EGEO/qJZuwA3NElqGZdExutbY8BVTbh0zHh
+MXEfDHC2dihRRsuzcSunl/9JZXALuuJ9rVKa5ZKna0/AHzyMRR6RhrpnKB7peKjy
+H+aQt2AvlR8CWbA9Vl9WwqrjL+6GBICRapMDKbfUDe7yi4fdHt5KE7B0p3LBeBeb
+N4mC9acbdMmjJNCiS0XeclPIdTBqJdLpR7A4tTppF54LOuxnHX30X7C1FYtsQm/a
+kVVCPTqw2besz4oi82uXEqK2/31py1sgiI5GhHxIihHzpf05uh7xJiNsmqLkuWxh
+jKNMrRjPs2w6Z9txEl7+IJu6pxJ1Thm+AZCTGGWkM75csrhoVGWUKNfxqEvBLfMy
+7A4AvbU/0q5Lzt080QDLu4pqPy3eJNJZtdhu06XZh/76GFUivk7xt8jMk6N+fTg4
+IAfEoJb6bfLl0w/aYDuG
+=XpD9
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti-2.7-fix-tests.patch b/app-emulation/ganeti/files/ganeti-2.7-fix-tests.patch
new file mode 100644
index 000000000000..b3b5ad17f2b1
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.7-fix-tests.patch
@@ -0,0 +1,30 @@
+diff --git a/test/py/ganeti.hooks_unittest.py b/test/py/ganeti.hooks_unittest.py
+index 30e00d8..50f91fc 100755
+--- a/test/py/ganeti.hooks_unittest.py
++++ b/test/py/ganeti.hooks_unittest.py
+@@ -192,7 +192,7 @@ class TestHooksRunner(unittest.TestCase):
+       os.symlink("/usr/bin/env", fname)
+       self.torm.append((fname, False))
+       env_snt = {"PHASE": phase}
+-      env_exp = "PHASE=%s" % phase
++      env_exp = "LD_PRELOAD=libsandbox.so\\nPHASE=%s" % phase
+       self.failUnlessEqual(self.hr.RunHooks(self.hpath, phase, env_snt),
+                            [(self._rname(fname), HKR_SUCCESS, env_exp)])
+ 
+diff --git a/test/py/ganeti.utils.process_unittest.py b/test/py/ganeti.utils.process_unittest.py
+index 2e36cfa..e0392b2 100755
+--- a/test/py/ganeti.utils.process_unittest.py
++++ b/test/py/ganeti.utils.process_unittest.py
+@@ -341,10 +341,10 @@ class TestRunCmd(testutils.GanetiTestCase):
+   def testResetEnv(self):
+     """Test environment reset functionality"""
+     self.failUnlessEqual(utils.RunCmd(["env"], reset_env=True).stdout.strip(),
+-                         "")
++                         "LD_PRELOAD=libsandbox.so")
+     self.failUnlessEqual(utils.RunCmd(["env"], reset_env=True,
+                                       env={"FOO": "bar",}).stdout.strip(),
+-                         "FOO=bar")
++                         "LD_PRELOAD=libsandbox.so\nFOO=bar")
+ 
+   def testNoFork(self):
+     """Test that nofork raise an error"""
diff --git a/app-emulation/ganeti/ganeti-2.7.1.ebuild b/app-emulation/ganeti/ganeti-2.7.1.ebuild
new file mode 100644
index 000000000000..a8ff88b48fe0
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.7.1.ebuild
@@ -0,0 +1,147 @@
+# 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.7.1.ebuild,v 1.1 2013/09/18 21:15:20 chutzpah Exp $
+
+EAPI=5
+PYTHON_COMPAT=(python2_{6,7})
+use test && PYTHON_REQ_USE="ipv6"
+
+inherit eutils confutils bash-completion-r1 python-single-r1
+
+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}"
+
+HASKELL_DEPS=">=dev-lang/ghc-6.12
+		dev-haskell/json
+		dev-haskell/curl
+		dev-haskell/network
+		dev-haskell/parallel
+		dev-haskell/utf8-string
+		dev-haskell/deepseq"
+
+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 )
+	haskell-daemons? (
+		${HASKELL_DEPS}
+		dev-haskell/hslogger
+		dev-haskell/crypto
+		dev-haskell/text
+		dev-haskell/hinotify
+		dev-haskell/regex-pcre-builtin
+		dev-haskell/attoparsec
+		dev-haskell/vector
+	)
+	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}"
+
+pkg_setup () {
+	confutils_use_depend_all haskell-daemons htools
+	python-single-r1_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"
+	epatch "${FILESDIR}/${PN}-2.7-fix-tests.patch"
+
+	python_fix_shebang tools daemons/import-export lib/ovf.py lib/tools
+}
+
+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 \
+		--enable-htools-rapi \
+		$(use_enable syslog) \
+		$(usex filestorage "--with-file-storage-dir=" "--with-file-storage-dir=" "/var/lib/ganeti-storage/file" "no") \
+		$(usex sharedstorage "--with-shared-file-storage-dir=" "--with-shared-file-storage-dir=" "/var/lib/ganeti-storage/shared" "no") \
+		$(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.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
+	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
+
+	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}/
+}
+
+src_test () {
+	emake check || die "emake check failed"
+}
diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml
index b73d307c0d32..f5cbe05db1a2 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 	<herd>virtualization</herd>
 	<maintainer>
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer>
 		<email>ramereth@gentoo.org</email>
 		<name>Lance Albertson</name>
 	</maintainer>