Version bump.

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

7 files changed, 263 insertions, 15 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 37b7cea1b904..54cc35b7e28f 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,14 @@
 # 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.75 2013/10/15 23:16:42 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.76 2013/11/13 03:39:15 chutzpah Exp $
+
+*ganeti-2.9.0 (13 Nov 2013)
+
+  13 Nov 2013; Patrick McLean <chutzpah@gentoo.org> +ganeti-2.9.0.ebuild,
+  +files/ganeti-2.9-automake-1.13.patch,
+  +files/ganeti-2.9-disable-root-tests.patch,
+  +files/ganeti-2.9-regex-builtin.patch, +files/ganeti-2.9-skip-cli-test.patch:
+  Version bump.
 
 *ganeti-2.7.2 (15 Oct 2013)
 
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 5fbd14be86be..a41e64fb9a44 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -8,6 +8,10 @@ AUX ganeti-2.6-add-pgrep.patch 1266 SHA256 6a42a97d9f76170bab8f0ef0f99a1afe524fb
 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-2.9-automake-1.13.patch 487 SHA256 696f240665447835598b89f614c6cd66052ead22aaf56a75134b92bb004627cd SHA512 d792bca7fe9c5c9f0c65adbc588faab0f57bec83b3fbbb3abce03836004c93661996d92c86a077eacc498fe011fbfbdeebb595242177994207fea398665e8ee9 WHIRLPOOL d149bb420a1cd20538d94fd88f77c7e6f1c86cfdb5f42f153c353a663aaa8b6ba28122bf70cefca570ec73f87923bfa018b7f766c0ff66c13768f43da6558283
+AUX ganeti-2.9-disable-root-tests.patch 727 SHA256 fe4f5937004acbb660a75104e7c121bf609846785177555a8ad23178b5df95d9 SHA512 b355624ee9f8d123df92511a1c4d7a72828224c166ada79dd7825bde88130ee027abaf2e6454d93457ae633e69dbebfba2c1c58798f0a11937107273df668250 WHIRLPOOL 974e9373cac76b0ba51de051d3062f9832f9599ef8ef2f955c64674b3f88122893f285484f48f4535c911cd37b495397a17e3c47440b7b9f7d8b11cbbd3f6fc0
+AUX ganeti-2.9-regex-builtin.patch 1044 SHA256 28c51ddf65600cd1744102b1df7681c7f39cb6b25ad78a0270f8a98069136add SHA512 ba08bc0a0276871741c5a0d4b9ea01f459aad7e9c545680d9e57622c63a1b1bce6e5a47cf16885c252c48cd99f0828dbdd522dd28031ab512724e63ccafb01d2 WHIRLPOOL 2dc69e9a3c4010ca02527f5045cb765f5d3a47b0cc4aba60eef11ea202d82fb45d4b8f13cbf4b41719c6b7753705ca3aa0d6c914f11cb5bb6774c8dd20fa769f
+AUX ganeti-2.9-skip-cli-test.patch 579 SHA256 153826a03825b7b195b546ad8bea54fda4691db4e05c7628e8c9173e25070051 SHA512 419861fd48a19aaef03053b09dc3f42b9be9ebdd490525c5a7e01c945c3f8da1a7223c5b8363a4222ba08d38d5e1ef7183e0988b8fabb280c5b66e38b1dfb2f2 WHIRLPOOL 809ad8c3f57c9ee33f4140aab8571b9689079d8737545fe5f768ac44123203f1a3fd782af925f3c5d8b508f817b1ea1f061c183ecbc8c2ee59e3c34cfc0fe596
 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
@@ -25,6 +29,7 @@ DIST ganeti-2.6.0.tar.gz 2752108 SHA256 015f0e425924ef5ea7db06a198991f95ca8aeea4
 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.2.tar.gz 3222364 SHA256 ea4178817df0d1352c2c2da292f0fc0fc17f0818ce5a48816b020dda03608481 SHA512 c868408605aec0c6a39af7924baf3ea04e8c855f4a702ed2025aff6bb539ea824a69e25e65f855ab6b56d4b1b5426ed31355eda496897964d2314f7d5cd3e010 WHIRLPOOL 8b1b48bb9b9ead37fc5d0eea3de333d05d09777828e5d5c224f1ff9fb0611888718d90be67186881f8caa1fbb7887057ccb848f9a370d68cb76dd60c990db9ce
+DIST ganeti-2.9.0.tar.gz 3601646 SHA256 4bdcb513547bd0ee3685fb62868fad9c73970b596a56671b325e262aa1042d9a SHA512 620cb9c5211d33dfc7a1adcbd2600dc72fd86520e31ff285a93db3ba6d8c65b1dd70824397b955a35c97149d394c971da237a54bfaaa76f7554ba33363c0bcfd WHIRLPOOL 025fdd71f6e49987418066725f5f6d48910dfc89a0650e6c11bd601ca115436c5457b378f864c77c08d78a4d08d6b95446ef4cabc117d52ff1b4f9dbf5f4ccee
 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
@@ -36,22 +41,23 @@ EBUILD ganeti-2.6.0.ebuild 3739 SHA256 ed32dd33a44955e59bba3ad2c8ef8f84bca8249da
 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
 EBUILD ganeti-2.7.2.ebuild 4329 SHA256 ba3ee62061cca5e433436926cda872ace275ef379182ac2de6ef8a1c83cb7e48 SHA512 c98cd64f6315c8bb2eb12b885b0e610e2a933da0ce9288a929d9c00875139c95ecb89929c244c8ad81f672753b9dc66fc0cc889f25a3224d0e5cce196dce150c WHIRLPOOL 0eb0c43df9466f042a5361619218403ba440810218fa5740eb85ec8465bd1eef5ab67f8435faf400f904f86f8de3e3535e13a8eff56130f0ff2ee3a2424b9cf9
-MISC ChangeLog 15209 SHA256 cc9ad88e66ccdd2428e92cde1bac8fbe767791129a2e1c233703e56411b61533 SHA512 dc69b3c7a0d72200d2f14885149f9763922f77353e7474ba1009cf3ad85293d6d6120bbfd867dc0861a9994d9cb66dc22b08fd7e52b15dc99fef170f5158b923 WHIRLPOOL cd2447313d567e9239e6d83bfa95302a5c13842db9d99881198cc2bd1b62bae20218f09ddbb08c0e556abdab105991dd5c54f32dd3dce373bb197df124017f31
+EBUILD ganeti-2.9.0.ebuild 4511 SHA256 ff14cd31763698b692901e43175c4550b51f3d54a3c8959c1a545106eee1de43 SHA512 f861abb1102fb3bb05ef5880a3ff43c9f436590a2b0cb3618ab1ea1b652ba9aef48415272ce953b666d540095046dc007924e898f44b7e550f97ab33a8dbc342 WHIRLPOOL 17fddd47d6eda50e5e7f6ad206c94e2ad0295d9245b3a14e05122c23c01d9496a2263d981334cc589de6fb759ac734b1c7fd30b483c7b0364d0c2ab6cca3e6a0
+MISC ChangeLog 15496 SHA256 1966477f7d16d9c5ff5a7be0aeaff953a2ae84a0e22809059de27a4e07f84fe7 SHA512 768673a3cfa58afd9ad70f145172537de1bb8daa4743f22cb9641949ee4163ffe8e07db5f7af9029c88da608d6aa8a3ea7c635cc3d404359dd8cc77fd8fe2dd1 WHIRLPOOL 7748cf23edca515017ace5693947c8f00a536f34e2a22d2cda803572d6e57e7c5a78d7279fd8d682dcf129d6233e4b8d79ee8e6467b8a19031df8c9b106e122e
 MISC metadata.xml 1672 SHA256 1c99a6285596d6c82cdafae945dc1d827f0c2f64e0a94171ddbf1285cad505f2 SHA512 51a26b3f371d183c00dfae19edf523f2f1207a65223a84213324c4b8d6b6d57144c5f30e0bb5c78061a9782691843a905dc7adf48118cac6eea9f8631e4d6097 WHIRLPOOL f1b2e6ade08ee53c8e0e97e578aef1843666ab205130a24cc05b8f74712756b29c2291374b3eaf99b6735c6d20c0229609aa70633bc1f5dbad9439acdf01080a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSXczlAAoJEHy/RO9cNQiDUf4QAJfO62b0Y5NV8cAIH8aAF8vE
-zmyntcDTBlfDUzeSKRA2/sdyssA6jXiuRRHkJ7Xu11gXRT+KMLwEDXbnPvadG1Du
-ULNVGA/7zZ/4oUXpgtu6YdqqTasH+6e00BlJ8bN8vjgmkz6e9hQim8nztdhTJx0T
-VzFTsGJJCyJy72MIkHeifDCQ68FqmpC+ocTJTN19bOgyRB1zHO511Bdg1P17uV0Y
-DvN5Q1hcuezum2HKIrOTe0l6tFcabpRCifduVFaokV8KCVF06EB/KI2SdGyfR6eP
-t3LqNuhxQmWcUoRkSB3AxEZ8gIceBgWX9I8XyS9C1Z+VQEcTgzNiGacRt2dQhAlo
-CGfzrshffIkdaHqxVNSaFVOBM4u/hdrs1bZowVIK5P7mSlO/oIvGHXCzEzYuSZlI
-9BgV8x4RRvYKbuidv9vw8oqO/FImOX4y3O6gRtfMowNi+aWdkpu3ZeTvxGoHnQqN
-mQlM7sey2ckS71o9t6y3HAQ1MBqrqtk1gVnZPGDygdgmu7Bx0vaKmf+aMX8z9NRZ
-BII6MvRNfq2nVeRgH0VvVRNqJ52gUAxQf4G3eFtRoE7zXo8IGdKcf9GLssbIodmi
-8/zvr5seF74oJS5jugKX6S5mXfWSliwbWLQB1gD4A2xv/oeuOMx71Let1wwv8Okj
-2iW5xXEn/f3V8OY6+zLC
-=yMhU
+iQIcBAEBCAAGBQJSgvRkAAoJEHy/RO9cNQiDNL8QAK1FWE19/XAONtkmVnT/EJqu
+5fmft/OriJffQ1vpgFRpMueXV2rvuBV0ciiPD30k3M3lnhbyjF5fYPsNBXAoJqXY
+W+zkUNgXhGs+nlB2v94wHlTL5PEwe1JR4z062Ms7pl7WcjPbSwqVuo3dzlcHs48v
+PAUdvTu7hpqVCN8ZXnsq8InHX9yNWvha7EzYypgUV2kuwTaJyrzDajaEYLMnkIMp
+dSNIiOeb0D8mvp2TIs1tAB7IamBayUvuIgwP+7CxI2O4mZg/Q0/o3cGkyft1WQWQ
+14iSap/4APcIYn1qitC5VZ3KO7V6ipdoXaUBl6/dCmmY2nfwh8yqx0U405t2BdSp
+iaroWJ0ZxjaFfkeDI3xxLRm806JRCImNP/YqjJ92lFcTJEbDZyiBfSClR8GXWr1N
+Si4FOylLc74DYwaVrbNJwe13LOVvGd74hjQhaRBQtYajogjvrm8DJbYRbjAwLARK
+do3Ejx6XlyGbNbxUZJOaFP5FRMyQciYuilh0biyXDhNpQbLsGcE6Ev9fL2d8jxxx
+lSuakm1hhUoByA9eN06Ey9M0BW5DhWvUAzKlfSusZmKTnV+wWspOc7F4bEW0kBMD
+NFAea32eegOqRlUc3D3HkY2f7I98/cUE/29qkWxftHZep3VhnvuTTi17SNOLfS0f
+CzsjKmpfEqqo7X8JG0PB
+=22XG
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti-2.9-automake-1.13.patch b/app-emulation/ganeti/files/ganeti-2.9-automake-1.13.patch
new file mode 100644
index 000000000000..6cc089dec7c6
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.9-automake-1.13.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2013-11-13 03:29:17.623574252 +0000
++++ configure.ac	2013-11-13 03:29:39.083848250 +0000
+@@ -12,7 +12,7 @@
+ AC_INIT(ganeti, gnt_version_full, ganeti@googlegroups.com)
+ AC_CONFIG_AUX_DIR(autotools)
+ AC_CONFIG_SRCDIR(configure)
+-AM_INIT_AUTOMAKE([1.9 foreign tar-ustar -Wall -Wno-portability])
++AM_INIT_AUTOMAKE([1.9 foreign tar-ustar serial-tests -Wall -Wno-portability])
+ 
+ AC_SUBST([VERSION_MAJOR], gnt_version_major)
+ AC_SUBST([VERSION_MINOR], gnt_version_minor)
diff --git a/app-emulation/ganeti/files/ganeti-2.9-disable-root-tests.patch b/app-emulation/ganeti/files/ganeti-2.9-disable-root-tests.patch
new file mode 100644
index 000000000000..932258b93a3d
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.9-disable-root-tests.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.am	2013-11-13 01:48:34.733493100 +0000
++++ b/Makefile.am	2013-11-13 01:48:46.623657315 +0000
+@@ -1245,7 +1245,6 @@
+ 	test/py/cfgupgrade_unittest.py \
+ 	test/py/docs_unittest.py \
+ 	test/py/ganeti.asyncnotifier_unittest.py \
+-	test/py/ganeti.backend_unittest-runasroot.py \
+ 	test/py/ganeti.backend_unittest.py \
+ 	test/py/ganeti.bootstrap_unittest.py \
+ 	test/py/ganeti.cli_unittest.py \
+@@ -1308,7 +1307,6 @@
+ 	test/py/ganeti.utils.algo_unittest.py \
+ 	test/py/ganeti.utils.filelock_unittest.py \
+ 	test/py/ganeti.utils.hash_unittest.py \
+-	test/py/ganeti.utils.io_unittest-runasroot.py \
+ 	test/py/ganeti.utils.io_unittest.py \
+ 	test/py/ganeti.utils.log_unittest.py \
+ 	test/py/ganeti.utils.lvm_unittest.py \
diff --git a/app-emulation/ganeti/files/ganeti-2.9-regex-builtin.patch b/app-emulation/ganeti/files/ganeti-2.9-regex-builtin.patch
new file mode 100644
index 000000000000..f9aba9d4e2eb
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.9-regex-builtin.patch
@@ -0,0 +1,22 @@
+--- configure.ac.orig	2013-11-13 01:56:03.819694900 +0000
++++ configure.ac	2013-11-13 01:56:34.350116602 +0000
+@@ -493,8 +493,8 @@
+ has_confd=False
+ if test "$enable_confd" != no; then
+   CONFD_PKG=
+-  AC_GHC_PKG_CHECK([regex-pcre], [HS_REGEX_PCRE=],
+-                   [CONFD_PKG="$CONFD_PKG regex-pcre"])
++  AC_GHC_PKG_CHECK([regex-pcre-builtin], [HS_REGEX_PCRE=],
++                   [CONFD_PKG="$CONFD_PKG regex-pcre-builtin"])
+   AC_GHC_PKG_CHECK([Crypto], [], [CONFD_PKG="$CONFD_PKG Crypto"])
+   AC_GHC_PKG_CHECK([text], [], [CONFD_PKG="$CONFD_PKG text"])
+   AC_GHC_PKG_CHECK([hinotify], [], [CONFD_PKG="$CONFD_PKG hinotify"])
+@@ -578,7 +578,7 @@
+ AC_GHC_PKG_CHECK([vector], [], [HS_NODEV=1])
+ AC_GHC_PKG_CHECK([process], [], [HS_NODEV=1])
+ AC_GHC_PKG_CHECK([snap-server], [], [HS_NODEV=1])
+-AC_GHC_PKG_CHECK([regex-pcre], [], [HS_NODEV=1])
++AC_GHC_PKG_CHECK([regex-pcre-builtin], [], [HS_NODEV=1])
+ AC_GHC_PKG_CHECK([Crypto], [], [HS_NODEV=1])
+ AC_GHC_PKG_CHECK([text], [], [HS_NODEV=1])
+ AC_GHC_PKG_CHECK([hinotify], [], [HS_NODEV=1])
diff --git a/app-emulation/ganeti/files/ganeti-2.9-skip-cli-test.patch b/app-emulation/ganeti/files/ganeti-2.9-skip-cli-test.patch
new file mode 100644
index 000000000000..7e1badc96fc0
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.9-skip-cli-test.patch
@@ -0,0 +1,18 @@
+--- Makefile.am.orig	2013-11-13 02:19:49.198992622 +0000
++++ Makefile.am	2013-11-13 02:20:12.709305182 +0000
+@@ -1332,7 +1332,6 @@
+ 	test/py/daemon-util_unittest.bash \
+ 	test/py/ganeti-cleaner_unittest.bash \
+ 	test/py/import-export_unittest.bash \
+-	test/py/cli-test.bash \
+ 	test/py/bash_completion.bash
+ 
+ if PY_UNIT
+@@ -1397,7 +1396,6 @@
+ 	test/py/daemon-util_unittest.bash \
+ 	test/py/ganeti-cleaner_unittest.bash \
+ 	test/py/import-export_unittest.bash \
+-	test/py/cli-test.bash \
+ 	test/py/bash_completion.bash \
+ 	test/hs/offline-test.sh \
+ 	test/hs/cli-tests-defs.sh \
diff --git a/app-emulation/ganeti/ganeti-2.9.0.ebuild b/app-emulation/ganeti/ganeti-2.9.0.ebuild
new file mode 100644
index 000000000000..8d3ac1bcbe9b
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.9.0.ebuild
@@ -0,0 +1,165 @@
+# 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.9.0.ebuild,v 1.1 2013/11/13 03:39:15 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
+
+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 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/hslogger
+		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.5 )
+	rbd? ( sys-cluster/ceph )
+	ipv6? ( net-misc/ndisc6 )
+	haskell-daemons? (
+		${HASKELL_DEPS}
+		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}
+	test? (
+		dev-python/mock
+		dev-python/pyyaml
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/test-framework-quickcheck2
+		dev-haskell/temporary
+		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.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/{ganeti.cron,gnt-config-backup}
+
+	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"
+}