Version bump, add selinux USE flag (bug #533118). Sync 9999 ebuild with current version.

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

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index efe3c08cca953f46b5fd34f30849132c58f05a75..34b5dcf837e0321bc006c26ee2b70094a72d5e86 100644 (file)
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/salt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.53 2015/01/03 12:26:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.54 2015/01/16 22:56:46 chutzpah Exp $
+
+*salt-2014.7.1 (16 Jan 2015)
+
+  16 Jan 2015; Patrick McLean <chutzpah@gentoo.org> +salt-2014.7.1.ebuild,
+  salt-9999.ebuild, +files/salt-2014.7.1-remove-pydsl-includes-test.patch:
+  Version bump, add selinux USE flag (bug #533118). Sync 9999 ebuild with
+  current version.
 
   03 Jan 2015; Sven Vermeulen <swift@gentoo.org> salt-9999.ebuild:
   Add selinux? dep to selinux-salt (bug #533118) for live ebuild

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index f07f75c7265a32106f5aa4cd4ed13099a5c4a7e5..29955d63ecdb0da4a62c8c305a6ea6ae5c01e052 100644 (file)
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -11,6 +11,7 @@ AUX salt-2014.1.2-tests-nonroot.patch 537 SHA256 5b0e06027eb2663d215b8ffda773d8d
 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-2014.7.1-remove-pydsl-includes-test.patch 3605 SHA256 0f0433f63a1b4a1a203331177c0ea46e43f74e69465f157e53f68f0d317cfdc0 SHA512 fe56cb6b5f91586e9acba136601c9380f158a4dc3a0316a00b23703a5e5de7b8ae3cec7b3bd606e0b7a927f8a7fc28c57e5dd5f10755f34e9dbd6052c9dc9b50 WHIRLPOOL e3386852207693d5f3415ef7b35297bd0fb12ba25e41adfb2b5958c51e9e4337c46871eac9823876a316c9a2357877690c741d074cdfb00314b699346eba6e2d
 AUX salt-api.service 166 SHA256 b4706ebbc243e44579327b07609499a587e4023a11d3928735b3b226ff504cb7 SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702 WHIRLPOOL cfba8559ffd486c5e49f3a7d54e0d03a4ae72065029cbbdd9b96403acafb304b1e687dc205960526a51f096eee58680329422e6b4a26022eed7469387a4dd763
 AUX salt-master.service 169 SHA256 5a8c43e469c47ce8cc5b4175105ca6233daa47b411ebf4002aad84003cb9f4a6 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8 WHIRLPOOL ebb632028483e8849eb8ab61677967477bd4f420277b1360b3c28424a5192615aecf2d62372df76d6dee8855e6cd5557075ce17bcf85a999d92a0734cf849628
 AUX salt-minion.service 162 SHA256 829f0f25e5ae73befaa107bd5d2317ec608e8be95d5f60f9650c01e5d19d07a6 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed WHIRLPOOL 50255e88a81c64d461b70b6d990545561f4e9cdbc1f4b0caf0048b8ca46eef3233f5d174b88b1e07bf52aaab5ba16355b72fdea675a0099578acab2d5cb27e1b
@@ -19,26 +20,28 @@ AUX syndic-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a
 AUX syndic-initd-3 411 SHA256 2de9f69462bc3b575a69a150b6bba21a6e341477010d284cb77614e810a7bf8c SHA512 0be38f5ec653852459b28b319c1c1b99b0a22b2cbeeadc27ccdbbc574e0a138e3d11f44b257b818655ac156fc3c6e719cde6c98391173621488e2c3000b4313f WHIRLPOOL 88c0c3f8def37e3bc2fb96c5af679ee8813f03f537bcb4356eab07c3eedb01debd1844e87ecba0d8927cc43d81191ab00efea481e9f9143b8c647ab5ae160ed7
 DIST salt-2014.1.13.tar.gz 2846659 SHA256 0ab37478e18e6490eccef4deb9f77a20c99ffcc6f97b48e25eb546f8b73f3c22 SHA512 967f7759cbeb55dba0842c8f6efa281a28afa3e9ad7fd0771c587629e8e601cdaf440573e2453e1f21ec3dafa01f0b042ecbd1faa515c9d088cefb19f6ce6629 WHIRLPOOL d992900416f55f857f7685b2110fad6aa43e5859005259dc7db66853aa57c74a8ac06c1894d4c4bf26959c61ccacdff3273c1cbf18039ec005d36fffbc30fbbb
 DIST salt-2014.7.0.tar.gz 3518342 SHA256 d4a64436636a5e6839c1ae1d16052d2e965b9aed5c3c58735bd89fddb9a0ed5c SHA512 2954c9c3fa061823a315e26c5e5b34d8cf982a91b39f123dbeb85afa92451a5dd176394af9ae5667ffd5ab9463766ae08c5d5a00d5ef6d9107669b45b0c6778f WHIRLPOOL 348b49cdb852d3af40dd68592b1b6cd40f8088889a062f44767d23912eef61474571c35633cceee49fd0057df26662eb3e4b3d53b6f3f118c4c9e0b10f2df08f
+DIST salt-2014.7.1.tar.gz 3583585 SHA256 fbb292ec9bd77fce0965bfaf429021916edbee83f6544c0216738d8653fff10a SHA512 37c3e368bb2467409a1576cf0311de3b38d670b242694c0757f05cfc4062d4c358417d0d307fad6044ad239ebea79559f895a5bffe2e9715690b8ffa32151ad0 WHIRLPOOL 45ba016aa8d220e0004123ec849b32d1906366a56f182d70490c2fae456cac3b18d1aa278c9fcabcc8d6bc59df5aa4a451190e759378b36be4192233a03e2108
 EBUILD salt-2014.1.13.ebuild 2527 SHA256 c8f768b7ef740be9bf50b832fb2e43ad81462e7afeb2da43e937b356091342fa SHA512 f38379e1b2a845d5eb6842ef6996c945d1bde7ab299845d1d225b3c0fb3240d23d3a3bce7a258b5350842fe05753c5247a5906231cf8524b10ed33ba0f2fcd0b WHIRLPOOL 99578601102b96b3ff9948b25a134d0833e2ae6f179df87ef390af2bc2ffc05bc41458da734afb1d95b5401630d07fcece8c2352433b9ff2059e1ab8ee6930b7
 EBUILD salt-2014.7.0-r1.ebuild 3184 SHA256 04ee25a5c80a2970aabad903f75587529187c3d71309eb992895e0d9dd4f802e SHA512 9f4b586490363306036c442b5d366b29282ad0929d9c489eefe70e333232e1282a3300973641307ad01a4c2ec2a04e996bb5f19124da75fb22f08c992002b080 WHIRLPOOL 1e9fb394527bc03da14ed1f1f13456a9746c082c7dc85bb3efbe648e552dbc0ad1bb8982973e476ad4c04ed309d13193de591b42ce7ca642e553ba0d85846e94
 EBUILD salt-2014.7.0.ebuild 3120 SHA256 3f4b005d97b6f08211debdccad15646abf87e08c2991cac464dfc569acbbcb81 SHA512 f3da3fb7ebf637a20bcc7e262076ca37b16ac46838f141648d7cc38fdeb9e58098be3162a6c0e588f75edb925c346d639076d5517ca9725952d272269846eca9 WHIRLPOOL 0ded0c0c7247a006f1eb538ff367f755077aef5c5f961f954a932e75f089b3693ffb663b319204263f05cf77ecc2106edf34185a90e7c25cbc64e9c1325122f6
-EBUILD salt-9999.ebuild 3094 SHA256 9e31c77561b912e10415b488006946bb273caaf373e534c169ef5ebba96011ee SHA512 9980cf42f2f9c7f25a08018f033c9e8df0eca36d26a68a4ab5dc57269ea596ca77690b810cd0a99a2c2c77364ea279519550c119db6d3541c3626a28714550d4 WHIRLPOOL 84f4bc00f7b5f71a09ca96d579b913df1f0517d7b426175cf831202e4b17319352fb20fd21dbf7a9b325dcee4d75d20435dabbe06d076da15fde5d8f83611555
-MISC ChangeLog 9982 SHA256 e44ddcc0eb6a9462fde2d706f6a9d454ee2c57d2a5463ada7cbb2cd358bb59e6 SHA512 504a3fddd21bbd3d74f1748db9c707496db77ade7dfab7438cb3f36781d5502a5db7ee3498de9ab9b3694d39d7d1c461786238d8786f59654a7d361130f7de03 WHIRLPOOL 20da0e502d073b23d87ea30f6a4fc7a7827fa5b447b5c44559a0df277db4104fa208d5ed109cbd9d681fb20439b1a19cc6f44777b3c005c49d4267239f525696
+EBUILD salt-2014.7.1.ebuild 3385 SHA256 738d69e69619133f62310451735696c1ed3defea763b219f69b973541daca854 SHA512 17f1398b045187a117a654c253225713a687c76ca845a853448855fc1e5a024c00c13d49dd77091a6dcb2e290cd20a3e97e3e86a4f7c4138c14887100082f474 WHIRLPOOL 7fac18a9287bb93a466670d31c9f5c0e16f8bfdf569382b66642597e4aae357da14c1aeef5b7884f74c4af726e988fd6ccd38d1225c2f2b5021bad81c6be8c4c
+EBUILD salt-9999.ebuild 3157 SHA256 68100c9477b649ba653c2e17b7f92342e8725dba10dd797ed0f8a510507ba398 SHA512 ced4c9bb7807f143edfa18c6b56241406a62da51ea4220f3b2d3221249a1eeff297d59d9e7a4734e63cbb998533b0aa55317911b6275933a10a99583b5cd547c WHIRLPOOL 7384e0df43eda85a7890a208396b3afff9759b003ea657ab1db940259727aa75851131e7a3b45ef5d2b94fbaff34de60115c0bb042173ab6adf07dcecbefe58d
+MISC ChangeLog 10259 SHA256 147752ea06cb94b868939eb0ce1ccbf041f37761cb6c1ae40d0c9432f37c49d7 SHA512 f523d66d07a136e0a4a6eaeeb3bcb29b7a6c3dae1f5eb8b1aacb4baf3fe2800c9c3f19393f7a95391090593524c57ef38ddc43011fc22dcf09ae3b5829f7e389 WHIRLPOOL 8e95ee332d649350f9875ba87b02fd9f3f5ecfbfcf452503618ff6fc963f8d09e306a27954255a373a1ee194b1b51251c2951398a72388e75cc80164b2a8a285
 MISC metadata.xml 1973 SHA256 9cd6ed9773018e0d406f1155f704c6660bf703cf992c7aee3458f34f3c90cdea SHA512 b26708b1407e867af702927ef395415f838ca25354e8fa3451b30d632b112511d1a902a521f5b8e3bde1218b3c810e1ebc27ca247266a210e872df9a05e05950 WHIRLPOOL 27904b1812756d483e1b28502422a2ed9a1c0410987529dbf5996394baa31901ae5671430223fa350f5f7f4bb05f8c45a247b43376a55ae4330e1044d8faff46
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUp9/rAAoJEC7dUkA7aK9HfA0QAIxbC5lrNqnvPXryNGWqKmOY
-9fdhLaOPo7zjV3CRCX8KJVE2oQUv+NpqgtLgodx5dVZe60M0C1wavOnMxbtACVor
-5DXYk6klp46K9VyNINAvfS0QSulfepGCkogJ318PfI84YGNUOCZUH+0rVMeSpP7C
-OiYaZw77AVHdkZdqKGt8LtMfJeRcNxIsIKCRA1aC8K1YdLnBqDU9ohqay3yW9hD9
-J79QmKylN2La3TB9Y50xKc95tQuqHKjsRmQr/KIKSJ3nSgGlMGa2CYzIBGEl57qU
-6A90Ipm0SFXZqY/XoCXYRMgObEMcu7ezMqLl8/vXRtxk+BNx3f/X2iO8l+OCdohg
-WEhIDFV0uXdKHy033ryehMoHfpTbuvOxVrD9pRHqUJYMaVFO5zbpANvBPc9mgAAy
-6V0hIhK9/4uyRti2semM8n6vIXgotE27racBHJnLmgbfXV9AVzAvVv/MhAG+jbK4
-IUjZmlmyXNDxRdaZWUyAEnv9HXiJ3FOZCh9AyPqwy7ijgD5RlQjUgp6Qzv4K0Gyn
-AGqeEz/3QU4N86CFX4WdPF2WAlvrLzQyUFj0zZ9gL00IMS7jUkxQHnUs9f4+KvBB
-tSyrsdpn480AHYnH1aZrMo1wfhllSLnNdnoxX1w5FrtIqzItvpPBqw8ewOzumT3w
-SyPQIeNnLVtaDByCsa6l
-=7/MJ
+iQIcBAEBCAAGBQJUuZdIAAoJEHy/RO9cNQiDfdkQAKXdzAaSNMiaheF3rRoH2XiF
+wPXLOnBfVFsQcxI/mmZLPyxMMT0oQu209yUQUP0N5v35Mn2EXrIwczC55xZUmnME
+p3EOVOcY0Gc5qAAbfWhC/GBuemE6nmYdj1r8Lrc6kClUCk5zTtnsySlIi7YcPn/m
+96+NFoArViJLxE9IoKXCzy4/bJVy9Gutf+eo8Nlnhz8hwQtcV+28i8s5yo6dE+9x
+YeUIlWdHkPBlDi9nlxEOP9lUoe4ox2QNjD/4EhuG0EM5ffyuz4hj9a+po/OrE16F
+vw/S7yp/1uMyRUbhwQP20sVbiNixURvYx/9urcbHJI60K/ZSse3TdAe2m8qwirqp
+x+2a1rE3lXJ2vrOkc2a7aj4XVUkIYjNKbMGt+8TakcSQzVx1SqM8qq71tdKpQvGi
+DSdh2k9rg/GLVsBVXaVZKbzkOW+EHAppSN7JlRtabIIe4fdF687PMVcO22vDRnlm
+HNcuDQlgddj+pA9xlWwQE6bRDeBv0DVXwzsZAxGBunzDbDzMxqP0cewTRO69G178
+jp4Pgpf4NRy/NW5P0B8569+TyWsiLEEcPTXm3R2vg6+suxWD2LoNFWB7jdluLOHZ
+Cepml+qK9Sb0K5/b1OJcelg6Nq8/IC2ceWu9MUde/HuNx1StPfN+VhVc7fH/dEPQ
+V/aO8NDNaIEMYljhqIIt
+=U6as
 -----END PGP SIGNATURE-----

diff --git a/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch b/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch
new file mode 100644 (file)
index 0000000..7c33c12
--- /dev/null
+++ b/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch
@@ -0,0 +1,104 @@
+diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py
+index 57ba81e..b26154e 100644
+--- a/tests/unit/pydsl_test.py
++++ b/tests/unit/pydsl_test.py
+@@ -298,99 +298,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 salt.utils.fopen(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/salt-2014.7.1.ebuild b/app-admin/salt/salt-2014.7.1.ebuild
new file mode 100644 (file)
index 0000000..8916ac8
--- /dev/null
+++ b/app-admin/salt/salt-2014.7.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.7.1.ebuild,v 1.1 2015/01/16 22:56:46 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="api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova"
+IUSE+=" openssl redis selinux 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}]
+       )
+       api? (
+               || (
+                       dev-python/cherrypy[${PYTHON_USEDEP}]
+                       www-servers/tornado[${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}] )
+       selinux? ( sec-policy/selinux-salt )
+       timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+       nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+       gnupg? ( dev-python/python-gnupg[${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.8.5[${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
+
+       # these tests fail because they depend on features that are only
+       # in git versions of SaltTesting
+       rm tests/unit/{templates/jinja,modules/hashutil}_test.py
+}
+
+python_install_all() {
+       USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+       for s in minion master syndic $(use api && echo api); 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 710ec63480dae7d1e1f976b7d7df95b5b26df3db..1e20ea3c6d748537f53be4f3b26339a809cd5104 100644 (file)
--- a/app-admin/salt/salt-9999.ebuild
+++ b/app-admin/salt/salt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.15 2015/01/03 12:26:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.16 2015/01/16 22:56:46 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_7)
@@ -23,7 +23,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql nova"
+IUSE="api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova"
 IUSE+=" openssl redis selinux timelib raet +zeromq test"
 
 RDEPEND="sys-apps/pciutils
@@ -48,6 +48,12 @@ RDEPEND="sys-apps/pciutils
                dev-python/m2crypto[${PYTHON_USEDEP}]
                dev-python/pycrypto[${PYTHON_USEDEP}]
        )
+       api? (
+               || (
+                       dev-python/cherrypy[${PYTHON_USEDEP}]
+                       www-servers/tornado[${PYTHON_USEDEP}]
+               )
+       )
        mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
        keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
        mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
@@ -55,14 +61,13 @@ RDEPEND="sys-apps/pciutils
        selinux? ( sec-policy/selinux-salt )
        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}] )"
+       gnupg? ( dev-python/python-gnupg[${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}]
+               >=dev-python/SaltTesting-2014.8.5[${PYTHON_USEDEP}]
                ${RDEPEND}
        )"
 
@@ -78,7 +83,7 @@ python_prepare() {
 python_install_all() {
        USE_SETUPTOOLS=1 distutils-r1_python_install_all
 
-       for s in minion master syndic; do
+       for s in minion master syndic $(use api && echo api); do
                newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
                newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
                systemd_dounit "${FILESDIR}"/salt-${s}.service