gentoo auto-resync : 09:04:2023 - 05:33:50

4 files changed, 133 insertions, 4 deletions

diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
index a0fae54f750a..308d7b56ea66 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -1,8 +1,9 @@
+AUX resolvelib.patch 5731 BLAKE2B fdc0660ea786e02475e7e9735de6493cd6b96048c238ee050d1751a46cce12048112e495e1de48e1d1bb41d5d4415b16dfe294621bd0f6bbb0786c3df52dd35b SHA512 baf5f8c42c85628dffda987dc81b98f56f1a60857f4cc9e6f1b9938f4978d1ba4d84dc7904685dbe02e19a4b91a7a2f979772bbdd42268e6754bcd5208e40d37
 DIST ansible-core-2.13.8.tar.gz 13985893 BLAKE2B c0fd9ebde2dacd590588a654df29ed56e681ee67f3df41f1d1e91351259c22a0b01f0eb108763596198133e4d980c2130317f79d4f8f25ea1e36dac9325a8b40 SHA512 a3abeaca7076a590892b31735c901447654b5f1db59ca3095ad1d98c8de11b982e1375a22f1814712545fe84a870f57132d87c2ca47fa6a779bd53cd99d17ba4
 DIST ansible-core-2.14.3.tar.gz 11516886 BLAKE2B 95c209842c1ccd090467e529f8c84def76cb3df69863b02c01f61a1ac6d4fa911134cc336e51e087215939efa91883ad51d4c01d2b3f4c124b82c540ab0e3be0 SHA512 95278d9c55d3eef2f66db1ee62648b5493e138f19513c32780684c55631c1ec49f94988a8d0f5eede44dbcceca7b4dd34aca10fa67d17dbe90ef8cf37051581d
 DIST ansible-core-2.14.4.tar.gz 11589961 BLAKE2B ae096debaf676dbd46cb047f0f87af5d09b4265368500964bbd0cf3ac8e58969bee489d66486fb570a697df5b22065fae206f1df361eb911a7fe025628655371 SHA512 86164dfded15232174e4f11140a71b91ef5b0d93b40a2df9588930b4b955f20feb419258c2bbf9d6735d298ec626c88c5e9b1c933a51e3273a28b85fac7a3762
 EBUILD ansible-core-2.13.8.ebuild 1325 BLAKE2B ca6bdb1f2b9eb14c94a4e443f02751f41e1ddf9eaec7e46ed91ebfb2fc9a77ed3d4d9bfef2bc9fd92e9ec6fe707a4854ddb0fdfd457d8859a5dd48da4783313e SHA512 380e6c95b884d493f0de5a6a721a2fbe02bc5ac99b9de8e8a2b7be901c9510b5d7f9f876352a2ff0fe553da03d50d5e55275135a899cc3f7a8e88e1bd8db714c
 EBUILD ansible-core-2.14.3.ebuild 1306 BLAKE2B 6305f4d4d83b581a94f7bb9e8501e541327c489215eeb2db26dd99086d25b8109a4cba21f982c67f04e978b7fd39d46a0ddb922ec503e60d6ff967ee1fcb9a18 SHA512 96b4ed14b611917f26c5eef7a618c9b6aeb3d84eda44f3292bdc448d50259a4c8618137ab655f326f49824695e0fb8e057109e68b5129c89e1d05df75e868958
-EBUILD ansible-core-2.14.4.ebuild 1309 BLAKE2B f3adc97a33c27b02a57ffa48d078f19368f12e659fd5c9e27b101df8018931866b6885c7312ffea16fab79f7657fa0558f0c0d6bbc8fb978366c7a42ad83dddc SHA512 dc7eb766d7e3cb23400df9fd194bd5745cec05d73869ea900378d4ef1495e5722d96188cd8f1ff44d53df2759a8738c7d50584a71f0b8a7de5f1e981b34c9cd4
-EBUILD ansible-core-9999.ebuild 1309 BLAKE2B f3adc97a33c27b02a57ffa48d078f19368f12e659fd5c9e27b101df8018931866b6885c7312ffea16fab79f7657fa0558f0c0d6bbc8fb978366c7a42ad83dddc SHA512 dc7eb766d7e3cb23400df9fd194bd5745cec05d73869ea900378d4ef1495e5722d96188cd8f1ff44d53df2759a8738c7d50584a71f0b8a7de5f1e981b34c9cd4
+EBUILD ansible-core-2.14.4-r1.ebuild 1354 BLAKE2B b338058c316d4c5ba00e2af886f80b0d30e2d35b21e7c761a9ae4c07a0a538f04980c19de72eb19f8a3267482c3c6a50b8a3bdaaca42c101e84cae71439f53d7 SHA512 fb2b58338c253cde83c375882cc648a8dc7930408f3e235b146144b067ce754f2bbfcb8e1de8429e13d2eb693fa68f7bac89cbe1861c10424d26057ebd020936
+EBUILD ansible-core-9999.ebuild 1309 BLAKE2B 5288758a95f5be33854ed6093801b954adbd067213b825eefb2ac56945f15cef99aae4d82e87de8af26b48068b0a98f424a12861efff111c2007e2f1f1d61420 SHA512 c9c81036d86440c692ccf304c229caa8929d1e34519831d62b627141192d33cf832462b3ef2fbe65ac8351f4b56cd3b3f898e0c829b45b5440a0753a88f0fc1e
 MISC metadata.xml 1042 BLAKE2B bf5f9a6d7f2b7a0465332ce47a343566749ac3e6b8c29d37c21140c69e56a3c58ba2bc6335b6839da43993dc427a12350506dc55b0f727856f16b173c0df90a4 SHA512 4adc7776bc6f02d91f2229ea96566e94b1e8155f75bac27d7391f87d6fc3100da425235f2c02dccd1ce7534abc9c30be0ab5a15ec9dc4278463f10dcf95e8b4d
diff --git a/app-admin/ansible-core/ansible-core-2.14.4.ebuild b/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild
index e9f5858cfb36..66c67a2e2ac7 100644
--- a/app-admin/ansible-core/ansible-core-2.14.4.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild
@@ -25,6 +25,10 @@ LICENSE="GPL-3"
 SLOT="0"
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/resolvelib.patch"
+)
+
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
@@ -35,7 +39,7 @@ RDEPEND="
 	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}]
+	<dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
 "
diff --git a/app-admin/ansible-core/ansible-core-9999.ebuild b/app-admin/ansible-core/ansible-core-9999.ebuild
index e9f5858cfb36..31aa6a3c7556 100644
--- a/app-admin/ansible-core/ansible-core-9999.ebuild
+++ b/app-admin/ansible-core/ansible-core-9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	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}]
+	<dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
 "
diff --git a/app-admin/ansible-core/files/resolvelib.patch b/app-admin/ansible-core/files/resolvelib.patch
new file mode 100644
index 000000000000..c38f10945d52
--- /dev/null
+++ b/app-admin/ansible-core/files/resolvelib.patch
@@ -0,0 +1,124 @@
+From e30959723a9603ff94bc18ba58ee3adbf305a6b6 Mon Sep 17 00:00:00 2001
+From: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
+Date: Sun, 12 Mar 2023 23:27:41 +0800
+Subject: [PATCH] ansible-galaxy - support `resolvelib >= 0.5.3, < 1.1.0`
+
+<https://pypi.org/project/resolvelib/1.0.1> released on 2023-03-09:
+
+-   <https://github.com/sarugaku/resolvelib/blob/main/CHANGELOG.rst#101-2023-03-09>
+-   <https://github.com/sarugaku/resolvelib/releases/tag/1.0.1>
+
+Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
+---
+ changelogs/fragments/80196-resolvelib_lt_1_1_0.yml    | 2 ++
+ lib/ansible/galaxy/dependency_resolution/providers.py | 4 ++--
+ requirements.txt                                      | 2 +-
+ test/lib/ansible_test/_data/requirements/ansible.txt  | 2 +-
+ test/sanity/code-smell/docs-build.requirements.in     | 2 +-
+ test/sanity/code-smell/docs-build.requirements.txt    | 2 +-
+ test/sanity/code-smell/package-data.requirements.in   | 2 +-
+ test/sanity/code-smell/package-data.requirements.txt  | 2 +-
+ 8 files changed, 10 insertions(+), 8 deletions(-)
+ create mode 100644 changelogs/fragments/80196-resolvelib_lt_1_1_0.yml
+
+diff --git a/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml b/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml
+new file mode 100644
+index 00000000000000..6fd419f0d4f929
+--- /dev/null
++++ b/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml
+@@ -0,0 +1,2 @@
++minor_changes:
++  - ansible-galaxy - support ``resolvelib >= 0.5.3, < 1.1.0``.
+diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py
+index d52006b24d7a77..1dcaf1c8d2cff1 100644
+--- a/lib/ansible/galaxy/dependency_resolution/providers.py
++++ b/lib/ansible/galaxy/dependency_resolution/providers.py
+@@ -42,7 +42,7 @@ class AbstractProvider:  # type: ignore[no-redef]
+ 
+ # TODO: add python requirements to ansible-test's ansible-core distribution info and remove the hardcoded lowerbound/upperbound fallback
+ RESOLVELIB_LOWERBOUND = SemanticVersion("0.5.3")
+-RESOLVELIB_UPPERBOUND = SemanticVersion("0.9.0")
++RESOLVELIB_UPPERBOUND = SemanticVersion("1.1.0")
+ RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version))
+ 
+ 
+@@ -220,7 +220,7 @@ def get_preference(self, *args, **kwargs):
+             Mapping of identifier, list of named tuple pairs.
+             The named tuples have the entries ``requirement`` and ``parent``.
+ 
+-        resolvelib >=0.8.0, <= 0.8.1
++        resolvelib >=0.8.0, <= 1.0.1
+ 
+         :param identifier: The value returned by ``identify()``.
+ 
+diff --git a/requirements.txt b/requirements.txt
+index d096901ec2bcdb..a07aa985063b6a 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -15,4 +15,4 @@ importlib_resources >= 5.0, < 5.1; python_version < '3.10'
+ # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
+ # NOTE: When updating the upper bound, also update the latest version used
+ # NOTE: in the ansible-galaxy-collection test suite.
+-resolvelib >= 0.5.3, < 0.9.0  # dependency resolver used by ansible-galaxy
++resolvelib >= 0.5.3, < 1.1.0  # dependency resolver used by ansible-galaxy
+diff --git a/test/lib/ansible_test/_data/requirements/ansible.txt b/test/lib/ansible_test/_data/requirements/ansible.txt
+index d096901ec2bcdb..a07aa985063b6a 100644
+--- a/test/lib/ansible_test/_data/requirements/ansible.txt
++++ b/test/lib/ansible_test/_data/requirements/ansible.txt
+@@ -15,4 +15,4 @@ importlib_resources >= 5.0, < 5.1; python_version < '3.10'
+ # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
+ # NOTE: When updating the upper bound, also update the latest version used
+ # NOTE: in the ansible-galaxy-collection test suite.
+-resolvelib >= 0.5.3, < 0.9.0  # dependency resolver used by ansible-galaxy
++resolvelib >= 0.5.3, < 1.1.0  # dependency resolver used by ansible-galaxy
+diff --git a/test/sanity/code-smell/docs-build.requirements.in b/test/sanity/code-smell/docs-build.requirements.in
+index 80e8f66bc7f6fb..9209dd34ebecdf 100644
+--- a/test/sanity/code-smell/docs-build.requirements.in
++++ b/test/sanity/code-smell/docs-build.requirements.in
+@@ -1,6 +1,6 @@
+ jinja2
+ pyyaml
+-resolvelib < 0.9.0
++resolvelib < 1.1.0
+ sphinx == 4.2.0
+ sphinx-notfound-page
+ sphinx-ansible-theme
+diff --git a/test/sanity/code-smell/docs-build.requirements.txt b/test/sanity/code-smell/docs-build.requirements.txt
+index 663e2c6c53d28a..7b4d563574c595 100644
+--- a/test/sanity/code-smell/docs-build.requirements.txt
++++ b/test/sanity/code-smell/docs-build.requirements.txt
+@@ -27,7 +27,7 @@ Pygments==2.14.0
+ pytz==2022.2.1
+ PyYAML==6.0
+ requests==2.28.1
+-resolvelib==0.8.1
++resolvelib==1.0.1
+ rstcheck==3.5.0
+ semantic-version==2.10.0
+ sh==1.14.3
+diff --git a/test/sanity/code-smell/package-data.requirements.in b/test/sanity/code-smell/package-data.requirements.in
+index acec62eff91ff8..50e8568c5cf8bc 100644
+--- a/test/sanity/code-smell/package-data.requirements.in
++++ b/test/sanity/code-smell/package-data.requirements.in
+@@ -1,6 +1,6 @@
+ docutils < 0.18  # match version required by sphinx in the docs-build sanity test
+ jinja2
+ pyyaml  # ansible-core requirement
+-resolvelib < 0.9.0
++resolvelib < 1.1.0
+ rstcheck < 4  # match version used in other sanity tests
+ antsibull-changelog
+diff --git a/test/sanity/code-smell/package-data.requirements.txt b/test/sanity/code-smell/package-data.requirements.txt
+index 6411020e47c67b..afc3cd6418e84d 100644
+--- a/test/sanity/code-smell/package-data.requirements.txt
++++ b/test/sanity/code-smell/package-data.requirements.txt
+@@ -5,7 +5,7 @@ Jinja2==3.1.2
+ MarkupSafe==2.1.1
+ packaging==21.3
+ pyparsing==3.0.9
+ PyYAML==6.0
+-resolvelib==0.8.1
++resolvelib==1.0.1
+ rstcheck==3.5.0
+ semantic-version==2.10.0
+ types-docutils==1.5.0