From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BE43B1384B4 for ; Thu, 19 Nov 2015 20:04:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72556E07A0; Thu, 19 Nov 2015 20:04:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0F47CE07A0 for ; Thu, 19 Nov 2015 20:04:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 15EE23409B9 for ; Thu, 19 Nov 2015 20:04:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29870FFB for ; Thu, 19 Nov 2015 20:04:25 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1447963449.df80cdfb3d3f5b256c944e542045e93fb40f4c86.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/salt/metadata.xml app-admin/salt/salt-9999.ebuild X-VCS-Directories: app-admin/salt/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: df80cdfb3d3f5b256c944e542045e93fb40f4c86 X-VCS-Branch: master Date: Thu, 19 Nov 2015 20:04:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cd30797d-4781-41cd-b55a-040b79b3db64 X-Archives-Hash: fa0aceddecaa7d4692992be6f5148f3d commit: df80cdfb3d3f5b256c944e542045e93fb40f4c86 Author: Patrick McLean gentoo org> AuthorDate: Thu Nov 19 20:04:09 2015 +0000 Commit: Patrick McLean gentoo org> CommitDate: Thu Nov 19 20:04:09 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df80cdfb app-admin/salt: sync 9999 ebuild with current release Package-Manager: portage-2.2.25 app-admin/salt/metadata.xml | 1 - app-admin/salt/salt-9999.ebuild | 47 +++++++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml index 02ebdc2..70f439d 100644 --- a/app-admin/salt/metadata.xml +++ b/app-admin/salt/metadata.xml @@ -21,7 +21,6 @@ Between the remote execution system, and state management Salt addresses the backbone of cloud and data center management. - Enable support for salt-api. Enable support for using cherrypy. Enable salt-cloud support via libcloud. Support managing virtual machines with app-emulation/libvirt. diff --git a/app-admin/salt/salt-9999.ebuild b/app-admin/salt/salt-9999.ebuild index 9c8d42f..fa3262c 100644 --- a/app-admin/salt/salt-9999.ebuild +++ b/app-admin/salt/salt-9999.ebuild @@ -5,7 +5,7 @@ EAPI=5 PYTHON_COMPAT=(python2_7) -inherit eutils distutils-r1 systemd +inherit eutils systemd distutils-r1 DESCRIPTION="Salt is a remote execution and configuration manager" HOMEPAGE="http://saltstack.org/" @@ -23,8 +23,8 @@ 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" +IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" +IUSE+=" openssl profile redis selinux test timelib raet +zeromq vim-syntax" RDEPEND="sys-apps/pciutils dev-python/jinja[${PYTHON_USEDEP}] @@ -33,27 +33,27 @@ RDEPEND="sys-apps/pciutils dev-python/markupsafe[${PYTHON_USEDEP}] >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] + >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] + virtual/python-futures[${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}] ) + openssl? ( + dev-libs/openssl:*[-bindist] + dev-python/pyopenssl[${PYTHON_USEDEP}] + ) raet? ( - dev-python/libnacl[${PYTHON_USEDEP}] - dev-python/ioflo[${PYTHON_USEDEP}] - dev-python/raet[${PYTHON_USEDEP}] + >=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}] - ) - api? ( - || ( - dev-python/cherrypy[${PYTHON_USEDEP}] - www-servers/tornado[${PYTHON_USEDEP}] - ) + >=dev-python/pycrypto-2.6.1[${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}] ) @@ -61,12 +61,18 @@ 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}] )" + neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim )" 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} )" @@ -78,16 +84,17 @@ REQUIRED_USE="|| ( raet zeromq )" python_prepare() { # this test fails because it trys to "pip install distribute" rm tests/unit/{modules,states}/zcbuildout_test.py \ - || die "Failed to remove broken tests" + tests/unit/modules/{rh_ip,win_network,random_org}_test.py } python_install_all() { + local svc 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 + 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}