[gentoo-commits] repo/gentoo:master commit in: app-admin/salt/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Patrick McLean" <chutzpah@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/
Date: Thu, 19 Nov 2015 20:04:25 +0000 (UTC)	[thread overview]
Message-ID: <1447963449.df80cdfb3d3f5b256c944e542045e93fb40f4c86.chutzpah@gentoo> (raw)

commit:     df80cdfb3d3f5b256c944e542045e93fb40f4c86
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 20:04:09 2015 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> 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.
   </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>

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}

next             reply	other threads:[~2015-11-19 20:04 UTC|newest]

Thread overview: 153+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-19 20:04 Patrick McLean [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-06-07 10:07 [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/ Michał Górny
2025-06-06 16:04 Arthur Zamarin
2025-04-22 11:58 Michał Górny
2025-02-08 10:18 Arthur Zamarin
2024-10-25 23:44 Sam James
2024-09-20 10:21 Arthur Zamarin
2024-09-20 10:21 Arthur Zamarin
2024-08-27 19:31 Patrick McLean
2024-08-27 17:30 Patrick McLean
2024-08-21 17:15 Patrick McLean
2024-05-29 22:06 Patrick McLean
2024-05-22  8:03 Michał Górny
2024-04-19 10:14 Arthur Zamarin
2024-04-19 10:14 Arthur Zamarin
2024-04-05 20:42 Patrick McLean
2024-03-18 23:41 Patrick McLean
2024-03-15  4:14 Ionen Wolkens
2024-03-12 21:39 Patrick McLean
2024-02-21 22:13 Patrick McLean
2024-02-14 16:29 Ionen Wolkens
2024-02-14 16:29 Ionen Wolkens
2024-02-13 19:27 Patrick McLean
2024-02-06 19:35 Patrick McLean
2023-12-13 17:39 Patrick McLean
2023-11-09 18:33 Patrick McLean
2023-11-09 18:33 Patrick McLean
2023-09-21 18:53 Patrick McLean
2023-08-15 21:19 Patrick McLean
2023-08-15 19:47 Patrick McLean
2023-04-22 15:11 Arthur Zamarin
2023-04-22  7:56 Jakov Smolić
2023-02-07  2:53 Sam James
2023-01-10 14:15 Michał Górny
2022-11-15 20:09 Michał Górny
2022-11-15 18:17 Michał Górny
2022-11-02 23:40 Patrick McLean
2022-11-02 23:40 Patrick McLean
2022-11-02 23:40 Patrick McLean
2022-11-02 23:40 Patrick McLean
2022-09-16  8:04 Arthur Zamarin
2022-09-16  7:21 Arthur Zamarin
2022-09-16  7:21 Arthur Zamarin
2022-08-12 10:19 Agostino Sarubbo
2022-08-12 10:17 Agostino Sarubbo
2022-06-28 18:24 Patrick McLean
2022-06-28 18:24 Patrick McLean
2022-05-31  7:16 Jakov Smolić
2022-05-06 19:59 Arthur Zamarin
2022-05-06 19:58 Arthur Zamarin
2022-04-16  8:43 Jakov Smolić
2022-04-02  8:45 Arthur Zamarin
2022-04-02  8:28 Arthur Zamarin
2022-03-31 21:53 Patrick McLean
2022-03-27  1:00 Sam James
2021-11-25 19:17 Arthur Zamarin
2021-11-02 19:43 Sam James
2021-10-14 13:40 Agostino Sarubbo
2021-09-08  1:01 Patrick McLean
2021-07-17 17:27 Matt Turner
2021-07-12 22:19 Sam James
2021-07-12 22:19 Sam James
2021-07-12 22:17 Sam James
2021-06-21  2:31 Sam James
2021-06-21  2:31 Sam James
2021-06-21  2:25 Sam James
2021-06-10 18:14 Sam James
2021-05-31 20:18 Michał Górny
2021-03-31 11:43 Thomas Deutschmann
2021-03-26 18:35 Sam James
2021-03-26 15:13 Agostino Sarubbo
2021-02-27  2:32 Patrick McLean
2020-12-22 19:37 Patrick McLean
2020-12-22 19:16 Patrick McLean
2020-12-17  5:45 Patrick McLean
2020-12-17  5:45 Patrick McLean
2020-11-19  3:14 Patrick McLean
2020-11-19  3:14 Patrick McLean
2020-11-19  3:14 Patrick McLean
2020-11-10  0:01 Sam James
2020-11-06 15:29 Sam James
2020-11-03 19:49 Patrick McLean
2020-11-03 19:49 Patrick McLean
2020-11-03 19:49 Patrick McLean
2020-11-03 19:49 Patrick McLean
2020-09-18 17:17 Patrick McLean
2020-09-06 19:13 Patrick McLean
2020-06-20 14:20 Thomas Deutschmann
2020-05-13 23:12 Patrick McLean
2020-05-13 23:12 Patrick McLean
2020-05-13 19:28 Mike Gilbert
2020-05-13 14:52 Agostino Sarubbo
2020-04-29 20:30 Patrick McLean
2020-04-29  4:21 Patrick McLean
2020-03-10 20:30 Patrick McLean
2019-05-13 17:57 Aaron Bauman
2019-01-07 17:00 Lars Wendler
2018-10-24 23:02 Patrick McLean
2018-10-24 23:02 Patrick McLean
2018-07-03 21:18 Patrick McLean
2018-07-03 21:18 Patrick McLean
2018-07-03 21:18 Patrick McLean
2018-07-03 21:18 Patrick McLean
2018-04-04 22:02 Patrick McLean
2018-04-04 22:02 Patrick McLean
2018-04-03 23:42 Patrick McLean
2018-03-09 17:59 Matt Thode
2018-02-27  0:52 Patrick McLean
2018-02-27  0:52 Patrick McLean
2018-02-08 20:04 Patrick McLean
2018-01-25  0:46 Aaron Bauman
2017-10-12  1:56 Patrick McLean
2017-10-12  1:56 Patrick McLean
2017-10-12  1:56 Patrick McLean
2017-10-12  1:56 Patrick McLean
2017-10-12  1:56 Patrick McLean
2017-09-08  1:32 Patrick McLean
2017-08-15 16:58 Manuel Rüger
2017-08-15 16:58 Manuel Rüger
2017-07-20 14:14 Manuel Rüger
2017-05-11 17:33 Patrick McLean
2017-04-21 21:59 Patrick McLean
2017-03-27 22:53 Patrick McLean
2017-03-27 22:53 Patrick McLean
2017-03-27 22:53 Patrick McLean
2017-01-31 23:22 Patrick McLean
2017-01-31 23:22 Patrick McLean
2017-01-15 17:45 David Seifert
2016-12-02  0:50 Patrick McLean
2016-09-09 21:44 Patrick McLean
2016-08-24 21:45 Patrick McLean
2016-07-26  1:05 Patrick McLean
2016-07-06  4:39 Aaron Bauman
2016-07-06  4:02 Aaron Bauman
2016-06-16 23:49 Patrick McLean
2016-06-16 18:48 Patrick McLean
2016-03-23 19:02 Patrick McLean
2016-03-03 18:35 Patrick McLean
2016-02-19  1:48 Patrick McLean
2016-02-03  1:10 Patrick McLean
2016-02-03  1:10 Patrick McLean
2016-01-26 20:00 Patrick McLean
2016-01-12 18:19 Patrick McLean
2015-12-02  0:31 Patrick McLean
2015-12-02  0:31 Patrick McLean
2015-12-02  0:31 Patrick McLean
2015-12-02  0:31 Patrick McLean
2015-11-19 20:04 Patrick McLean
2015-11-19 20:04 Patrick McLean
2015-11-06  7:29 Justin Lecher
2015-11-06  7:29 Justin Lecher
2015-09-29  1:23 Patrick McLean
2015-09-01 21:39 Patrick McLean

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:02ebdc2 dfblob:70f439d dfblob:9c8d42f dfblob:fa3262c )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: app-admin/salt/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1447963449.df80cdfb3d3f5b256c944e542045e93fb40f4c86.chutzpah@gentoo \
    --to=chutzpah@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox