Version bump (bug #528324), this version adds RAET support so fixes bug #522600. Remove app-emulation/libvirt dependency, since it is replaced by libvirt-python. Remove old versions.

Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF
author: Patrick McLean <chutzpah@gentoo.org> 2014-11-13 03:58:36 +0000
committer: Patrick McLean <chutzpah@gentoo.org> 2014-11-13 03:58:36 +0000
commit: 50dc4fcfceaa1674889025f4487201686e7a4938 (patch)
tree: eea59b3e60cf3b5fd11ecbf6a0c317b787497289 /app-admin
parent: New package, mock library for boto (diff)
download: historical-50dc4fcfceaa1674889025f4487201686e7a4938.tar.gz
historical-50dc4fcfceaa1674889025f4487201686e7a4938.tar.bz2
historical-50dc4fcfceaa1674889025f4487201686e7a4938.zip
10 files changed, 299 insertions, 337 deletions
diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index 80b5ea881b51..ea5d0e6a1b2b 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/salt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.50 2014/10/18 01:49:25 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.51 2014/11/13 03:58:29 chutzpah Exp $
+
+*salt-2014.7.0 (13 Nov 2014)
+
+  13 Nov 2014; Patrick McLean <chutzpah@gentoo.org> -salt-2014.1.10.ebuild,
+  -salt-2014.1.11.ebuild, -salt-2014.1.12.ebuild, salt-2014.1.13.ebuild,
+  +salt-2014.7.0.ebuild, salt-9999.ebuild,
+  +files/salt-2014.7.0-remove-pydsl-includes-test.patch, metadata.xml:
+  Version bump (bug #528324), this version adds RAET support so fixes bug
+  #522600. Remove app-emulation/libvirt dependency, since it is replaced by
+  libvirt-python. Remove old versions.
 
 *salt-2014.1.13 (18 Oct 2014)
 
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index bd6a780b3d00..3d94ce357507 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -8,36 +8,33 @@ AUX minion-initd-3 417 SHA256 06415d7f958210a4dd1490db5796b0d3c08392a81547f29077
 AUX salt-2014.1.2-tests-nonroot.patch 537 SHA256 5b0e06027eb2663d215b8ffda773d8d4b7aac69489563a15f177d7f8049f1f46 SHA512 17de6c83da1660b35590d0acfcbbc1756c0699bf7b1de72157b4f3039fac00c7dfd1a3536662ad7322b39d7e710feb53c7174084a11c3248bc2f09d15010612c WHIRLPOOL 81233516139fa12627fe110aab27aba6cfd738cab9b996e980deb0eb11fac310279dcfc1920bfdc42f57788e523628dd7108d252046aec48c4659db4c8420c5f
 AUX salt-2014.1.5-minion-error.patch 578 SHA256 fe7ebaaa872958d8135ead8d00e717bda12aed270bb4357a675e6f16f1d81921 SHA512 cf6064ebe739731ec159634fe750100e121f45b87abc1e159e310efa0adcc6b1931af306b44384734e163d23a83ab659f3df744641bab97b0d42efcb4ee032dc WHIRLPOOL adf93fa5d76474752eb81ecf1ba3d6d0f861a740490550299dfe13977dbb8d01e46e82e01ff242af578aad5abbc913b4c790325bec7b725815abe203164f2431
 AUX salt-2014.1.5-tests-nonroot.patch 643 SHA256 3094a80bc6966a266dc0b5fae8cec2bed80df83399a805a7aac48b5df09800e5 SHA512 76f7ce52419951122943d0d33c9db29a2be539b1eba96b86885eb61553f65b885ca04dff68b2bdcd3c2184ce0cd04b2a0c4025c0bfa98f80b53300583f922587 WHIRLPOOL 127872ecf85b907987e1c55642ef42d8a8f3bac9419929f851de82b8e942982474dab986adb61a14263f1855a4ecc131e81dc354c6992416de0c07f0b7f0c3dc
+AUX salt-2014.7.0-remove-pydsl-includes-test.patch 3593 SHA256 5445f3e0b2c9dbbaae52c9f191fadfed55f07e453763f55c60053cde404ad8c9 SHA512 9055ebaa8c9a775166bfabdaa9c25caf4aeee4b0e7afb4f4cf6398fa2c588d0ec10f3c89d5099798d9732ca3ef28ebe1dd9be3f4525a9d970472f208f7e46ec9 WHIRLPOOL e6d9239c66901026ce3afce799e28cd3882a69b9d7c46ab2cc4f65cea62771cee027f2df06f2cda28ef31aee6bc6912e7d3af7ea6e90ce1abc6bd943f433498a
 AUX salt-master.service 169 SHA256 5a8c43e469c47ce8cc5b4175105ca6233daa47b411ebf4002aad84003cb9f4a6 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8 WHIRLPOOL ebb632028483e8849eb8ab61677967477bd4f420277b1360b3c28424a5192615aecf2d62372df76d6dee8855e6cd5557075ce17bcf85a999d92a0734cf849628
 AUX salt-minion.service 162 SHA256 829f0f25e5ae73befaa107bd5d2317ec608e8be95d5f60f9650c01e5d19d07a6 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed WHIRLPOOL 50255e88a81c64d461b70b6d990545561f4e9cdbc1f4b0caf0048b8ca46eef3233f5d174b88b1e07bf52aaab5ba16355b72fdea675a0099578acab2d5cb27e1b
 AUX salt-syndic.service 169 SHA256 2199cd525392b3f6615acd2ef8b9c1b31be96c69f7e26c6acd28a3c5fc0d3079 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0 WHIRLPOOL 1162d09a6b454f710823d60c559eb92320fcec7ba2216e7c3e2e670bb61371877c897a12acf014f6c97732b2aa991574569125fa91157791c25d46c4dc6a41fc
 AUX syndic-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed WHIRLPOOL fed0dffe202d776cd5f1b74a28c5dac69b082603c9ddf695616a0a6bca5084b9589f1f4d03313f7271754166a9aa136c06aa61e6fd2e3b02d829798aa741c432
 AUX syndic-initd-3 411 SHA256 2de9f69462bc3b575a69a150b6bba21a6e341477010d284cb77614e810a7bf8c SHA512 0be38f5ec653852459b28b319c1c1b99b0a22b2cbeeadc27ccdbbc574e0a138e3d11f44b257b818655ac156fc3c6e719cde6c98391173621488e2c3000b4313f WHIRLPOOL 88c0c3f8def37e3bc2fb96c5af679ee8813f03f537bcb4356eab07c3eedb01debd1844e87ecba0d8927cc43d81191ab00efea481e9f9143b8c647ab5ae160ed7
-DIST salt-2014.1.10.tar.gz 2813318 SHA256 f175fc0385849fe557c0c91b0331926dacd665ae0ba3aa0d585bd7670d13edc5 SHA512 36381f371e98b157cbb7a36e3f77fa00da315997dd57cf24cff555f2532e090938e031901141efdad502da131992b957433d6b4bf493a83108bf7c273f4e616f WHIRLPOOL c7dbe44c914f3d7e1de566815bb7124a55a8f82214f89f8f59fcf900d315e70c2363471f7185c4f99af8d35f4ea20b7b31076f8913581f6b7954d662bf45424d
-DIST salt-2014.1.11.tar.gz 2820888 SHA256 80b9451a56d2282e46964965baa27063f5e26b374a0f8e5883b208730daf6e1c SHA512 11948b8f3673b41d479d6469be0686e20e3d9eeabb1b95bff250f04cbe0c231ba1ac6b1fa114d2d56324eca75d06fd33b6675fe57a6747a7a8f210fd9eda6f8d WHIRLPOOL 6a61f6ce6dc1827afdc21750dccc67c83b974fa3ced7986ed7553099b3b3c33e9eac93bfa34768b5abc95ec4e87f3038db9594f9025a72db580fccdcaa28e96c
-DIST salt-2014.1.12.tar.gz 2823504 SHA256 244921334b0db5c5b8801916df90e02539add5f5d7c8ce45be1c122721a4a32c SHA512 5445322749d76a6f2e0ef2f29e2ef778bb7c9e3afcd72e2af76a21054aade882e076e572aed5e69516356cd8d79a87bee2e8803e24aa3493017a4191bfb012d7 WHIRLPOOL 7be65a85efbd370d2a1750037b7c1b69e205336c42b402314fccc3418ebed1a9717c754cd13b9e2cf8ebd67e3817880db4fba46d1fb1a0f33b842a7bd94eb9ef
 DIST salt-2014.1.13.tar.gz 2846659 SHA256 0ab37478e18e6490eccef4deb9f77a20c99ffcc6f97b48e25eb546f8b73f3c22 SHA512 967f7759cbeb55dba0842c8f6efa281a28afa3e9ad7fd0771c587629e8e601cdaf440573e2453e1f21ec3dafa01f0b042ecbd1faa515c9d088cefb19f6ce6629 WHIRLPOOL d992900416f55f857f7685b2110fad6aa43e5859005259dc7db66853aa57c74a8ac06c1894d4c4bf26959c61ccacdff3273c1cbf18039ec005d36fffbc30fbbb
-EBUILD salt-2014.1.10.ebuild 2640 SHA256 ff7f2e7ec839994959d9522e4bed8c9d07adf342b86796da6e9aa202fc56b67a SHA512 9dc5383b97f94da96f14e19928dfa32caf4fcfd19f5eb36d288669d36ff07f9410aa1282a43b80b880cf3ad73df9002a5102a3225d0cf03eaceb6a481f33c534 WHIRLPOOL 6d5a259dc25e977ad9180c8068882269ceb44856fcf5701e40897175cbc5d851a24b36b335ea84fbe8cbde53c1f6893b6712a9961a753ba6ca1e1774d52edfb6
-EBUILD salt-2014.1.11.ebuild 2592 SHA256 13d78c352b34023810c9041585db3e9b81444cdd214dcb5011fce2b426ea356b SHA512 2a423e2302492a3e04ad10820eff3d6818c978a2c45f42fd34e74de6a7d79a29bd19188276aa053842cc59051b843922f1a75b8ed0282619a85f6b3915d5261e WHIRLPOOL 8cfdfd63665c16b0c1625b395db87c6537cb031b4485236d1126129add017d5883e9911437b9ff3bf31658dcae361dbd8ee76b67c3c7a6e5067d39959941b183
-EBUILD salt-2014.1.12.ebuild 2592 SHA256 310b830625de334c2c0c3c36dd54245f986335acae99c3e0ddb49113de89ade2 SHA512 60d7c3d6a1da43f8fa6c0c147081c0a24f5b3fe174f9f2b8c70b98613b9603a70103c4884ebb6f59b86f8e0e7d3a4e1f119b6248574be7d15e19d8b2c4ef520c WHIRLPOOL 6f61b64606b1469c22dc06c2b4505eea844d6458a0da8c81c11c204fe2aad30d6a19c3eb303d4b4ae93f4386e2fa66ee4eb56969bcda12bc24707254f230e2a4
-EBUILD salt-2014.1.13.ebuild 2592 SHA256 88399dc0822d49430258a5176551dd1d76b5ea946dc4a2fa8260c50666111a19 SHA512 efc274661611df596ec6ca9279e8cd388745bcbaccafa461d34c2d2ab856b020704cea1a8152d23d0254658c4a0f3c69f9f1792a0b0fe6366ca6cbfe7591189d WHIRLPOOL 403d298dee966fb4d1316f49e3f89f8369180c254c2ded510b1fa33aa19670cd9547e70e675d5f6c338295f14e8593d8092b2beca0d01a8bf3d2fe4b273b4d5a
-EBUILD salt-9999.ebuild 2514 SHA256 089a2225faefbd47ea39884b6b0c537be3c8172add87247ca69f26a97a0b4dcd SHA512 0d8186c557edf3ea60fc44f8d6f4bba21bd37a1eb133d6bf0477ee3e6216c2d0c56516c44cf811512cb0abc71501b279ba2e060b4c169995eca233ccd08c6418 WHIRLPOOL 6c52716faa1f82d2c46863c5ab94617f8e56f2fdcbaad8a7b3ed9e8453635dc794b37c3cd78ab56b9e4f819d63142325a70eef825042a4db40ef70f5410c1b9c
-MISC ChangeLog 8986 SHA256 52cb01f13f6a3e1f2bd28dd333fa8956dda8a38b0c4f109c13b5eb99964cc621 SHA512 d2b3eb22d30a415a8e8f08589a1ec88e3eb0961b0bd9cc01c1b6ff615aa08fd94ec3d24e8f9e2d14fff31e8624dac864a79e0d1de1c07755b9ae8f94ca71898a WHIRLPOOL 127a3549300cff41f58a10092798c5a905e149f38c006509051a65f122d090b0aafcc2b4a098c12e3a02fc85b005a6f8551c292c2b4751404634bade0b7f8e8c
-MISC metadata.xml 1506 SHA256 ae73efc765e4fcb1806a7f8da5e27e00fd3c42b90494ba9870304b9abd49df93 SHA512 00d2c68cd6edb7ae2b26c5b16dc182d136dd2969844a5dbedc1864b5af8783885fc597f20df427dbfa57cc1a59c1e43299c6aa7ecf7d1a5a9e512b2f61a1c8f4 WHIRLPOOL 29859710a53a6cba45848b8ea0cb283c268124c592d5b95e31b7956b3e95449f607a7675087f851933b661252a7599eda869b04116279ca00261fa2008cde929
+DIST salt-2014.7.0.tar.gz 3518342 SHA256 d4a64436636a5e6839c1ae1d16052d2e965b9aed5c3c58735bd89fddb9a0ed5c SHA512 2954c9c3fa061823a315e26c5e5b34d8cf982a91b39f123dbeb85afa92451a5dd176394af9ae5667ffd5ab9463766ae08c5d5a00d5ef6d9107669b45b0c6778f WHIRLPOOL 348b49cdb852d3af40dd68592b1b6cd40f8088889a062f44767d23912eef61474571c35633cceee49fd0057df26662eb3e4b3d53b6f3f118c4c9e0b10f2df08f
+EBUILD salt-2014.1.13.ebuild 2527 SHA256 c8f768b7ef740be9bf50b832fb2e43ad81462e7afeb2da43e937b356091342fa SHA512 f38379e1b2a845d5eb6842ef6996c945d1bde7ab299845d1d225b3c0fb3240d23d3a3bce7a258b5350842fe05753c5247a5906231cf8524b10ed33ba0f2fcd0b WHIRLPOOL 99578601102b96b3ff9948b25a134d0833e2ae6f179df87ef390af2bc2ffc05bc41458da734afb1d95b5401630d07fcece8c2352433b9ff2059e1ab8ee6930b7
+EBUILD salt-2014.7.0.ebuild 3120 SHA256 3f4b005d97b6f08211debdccad15646abf87e08c2991cac464dfc569acbbcb81 SHA512 f3da3fb7ebf637a20bcc7e262076ca37b16ac46838f141648d7cc38fdeb9e58098be3162a6c0e588f75edb925c346d639076d5517ca9725952d272269846eca9 WHIRLPOOL 0ded0c0c7247a006f1eb538ff367f755077aef5c5f961f954a932e75f089b3693ffb663b319204263f05cf77ecc2106edf34185a90e7c25cbc64e9c1325122f6
+EBUILD salt-9999.ebuild 3117 SHA256 4f3512286c54baa213a6559e8b7ad3ff233633a57980152a0723c301defe5a9a SHA512 a081b72c91f11df6f44cf8acb7423f62223610076df3406b706c8d8e83a4b674a2241584d78214363d8f5efbe35d0bf0866dac14c26a4ed3c8c6da1d4c0fb9f5 WHIRLPOOL 8b5d4c7aa81de9cb1346380b76f7f1255db8f291bca459af9a84c4dc55be5cd5b51b68cece04f5732f85a0bc01f7e50049b93d496ad8b56214828363381bf2c8
+MISC ChangeLog 9469 SHA256 0f16429a5e0bae2877dc5231ce88090f8ed931bad351ecbe90d3eee9081b920e SHA512 6eac45845412a33d7277abdd63fc5ae779f50246c03721eafb497364227a933e96bc61515f691deac5179c3c6028e900998236eaccf4b8000df8962809e9cfa5 WHIRLPOOL 34511dc3e99c5841e9e5f6d33a6ce67a1272d9f2e9402dc4c5a0ad6bd23c3246d3f43b2d5560215778a36ec0a2f5f464696c2d64b7762830cbb20b5013cb8055
+MISC metadata.xml 1918 SHA256 5034bf3ea2c2df2c3340beb55e35252e09784c88a2c67c8ac53a55ac91fddac9 SHA512 69445c2c3364d4d101792c97d8e289d2eb3bd45cbc23eb417121fb9d6edbf08ef4fd866635feed4a758219e17ba68b250d01b5d062cc2f3a340ff9698378cc59 WHIRLPOOL 6af3d8c8766c7290c6c0bad18c4a5e4ced45e0cbebd93b6441cd34daadc83ce93503712e714bb1f68fb02860fb861978ae103abcd259995dd5937feb641f42b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUQccmAAoJEHy/RO9cNQiDWnUP/2N8qBYWdVzOWPHyUx8v52Pm
-oZzOhcYhxGjRUsq+oF7FzcfMZ30GuUKCxi5AwXQNePINlEjeSb0YPp0po6BdswG7
-2JhvKwX+SvVyuyeJGddP54gX3xYqT0Jm1qI1dSeMQJVYuD716P/DRN7dDhtO/4sX
-VYoZjvoVg9bcIO9QZIQnzX1WszyHtJv5kyw4Ftqq4IF4ztUMwgepsQzJ0u3GIhkV
-jKokT1+gGQpSZsPIfrSusLo87qq2RZ+vrAEC27A7Vsui6WpPwZ7ibeyEkySFsF3l
-lfC6RpI+XJ0OgIjcN4GoMSwK4ybBjYYMLouH7bYONzQio4nCKY45WNNrpWSG9III
-XE/QM7OkzDV75Yff4Z6Bf14BUr0IwKIExJY+Ys1AX+FVqO1KGPpzzJa7pnOYCsv/
-Oszv5L5rxBPmyWa8Wfv6LA3X62jMZWiXo7NSM6WmLeBeVdC76t7QBHUM5+1TfSHD
-OZYjmxDuWdcbnxHbW6U57Mfp3KOl68wtGtoWHqQPusXqKJqxyuuHdu5ts+9w4uUB
-jjEEQUvydR24mWq/+cF4lVi3kpHU8KSisKDZUvSwPzNmPveFsNu7A7+CfVu/yI3R
-krwd31UZ+BodNSrx46SxX9LRf1YkwJtdjVsfU48G55lBZIUmUqBsJ68LGymWSsMs
-ifyp3HKVEkHsfNfLhyOY
-=08CI
+iQIcBAEBCAAGBQJUZCxnAAoJEHy/RO9cNQiDmQEP+wfnoQj/rukam6T1yMB6Axml
+C4oox0TkYt0CXqpBY7NUYs7jMNlo7DdyPLm+yfccd5dHciy19YXzzK0RxRLOMbaU
+n6awb0itmebnlv37pgLFMy/6eSiLsWmGJ/sd+Ym9m6RsJ8U7YpV73qmjgtzSvGuw
+SDTZAoi6noJIlSKX02T7ics7TGiM5w3eDVhskHNK0miqyEnTlhwnvo/Iha1oug+N
+jjKVp/TzP1Zc4l7EIrITxNlVoSsAUnhn388xEYfOMcfFeMBGzdg0pFLr7CnTz+Ui
+VZgg+sT7Jf4/5UXQ5wMfzqgJGxVTNo909BER8syQYpGxw3Di/M+KY7Wleoh8a9K8
+XZx/G1v84Wp3TWngMS5YWanmlYZsfv6nrtlcuI5ndpljZEhSZYxqRCWSYHIaztVC
+VZSRZrj479nysbE4FKSBRbADArFueGxc9Ho76lewO9x0lqNhrZpsN91gf1zOZX6B
+zrX4MUGUN1kLAcX8GmeYA2BqEDacHDyZagQJbC8QxNzq6zfljvatU8JXst2eUM/r
+o7MLu5GeqEz+DdvRUPFgL46fdi0zfFQ5ut4FhvppD5CLMFTRxeTjMoKAPcyhXoqy
+4jjaqN7nwARF2ynCqi4hdvGmOrZXe680Xbz1iOk3ksnPzZjclKeph8cJUZ1vEiXB
+TcDsvfT4wc2C/Rw0vC5s
+=M/oy
 -----END PGP SIGNATURE-----
diff --git a/app-admin/salt/files/salt-2014.7.0-remove-pydsl-includes-test.patch b/app-admin/salt/files/salt-2014.7.0-remove-pydsl-includes-test.patch
new file mode 100644
index 000000000000..0cf3efe8f347
--- /dev/null
+++ b/app-admin/salt/files/salt-2014.7.0-remove-pydsl-includes-test.patch
@@ -0,0 +1,104 @@
+diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py
+index 59442bd..2c5d129 100644
+--- a/tests/unit/pydsl_test.py
++++ b/tests/unit/pydsl_test.py
+@@ -297,99 +297,6 @@ class PyDSLRendererTestCase(TestCase):
+         finally:
+             shutil.rmtree(dirpath, ignore_errors=True)
+ 
+-    def test_rendering_includes(self):
+-        dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR)
+-        if not os.path.isdir(dirpath):
+-            self.skipTest(
+-                'The temporary directory {0!r} was not created'.format(
+-                    dirpath
+-                )
+-            )
+-        output = os.path.join(dirpath, 'output')
+-        try:
+-            write_to(os.path.join(dirpath, 'aaa.sls'), textwrap.dedent('''\
+-                #!pydsl|stateconf -ps
+-
+-                include('xxx')
+-                yyy = include('yyy')
+-
+-                # ensure states in xxx are run first, then those in yyy and then those in aaa last.
+-                extend(state('yyy::start').stateconf.require(stateconf='xxx::goal'))
+-                extend(state('.start').stateconf.require(stateconf='yyy::goal'))
+-
+-                extend(state('yyy::Y2').cmd.run('echo Y2 extended >> {0}'))
+-
+-                __pydsl__.set(ordered=True)
+-
+-                yyy.hello('red', 1)
+-                yyy.hello('green', 2)
+-                yyy.hello('blue', 3)
+-                '''.format(output)))
+-
+-            write_to(os.path.join(dirpath, 'xxx.sls'), textwrap.dedent('''\
+-                #!stateconf -os yaml . jinja
+-
+-                include:
+-                  - yyy
+-
+-                extend:
+-                  yyy::start:
+-                    stateconf.set:
+-                      - require:
+-                        - stateconf: .goal
+-
+-                  yyy::Y1:
+-                    cmd.run:
+-                      - name: 'echo Y1 extended >> {0}'
+-
+-                .X1:
+-                  cmd.run:
+-                    - name: echo X1 >> {1}
+-                    - cwd: /
+-                .X2:
+-                  cmd.run:
+-                    - name: echo X2 >> {2}
+-                    - cwd: /
+-                .X3:
+-                  cmd.run:
+-                    - name: echo X3 >> {3}
+-                    - cwd: /
+-
+-                '''.format(output, output, output, output)))
+-
+-            write_to(os.path.join(dirpath, 'yyy.sls'), textwrap.dedent('''\
+-                #!pydsl|stateconf -ps
+-
+-                include('xxx')
+-                __pydsl__.set(ordered=True)
+-
+-                state('.Y1').cmd.run('echo Y1 >> {0}', cwd='/')
+-                state('.Y2').cmd.run('echo Y2 >> {1}', cwd='/')
+-                state('.Y3').cmd.run('echo Y3 >> {2}', cwd='/')
+-
+-                def hello(color, number):
+-                    state(color).cmd.run('echo hello '+color+' '+str(number)+' >> {3}', cwd='/')
+-                '''.format(output, output, output, output)))
+-
+-            state_highstate({'base': ['aaa']}, dirpath)
+-            expected = textwrap.dedent('''\
+-                X1
+-                X2
+-                X3
+-                Y1 extended
+-                Y2 extended
+-                Y3
+-                hello red 1
+-                hello green 2
+-                hello blue 3
+-                ''')
+-
+-            with open(output, 'r') as f:
+-                self.assertEqual(sorted(f.read()), sorted(expected))
+-
+-        finally:
+-            shutil.rmtree(dirpath, ignore_errors=True)
+-
+     def test_compile_time_state_execution(self):
+         if not sys.stdin.isatty():
+             self.skipTest('Not attached to a TTY')
diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
index 5ecf0208add5..3349a941c5af 100644
--- a/app-admin/salt/metadata.xml
+++ b/app-admin/salt/metadata.xml
@@ -21,13 +21,19 @@ Between the remote execution system, and state management Salt addresses the
 backbone of cloud and data center management.
 </longdescription>
 	<use>
-		<flag name="openssl">Add support for using TLS via OpenSSL.</flag>
+		<flag name="cherrypy">Enable support for cherrypy.</flag>
 		<flag name="libcloud">Enable salt-cloud support via libcloud.</flag>
 		<flag name="libvirt">Support managing virtual machines with app-emulation/libvirt.</flag>
+		<flag name="gnupg">Enable support for gnupg via python-gnupg.</flag>
+		<flag name="keyring">Enable support for keyrings via python-keyring.</flag>
+		<flag name="mako">Add support for using the mako template engine for parsing salt states.</flag>
 		<flag name="mongodb">Support returning data to a mongodb server.</flag>
+		<flag name="nova">Enable support for the OpenStack Nova API</flag>
+		<flag name="openssl">Add support for using TLS via OpenSSL.</flag>
+		<flag name="raet">Add support for the new RAET transport.</flag>
 		<flag name="redis">Support returning data to a redis database.</flag>
-		<flag name="mako">Add support for using the mako template engine for parsing salt states.</flag>
 		<flag name="timelib">Use timelib to parse english textual date descriptions.</flag>
+		<flag name="zeromq">Add support for the zeromq transport.</flag>
 	</use>
 </pkgmetadata>
 
diff --git a/app-admin/salt/salt-2014.1.10.ebuild b/app-admin/salt/salt-2014.1.10.ebuild
deleted file mode 100644
index 7a79f0f01794..000000000000
--- a/app-admin/salt/salt-2014.1.10.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.10.ebuild,v 1.2 2014/08/10 01:37:40 patrick Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7})
-
-inherit eutils distutils-r1 systemd
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ldap libcloud libvirt mako mongodb mysql openssl redis timelib test"
-
-RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/m2crypto[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		dev-python/pycryptopp[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-		sys-apps/pciutils
-		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-		libvirt? ( || (
-			dev-python/libvirt-python[${PYTHON_USEDEP}]
-			app-emulation/libvirt[python,${PYTHON_USEDEP}]
-			)
-		)
-		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-		timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )"
-DEPEND="test? (
-			dev-python/pip
-			dev-python/virtualenv
-			dev-python/timelib
-			>=dev-python/SaltTesting-2014.4.24
-			${RDEPEND}
-		)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2014.1.2-tests-nonroot.patch"
-	"${FILESDIR}/${PN}-2014.1.5-tests-nonroot.patch"
-	"${FILESDIR}/${PN}-2014.1.5-minion-error.patch"
-)
-DOCS=(README.rst AUTHORS)
-
-python_prepare() {
-	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py
-}
-
-python_install_all() {
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for s in minion master syndic; do
-		newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-		systemd_dounit "${FILESDIR}"/salt-${s}.service
-	done
-
-	insinto /etc/${PN}
-	doins conf/*
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 3072
-	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report --verbose || die
-}
diff --git a/app-admin/salt/salt-2014.1.11.ebuild b/app-admin/salt/salt-2014.1.11.ebuild
deleted file mode 100644
index a18787e0122d..000000000000
--- a/app-admin/salt/salt-2014.1.11.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.11.ebuild,v 1.1 2014/10/10 01:12:19 chutzpah Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7})
-
-inherit eutils distutils-r1 systemd
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ldap libcloud libvirt mako mongodb mysql openssl redis timelib test"
-
-RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/m2crypto[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		dev-python/pycryptopp[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-		sys-apps/pciutils
-		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-		libvirt? ( || (
-			dev-python/libvirt-python[${PYTHON_USEDEP}]
-			app-emulation/libvirt[python,${PYTHON_USEDEP}]
-			)
-		)
-		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-		timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )"
-DEPEND="test? (
-			dev-python/pip
-			dev-python/virtualenv
-			dev-python/timelib
-			>=dev-python/SaltTesting-2014.4.24
-			${RDEPEND}
-		)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2014.1.2-tests-nonroot.patch"
-	"${FILESDIR}/${PN}-2014.1.5-tests-nonroot.patch"
-)
-DOCS=(README.rst AUTHORS)
-
-python_prepare() {
-	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py
-}
-
-python_install_all() {
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for s in minion master syndic; do
-		newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-		systemd_dounit "${FILESDIR}"/salt-${s}.service
-	done
-
-	insinto /etc/${PN}
-	doins conf/*
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 3072
-	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report --verbose || die
-}
diff --git a/app-admin/salt/salt-2014.1.12.ebuild b/app-admin/salt/salt-2014.1.12.ebuild
deleted file mode 100644
index 946078fc3f85..000000000000
--- a/app-admin/salt/salt-2014.1.12.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.12.ebuild,v 1.1 2014/10/10 17:10:49 chutzpah Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7})
-
-inherit eutils distutils-r1 systemd
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ldap libcloud libvirt mako mongodb mysql openssl redis timelib test"
-
-RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/m2crypto[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		dev-python/pycryptopp[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-		sys-apps/pciutils
-		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-		libvirt? ( || (
-			dev-python/libvirt-python[${PYTHON_USEDEP}]
-			app-emulation/libvirt[python,${PYTHON_USEDEP}]
-			)
-		)
-		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-		timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )"
-DEPEND="test? (
-			dev-python/pip
-			dev-python/virtualenv
-			dev-python/timelib
-			>=dev-python/SaltTesting-2014.4.24
-			${RDEPEND}
-		)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2014.1.2-tests-nonroot.patch"
-	"${FILESDIR}/${PN}-2014.1.5-tests-nonroot.patch"
-)
-DOCS=(README.rst AUTHORS)
-
-python_prepare() {
-	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py
-}
-
-python_install_all() {
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for s in minion master syndic; do
-		newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-		systemd_dounit "${FILESDIR}"/salt-${s}.service
-	done
-
-	insinto /etc/${PN}
-	doins conf/*
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 3072
-	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report --verbose || die
-}
diff --git a/app-admin/salt/salt-2014.1.13.ebuild b/app-admin/salt/salt-2014.1.13.ebuild
index 5d1fefd7451c..e5f33189c833 100644
--- a/app-admin/salt/salt-2014.1.13.ebuild
+++ b/app-admin/salt/salt-2014.1.13.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-admin/salt/salt-2014.1.13.ebuild,v 1.1 2014/10/18 01:49:25 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.13.ebuild,v 1.2 2014/11/13 03:58:29 chutzpah Exp $
 
 EAPI=5
 
@@ -39,11 +39,7 @@ RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
 		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
 		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
 		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-		libvirt? ( || (
-			dev-python/libvirt-python[${PYTHON_USEDEP}]
-			app-emulation/libvirt[python,${PYTHON_USEDEP}]
-			)
-		)
+		libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
 		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
 		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
diff --git a/app-admin/salt/salt-2014.7.0.ebuild b/app-admin/salt/salt-2014.7.0.ebuild
new file mode 100644
index 000000000000..266adf80d545
--- /dev/null
+++ b/app-admin/salt/salt-2014.7.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.7.0.ebuild,v 1.1 2014/11/13 03:58:29 chutzpah Exp $
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+
+inherit eutils distutils-r1 systemd
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="http://saltstack.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql nova"
+IUSE+=" openssl redis timelib raet +zeromq test"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	raet? (
+		dev-python/libnacl[${PYTHON_USEDEP}]
+		dev-python/ioflo[${PYTHON_USEDEP}]
+		dev-python/raet[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		dev-python/m2crypto[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2014.4.24[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=(README.rst AUTHORS)
+
+REQUIRED_USE="|| ( raet zeromq )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-remove-pydsl-includes-test.patch"
+)
+
+python_prepare() {
+	# this test fails because it trys to "pip install distribute"
+	rm tests/unit/{modules,states}/zcbuildout_test.py
+}
+
+python_install_all() {
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for s in minion master syndic; do
+		newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
+		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
+		systemd_dounit "${FILESDIR}"/salt-${s}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	# testsuite likes lots of files
+	ulimit -n 3072
+
+	# using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
+	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
+		./tests/runtests.py --unit-tests --no-report --verbose || die "testing failed"
+}
diff --git a/app-admin/salt/salt-9999.ebuild b/app-admin/salt/salt-9999.ebuild
index 0d44e1b49635..a55c21fc09af 100644
--- a/app-admin/salt/salt-9999.ebuild
+++ b/app-admin/salt/salt-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.12 2014/08/10 01:37:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.13 2014/11/13 03:58:29 chutzpah Exp $
 
 EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7})
+PYTHON_COMPAT=(python2_7)
 
 inherit eutils distutils-r1 systemd
 
@@ -12,7 +11,7 @@ DESCRIPTION="Salt is a remote execution and configuration manager"
 HOMEPAGE="http://saltstack.org/"
 
 if [[ ${PV} == 9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
@@ -24,43 +23,57 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="ldap libcloud libvirt mako mongodb mysql openssl redis timelib test"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql nova"
+IUSE+=" openssl redis timelib raet +zeromq test"
 
-RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	raet? (
+		dev-python/libnacl[${PYTHON_USEDEP}]
+		dev-python/ioflo[${PYTHON_USEDEP}]
+		dev-python/raet[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
 		dev-python/m2crypto[${PYTHON_USEDEP}]
 		dev-python/pycrypto[${PYTHON_USEDEP}]
-		dev-python/pycryptopp[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-		sys-apps/pciutils
-		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-		libvirt? ( || (
-			dev-python/libvirt-python[${PYTHON_USEDEP}]
-			app-emulation/libvirt[python,${PYTHON_USEDEP}]
-			)
-		)
-		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-		timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )"
-DEPEND="test? (
-			dev-python/pip
-			dev-python/virtualenv
-			dev-python/timelib
-			>=dev-python/SaltTesting-2014.4.24
-			${RDEPEND}
-		)"
+	)
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2014.4.24[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
 DOCS=(README.rst AUTHORS)
 
-python_prepare() {
-	sed -i '/install_requires=/ d' setup.py || die "sed failed"
+REQUIRED_USE="|| ( raet zeromq )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-remove-pydsl-includes-test.patch"
+)
+
+python_prepare() {
 	# this test fails because it trys to "pip install distribute"
 	rm tests/unit/{modules,states}/zcbuildout_test.py
 }
@@ -75,11 +88,14 @@ python_install_all() {
 	done
 
 	insinto /etc/${PN}
-	doins conf/*
+	doins -r conf/*
 }
 
 python_test() {
 	# testsuite likes lots of files
 	ulimit -n 3072
-	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report --verbose || die
+
+	# using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
+	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
+		./tests/runtests.py --unit-tests --no-report --verbose || die "testing failed"
 }
author	Patrick McLean <chutzpah@gentoo.org>	2014-11-13 03:58:36 +0000
committer	Patrick McLean <chutzpah@gentoo.org>	2014-11-13 03:58:36 +0000
commit	50dc4fcfceaa1674889025f4487201686e7a4938 (patch)
tree	eea59b3e60cf3b5fd11ecbf6a0c317b787497289 /app-admin
parent	New package, mock library for boto (diff)
download	historical-50dc4fcfceaa1674889025f4487201686e7a4938.tar.gz historical-50dc4fcfceaa1674889025f4487201686e7a4938.tar.bz2 historical-50dc4fcfceaa1674889025f4487201686e7a4938.zip