1 |
commit: f0850331d8101895aa833eefdfabb8f48ce4f023 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 8 21:09:51 2022 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 8 21:13:10 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0850331 |
7 |
|
8 |
app-admin/ansible-base: ansible-base-2.11.6 and 2.12.1 cleanup |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/ansible-base/Manifest | 2 - |
14 |
.../ansible-base/ansible-base-2.11.6-r1.ebuild | 64 ---------------------- |
15 |
app-admin/ansible-base/ansible-base-2.12.1.ebuild | 64 ---------------------- |
16 |
3 files changed, 130 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest |
19 |
index de7bc3a6bcfa..847aa0e09b0f 100644 |
20 |
--- a/app-admin/ansible-base/Manifest |
21 |
+++ b/app-admin/ansible-base/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST ansible-core-2.11.6.tar.gz 6999232 BLAKE2B 5105928881297226e982e42c8027a370ad31869d92ca87d338cdb6e72504a22cf3fe7843921905599c7126c840197fb7799a72c261a007437a437b85c4a65c68 SHA512 d14686afb7b2802be3bca3baf6f3840d33f7994b7c48fcb4d42f871e13e4eb54ffef413e124dbe614a55041c23b509f5e887b687dbb6c4868425957cac45910a |
24 |
DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92 |
25 |
-DIST ansible-core-2.12.1.tar.gz 7401160 BLAKE2B 2bc412bade7f7e5dee0e51c78a74b4dea286aca1b82e2217012f168cd529a06887f11d672ff883af6a71c3af6ea1596f6720bcde9ed3696f87b8b5def1a1172b SHA512 89468d172dca502da42b94d0a781906578322ac531b3dfc3cece383b0e93fbec0f199d7b76abfd80d24654d5d939ee66a15b74565f50cca0c72d427aab9f4e08 |
26 |
DIST ansible-core-2.12.2.tar.gz 7750306 BLAKE2B 629ff38ad98eebdf6b8d7f47355f065589c511fb66b19543ad696b973f6a776b420158ce157c0af5f14b85574808bd5bf3f285607e588949f6cd2e232941e508 SHA512 a9afc3768d27a7049c275da8780e6dcd7da42263fc9065a1df1aabd0d8c54020313e9065349a6f52138e11eafb176348bf2ec33c0c1b08dc9837b7ac832542af |
27 |
|
28 |
diff --git a/app-admin/ansible-base/ansible-base-2.11.6-r1.ebuild b/app-admin/ansible-base/ansible-base-2.11.6-r1.ebuild |
29 |
deleted file mode 100644 |
30 |
index 3be60e1e69ec..000000000000 |
31 |
--- a/app-admin/ansible-base/ansible-base-2.11.6-r1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,64 +0,0 @@ |
34 |
-# Copyright 1999-2021 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-PYTHON_COMPAT=( python3_{8..9} ) |
40 |
-DISTUTILS_USE_SETUPTOOLS=bdepend |
41 |
- |
42 |
-inherit distutils-r1 |
43 |
- |
44 |
-DESCRIPTION="Model-driven deployment, config management, and command execution framework" |
45 |
-HOMEPAGE="https://www.ansible.com/" |
46 |
- |
47 |
-if [[ ${PV} == 9999 ]]; then |
48 |
- inherit git-r3 |
49 |
- EGIT_REPO_URI="https://github.com/ansible/ansible.git" |
50 |
- EGIT_BRANCH="devel" |
51 |
-else |
52 |
- MY_PN="${PN/-base/-core}" |
53 |
- MY_P="${MY_PN}-${PV}" |
54 |
- SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
55 |
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" |
56 |
- S="${WORKDIR}"/${MY_P} |
57 |
-fi |
58 |
- |
59 |
-LICENSE="GPL-3" |
60 |
-SLOT="0" |
61 |
-IUSE="test" |
62 |
-RESTRICT="test" |
63 |
- |
64 |
-RDEPEND=" |
65 |
- dev-python/paramiko[${PYTHON_USEDEP}] |
66 |
- dev-python/jinja[${PYTHON_USEDEP}] |
67 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
68 |
- dev-python/cryptography[${PYTHON_USEDEP}] |
69 |
- dev-python/httplib2[${PYTHON_USEDEP}] |
70 |
- dev-python/six[${PYTHON_USEDEP}] |
71 |
- dev-python/netaddr[${PYTHON_USEDEP}] |
72 |
- dev-python/pexpect[${PYTHON_USEDEP}] |
73 |
- >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}] |
74 |
- <dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}] |
75 |
- net-misc/sshpass |
76 |
- virtual/ssh |
77 |
-" |
78 |
-DEPEND=" |
79 |
- >=dev-python/packaging-16.6[${PYTHON_USEDEP}] |
80 |
- test? ( |
81 |
- ${RDEPEND} |
82 |
- dev-python/bcrypt[${PYTHON_USEDEP}] |
83 |
- dev-python/nose[${PYTHON_USEDEP}] |
84 |
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] |
85 |
- dev-python/passlib[${PYTHON_USEDEP}] |
86 |
- dev-python/coverage[${PYTHON_USEDEP}] |
87 |
- dev-vcs/git |
88 |
- )" |
89 |
- |
90 |
-python_compile() { |
91 |
- export ANSIBLE_SKIP_CONFLICT_CHECK=1 |
92 |
- distutils-r1_python_compile |
93 |
-} |
94 |
- |
95 |
-python_test() { |
96 |
- nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die |
97 |
-} |
98 |
|
99 |
diff --git a/app-admin/ansible-base/ansible-base-2.12.1.ebuild b/app-admin/ansible-base/ansible-base-2.12.1.ebuild |
100 |
deleted file mode 100644 |
101 |
index e8c2a3cb1c45..000000000000 |
102 |
--- a/app-admin/ansible-base/ansible-base-2.12.1.ebuild |
103 |
+++ /dev/null |
104 |
@@ -1,64 +0,0 @@ |
105 |
-# Copyright 1999-2022 Gentoo Authors |
106 |
-# Distributed under the terms of the GNU General Public License v2 |
107 |
- |
108 |
-EAPI=8 |
109 |
- |
110 |
-PYTHON_COMPAT=( python3_{8..10} ) |
111 |
-DISTUTILS_USE_SETUPTOOLS=bdepend |
112 |
- |
113 |
-inherit distutils-r1 |
114 |
- |
115 |
-DESCRIPTION="Model-driven deployment, config management, and command execution framework" |
116 |
-HOMEPAGE="https://www.ansible.com/" |
117 |
- |
118 |
-if [[ ${PV} == 9999 ]]; then |
119 |
- inherit git-r3 |
120 |
- EGIT_REPO_URI="https://github.com/ansible/ansible.git" |
121 |
- EGIT_BRANCH="devel" |
122 |
-else |
123 |
- MY_PN="${PN/-base/-core}" |
124 |
- MY_P="${MY_PN}-${PV}" |
125 |
- SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
126 |
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" |
127 |
- S="${WORKDIR}"/${MY_P} |
128 |
-fi |
129 |
- |
130 |
-LICENSE="GPL-3" |
131 |
-SLOT="0" |
132 |
-IUSE="test" |
133 |
-RESTRICT="test" |
134 |
- |
135 |
-RDEPEND=" |
136 |
- dev-python/paramiko[${PYTHON_USEDEP}] |
137 |
- dev-python/jinja[${PYTHON_USEDEP}] |
138 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
139 |
- dev-python/cryptography[${PYTHON_USEDEP}] |
140 |
- dev-python/httplib2[${PYTHON_USEDEP}] |
141 |
- dev-python/six[${PYTHON_USEDEP}] |
142 |
- dev-python/netaddr[${PYTHON_USEDEP}] |
143 |
- dev-python/pexpect[${PYTHON_USEDEP}] |
144 |
- >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}] |
145 |
- <dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}] |
146 |
- net-misc/sshpass |
147 |
- virtual/ssh |
148 |
-" |
149 |
-DEPEND=" |
150 |
- >=dev-python/packaging-16.6[${PYTHON_USEDEP}] |
151 |
- test? ( |
152 |
- ${RDEPEND} |
153 |
- dev-python/bcrypt[${PYTHON_USEDEP}] |
154 |
- dev-python/nose[${PYTHON_USEDEP}] |
155 |
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] |
156 |
- dev-python/passlib[${PYTHON_USEDEP}] |
157 |
- dev-python/coverage[${PYTHON_USEDEP}] |
158 |
- dev-vcs/git |
159 |
- )" |
160 |
- |
161 |
-python_compile() { |
162 |
- export ANSIBLE_SKIP_CONFLICT_CHECK=1 |
163 |
- distutils-r1_python_compile |
164 |
-} |
165 |
- |
166 |
-python_test() { |
167 |
- nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die |
168 |
-} |