Merge updates from master

7 files changed, 85 insertions, 101 deletions

diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
index 222adbb1bf05..9d8581c01118 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -2,4 +2,5 @@ DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1
 DIST ansible-core-2.12.10.tar.gz 7762154 BLAKE2B deffcc42c124a40ce34ce9a26a0c400b1199018cb05478ea8860500e1a507f9f604c1f40f0d006682fc14ad8f0cc3d035b8ffb1307ee37d26191be3c68e33253 SHA512 8b4eb0e923f976680e81ffbe942c4ddc7ddaaaffe83d14c20f78f7c6ab4f548f21920cdfa57b48de2bc24683028e744a92ac4ca45fecc459ea2b042de8c40737
 DIST ansible-core-2.13.5.tar.gz 13934317 BLAKE2B 27ac2040f3626d645e57fab4df9b1b6a349fb81bec4cc8bb87b4dd16351f43d71a6210e32e2906346500742be2bf94512a1b05ba95b7ac0dfeac89696dfc9760 SHA512 e57dca7d457cfbf8a805442dd274499e3a6e4652303dc9e838b46c7dba9a36f2262e548bf9b6ff66f4e4bed5fa648abf9bb9a881047d4c6c0d6efbc91269eca2
 DIST ansible-core-2.13.6.tar.gz 13938462 BLAKE2B bf7bbeb5d5f7e27a2d72a61223559f79971aeb86d91688907c629388cf4c2578c88694f6ca23b22b6f8fe50cdaa909b34c05e9756258a062156a1e5d2bcea3b4 SHA512 2a91916e94bf65f76c450e548c6464660ef0e1a62e17f889785cb94c735c2bf153a2d8eff7a0dac90836a523f5768453bf18c4bdf3cbee0f8916d6cd0b11a902
+DIST ansible-core-2.13.7.tar.gz 13940230 BLAKE2B fd3556514f7692b48a66987ff5a084b132217c910ba0b216f2533cd1e542a9b6da6d2aa96e8e32142ab3a6ed7357fc1b68b9827ceaf44b91238bfbcb15b5d026 SHA512 f46d8acb07fa1d397e6e640c52237ed70b575ae0760eeb82b9e41afc6c06d99d341856d6af3452edb82e63a708600c2f348782b8bebc18c0ea9b03a4df80594a
 DIST ansible-core-2.14.0.tar.gz 13988948 BLAKE2B 7b68d72c292d8f3e8fb2d0d66fce0eca1de1b74ec1dc3ecaa2c4b37177d693567272260b3e98c9d81f7ff5e5cc4972dfa1f24c9f5e0119bb1da528388081d5fb SHA512 09e5b45608f7e1f341100dd89a6277a71a5ff0a45244cd6862a10d0f35a993c3cf649a5f9936ac726f7e903269f98a975804418516e602b8dd983bfca23c66cb
diff --git a/app-admin/ansible-core/ansible-core-2.13.7.ebuild b/app-admin/ansible-core/ansible-core-2.13.7.ebuild
new file mode 100644
index 000000000000..3655837bc68d
--- /dev/null
+++ b/app-admin/ansible-core/ansible-core-2.13.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+BDEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		dev-python/botocore[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 45fe5659eac8..fb3ca72855fe 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -2,3 +2,4 @@ DIST ansible-4.6.0.tar.gz 35644507 BLAKE2B 94f544caa81ba7d20493f469483612f2ebf9e
 DIST ansible-5.10.0.tar.gz 36898833 BLAKE2B 5705325c150909e4911cbc6fafb9b6194bcd15cf7a97978835b29cb8b87b671fa888163e28e825d1fc98006c57313677afed63236f4a55af415a70daf5fe305f SHA512 d81b34642533dfaf0c3dba5ecc8ba483efb3d82bd40afa469de2778666e932bec3c20e61ae579184fcbd7f1ec7c8d694617f334ebb3e910db3c9f6709d3b9385
 DIST ansible-6.5.0.tar.gz 38275680 BLAKE2B 5d17ba2b8b3a0ccb1ea9873c0d500ca7984d2d3db19d062807004da5c001ee44d33cd6707226887bef8f6bae0ea9584f8c2c63a8cb176a2244b3b2ad92e13454 SHA512 ddb77304c6a9617186fa0252a0da91632ffc21f910e02fc68e340ed37de0806586a2543700e996db7fb0bb9240a2ee20b7a462f005de200028748b38fbb2e293
 DIST ansible-6.6.0.tar.gz 35620748 BLAKE2B 1e36ff72669902629cf1f373e9816b9d0a3136cb205867a24d67efc27b0ca3f2d361f3017fb1543c46da8693bb165ee6b354388611ab3e3186098513bd49f41d SHA512 51d06386dfb14ef826562dd4991556805d3e6014173965f0541e97b905984208a95889392dd3bb22027060ac767a354d53dfb9de774d5b461b15b236395d6fd1
+DIST ansible-6.7.0.tar.gz 36371372 BLAKE2B 75cb14f158c36ded8313a1c5b798838afdf3a38ffc8e29a87c8e1e3e74c9aeca827432397ad83ed23a1d3aeaaef91822cc3c23aa226a307d93f84f54b25d71bb SHA512 676baf03626d5bf36aea7117d39ef71ba7878ab6bccdec1ee199bd699d559a5f3f6a0d9032ef120204093677b7fbbe1b575529d3aa692acd1a4447f9c2715f3a
diff --git a/app-admin/ansible/ansible-6.7.0.ebuild b/app-admin/ansible/ansible-6.7.0.ebuild
new file mode 100644
index 000000000000..cf0da827da5f
--- /dev/null
+++ b/app-admin/ansible/ansible-6.7.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-core-2.13.0
+	<app-admin/ansible-core-2.14"
+
+python_compile() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+python_install() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_install
+}
diff --git a/sci-mathematics/cadabra/Manifest b/sci-mathematics/cadabra/Manifest
index f0e4cf0aa3a5..517715df8c6b 100644
--- a/sci-mathematics/cadabra/Manifest
+++ b/sci-mathematics/cadabra/Manifest
@@ -1,4 +1,3 @@
-DIST cadabra-2.3.9.3.tar.gz 24685603 BLAKE2B eb76f65898be499eb5abbbaf8ac478a056ffe5801bcf7124be60d1b034f4e88e9999d76354f03e7a2de9b7f7561a32e82699c882be135fb5966614da37526933 SHA512 9a5cdc6a7d824350ef3929c9f21647588891c1376103a57d231c2f5160971e3373b0efb9e050c574ebd51921a3f7d9f230f533a88a44e0dd8e645bf2395a95fe
-DIST cadabra-2.4.0.2.tar.gz 24688084 BLAKE2B 4bc1e00ab87bbdc43dae261e1948b41a6372f90ad394e5208b65b993210ff42e84ed098ad4fcf6d056fc42947b75f970f18a92b67859fd69c8ea3cc18ffb2e9a SHA512 2545f7ba3238944902b413bfbed91d87594d87afe99d1fb61061115b354a6fa29ffb7b71017d790e54080da33aa905d0f9afe0546fb1397144fe7b135e906274
 DIST cadabra-2.4.2.1.tar.gz 25154623 BLAKE2B 99c24728c80c5909df338b9214774123c2aac63e475138b5059c0c7824685827765d7906c17200ab3bad63e08b3637c7eb67b2f25bb3477eab4ca02fcbedbb56 SHA512 9dd280dfaca3cf1def268bca7884b0d00287bba5bfb7b80e8bdf4759f91c83117d146af2a24e05d2a8bdc8a5be412529a805713861a56a7186c35fe07ff8d0db
 DIST cadabra-2.4.2.2.tar.gz 25156757 BLAKE2B 05d4e490d1fa740b3dd505b72d5f4f298e62e234859e81b5bdf865e895ab820b3cd5d6db3ecda1cac0426b031cc5c87428d464bdb66b24cb9b945ababc860a90 SHA512 c5c55abad090d72f981341d94d3e299583f446a4bff1df994a60c740cede9e543b5cdee146dae2a846deec4adf446172e62b0f12deab8c89e7a085ffa7006acf
+DIST cadabra-2.4.3.2.tar.gz 25157173 BLAKE2B 895b91a01f5dedc87294903959ee3aca0234016fce0094f4288c07e2d265f90f834670b9c50dcfa059e46564c773f73f049cf65db74f49932e442d15d68ecd88 SHA512 21c76804442397fa3d5fa407fc74395fc800d01c2a5d84270e9cf3abd875c8ff96e2ba8f8349037797ff4ef3d2b9033c2a1a6af45bb75c3a201acdd7357adb6f
diff --git a/sci-mathematics/cadabra/cadabra-2.3.9.3.ebuild b/sci-mathematics/cadabra/cadabra-2.3.9.3.ebuild
deleted file mode 100644
index a39fec81b21a..000000000000
--- a/sci-mathematics/cadabra/cadabra-2.3.9.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MAJOR=$(ver_cut 1)
-CADABRA=${PN}${MAJOR}
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit xdg-utils python-single-r1 cmake
-
-DESCRIPTION="Field-theory motivated approach to computer algebra"
-HOMEPAGE="https://cadabra.science/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kpeeters/${CADABRA}.git"
-else
-	SRC_URI="https://github.com/kpeeters/${CADABRA}/archive/${PV}.tar.gz
-				-> ${P}.tar.gz"
-	S="${WORKDIR}"/${CADABRA}-${PV}
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${MAJOR}"
-IUSE="gtk +jupyter test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"  # For this version some tests fail.
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/dvipng
-	dev-cpp/glibmm:2
-	dev-db/sqlite:3=
-	dev-libs/boost:=
-	dev-libs/gmp:=[cxx]
-	dev-libs/jsoncpp:=
-	dev-libs/libsigc++:2
-	dev-texlive/texlive-basic
-	$(python_gen_cond_dep '
-		dev-python/gmpy:2[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-		jupyter? ( dev-python/jupyter[${PYTHON_USEDEP}] )
-	')
-	gtk? ( dev-cpp/gtkmm:3.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')"
-
-PATCHES=( "${FILESDIR}"/${CADABRA}-CMake.patch )
-
-DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md JUPYTER.rst README.rst )
-
-# Because we do not want to pull in "_XDG_DEPEND" dependencies with USE="-gtk"
-xdg_update() {
-	if use gtk ; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-src_prepare() {
-	# Clean postinst script which calls libtool and icon-cache update
-	echo '#!/bin/sh' > "${S}"/config/postinst.in || die
-
-	# Fix "PYTHON_EXECUTABLE" in Jupyter kernel
-	sed -i "s|@PYTHON_EXECUTABLE@|${EPYTHON}|"  \
-		"${S}"/jupyterkernel/kernelspec/kernel.json.in || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_SYSTEM_JSONCPP=ON
-		-DPACKAGING_MODE=ON
-		-DUSE_PYTHON_3=ON
-		-DBUILD_AS_CPP_LIBRARY=OFF
-		-DENABLE_JUPYTER=OFF  # special Xeus Jupyter kernel (uses xtl)
-		-DENABLE_MATHEMATICA=OFF
-		-DINSTALL_TARGETS_ONLY=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DENABLE_FRONTEND=$(usex gtk)
-		-DENABLE_PY_JUPYTER=$(usex jupyter)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_update
-}
-
-pkg_postrm() {
-	xdg_update
-}
diff --git a/sci-mathematics/cadabra/cadabra-2.4.0.2.ebuild b/sci-mathematics/cadabra/cadabra-2.4.3.2.ebuild
index c3b86c9b872e..c3b86c9b872e 100644
--- a/sci-mathematics/cadabra/cadabra-2.4.0.2.ebuild
+++ b/sci-mathematics/cadabra/cadabra-2.4.3.2.ebuild