Version bump, lots of ebuild bug fixes

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x27F4B742

5 files changed, 376 insertions, 2 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 063a3530bbc0..3b53ac4e2e7e 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-emulation/ganeti
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.66 2012/12/16 16:20:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.67 2012/12/24 07:34:07 ramereth Exp $
+
+*ganeti-2.6.2 (24 Dec 2012)
+*ganeti-2.5.2-r2 (24 Dec 2012)
+
+  24 Dec 2012; Lance Albertson <ramereth@gentoo.org> +ganeti-2.5.2-r2.ebuild,
+  +ganeti-2.6.2.ebuild, +files/ganeti-2.6-fix-tests.patch:
+  Version bump, lots of ebuild bug fixes
+
+  Most of these fixes only apply to 2.6.2 however a few apply to 2.5.2-r2
+
+  * Forced python2, fixes #417029 #311183
+  * Install cronjob by default, fixes #433151
+  * Fixed so tests run properly, fixes #298006 #394217 
+  * Switched to using REQUIRED_USE, fixes #445528
+  * Add non-verbose to emake, fixes #445530
 
   16 Dec 2012; Agostino Sarubbo <ago@gentoo.org> ganeti-2.4.5-r1.ebuild:
   Stable for x86, wrt bug #445316
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 18f2429d4b32..fb61f4fee1b4 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.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
+AUX ganeti-2.6-fix-tests.patch 2081 SHA256 002994e94a015227e29d21f1300131f0e3268c577e321b9f7faf4c96f1ca32da SHA512 cbf9a08c55978773f3f1097841f9f03368b57b71cf7039ca5b8bf6c747542d494e803051ef1c35f3423a0d91e9ae5d8b1093d7afbd8a5a40c7e07f0646f19c74 WHIRLPOOL 50bae1e77fe4b29ac69b0aaa28972b13d9e789add093ced1bce6b669db3ef7920d3ffc6a040ebabdf4c3dd0b729d02abde36c3560ace7d3c389710a2cb5792da
 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
@@ -19,6 +23,7 @@ DIST ganeti-2.5.1.tar.gz 2292928 SHA256 c80ce69e5cee61cff058dbde43a1fa32f020b95a
 DIST ganeti-2.5.2.tar.gz 2294366 SHA256 356a50fb847003c05a493888192912a3079de928ec73d9b4c5cb887968d6d6b4 SHA512 58f9b93fd75bcd94dd351cd46754f6516eaaf6d85807a1a26a394f9ba48a73abd13e8355bb3b91c0f7e7a0f4dfd38fc3a1533ccf6b043507a59ea58e8cfe679f WHIRLPOOL 5e76ff14850e2e349211b144bd6a7a8813408bf8eff379a7826814be1bb8ecaaea72da7226d24a9e0ce7a39ee45b93a0fa1500ce083aed289200d8f19311b030
 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
 EBUILD ganeti-1.2.9.ebuild 1186 SHA256 4881e505e39e2db011aca0f6ab1f1c49c0eabd9fe35ef389c42b7cbbcddb12c1 SHA512 dfff5fd7d71ee0a5b06b3895eb91e4612f77077fd805af5d85bd23b72d1184c225c147d93527542e9b753b6bb0c50ab84073af97530ea9c50e38b0adef402094 WHIRLPOOL 6a888869c694d545759bfacc278799ce46b5b673420cdeac5f45a983e464ab5ec870e18842677b22831b95c567b61695f9c2100c2acfdb6c6d07f3cdcd9e7fae
 EBUILD ganeti-2.0.6.ebuild 1752 SHA256 c99accf525643abd311497ea1ccde735ab561d3fada116a130bf85df0ec80289 SHA512 44423f2599cc162c4a184a700e4d36efc2dce1856171b2ec32934f2dff68ce9c149a3f9ad385c6411bf4e08b210b71b21627f7d8bd3a40a23bbe54638fd68011 WHIRLPOOL 9bcd3fa79e94e302b5dc4906f300999aeb464db7bfa05e422089c884c2e0a45d49df04144254581af10794df7a7134f31cb293e4c193fc81a87cd6cef55bbe53
 EBUILD ganeti-2.1.8.ebuild 2022 SHA256 5d2ac03c4b8b7fa768784f9b38a8172a569e0d3881e1386c7ff746bb6da7f63c SHA512 9cae80733a99ba9f5c211b37f8a403206d414603694894d45802bb4195dd84a631f76ef2cfe01720ff4efd0a9105e7048fc09d3754c69c1c335d9accadb24c7e WHIRLPOOL cd2ab3a7a4bf2d463edee0721996c08cb579857e3d496eaa384cc808f628db2b829fc8e036b4743e156d1a0bd37c4e4c04663240d3e09523290e26bf0a5fe7ea
@@ -28,8 +33,17 @@ EBUILD ganeti-2.4.5-r1.ebuild 2535 SHA256 6d1c474e5eada353d7057224a5d63d5e52d62e
 EBUILD ganeti-2.4.5.ebuild 2439 SHA256 5b0d3044e0c426a735d8d7e341ef8d7e0824878f5310f8f41ceb564fab5db4a9 SHA512 f7343c07387f5a8508480538cf5a0ccf1fed271455ed8ed357a8e53c41057a90404b0783c2d9be0a5aa341fc6c86c51c81e971b79e278fe4cfefe7840b9541c6 WHIRLPOOL 54640898c660f54fbe3eb34b5eaf3768bae2f873c379073742cd27b877c93301b090300a30e3c1e9e8bd69e9a21c5c114116400932dd334d628af173da4ab3d5
 EBUILD ganeti-2.5.1.ebuild 3375 SHA256 fc3b51756e78cdf4134cabccec8aa3fcd1e9212d327cf2a38e4cba526f15c58f SHA512 b9ce6102bcaa6b8f6215fb9ee285d7402932747bfd4679ec18d1bfa0450ac492e8a3348317ada69d434a3363852f9e14040bc9a904a4d87da8053297603444bb WHIRLPOOL deef3385da7f6c35e4c8c65c2ae49196e24755638b2f46688de6fb8dc4743e88bf82ec7205860da767561ab810e7d4921d262761af64e61567d550daa804eaa6
 EBUILD ganeti-2.5.2-r1.ebuild 3441 SHA256 1b384142ab3f09ed6f48c87c16ad79b8acf3c53fc3adf3db73ca99351afdd41a SHA512 104c0be97a6b516cd83170a44266e0621829214de54131746fb1e192b2cc3b777a6fbc7808adb9f4bf90bc4fb3c1b31b6a2e449d58e0d37125db55a946c28b3b WHIRLPOOL 66588b4b3d58c0b70d9232dafb3f72d53aa86c172e7a758c56e0e65f72a5393d502628159fa95b9d0a56ef0d3b44c655eefb973597e3963ffa566583df448676
+EBUILD ganeti-2.5.2-r2.ebuild 3843 SHA256 4cd0453bf3fea2ed56eab11f242fc405c072e72de10077f1a7ea70647d406e4a SHA512 6ba54f490551d5173944f67541d813a0ed09b2b0b88dd84ef1d750cec6c24a11e7dd6ab2e488091f6729178a7d1cd81591b1415f3cd50ea435ba53541f599812 WHIRLPOOL b156865f6c074792772b457f295bd605c07d7e7f9aa1fab9f2972dad746d02fb78ef96ac4104ea7f1725c4997fedadbe648c5b6278c9c207d85c2a33edfa25f5
 EBUILD ganeti-2.5.2.ebuild 3375 SHA256 585aab7452710cbf6189c28adce9d2a0fc51842dfcea8479b8cbe150515f2e41 SHA512 7bd0198e3da6250854d4982ee14074cc38436b0326e5c7bc0c010ee79267d221589d1e35314d8d51bd8eb8012dfb0e18d51f902152089484308c00e45ebaccd0 WHIRLPOOL 844e64260cb0474d1e7cba6dea38b8382fa52170adf6f0bea302ce84eaac560c1a96d670fe24d7a2c06bb525d331ea8ab26cb845ad4d09acee855532a13873f2
 EBUILD ganeti-2.6.0.ebuild 3771 SHA256 07e1ef50e63fc117e822daa35589b053bb1f16cdfc0fcc6f145faa03ca12312a SHA512 975ffc912bca1ab35cc62852043fe13676baf03c09d6f40b8e5800eb95f468d6a9ca4f76780594c8bfa9b05a9704d175f9d47070da118bd6a8a973e40fd8a3be WHIRLPOOL 0e7c02891426a965782469c7de2eb290ef8504ed5a766b2a5074bcc306a4f29cf5cbb7d354930e63bd445b08cbb4a0d4804e8f567473594d3373e884b8dcd612
 EBUILD ganeti-2.6.1.ebuild 3773 SHA256 0c583feec4c4fe9b1a674a0971299e18d1e39274e14acbcfec9d438ed8029732 SHA512 d31c79f79c2d5ff352f0bca2a2dfca60b795194fa9afdb82c5085e0660d305bfaf89f25b1e2ea9dd47ed8ef0869bf120c2e040cfa2e7f1922ab82470fd96318d WHIRLPOOL a0714b7d92009b79a5f7131a64272302869cd4d47e03d44ecd55c28fba8a896a85b62cfa250ccad1fe137ca3fa22a9b53bb446716efe1333317f83f8d87fff63
-MISC ChangeLog 12792 SHA256 f69bc02803a3c7ee3b2cb679ed4cfa781be125b4cfddfc1cf7897deec17ba4da SHA512 40158b0eb8392b78202f8d87b9df201edf8387e350f13ccbd2447fc86e874f12b0cec0a831154db9b059a3c3d3089e8ca9ca554b9cccbf8d6c850dcac560e764 WHIRLPOOL 0ccc6a3bef501ae0d4103dce7a004e9ec4f5a400762339c8a805f31a7238542bab48263555a2b46082b2370213628fd6fa5d36457739de1ab3e60568a015dd1d
+EBUILD ganeti-2.6.2.ebuild 4472 SHA256 c800707d99ff74ea4f95afd3553614f326061d63e37b3f1cb17b22e0e4def36d SHA512 deaba8050bdf0ca05e1b98591b47f8fe14624c3f836f37f907c1f190e77e00381a2211c285ecd590a59d181f1c8935c5a09d9bbc400ae03ec37dd70811b6cc58 WHIRLPOOL 1e03d7481c1b16a1515228c8e21af6352774dcda92bc880269edb54d5cca64a6dede8e585a17e5caa88a79956853d10ae0907546609215d6707c0ff0b7a41566
+MISC ChangeLog 13350 SHA256 5354be30ff7156d977d5acc9e1c2ce6db8afbe6719f26781e33bbfbfc38e377e SHA512 4e4d98bf26c513cfb02457bbffbb30b6eabbdf50aa9082bbfb9049741d1667869b09a35dae654e54f31864f9d3f8c157867f154975112ca1691993ab3a0ed064 WHIRLPOOL 20bdc0998e16933d8cdaae0c87b3d7b7235f88b3927a4637bd17c3ed5302f0cb589c943bd9b605097ef3c67c87d7a739ee958c7e1a46269a14128a41ae751716
 MISC metadata.xml 1576 SHA256 6658d9da18761ed1a7709e087692355cdeb98f0cb7a67e124900335b8d48cbae SHA512 a4dd8876e15e98aa08ec4e9d4859b0a81acf427ec5e9be4067bad6579044601601af39d4cd5509f5b7d3e158040c3e2a6f14ed902aea7d1d5ec06dcafc4bdfa8 WHIRLPOOL 9b8894c29fb219420bd45701ba1eb1d374154cf2f9185055d5bfdfcae4aa7afe2d69e7b6823fd60b05601e030ffcb570f470bae287137dfdaafd0b5c4bd085b2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iD8DBQFQ2AVxQW+hXSf0t0IRCDoFAJ9/Z8bwbzpbYI2I3DyCa1BYMZZsEQCdF2Io
+mAmNVqYLEZOs1mACjfL+lTg=
+=A6mb
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti-2.6-fix-tests.patch b/app-emulation/ganeti/files/ganeti-2.6-fix-tests.patch
new file mode 100644
index 000000000000..51c516a21b9a
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.6-fix-tests.patch
@@ -0,0 +1,42 @@
+diff -ur ganeti-2.6.2/test/cli-test.bash ganeti-2.6.2.new/test/cli-test.bash
+--- ganeti-2.6.2/test/cli-test.bash	2012-12-21 06:38:52.000000000 -0800
++++ ganeti-2.6.2.new/test/cli-test.bash	2012-12-23 22:29:14.886372066 -0800
+@@ -3,6 +3,7 @@
+ export SCRIPTS=${TOP_BUILDDIR:-.}/scripts
+ export DAEMONS=${TOP_BUILDDIR:-.}/daemons
+ 
+-shelltest $SHELLTESTARGS \
+-  ${TOP_SRCDIR:-.}/test/gnt-*.test \
+-  -- --hide-successes
++# Skip shelltest until package is in portage
++#shelltest $SHELLTESTARGS \
++#  ${TOP_SRCDIR:-.}/test/gnt-*.test \
++#  -- --hide-successes
+diff -ur ganeti-2.6.2/test/ganeti.hooks_unittest.py ganeti-2.6.2.new/test/ganeti.hooks_unittest.py
+--- ganeti-2.6.2/test/ganeti.hooks_unittest.py	2012-12-21 06:38:52.000000000 -0800
++++ ganeti-2.6.2.new/test/ganeti.hooks_unittest.py	2012-12-23 22:30:34.902373826 -0800
+@@ -191,7 +191,7 @@
+       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 -ur ganeti-2.6.2/test/ganeti.utils.process_unittest.py ganeti-2.6.2.new/test/ganeti.utils.process_unittest.py
+--- ganeti-2.6.2/test/ganeti.utils.process_unittest.py	2012-12-21 06:38:52.000000000 -0800
++++ ganeti-2.6.2.new/test/ganeti.utils.process_unittest.py	2012-12-23 22:30:09.278373262 -0800
+@@ -340,10 +340,10 @@
+   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.5.2-r2.ebuild b/app-emulation/ganeti/ganeti-2.5.2-r2.ebuild
new file mode 100644
index 000000000000..d357e1934696
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.5.2-r2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2012 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.1 2012/12/24 07:34:07 ramereth 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-1.4.6
+	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
new file mode 100644
index 000000000000..8fcdc02978c0
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.6.2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2012 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.1 2012/12/24 07:34:07 ramereth 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
+	haskell-daemons rbd"
+REQUIRED_USE="|| ( kvm xen lxc )"
+
+S="${WORKDIR}/${MY_P}"
+
+if use test ; then
+	PYTHON_DEPEND=">=dev-lang/python-2.6[ipv6]"
+else
+	PYTHON_DEPEND=">=dev-lang/python-2.6"
+fi
+
+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/elementtree
+	dev-python/paramiko
+	dev-python/pyopenssl
+	>=dev-python/pyparsing-1.4.6
+	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
+	${PYTHON_DEPEND}
+	${GIT_DEPEND}"
+RDEPEND="${DEPEND}
+	!app-emulation/ganeti-htools"
+
+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"
+}