From 58e20bfd4e790b1b3b5426cc9fd710fbbb7aedb7 Mon Sep 17 00:00:00 2001
From: Domagoj Stolfa <ds815@gmx.com>
Date: Tue, 18 May 2021 16:34:37 +0100
Subject: [PATCH] ansible: update to 4.0.0

With the update of ansible to 4.0.0, ansible-base has been deprecated
and ansible-core is the new name of its dependency [1]. This commit
makes the following changes outside of ansible:

ansible-base is now a transitional package that depends on ansible-core.

ansible-core is what ansible-base used to be (for the most part) with
names changed where necessary.

In order to minimize the chance of users getting into a broken state,
this was all done as a single commit rather than separate ones.

[1]: https://www.ansible.com/blog/ansible-3.0.0-qa
---
 srcpkgs/ansible-base/template                 | 21 ++++------------
 srcpkgs/ansible-core/template                 | 24 +++++++++++++++++++
 srcpkgs/{ansible-base => ansible-core}/update |  0
 srcpkgs/ansible/template                      |  6 ++---
 4 files changed, 31 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/ansible-core/template
 rename srcpkgs/{ansible-base => ansible-core}/update (100%)

diff --git a/srcpkgs/ansible-base/template b/srcpkgs/ansible-base/template
index 177f378e146d..4bad4162624b 100644
--- a/srcpkgs/ansible-base/template
+++ b/srcpkgs/ansible-base/template
@@ -1,24 +1,11 @@
 # Template file for 'ansible-base'
+# This is a transitional package for ansible-core. Since ansible 4.0.0,
+# ansible-base was deprecated in favor of ansible-core.
 pkgname=ansible-base
-version=2.10.9
+version=2.11.0
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml python3-packaging"
+depends="ansible-core"
 short_desc="Simple deployment, configuration management and execution framework"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://www.ansible.com/"
-distfiles="${PYPI_SITE}/a/ansible-base/ansible-base-${version}.tar.gz"
-checksum=04635d3e08fc29358c76b8e7f1e9db0ce443fb09ce30b2acc6cacaad165f2151
-conflicts="ansible<2.10.1_1"
-make_check=no
-
-post_install() {
-	vsconf examples/ansible.cfg
-	vsconf examples/hosts
-	for m in docs/man/man1/*.1; do
-		vman ${m}
-	done
-}
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
new file mode 100644
index 000000000000..34cf7cbe57a3
--- /dev/null
+++ b/srcpkgs/ansible-core/template
@@ -0,0 +1,24 @@
+# Template file for 'ansible-core'
+pkgname=ansible-core
+version=2.11.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
+ python3-yaml python3-packaging"
+short_desc="Simple deployment, configuration management and execution framework"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://www.ansible.com/"
+distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
+checksum=9470ceb710711eacd75f1bcae802af036ab2a6c2cd5a13bfcb50b2d89667c9c5
+conflicts="ansible<4.0.0"
+make_check=no
+
+post_install() {
+	vsconf examples/ansible.cfg
+	vsconf examples/hosts
+	for m in docs/man/man1/*.1; do
+		vman ${m}
+	done
+}
diff --git a/srcpkgs/ansible-base/update b/srcpkgs/ansible-core/update
similarity index 100%
rename from srcpkgs/ansible-base/update
rename to srcpkgs/ansible-core/update
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 143f1e3f6ea4..d7c2047fcafc 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,14 +1,14 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=3.3.0
+version=4.0.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3 ansible-base"
+depends="python3 ansible-core"
 short_desc="Simple deployment, configuration management and execution framework"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://www.ansible.com/"
 distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=2de5385c48a2a24a19f6cbaccc7d7684c64b6194f9a9b175aba7949d53b07bc9
+checksum=6f67ca5c634e4721d1f8e206dc71d60d1a114d147945355bfc902bd37eb07080
 make_check=no