From: Patrick McLean Date: Tue, 17 Feb 2015 20:07:33 +0000 (+0000) Subject: Version bump, clean out old versions, sync 9999. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7468082477ed70d3f2cabb171e4a8d1fdd2ebcbc;p=gentoo.git Version bump, clean out old versions, sync 9999. Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF --- diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog index 34b5dcf837e0..600d4800fc7a 100644 --- a/app-admin/salt/ChangeLog +++ b/app-admin/salt/ChangeLog @@ -1,6 +1,12 @@ # 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.54 2015/01/16 22:56:46 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.55 2015/02/17 20:07:03 chutzpah Exp $ + +*salt-2014.7.2 (17 Feb 2015) + + 17 Feb 2015; Patrick McLean +salt-2014.7.2.ebuild, + salt-9999.ebuild: + Version bump, clean out old versions, sync 9999. *salt-2014.7.1 (16 Jan 2015) diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 29955d63ecdb..805a46a998ac 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -21,27 +21,29 @@ AUX syndic-initd-3 411 SHA256 2de9f69462bc3b575a69a150b6bba21a6e341477010d284cb7 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 +DIST salt-2014.7.2.tar.gz 3570683 SHA256 92e6b9afe764c836cd24aa210d98050bc0fdb4d8ee9f813edc504ea19651e505 SHA512 baf9e856a84e208fe3906100e10b31ca06992a90d64aecb7a95315c5048a6a627fc0cc56276302afcd1f0a4230c7bd564e37d0c09ebcb8eedad9ee6c96830da1 WHIRLPOOL 72b3511ecb3de0a5a97f883b7329ae1a92735fde39942c8f70679f358c8ef7f0115de518c79158505b91b517d22a0188dbf97c4bfa79fcdeeefe79dd43e53ac4 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-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 +EBUILD salt-2014.7.2.ebuild 3259 SHA256 88d301326e7192849235a7ec546ed46d8479e479693b1e3aeb7c3d4a4da66934 SHA512 6d027585c2e126929a823cd51d2b1c799324279c8e7d9cddaf4dc01408bd7fd86915fffc1656b72f65ef4e52ac1d3209e96f913762e36a31b4fef24068e63f4d WHIRLPOOL 7601250d54a7d2b6d3bc03d501c1b262529b0abc856603822a5ed21de26f4504eabd859295dcd2b8a4ed9643cec15b576b9c1dc1395988827b453feda3d8dcd5 +EBUILD salt-9999.ebuild 3180 SHA256 effeffcda9616e178870f68068287fd34c02de92525e2fe36381c99199f17ada SHA512 0d3ddf76dfb69699c9e7cf163dd83d43a12b3ec893ebc84ed44db1e3b2d992684b2bcab8a2829457cc65c8c195e7f4d0d809bdee6191035848e16019db2de2a4 WHIRLPOOL d86fb53e41d3c2d555906925ede2819e527784628a87476e6a672b185fc9a94055036d966fd94fd72c0f6a31000ac2bfd454d904235f835341ad30b9ff446b50 +MISC ChangeLog 10436 SHA256 1e6e1027a675e22aca5a973175fd2d495f8670a9008eba4414f704050eefd860 SHA512 31d8bc2fdc61b8c57dc800f249d70a840aacb68254f58d93facc551761d322648d8ff04b91126ea851e735047b97461a2f32e3e3a4fef60581f84ff4c621dd6d WHIRLPOOL d8d4cfbf8b9de6c91b2af1322ff7cc170a18f4ea54f7891ea04476c2143bd2074a2140003cbd566029fba04c3e56880ca7547826d573025a70d1752551f33575 MISC metadata.xml 1973 SHA256 9cd6ed9773018e0d406f1155f704c6660bf703cf992c7aee3458f34f3c90cdea SHA512 b26708b1407e867af702927ef395415f838ca25354e8fa3451b30d632b112511d1a902a521f5b8e3bde1218b3c810e1ebc27ca247266a210e872df9a05e05950 WHIRLPOOL 27904b1812756d483e1b28502422a2ed9a1c0410987529dbf5996394baa31901ae5671430223fa350f5f7f4bb05f8c45a247b43376a55ae4330e1044d8faff46 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -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 +iQIcBAEBCAAGBQJU45+AAAoJEHy/RO9cNQiDAiIP/j2znjpnRWK3LILQDoaS2F0z +Y1yhG/8kxO5hTSNGOKrupSy931tlQkmWbbKV6PeaUDlTfelvZv8vL/CKs5RVorc2 +LHmY2CQfrCSSxj9EvFP/VvU67C7h9mc6FhtYykwim1nWveQ4cX2kXJquL6qzIRhU +3sT4Vb0XAL8x+S34j1BA8aJ4/tPNsR+uKDmvkDhphQ2n3R2i5u2ndJYm2r0gKz0A +D3hdq6Jalzw5SJeN603MxvoYzuKCiLoFosi/LF5o2CdS3y4v3qiFNLsKuWMtkq0Z +ZQZ86hEAkIrQPZkQLBegw2eyV5/pXicKUyOUdKkqEEV8eftl/dmB6AxXY6NDDvxR +9QaMjkJ45on6dOHcq+hVKQueSTytoLJ0Y3mkjpx8PLgxp6DBCb6tamhhJFfaHpnv +7sycc3I9/u4IVQBN6MUhtSnK2kLRBAmHi/pttOFLvBe/JlYMCLeOEin4xIjdZ3tN +tnX4+cDNavJ+s6Ov3IHCOQyte7LDNLZmhPPNzakbvg08gRX6IwW0yjJ3ColfIIi9 +dXWe2LkUD9VIedKPFmd0O7aTLmr5KAkERdF45A/zccejW0i6n+2Hf9fm79WXqXmq +PIjv6BTtPS2UXcGlL+LMN3Kk7WW9btA4elzuqf86y1nyOBS/+YoOuupaDoW3Mest +VML6gK9+dM86v3Y3NbuS +=v5vJ -----END PGP SIGNATURE----- diff --git a/app-admin/salt/salt-2014.7.2.ebuild b/app-admin/salt/salt-2014.7.2.ebuild new file mode 100644 index 000000000000..56737010a7f0 --- /dev/null +++ b/app-admin/salt/salt-2014.7.2.ebuild @@ -0,0 +1,108 @@ +# 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.2.ebuild,v 1.1 2015/02/17 20:07:03 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-0.22.3[${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-2015.2.16[${PYTHON_USEDEP}] + ${RDEPEND} + )" + +DOCS=(README.rst AUTHORS) + +REQUIRED_USE="|| ( raet zeromq )" + +PATCHES=( + "${FILESDIR}/${PN}-2014.7.1-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 $(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" \ + ${EPYTHON} 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 1e20ea3c6d74..fbed190aedb6 100644 --- 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.16 2015/01/16 22:56:46 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.17 2015/02/17 20:07:03 chutzpah Exp $ EAPI=5 PYTHON_COMPAT=(python2_7) @@ -45,7 +45,7 @@ RDEPEND="sys-apps/pciutils ) zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - dev-python/m2crypto[${PYTHON_USEDEP}] + >=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}] dev-python/pycrypto[${PYTHON_USEDEP}] ) api? ( @@ -67,7 +67,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] dev-python/pip[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] dev-python/timelib[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2014.8.5[${PYTHON_USEDEP}] + >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] ${RDEPEND} )" @@ -99,5 +99,6 @@ python_test() { # 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" + ${EPYTHON} tests/runtests.py \ + --unit-tests --no-report --verbose || die "testing failed" }