Version bump, patch to fix ganeti init issues

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

8 files changed, 408 insertions, 6 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 2e0fb737e3ef..79e2e5982139 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,15 @@
 # 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.61 2012/07/25 16:45:02 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.62 2012/08/05 21:33:42 ramereth Exp $
+
+*ganeti-2.6.0 (05 Aug 2012)
+*ganeti-2.5.2-r1 (05 Aug 2012)
+
+  05 Aug 2012; Lance Albertson <ramereth@gentoo.org> +ganeti-2.5.2-r1.ebuild,
+  +files/ganeti-2.5-gentoo-start-stop-daemon.patch, +ganeti-2.6.0.ebuild,
+  +files/ganeti-2.6-add-pgrep.patch, +files/ganeti-2.6-fix-args.patch,
+  metadata.xml:
+  Version bump, patch to fix ganeti init issues
 
 *ganeti-2.5.2 (25 Jul 2012)
 
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 07fa2ba88e29..51a549633ff7 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -3,6 +3,9 @@ Hash: SHA1
 
 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-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
@@ -17,6 +20,7 @@ DIST ganeti-2.3.1.tar.gz 1679030 SHA256 3d644eea35f1caed9e38246f21fa79f4d4d783f3
 DIST ganeti-2.4.5.tar.gz 1828118 SHA256 9141379f3802238fb209309ec12f7090d872b77d7a473c91fe766d1fcec97c89 SHA512 e3abc2fd7c031fbef41c6e993f4cb129fa1dd4cb8c44961a2574da23832fd8412b8b3664b2e05ba8236cb8e58e8d70c3c9081f3f1b6dba8ffdc28d298c8a5099 WHIRLPOOL 897c2b3cdf0c7b03232a4ec99314439dbd29afd65eb2502d21a9f197cc098323a4b9ec0671c24ef7aad44b5327316ee68731e7e5304c8730d03f8ca908b93b62
 DIST ganeti-2.5.1.tar.gz 2292928 SHA256 c80ce69e5cee61cff058dbde43a1fa32f020b95aa804fd614682931a6791ec9e SHA512 bc4214c2319a231200df9bd70d05da61079dedc36dc55e7bf2f77afd64da5837ebcc15088a4066ea2c54c24a4adf647d0ac3deda64e21ed631895eb503a7d6eb WHIRLPOOL f955e697d7b094d014b705070d8c9441bc713067583d95558d9fb1e3656ad51951df9c41a4e289068e8696da5e3118a7f38440d53f594824ecd9db86f5c8a880
 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
 EBUILD ganeti-1.2.9.ebuild 1186 SHA256 4881e505e39e2db011aca0f6ab1f1c49c0eabd9fe35ef389c42b7cbbcddb12c1 SHA512 dfff5fd7d71ee0a5b06b3895eb91e4612f77077fd805af5d85bd23b72d1184c225c147d93527542e9b753b6bb0c50ab84073af97530ea9c50e38b0adef402094 WHIRLPOOL 6a888869c694d545759bfacc278799ce46b5b673420cdeac5f45a983e464ab5ec870e18842677b22831b95c567b61695f9c2100c2acfdb6c6d07f3cdcd9e7fae
 EBUILD ganeti-2.0.6.ebuild 1758 SHA256 3ad06822eab40cfdb00c94765b223f4e4a56d28dadb633a81f653024d97fcaac SHA512 98974e6d47e0e84edfcc46f06407d79860b4ef8bca216f1ba35f92b501b04c9344266b7fe23ba776341ca29656d52ed519af94f59564d4c9ceb19bfb16ed6eb4 WHIRLPOOL db3623ba79d3ff9464c4d595496fd720ef59a387c5e19ecc093b0a215c6c5ff75f20be1e3c09af260d2a22f4f641609d539030ce76b4c873aa43738a202997f7
 EBUILD ganeti-2.1.8.ebuild 2028 SHA256 385cc64b07a46852806869f1228ce76bad3743b75036c183a47847c4460111de SHA512 12e9f5601ef379e91e10a6b984925352b4586e4a0da1ec172cd5fba12a79a7ef16212c44f6ef9f04fa4ff997031d690100bbcd95847c29772ba8bc0f2136d018 WHIRLPOOL 5b87539ff6c8680fe973f98489ec9815249f63be1b31c8915793ce0acc0f0aaccf318757057567c5ceefc2c943cece283679929957c9e0d6ddf94eb64863a441
@@ -25,13 +29,15 @@ EBUILD ganeti-2.3.1.ebuild 2147 SHA256 55ece094a5fd5bd64da7873bc4b36992e54f8ff72
 EBUILD ganeti-2.4.5-r1.ebuild 2546 SHA256 648095a73f9aa38264dc67da79f8ec980d0476b56869b97b9402be6f46ccb431 SHA512 929f5cfbbee47e8394fc7d3be9842f18337aafb0a8493205b505d9a3c1402c7500a95d4a363a8c5f87f9809883ea160d7dde26246482ca4da9ed5436061b2470 WHIRLPOOL 201823692377f98105592413e800e8e9cea1d77bd9b9ed0fdf278b2b4d91a04b3c1998aadb9c6a85abee52e9be069e49028bbc478d2a375adf627d99a64afbeb
 EBUILD ganeti-2.4.5.ebuild 2445 SHA256 956751207977726f6468e0da6b771e44c3fed96988e8dd5189eb530c7dd27056 SHA512 0b4c16166b7ca96f4cd2a52a3b3da74d10e5a4188e53911207adb29a9b9c9875d2c9238ea3b1c45d1a736dfff117590c16b739f0daeecddde47a3cf1e0955e40 WHIRLPOOL 8b16b6b714196e342faf66720cf7ae959b890e2bf1203842f56aa2f51f49ad84f9bc686aa4e8d863555236251906dc63f0b31af2ff279f48c3bcb0c7425a5886
 EBUILD ganeti-2.5.1.ebuild 3381 SHA256 906538ef5dabe6526ad64d43b087fc5569c171eea3ef746e67f6fd575cec29b0 SHA512 02638f6a16046b8058c559d43567cab99ece5c372ab3eb12ac11acce21b78ab9e317c24c120907bc81f8565a2f35daf7a12b191fa4ad6dc4dd5dd55ce62203d7 WHIRLPOOL 75b195df2a3a2ae6a11e8e2d28ebc9683f91a562e40d2ed7966216c19aea3c30174c2b8e3dd3cff81c80162e7a9fcc87c3caecd06b72d5bb7959678b78db55c5
+EBUILD ganeti-2.5.2-r1.ebuild 3447 SHA256 04a2f67c9f76f59a97f3712eb39b0edcaca6f32498330fb9dc14e50da1504543 SHA512 39e2b7a4c4385ca0e22d0762c8a476631e1f6c332cb779d350f9d0b4dc0baf1a089924e69964fd7e58a2d614e175a9ad08700ffb6cce91ac6c8f3bbbc8331ca9 WHIRLPOOL 2d979d167cb15c74807bebcb70c6e832e511372f25d3ee3ba0a3acd50827ebce4d100f9472b3499cc0e50e9842ea19ffca681fcd00ead89b0d05c3aed1ae6dbd
 EBUILD ganeti-2.5.2.ebuild 3381 SHA256 afee1d3fbb858ff17592d9efba7b43601dd64dada4516c043e2cf4d2ecdd923f SHA512 f2a31b007602370b95ba5c4bbdc9d37d44e64dd994b79d4231c52489d2441d22903bf5857b062f109a0152f78ccd7981f263404a6fa406eb733b00310183bfca WHIRLPOOL 40ccb001b87cd4d0ad00efee7c2645c2af9471e802007dfe5c5fdfae715c202fb044af21cae143fe964d0a323fe0d6b63ac3dc267b3daf38a8806afb3dbd75b9
-MISC ChangeLog 11795 SHA256 bcff1351a4830e79b623d1089df3e4b43ce0fa6c2f43abea42e71f61ce6aa603 SHA512 23104065a91a2b8bcee3678e899aeb04a264c501cd90e3d18f8e123883c07c8a6b98746bb4c26393b05d414bd36ee73823ea703e0339d9650bbf55f96ba45030 WHIRLPOOL d07115acd6c4a7e3aa5008a1d496cdc50f202d3cad2b16068468d9a4a842c27f6240d280a13fa3252c5ff67fb1a4a6091cd6ee32fb52e07bb1671f0614294e3a
-MISC metadata.xml 1417 SHA256 4c9d7eac035b80579071e8d3d283df32f011729e8058345b7d3c497671d59bf4 SHA512 816f64c95b372804ddcce600134dc89463e3bf9934c62878b7521e95f83301b50976152f5d633b03ad4c64405fda9a155087b15e79124604de21802189fa9b50 WHIRLPOOL dc9a34896ef65c1520f44f45bef91ff24b43e28de0dc1f2b3813f708e44843b35f58d0a639f13af8890ce4ffd37251a9d89bf05336cca4cad207bd6366f39821
+EBUILD ganeti-2.6.0.ebuild 3777 SHA256 3f15cf9ba11ddbc4cfe68632f222194c0ecf8f7235bb0e4ed9ed34cad7103ef1 SHA512 97aa6b9bf1457f36bb3f6e7202e517c004dd286876cba610d196391b43c6dfdce0d89f7dbd3886ac7cb42d167b91cb715a72ffe382f3957c1eb15294247eceee WHIRLPOOL 2e16f9b05d15713cb90d5d8cb02259f7133a149ee6eb24361e003a3f71ba7fa660870c5005edeb74e94c76983cc0b19fcfaed22e3dae9a779d1d82230ecb5360
+MISC ChangeLog 12143 SHA256 7d03ff37108121c6b0347de017e8ecd25b3f24c793346518267598e3321fe897 SHA512 ffd9cd1b334807ce5c693291c72aa07d1ca58d62ca5239c4f6d78f723892bdbc5edb05cfd3b158eaecec1d239965ce9c450e3a82c3e30bd60b8352e4bb733628 WHIRLPOOL 74f39b9e4ea00fdd81c0c25c9a0f33de3d4d30d1c361ac842c275946e4f478842a8d7fbfc794e106cb91641a453b223f9e270761b3f256e941da2ae6d5010763
+MISC metadata.xml 1576 SHA256 6658d9da18761ed1a7709e087692355cdeb98f0cb7a67e124900335b8d48cbae SHA512 a4dd8876e15e98aa08ec4e9d4859b0a81acf427ec5e9be4067bad6579044601601af39d4cd5509f5b7d3e158040c3e2a6f14ed902aea7d1d5ec06dcafc4bdfa8 WHIRLPOOL 9b8894c29fb219420bd45701ba1eb1d374154cf2f9185055d5bfdfcae4aa7afe2d69e7b6823fd60b05601e030ffcb570f470bae287137dfdaafd0b5c4bd085b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iD8DBQFQECKVQW+hXSf0t0IRAqa2AKDP8kA0W8R4TnyXdxnbjORI1XKP6QCbBIMx
-bJA1/hCUDKosnJcy+p8ROO8=
-=TynI
+iD8DBQFQHua6QW+hXSf0t0IRAo+YAJ0QVmpAyXNYDWQKIueGXBLF8tJ7uACg8rfE
+QoCC9G+b9Kr+EPInAvd7cpg=
+=S4jz
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti-2.5-gentoo-start-stop-daemon.patch b/app-emulation/ganeti/files/ganeti-2.5-gentoo-start-stop-daemon.patch
new file mode 100644
index 000000000000..c668a2131178
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.5-gentoo-start-stop-daemon.patch
@@ -0,0 +1,38 @@
+From 041efca59326baf7c2ec08dd505e06ae86dd6954 Mon Sep 17 00:00:00 2001
+From: Lance Albertson <lance@osuosl.org>
+Date: Wed, 25 Jul 2012 16:21:21 -0700
+Subject: [PATCH] Check if process is already running and skip if so
+
+Gentoo uses a modified version of start-stop-daemon which returns an error if it
+sees another process running with the same name. This happens during cluster
+initialization since ganeti-noded gets fired off first.
+---
+ daemons/daemon-util.in |   12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
+index 00fe1b6..8e4ce97 100644
+--- a/daemons/daemon-util.in
++++ b/daemons/daemon-util.in
+@@ -172,11 +172,13 @@ start() {
+ 
+   @PKGLIBDIR@/ensure-dirs
+ 
+-  start-stop-daemon --start --quiet \
+-    --pidfile $(_daemon_pidfile $name) \
+-    --exec $(_daemon_executable $name) \
+-    --user $(_daemon_usergroup $plain_name) \
+-    -- $args "$@"
++  if ! ret=$(/usr/bin/pgrep $name) ; then
++      start-stop-daemon --start --quiet \
++        --pidfile $(_daemon_pidfile $name) \
++        --exec $(_daemon_executable $name) \
++        --user $(_daemon_usergroup $plain_name) \
++        -- $args "$@"
++  fi
+ }
+ 
+ # Stops a daemon
+-- 
+1.7.9.5
+
diff --git a/app-emulation/ganeti/files/ganeti-2.6-add-pgrep.patch b/app-emulation/ganeti/files/ganeti-2.6-add-pgrep.patch
new file mode 100644
index 000000000000..c69128229a66
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.6-add-pgrep.patch
@@ -0,0 +1,38 @@
+From 49767a66e27a1cb61abb8f812b2e61eba03a9594 Mon Sep 17 00:00:00 2001
+From: Lance Albertson <lance@osuosl.org>
+Date: Wed, 25 Jul 2012 16:21:21 -0700
+Subject: [PATCH 2/2] Check if process is already running and skip if so
+
+Gentoo uses a modified version of start-stop-daemon which returns an error if it
+sees another process running with the same name. This happens during cluster
+initialization since ganeti-noded gets fired off first.
+---
+ daemons/daemon-util.in |   12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
+index c19daa7..7be9d8b 100644
+--- a/daemons/daemon-util.in
++++ b/daemons/daemon-util.in
+@@ -222,11 +222,13 @@ start() {
+   @PKGLIBDIR@/ensure-dirs
+ 
+   if type -p start-stop-daemon >/dev/null; then
+-    start-stop-daemon --start --quiet \
+-      --pidfile $pidfile \
+-      --exec $daemonexec \
+-      --user $usergroup \
+-      -- $args "$@"
++    if ! ret=$(/usr/bin/pgrep $name) ; then
++      start-stop-daemon --start --quiet \
++        --pidfile $pidfile \
++        --exec $daemonexec \
++        --user $usergroup \
++        -- $args "$@"
++    fi
+   else
+     # TODO: Find a way to start daemon with a group, until then the group must
+     # be removed
+-- 
+1.7.9.5
+
diff --git a/app-emulation/ganeti/files/ganeti-2.6-fix-args.patch b/app-emulation/ganeti/files/ganeti-2.6-fix-args.patch
new file mode 100644
index 000000000000..6fb5bd0df62f
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.6-fix-args.patch
@@ -0,0 +1,45 @@
+From 0491397d7648fd70ad0a6cef9e8626b9c2a968e9 Mon Sep 17 00:00:00 2001
+From: Lance Albertson <ramereth@gmail.com>
+Date: Mon, 8 Aug 2011 23:34:33 -0700
+Subject: [PATCH 1/2] Remove/fix deprecated start-stop-daemon functions
+
+daemon-util uses the deprecated functions --startas, --chuid and, most
+importantly, --oknodo. The last one causes start-stop-daemon to exit with a
+non-zero status, which makes openrc think it crashed (when in reality it just
+shut down properly) [1].
+
+[1] https://bugs.gentoo.org/show_bug.cgi?id=377905
+---
+ daemons/daemon-util.in |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
+index b754e7f..c19daa7 100644
+--- a/daemons/daemon-util.in
++++ b/daemons/daemon-util.in
+@@ -222,10 +222,10 @@ start() {
+   @PKGLIBDIR@/ensure-dirs
+ 
+   if type -p start-stop-daemon >/dev/null; then
+-    start-stop-daemon --start --quiet --oknodo \
++    start-stop-daemon --start --quiet \
+       --pidfile $pidfile \
+-      --startas $daemonexec \
+-      --chuid $usergroup \
++      --exec $daemonexec \
++      --user $usergroup \
+       -- $args "$@"
+   else
+     # TODO: Find a way to start daemon with a group, until then the group must
+@@ -248,7 +248,7 @@ stop() {
+   local pidfile=$(_daemon_pidfile $name)
+ 
+   if type -p start-stop-daemon >/dev/null; then
+-    start-stop-daemon --stop --quiet --oknodo --retry 30 \
++    start-stop-daemon --stop --quiet --retry 30 \
+       --pidfile $pidfile
+   else
+     _ignore_error killproc -p $pidfile $name
+-- 
+1.7.9.5
+
diff --git a/app-emulation/ganeti/ganeti-2.5.2-r1.ebuild b/app-emulation/ganeti/ganeti-2.5.2-r1.ebuild
new file mode 100644
index 000000000000..79180fe47209
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.5.2-r1.ebuild
@@ -0,0 +1,125 @@
+# 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-r1.ebuild,v 1.1 2012/08/05 21:33:42 ramereth Exp $
+
+EAPI="4"
+
+inherit eutils confutils bash-completion-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"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="xen? ( >=app-emulation/xen-3.0 )
+	kvm? ( app-emulation/qemu-kvm )
+	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 () {
+	confutils_require_any kvm xen lxc
+}
+
+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"
+}
+
+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}
+
+	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.0.ebuild b/app-emulation/ganeti/ganeti-2.6.0.ebuild
new file mode 100644
index 000000000000..64b8aa6b485f
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.6.0.ebuild
@@ -0,0 +1,139 @@
+# 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.0.ebuild,v 1.1 2012/08/05 21:33:42 ramereth Exp $
+
+EAPI="4"
+
+inherit eutils confutils bash-completion-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"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="xen? ( >=app-emulation/xen-3.0 )
+	kvm? ( app-emulation/qemu-kvm )
+	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
+	>=dev-lang/python-2.6
+	${GIT_DEPEND}"
+RDEPEND="${DEPEND}
+	!app-emulation/ganeti-htools"
+
+pkg_setup () {
+	confutils_require_any kvm xen lxc
+	confutils_use_depend_all haskell-daemons htools
+}
+
+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"
+}
+
+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 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}
+
+	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/metadata.xml b/app-emulation/ganeti/metadata.xml
index 532b120ad87d..b73d307c0d32 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -28,6 +28,8 @@
 		<flag name='filestorage'>Enable File Storage</flag>
 		<flag name='sharedstorage'>Enable Shared Storage support</flag>
 		<flag name='htools'>Enable htools support</flag>
+		<flag name='haskell-daemons'>Build haskell daemons instead of python</flag>
+		<flag name='rbd'>Enable rados block device support via sys-cluster/ceph</flag>
 	</use>
 </pkgmetadata>