* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-base/, app-admin/ansible/, dev-python/ansible-compat/, ...
@ 2022-09-02 9:32 Marek Szuba
0 siblings, 0 replies; only message in thread
From: Marek Szuba @ 2022-09-02 9:32 UTC (permalink / raw
To: gentoo-commits
commit: f3f90018e3bd4e9258b24c63d1159d43cc4371a0
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 2 09:29:24 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 09:29:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f90018
app-admin/ansible-core: rename from app-admin/ansible-base
This is the name upstream has eventually settled on. Change discussed
with and approved by monsieurp on IRC.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-admin/{ansible-base => ansible-core}/Manifest | 0
.../ansible-core-2.11.7.ebuild} | 5 +----
.../ansible-core-2.12.7.ebuild} | 5 +----
.../ansible-core-2.12.8.ebuild} | 5 +----
.../ansible-core-2.13.2.ebuild} | 5 +----
.../ansible-core-2.13.3.ebuild} | 5 +----
.../ansible-core-9999.ebuild} | 7 ++-----
app-admin/{ansible-base => ansible-core}/metadata.xml | 2 +-
app-admin/ansible-lint/ansible-lint-6.4.0.ebuild | 2 +-
app-admin/ansible-lint/ansible-lint-6.5.2.ebuild | 2 +-
app-admin/ansible/ansible-4.6.0.ebuild | 6 +++---
app-admin/ansible/ansible-5.10.0.ebuild | 4 ++--
app-admin/ansible/ansible-5.9.0.ebuild | 4 ++--
app-admin/ansible/ansible-6.1.0.ebuild | 4 ++--
app-admin/ansible/ansible-6.2.0.ebuild | 4 ++--
dev-python/ansible-compat/ansible-compat-2.1.0.ebuild | 2 +-
dev-python/ansible-compat/ansible-compat-2.2.0.ebuild | 2 +-
profiles/features/wd40/package.mask | 2 +-
profiles/updates/3Q-2022 | 1 +
19 files changed, 25 insertions(+), 42 deletions(-)
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-core/Manifest
similarity index 100%
rename from app-admin/ansible-base/Manifest
rename to app-admin/ansible-core/Manifest
diff --git a/app-admin/ansible-base/ansible-base-2.11.7.ebuild b/app-admin/ansible-core/ansible-core-2.11.7.ebuild
similarity index 91%
rename from app-admin/ansible-base/ansible-base-2.11.7.ebuild
rename to app-admin/ansible-core/ansible-core-2.11.7.ebuild
index 3b6b3c0d41e6..e84226ab4437 100644
--- a/app-admin/ansible-base/ansible-base-2.11.7.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.11.7.ebuild
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ansible/ansible.git"
EGIT_BRANCH="devel"
else
- MY_PN="${PN/-base/-core}"
- MY_P="${MY_PN}-${PV}"
- SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
- S="${WORKDIR}"/${MY_P}
fi
LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/ansible-base-2.12.7.ebuild b/app-admin/ansible-core/ansible-core-2.12.7.ebuild
similarity index 91%
rename from app-admin/ansible-base/ansible-base-2.12.7.ebuild
rename to app-admin/ansible-core/ansible-core-2.12.7.ebuild
index e8c2a3cb1c45..aebbfcec8b52 100644
--- a/app-admin/ansible-base/ansible-base-2.12.7.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.12.7.ebuild
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ansible/ansible.git"
EGIT_BRANCH="devel"
else
- MY_PN="${PN/-base/-core}"
- MY_P="${MY_PN}-${PV}"
- SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
- S="${WORKDIR}"/${MY_P}
fi
LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/ansible-base-2.12.8.ebuild b/app-admin/ansible-core/ansible-core-2.12.8.ebuild
similarity index 91%
rename from app-admin/ansible-base/ansible-base-2.12.8.ebuild
rename to app-admin/ansible-core/ansible-core-2.12.8.ebuild
index 06d9ba54c027..10e608c937a9 100644
--- a/app-admin/ansible-base/ansible-base-2.12.8.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.12.8.ebuild
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ansible/ansible.git"
EGIT_BRANCH="devel"
else
- MY_PN="${PN/-base/-core}"
- MY_P="${MY_PN}-${PV}"
- SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
- S="${WORKDIR}"/${MY_P}
fi
LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/ansible-base-2.13.2.ebuild b/app-admin/ansible-core/ansible-core-2.13.2.ebuild
similarity index 91%
rename from app-admin/ansible-base/ansible-base-2.13.2.ebuild
rename to app-admin/ansible-core/ansible-core-2.13.2.ebuild
index 20a3a7eaa8dd..49cb6548905c 100644
--- a/app-admin/ansible-base/ansible-base-2.13.2.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.13.2.ebuild
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ansible/ansible.git"
EGIT_BRANCH="devel"
else
- MY_PN="${PN/-base/-core}"
- MY_P="${MY_PN}-${PV}"
- SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
- S="${WORKDIR}"/${MY_P}
fi
LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/ansible-base-2.13.3.ebuild b/app-admin/ansible-core/ansible-core-2.13.3.ebuild
similarity index 91%
rename from app-admin/ansible-base/ansible-base-2.13.3.ebuild
rename to app-admin/ansible-core/ansible-core-2.13.3.ebuild
index 87c538eaf16d..d4dfeb185432 100644
--- a/app-admin/ansible-base/ansible-base-2.13.3.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.13.3.ebuild
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ansible/ansible.git"
EGIT_BRANCH="devel"
else
- MY_PN="${PN/-base/-core}"
- MY_P="${MY_PN}-${PV}"
- SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
- S="${WORKDIR}"/${MY_P}
fi
LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/ansible-base-9999.ebuild b/app-admin/ansible-core/ansible-core-9999.ebuild
similarity index 89%
rename from app-admin/ansible-base/ansible-base-9999.ebuild
rename to app-admin/ansible-core/ansible-core-9999.ebuild
index caee1ffe1113..10e608c937a9 100644
--- a/app-admin/ansible-base/ansible-base-9999.ebuild
+++ b/app-admin/ansible-core/ansible-core-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ansible/ansible.git"
EGIT_BRANCH="devel"
else
- MY_PN="${PN/-base/-core}"
- MY_P="${MY_PN}-${PV}"
- SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
- S="${WORKDIR}"/${MY_P}
fi
LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/metadata.xml b/app-admin/ansible-core/metadata.xml
similarity index 95%
rename from app-admin/ansible-base/metadata.xml
rename to app-admin/ansible-core/metadata.xml
index 3f94edf04c28..92fba0212508 100644
--- a/app-admin/ansible-base/metadata.xml
+++ b/app-admin/ansible-core/metadata.xml
@@ -10,7 +10,7 @@
<name>Patrice Clement</name>
</maintainer>
<upstream>
- <remote-id type="pypi">ansible-base</remote-id>
+ <remote-id type="pypi">ansible-core</remote-id>
<remote-id type="github">ansible/ansible</remote-id>
<bugs-to>https://github.com/ansible/ansible/issues</bugs-to>
</upstream>
diff --git a/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
index 071feb3061bb..bc3e252daa8c 100644
--- a/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS="~amd64 ~riscv"
RDEPEND="
- >=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}]
+ >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
>=dev-python/ansible-compat-2.1.0[${PYTHON_USEDEP}]
>=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
>=dev-python/jsonschema-4.8.0[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
index 25c5750d037c..71e510a4133d 100644
--- a/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS="~amd64 ~riscv"
RDEPEND="
- >=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}]
+ >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
>=dev-python/ansible-compat-2.2.0[${PYTHON_USEDEP}]
dev-python/black[${PYTHON_USEDEP}]
>=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible/ansible-4.6.0.ebuild b/app-admin/ansible/ansible-4.6.0.ebuild
index d96231433bb4..a932683ff21d 100644
--- a/app-admin/ansible/ansible-4.6.0.ebuild
+++ b/app-admin/ansible/ansible-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,8 +16,8 @@ SLOT="0"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
RESTRICT="test"
-RDEPEND=">=app-admin/ansible-base-2.11.1
- <app-admin/ansible-base-2.12"
+RDEPEND=">=app-admin/ansible-core-2.11.1
+ <app-admin/ansible-core-2.12"
python_compile() {
local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/app-admin/ansible/ansible-5.10.0.ebuild b/app-admin/ansible/ansible-5.10.0.ebuild
index 999bc1a1edb8..10da86624659 100644
--- a/app-admin/ansible/ansible-5.10.0.ebuild
+++ b/app-admin/ansible/ansible-5.10.0.ebuild
@@ -16,8 +16,8 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
RESTRICT="test"
-RDEPEND=">=app-admin/ansible-base-2.12.0
- <app-admin/ansible-base-2.13"
+RDEPEND=">=app-admin/ansible-core-2.12.0
+ <app-admin/ansible-core-2.13"
python_compile() {
local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/app-admin/ansible/ansible-5.9.0.ebuild b/app-admin/ansible/ansible-5.9.0.ebuild
index 21e85e45cd01..187c0ab3cccb 100644
--- a/app-admin/ansible/ansible-5.9.0.ebuild
+++ b/app-admin/ansible/ansible-5.9.0.ebuild
@@ -16,8 +16,8 @@ SLOT="0"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
RESTRICT="test"
-RDEPEND=">=app-admin/ansible-base-2.12.0
- <app-admin/ansible-base-2.13"
+RDEPEND=">=app-admin/ansible-core-2.12.0
+ <app-admin/ansible-core-2.13"
python_compile() {
local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/app-admin/ansible/ansible-6.1.0.ebuild b/app-admin/ansible/ansible-6.1.0.ebuild
index 162e798cc5b4..2117a72eafcb 100644
--- a/app-admin/ansible/ansible-6.1.0.ebuild
+++ b/app-admin/ansible/ansible-6.1.0.ebuild
@@ -16,8 +16,8 @@ SLOT="0"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
RESTRICT="test"
-RDEPEND=">=app-admin/ansible-base-2.13.0
- <app-admin/ansible-base-2.14"
+RDEPEND=">=app-admin/ansible-core-2.13.0
+ <app-admin/ansible-core-2.14"
python_compile() {
local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/app-admin/ansible/ansible-6.2.0.ebuild b/app-admin/ansible/ansible-6.2.0.ebuild
index 6edb26b0dbf7..dc69c24b7721 100644
--- a/app-admin/ansible/ansible-6.2.0.ebuild
+++ b/app-admin/ansible/ansible-6.2.0.ebuild
@@ -16,8 +16,8 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
RESTRICT="test"
-RDEPEND=">=app-admin/ansible-base-2.13.0
- <app-admin/ansible-base-2.14"
+RDEPEND=">=app-admin/ansible-core-2.13.0
+ <app-admin/ansible-core-2.14"
python_compile() {
local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
index 7f566730059f..438acfa7dc99 100644
--- a/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
KEYWORDS="~amd64 ~riscv"
RDEPEND="
- >=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
+ >=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
>=dev-python/jsonschema-4.5.1[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
index 36ec1e075135..5abc44e6b8de 100644
--- a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
KEYWORDS="~amd64 ~riscv"
RDEPEND="
- >=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
+ >=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 1bfc099be13f..6dc55ad9a1bc 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -3,7 +3,7 @@
# Various packages requiring Rust.
app-admin/ansible
-app-admin/ansible-base
+app-admin/ansible-core
app-crypt/acme
app-crypt/certbot
app-crypt/certbot-nginx
diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
index 2cdcd10dc1c9..91742f7d8e70 100644
--- a/profiles/updates/3Q-2022
+++ b/profiles/updates/3Q-2022
@@ -12,3 +12,4 @@ move gnome-extra/chrome-gnome-shell gnome-extra/gnome-browser-connector
move dev-python/PyQt6_sip dev-python/PyQt6-sip
move dev-python/PyQt6_WebEngine dev-python/PyQt6-WebEngine
move net-p2p/go-ipfs net-p2p/kubo
+move app-admin/ansible-base app-admin/ansible-core
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-09-02 9:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-02 9:32 [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-base/, app-admin/ansible/, dev-python/ansible-compat/, Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox