Fix problem where ganeti-2.10 was installing lots of broken symlinks. Add patch to use /run rather than /var/run. Remove 2.10.0.

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

5 files changed, 69 insertions, 189 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index ca966fff11f3..df8a05e9d45b 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,11 @@
 # 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.81 2014/03/06 19:56:01 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.82 2014/03/07 03:50:02 chutzpah Exp $
+
+  07 Mar 2014; Patrick McLean <chutzpah@gentoo.org> -ganeti-2.10.0.ebuild,
+  ganeti-2.10.1.ebuild, +files/ganeti-2.10-rundir.patch:
+  Fix problem where ganeti-2.10 was installing lots of broken symlinks. Add
+  patch to use /run rather than /var/run. Remove 2.10.0.
 
 *ganeti-2.10.1 (06 Mar 2014)
 
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 5961d5294af8..eedcaf81fec3 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX ganeti-2.0.3-gentoo-brctl-path.patch 741 SHA256 8362692d1af5b264a9681d63137bd010be29047419718b8daaa320dfb0979965 SHA512 a210c6637f2526111d56773b5ed13b36c3843a07aca44f80e1e8626182d4cdc92e34b2296f70cd06091ce42e4edf7831293c4cfbe5d34f57cfed0b4478710300 WHIRLPOOL cb7b68ca1d08bb80c811ab9294c1789f9eaad6232d11c51fd856ee37aab0bb881950590f6da04b14caa4b3f015af3a7c4e3c38ea99aed1e49a1a16a8d4a9f90f
 AUX ganeti-2.1.initd 2715 SHA256 b56dfab540977f17f2e80e30ba49d3b0848cb58f031a5c7b388c967870ea2d29 SHA512 c61b10393264feef03bb237f739a344912b5e22620818a25e8bb0a774e38aadccf6585a800edc7e37895016d73be1cf318a04fcc64f71d9d53d2004e917df614 WHIRLPOOL c03d82b844e9004ad3bf1bc48ffa01e37a25f3c94d0dabcb6dab4e94cca2d8178ee140957f9b7704427e089913c7992db51942c93d739d80f2e012d3317cdeea
+AUX ganeti-2.10-rundir.patch 1305 SHA256 13783753b68a5dcb45a81653b449d085ff74ee812df8be45b3d043361f3e447c SHA512 67a475c8e4ed9fd7d28bcf514fff5dd3ea6a458f57e02138b9fe6b1288732dfb3fc4e2fe1586dc5f78c1cda5733b5163f723709f37c4ded1a99d8b0b2773f61d WHIRLPOOL a21467c23ebffe9cfbbdd9532d43a985d9d8dfdfc701585e4092c4967574ab3556bf3d0571025dc18f2745e4c8db4319f5bb5bd466cbfbe9cfa852d8a3b7c610
 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
@@ -22,7 +23,6 @@ AUX ganeti2.initd 1503 SHA256 6fd666648ac543ffcc3700821a36eba9a027eb04278e53f60e
 DIST ganeti-1.2.9.tar.gz 847644 SHA256 1de2432281f127a2b19106ba04fd1f630c7868113f0665063ff10a147676b92b SHA512 6e98aa2141c05f80658523174c32d8acd165da80b73dcdd6af21dee71f53784fb3624070de826963ff98eb7e2b760901c0c6ca82ae2c29472f12d3f7a96404a8 WHIRLPOOL 8818fa39bdfa523efbe05bde10342254ffbf7b25b18adf490482d507f772a52b142469b50d4f1487415571b9ed61c640fd5be2cb78f7d69da275d7e19e2c0411
 DIST ganeti-2.0.6.tar.gz 684502 SHA256 f06433c567109ffa319ca23449eec670fb8b7bec7fa906edbf3c0cfc01f60043 SHA512 4c175e458a8d94b740de7cb63c09b91351711465b0bb2f68cb9236108bd8e04db851f3ad6edc827b6f63a67785c401a4b44d138a4b9836d7fc3110736164339f WHIRLPOOL 5803221f764751464f38f5c790289dff51ad385cb47ccd0cfd861945c9d00e3cb4616a698c90e69b4fc7078278a0fb27e33e3fb7af13baa4de2eb77fa11dd9fb
 DIST ganeti-2.1.8.tar.gz 1400262 SHA256 80fc2add2937bb7503a003d71b910ccac29e691c35e2febc5e05908a551908ad SHA512 2a4b19d3116608e5d44cb62d334bc3933ca06125159a53a974c6b6215aec02ddf39d1b4688d8077b83726169383356a8d52c4c0114654b819de43d0c6c39fb36 WHIRLPOOL e8812dfddb3282f9e3d28752b727c19270e8b3428145f34db225a5a918ceda010204e66cc5e6fa4f52f73e41dabe065149792c248607159b8c872ea82e968a49
-DIST ganeti-2.10.0.tar.gz 3827918 SHA256 d382f19f918be950770c3fbda959cf82f3adc907c3575264ce1c917d92daa92a SHA512 a75b6a5aef3a77715fd8de3834f318b9535e5d7bc5c1a4bf6a0b34026b56bd34ddb096761983b447664e4194208d6171b5ec068810ebeb1942aee68bd4c70c47 WHIRLPOOL c6ab744076c18c6bd667ba095a13ee802638f4a5871f2fe84ad16d11c3ec7b4b1b7395b2d3eb56e69425a365c56ca58cf1e06fa43ba953b37751cf7aaf8835be
 DIST ganeti-2.10.1.tar.gz 3830115 SHA256 3401d5868bc8947f2350757242e4b15928cd22a35ecac1aef0f8669a1715a349 SHA512 696b3abc4262799c2f04eb62bebdd05c9bffdf3110e81706ebaf0ca5f777b123eaba666a65788cac936b4e551ea0233188ad8cf525db44e07f5c84cc280f4f10 WHIRLPOOL 4a9890f39d9de65cf04e12fe14f9d0954c8ef9eeb63568f8e6f911adc291d3add8279dcf5fd358e560911f6c03f0887deb9ab0743b8053351f9f6e7f75d62180
 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
@@ -37,8 +37,7 @@ DIST ganeti-2.9.5.tar.gz 3614501 SHA256 8fb94e526c862e851cc700bc2eb04387f2b33af5
 EBUILD ganeti-1.2.9.ebuild 1189 SHA256 952e74cc5ce51864eed55bd46204e09b082c51236176bb2121da1f407e507c13 SHA512 8b9c5cf1e828d55f4908a3525781d033c1636fd75c74adee0d0500ddca605490c4757559ee9d1f10ddd31043b14ad5adef7ad7ae35e704bdb207e6c7732235d1 WHIRLPOOL 82342ba9c52ee4014cd2fc0d2585641ef1b8c6331337e049b76d8f7058580fd2d332198bc1cc056d6c153a01ab963c690558c98022936de0a663b4137bc4076d
 EBUILD ganeti-2.0.6.ebuild 1752 SHA256 e78392e12f76adde3c42c4e587710f670fa9dd3928b11adf917aea24a14c23d8 SHA512 f96bceb15af5fca5f9457ea27eb4fcf57009366d1a918c04964315a4e872b0b379ee36f0ba2c30afe6ce9b21580e391402e90722a86ab7b8163eab442f19762e WHIRLPOOL 31a37195cf34d7c20810420c50d30a6b2637149e31f2b49a9d251565294d308eff81fdef1a53e9555bbcecd2bb2872753e33334bcbcfdbcf48b2ffdb18a43028
 EBUILD ganeti-2.1.8.ebuild 2022 SHA256 33bb15b7318d2976f46694796b6ca485a657a8c98887f14c1760f45f3fbace52 SHA512 8a56053dd94a0c116f92592c2cf641da4631f489db2725dd83abaf85844a36ba4e06d24a9362e8601052910cc1515d1aac750c9b3b06f9109fa91057e2f9298a WHIRLPOOL 200c4a630a655c7ea87e3d1a8794e00b50415ba7ee19214466169db0e473112f4336a2ca2476ab0c0fdfbcecc72908c6f4f8903321219af471b2b70fd36932cc
-EBUILD ganeti-2.10.0.ebuild 4642 SHA256 58a921f72b5506e835f51d597786b97ef7281af8d9afd71687b9931fc27c973a SHA512 be3b70b2556578eac0aa312162661590c62e43de6df553fcc2a1dfc46c7f4ee838cc022873486d6be13ffa45be2815ca46b5ed76a9463e18928e208aac2878eb WHIRLPOOL 3fb34589e88a8a2a9cebcec6149660faf7ec1168fec669cf2e3d9a868ecfb05d643803591b03941bcad57fcf188df82b24481a02a59805869f3cf60ad3f6f475
-EBUILD ganeti-2.10.1.ebuild 4642 SHA256 3adbc432bf32e5ac5880a976b7550f817308443b38e584238196836223c08341 SHA512 8c0ca1cf41c1d9ab6ca2292d84235d704f14cef2e53e01cfaa0b96692f48139a901e6caaedebc884d32a4105dc82a2a67cbdc1247cdda9b7b0283d58d90bf571 WHIRLPOOL 8dc89f45ad9361e5f7ca496d00ab8a6268dcb8215d9222177846b51676f171497a4a3e42ceea9594d59f425615a908c1bbddf3a32a054723fcc0c37f451f0577
+EBUILD ganeti-2.10.1.ebuild 4853 SHA256 6f5829516c3c82ecbf2ab5e45e24685f4c099a744b8bc4fa0751ae80ed3e758d SHA512 08f1f2adb0619e90669a4559573be3a58f3f85700fe91148e71d26fcc3951dd04ddf64c1821d69c3ac8d262c157b4d61dfadc3155a2293fb4d53859dc8794760 WHIRLPOOL 74c7c9b6f272f69cd9e06f0ebfadf09529dfc267f5ba5939155a8a369918ab5b01150ea657c5ac986784ccde3f1197d677a6f45daa862018adc3171d9d45c351
 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
@@ -49,22 +48,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 16519 SHA256 b6cb877f4500b7f55d4fa061f17d87f2e41fe31e9af79e2098aca174417840ab SHA512 1c77280f4ea5974aa29bd0d20082d8423f2330ccda536cb51776e805355b202c56bbe9f83b37b63bc7b3afdb4a6c726e045567e87366fd48a716d65c0503edb4 WHIRLPOOL c854e91ca475bea6533c1b6e23d8f58d7a24423efd45f1171934160d727bf0935415d384a9e516587c0a41e0a649441969cd25ff39686a464d88a715253f6577
+MISC ChangeLog 16785 SHA256 950b667b27d141d23483b17fc20d226477fa71b364821169e016cea1e5f8ed49 SHA512 c70b184b0ae1d79a44f6ce416f5e6ba819c7ee0f0285263b864014edffe06a2f481ac6c5952d10ec41f250413d539a30cbfd89bd3edf936aa0686a0271dca9b9 WHIRLPOOL bc17521d8fce09dc20453be5ef9e1e774075499f41fcd6fed832b7a7141b86029a156bacdeab62add4a7ae2503dd5e6cf5ad1a3ea417da5fb8a8a2b50bc81186
 MISC metadata.xml 1575 SHA256 b8b9531634759b7f388efeea55dcc70d94cbaeca25f063ed3a30dfda77c83c65 SHA512 28449dd837162e3f61e4f9fd8b66206cf1d3130b60997dd06f4987635ab4506bc082745822416cdbd8f1d3ff22a8935abff0b1bfa1fda569824734d5c4fcaec1 WHIRLPOOL 17475d0b41d4222a55ed26f5fcc0409d33ee34e272d36c015ac1e0742aa1945926d6782422484f5eeba602fae45cf4f94ebf9db394ceb26ac6a8f58d4149f990
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTGNLSAAoJEHy/RO9cNQiD3LIP/i6/pH2C+5VINrJxOOrFNYOg
-PJpPSeNPZF2/s10IamKO9mNZrs7n1LWen1efG/ZAiMv5qK2F9ztGS2/jVx5xHK3I
-hGN3GHQgVQUPbTui1YD1/9gfL7lWtZ3xLhJAvNxFMSDlMw7o1sO0vZjDI5kZ0QAX
-XoS21gnaNDaxfeg72aqGmcRarY3lgNoWFIVXR0db0gpp7rZUqMp9s4l7thpvuQd9
-+jWLDooSzaqii3pEaCKthyVc+OSkzYfdPKY+NyMvsDCFJ0EuxE7+FPChtdtqtkXB
-hN4zLHbCGxbQxMQisL0jCvGGoBfNVY8l502fIya1p9iidyfkPn/6uNpZURt03Mn3
-7xMnrtsL+JCFB1exrAdinV5SjiHGBMlVozOMkQt0uTOHmTNItXpXOQ8t4UHBFNIh
-ER9zgyd5xfB5RnjjFDNsJfaxEuiqmUm9dvwZDipnLXOmFvJEa2m210eHX2RA1d7Y
-r7SX2XLSY5CHeV2cE83DfLPN/LlGILFZRQsJ0Lh54gRfTvcMAEZDgmuUPoywqMOx
-xx17DHNGiCtHkZAOh4mNbWMMzi1b5gx9mqmo0P56VCui168FSm7sHW1LvmCE9duE
-2nz7P09bOBcXfDj4C88lHWnBwa1rkt+beJjvcoZ2Wm1aA2q1fDZy7DJKFqSLQ6Li
-uBg0Ft16POgrURTSiZiw
-=s18i
+iQIcBAEBCAAGBQJTGUHrAAoJEHy/RO9cNQiDVK8P/3uE5iwMwM0d0H1Yy6CeyAD4
+MIa6GYbWV5w3rhWXSPz88iqGfY/LEBB+H3Jal2PWAvYjFqnj3j+GJXMvSsvYOtgj
+NJ+OVz29+xk2WMpuaQDLLed88tV1pu5qoF36OXfm0hOXZraHnR+F1lA/LtfJhLt0
+UJXyMuSSrVFTHlC/RotoZ4q+T95uuDQOqqfyRS2w/odfpVZDlYLY/4CGSHktNS20
+sZcXhIDDcLC9HG/syqi+uj7ZFMFDpklE53QsYvPRHyeNiBluZ4iq/UlhzmFiI0C4
+aaPcfd/49PdsM6tlaa1X8iQe8xzaIObCVqhMhl+ZiEd5sYYZA5B5zBUnKky761yu
+i5d2syavH9QATxxTvonufsLXamScRRaGele9iOZQ1Rf9LlZlz6/rzj4a4Im4ZM8O
+0PQ3SSkSLfT1hAO0J+hQDbFujjOsX9BNJoweyZ2UpcyudDkB8+gCrckJx+Iu6JCx
+BLKUPzO8Mblq4D4hKSP7aGV1wdvHrm+fTqV/Kw+8gJN5BgscKgp37BEUmDbngGUy
+aYde9E+lmT9DoyUT9H6rbTd9/+JCRNeYS9Qc+7/u4ny+AwDcY7zQbZN3oOKo/MyT
+dxTKfmMwj8hzbh0wPnvRYOIg5c1tzSsPJ7FCjzBbHwSSmk3Ozccb2Jh2a/G70F+Y
+OBAocDUt6a4gNPWyawhc
+=cWo5
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti-2.10-rundir.patch b/app-emulation/ganeti/files/ganeti-2.10-rundir.patch
new file mode 100644
index 000000000000..a723f2b63d85
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.10-rundir.patch
@@ -0,0 +1,35 @@
+diff --git a/Makefile.am b/Makefile.am
+index df62fdf..b034d32 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1865,7 +1865,7 @@ $(SHELL_ENV_INIT): Makefile stamp-directories
+ 	  echo; \
+ 	  echo 'readonly PKGLIBDIR=$(libdir)/ganeti'; \
+ 	  echo 'readonly LOG_DIR="$$LOCALSTATEDIR/log/ganeti"'; \
+-	  echo 'readonly RUN_DIR="$$LOCALSTATEDIR/run/ganeti"'; \
++	  echo 'readonly RUN_DIR="/run/ganeti"'; \
+ 	  echo 'readonly DATA_DIR="$$LOCALSTATEDIR/lib/ganeti"'; \
+ 	  echo 'readonly CONF_DIR="$$SYSCONFDIR/ganeti"'; \
+ 	} > $@
+@@ -2208,7 +2208,7 @@ dist-release: dist
+ install-exec-local:
+ 	@mkdir_p@ "$(DESTDIR)${localstatedir}/lib/ganeti" \
+ 	  "$(DESTDIR)${localstatedir}/log/ganeti" \
+-	  "$(DESTDIR)${localstatedir}/run/ganeti"
++	  "$(DESTDIR)/run/ganeti"
+ 	for dir in $(SYMLINK_TARGET_DIRS); do \
+ 	  @mkdir_p@  $(DESTDIR)$$dir; \
+ 	done
+diff --git a/lib/pathutils.py b/lib/pathutils.py
+index f075e22..38b02e9 100644
+--- a/lib/pathutils.py
++++ b/lib/pathutils.py
+@@ -62,7 +62,7 @@ ETC_HOSTS = vcluster.ETC_HOSTS
+ DATA_DIR = LOCALSTATEDIR + "/lib/ganeti"
+ LOCK_DIR = LOCALSTATEDIR + "/lock"
+ LOG_DIR = LOCALSTATEDIR + "/log/ganeti"
+-RUN_DIR = LOCALSTATEDIR + "/run/ganeti"
++RUN_DIR = "/run/ganeti"
+ 
+ #: Script to configure master IP address
+ DEFAULT_MASTER_SETUP_SCRIPT = TOOLSDIR + "/master-ip-setup"
diff --git a/app-emulation/ganeti/ganeti-2.10.0.ebuild b/app-emulation/ganeti/ganeti-2.10.0.ebuild
deleted file mode 100644
index 303359a348aa..000000000000
--- a/app-emulation/ganeti/ganeti-2.10.0.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.10.0.ebuild,v 1.2 2014/03/04 00:12:09 chutzpah Exp $
-
-EAPI=5
-PYTHON_COMPAT=(python2_{6,7})
-use test && PYTHON_REQ_USE="ipv6"
-
-inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-#MY_PV="${PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
-	inherit git-2
-	KEYWORDS=""
-	# you will need to pull in the haskell overlay for pandoc
-	GIT_DEPEND="app-text/pandoc
-		dev-python/docutils
-		dev-python/sphinx
-		media-libs/gd[fontconfig,jpeg,png,truetype]
-		media-gfx/graphviz
-		media-fonts/urw-fonts"
-else
-	SRC_URI="http://downloads.ganeti.org/releases/$(get_version_component_range 1-2)/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://code.google.com/p/ganeti/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="kvm xen lxc drbd htools syslog ipv6 haskell-daemons rbd test"
-REQUIRED_USE="|| ( kvm xen lxc )"
-
-S="${WORKDIR}/${MY_P}"
-
-HASKELL_DEPS=">=dev-lang/ghc-6.12:0=
-		dev-haskell/json:0=
-		dev-haskell/curl:0=
-		dev-haskell/network:0=
-		dev-haskell/parallel
-		dev-haskell/hslogger:0=
-		dev-haskell/utf8-string:0=
-		dev-haskell/deepseq:0=
-		dev-haskell/attoparsec:0=
-		dev-haskell/crypto:0="
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
-	kvm? ( app-emulation/qemu )
-	lxc? ( app-emulation/lxc )
-	drbd? ( <sys-cluster/drbd-8.5 )
-	rbd? ( sys-cluster/ceph )
-	ipv6? ( net-misc/ndisc6 )
-	haskell-daemons? (
-		${HASKELL_DEPS}
-		dev-haskell/text:0=
-		dev-haskell/hinotify:0=
-		dev-haskell/regex-pcre-builtin:0=
-		dev-haskell/vector:0=
-	)
-	dev-libs/openssl
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/bitarray[${PYTHON_USEDEP}]
-	net-analyzer/arping
-	net-analyzer/fping
-	net-misc/bridge-utils
-	net-misc/curl[ssl]
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	sys-fs/lvm2
-	>=sys-apps/baselayout-2.0
-	${PYTHON_DEPS}
-	${GIT_DEPEND}"
-RDEPEND="${DEPEND}
-	!app-emulation/ganeti-htools"
-DEPEND+="${HASKELL_DEPS}
-	sys-devel/m4
-	test? (
-		dev-python/mock
-		dev-python/pyyaml
-		dev-haskell/test-framework:0=
-		dev-haskell/test-framework-hunit:0=
-		dev-haskell/test-framework-quickcheck2:0=
-		dev-haskell/temporary:0=
-		sys-apps/fakeroot
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6-fix-args.patch"
-	"${FILESDIR}/${PN}-2.6-add-pgrep.patch"
-	"${FILESDIR}/${PN}-2.7-fix-tests.patch"
-	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
-	"${FILESDIR}/${PN}-2.9-regex-builtin.patch"
-	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
-)
-
-pkg_setup () {
-	confutils_use_depend_all haskell-daemons htools
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	has_version ">=sys-devel/automake-1.13" && epatch "${FILESDIR}/${PN}-2.9-automake-1.13.patch"
-	[[ ${PV} == "9999" ]] && ./autogen.sh
-	rm autotools/missing
-	eautoreconf
-}
-
-src_configure () {
-	econf --localstatedir=/var \
-		--docdir=/usr/share/doc/${P} \
-		--with-ssh-initscript=/etc/init.d/sshd \
-		--with-export-dir=/var/lib/ganeti-storage/export \
-		--with-os-search-path=/usr/share/ganeti/os \
-		$(use_enable syslog) \
-		$(usex kvm '--with-kvm-path=' '' '/usr/bin/qemu-kvm' '') \
-		$(usex haskell-daemons "--enable-confd=haskell" '' '' '')
-}
-
-src_install () {
-	emake V=1 DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/ganeti-2.2.initd ganeti
-	newconfd "${FILESDIR}"/ganeti.confd ganeti
-	use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
-	use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
-	newbashcomp doc/examples/bash_completion ganeti
-	dodoc INSTALL UPGRADE NEWS README doc/*.rst
-	dohtml -r doc/html/*
-	rm -rf "${D}"/usr/share/doc/ganeti
-
-	docinto examples
-	dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
-	docinto examples/hooks
-	dodoc doc/examples/hooks/{ipsec,ethers}
-
-	insinto /etc/cron.d
-	newins doc/examples/ganeti.cron ${PN}
-
-	insinto /etc/logrotate.d
-	newins doc/examples/ganeti.logrotate ${PN}
-
-	python_fix_shebang "${D}"/usr/sbin/ "${D}"/usr/"$(get_libdir)"/ganeti/ensure-dirs
-
-	keepdir /var/{lib,log,run}/ganeti/
-	keepdir /usr/share/ganeti/os/
-	keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
-	python_fix_shebang "${ED}"
-}
-
-src_test () {
-	emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.10.1.ebuild b/app-emulation/ganeti/ganeti-2.10.1.ebuild
index 2dac5aacbbf1..71f68d897d82 100644
--- a/app-emulation/ganeti/ganeti-2.10.1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.10.1.ebuild,v 1.1 2014/03/06 19:56:01 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.10.1.ebuild,v 1.2 2014/03/07 03:50:02 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_{6,7})
@@ -11,6 +11,7 @@ inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionat
 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"
@@ -24,7 +25,7 @@ if [[ ${PV} == "9999" ]] ; then
 		media-gfx/graphviz
 		media-fonts/urw-fonts"
 else
-	SRC_URI="http://downloads.ganeti.org/releases/$(get_version_component_range 1-2)/${P}.tar.gz"
+	SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -103,6 +104,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
 	"${FILESDIR}/${PN}-2.9-regex-builtin.patch"
 	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+	"${FILESDIR}/${PN}-2.10-rundir.patch"
 )
 
 pkg_setup () {
@@ -120,11 +122,13 @@ src_prepare() {
 
 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/ganeti/os \
-		$(use_enable syslog) \
+		$(use_enable syslog) 
 		$(usex kvm '--with-kvm-path=' '' '/usr/bin/qemu-kvm' '') \
 		$(usex haskell-daemons "--enable-confd=haskell" '' '' '')
 }
@@ -154,10 +158,13 @@ src_install () {
 
 	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,log}/ganeti/
+	keepdir /usr/share/ganeti/${SERIES}/os/
 	keepdir /var/lib/ganeti-storage/{export,file,shared}/
 
+	dosym ${SERIES} "/usr/share/ganeti/default"
+	dosym ${SERIES} "/usr/$(get_libdir)/ganeti/default"
+
 	python_fix_shebang "${ED}"
 }