chutzpah    15/05/06 22:27:59

  Modified:             metadata.xml ChangeLog
  Added:                salt-2015.5.0.ebuild
  Log:
  Version bump. Add vim-syntax USE flag (bug #548362), retry when stopping 
services (bug #544290).
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
0xE3F69979BB4B8928DA78E3D17CBF44EF)

Revision  Changes    Path
1.10                 app-admin/salt/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/metadata.xml?rev=1.10&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/metadata.xml?rev=1.10&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/metadata.xml?r1=1.9&r2=1.10

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/salt/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml        18 Apr 2015 11:14:31 -0000      1.9
+++ metadata.xml        6 May 2015 22:27:59 -0000       1.10
@@ -22,12 +22,14 @@
 </longdescription>
        <use>
                <flag name="api">Enable support for salt-api.</flag>
+               <flag name="cherrypy">Enable support for using 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="neutron">Support the OpenStack neutron network 
service.</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>



1.62                 app-admin/salt/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?rev=1.62&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?rev=1.62&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?r1=1.61&r2=1.62

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ChangeLog   21 Apr 2015 22:25:07 -0000      1.61
+++ ChangeLog   6 May 2015 22:27:59 -0000       1.62
@@ -1,6 +1,15 @@
 # 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.61 2015/04/21 
22:25:07 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.62 2015/05/06 
22:27:59 chutzpah Exp $
+
+*salt-2015.5.0 (06 May 2015)
+
+  06 May 2015; Patrick McLean <[email protected]> +files/api-initd-4,
+  +files/master-initd-4, +files/minion-initd-4,
+  +files/salt-2015.5.0-archive-test.patch, +files/syndic-initd-4,
+  +salt-2015.5.0.ebuild, metadata.xml:
+  Version bump. Add vim-syntax USE flag (bug #548362), retry when stopping
+  services (bug #544290).
 
 *salt-2014.7.5 (21 Apr 2015)
 



1.1                  app-admin/salt/salt-2015.5.0.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-2015.5.0.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-2015.5.0.ebuild?rev=1.1&content-type=text/plain

Index: salt-2015.5.0.ebuild
===================================================================
# 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-2015.5.0.ebuild,v 1.1 
2015/05/06 22:27:59 chutzpah Exp $

EAPI=5
PYTHON_COMPAT=(python2_7)

inherit eutils systemd vim-plugin distutils-r1

DESCRIPTION="Salt is a remote execution and configuration manager"
HOMEPAGE="http://saltstack.org/";
SALT_VIM_HASH="20695f68e5895e5ae2b5884b78f5a2cd29897b05"

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

SRC_URI+=" vim-syntax? ( 
https://github.com/${PN}stack/${PN}-vim/archive/${SALT_VIM_HASH}.tar.gz -> 
salt-vim-20141109.tar.gz )"

LICENSE="Apache-2.0"
SLOT="0"
IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron 
nova"
IUSE+=" openssl redis selinux test timelib raet +zeromq vim-syntax"

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}]
        >=www-servers/tornado-4.0[${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-1.0.0[${PYTHON_USEDEP}]
                >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
                >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
        )
        zeromq? (
                >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
                >=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
                dev-python/pycrypto[${PYTHON_USEDEP}]
        )
        cherrypy? ( >=dev-python/cherrypy-3.2.2[${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}] )
        neutron? ( >=dev-python/python-neutronclient-2.3.6[${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/mock[${PYTHON_USEDEP}]
                dev-python/timelib[${PYTHON_USEDEP}]
                >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
                >=dev-python/moto-0.3.6[${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"
        "${FILESDIR}/${PN}-2015.5.0-archive-test.patch"
)

python_prepare() {
        # this test fails because it trys to "pip install distribute"
        rm tests/unit/{modules,states}/zcbuildout_test.py 
tests/unit/modules/{rh_ip,win_network}_test.py
}

python_install_all() {
        local svc
        USE_SETUPTOOLS=1 distutils-r1_python_install_all

        for svc in minion master syndic api; do
                newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
                newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
                systemd_dounit "${FILESDIR}"/salt-${svc}.service
        done

        insinto /etc/${PN}
        doins -r conf/*

        use vim-syntax && S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}" \
                vim-plugin_src_install
}

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"
}




Reply via email to