gentoo resync : 15.06.2021

3 files changed, 9 insertions, 106 deletions

diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 6558b8d8b765..89aeb5846b9c 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,3 @@
-DIST conan-1.28.0.tar.gz 1135799 BLAKE2B 774f980b489bc2ee7973447829ac2f9062198ec85a1129e3cfcf34a490b969cb5c04546a8918b542bc15e429d75d8e7fe3bc29f9cd5c6cebb6f7270a921a47f2 SHA512 1366f37d774bcaeadaf27f459d9a3889424a21ad14cc0e59f978ccf77a2d4e1f3497e98533e325fe086735b9bdaee64fd2df6c228e62d7577533142ab28401c8
-DIST conan-1.28.1.tar.gz 1138639 BLAKE2B 91f277b88a2069efa3ad5f6209279888b4ac8cf5c359b7933ace6cc08c8b61a868dc8f7bb6a817fbdea378ce175229c91c9defb750326e2a5e31c4d6d528985d SHA512 b8eb4fe34b1614ebcb5e15bd0a827c5949e8588c6a04380632858e68eb4172361c96305154cc5a630254ed6236d7fd82e3a2c05962e312af3cedba41eac0a6e3
-EBUILD conan-1.28.0.ebuild 2463 BLAKE2B a7783520d53cd295fcf3ceeecc1f81c3eec33dfee2c00ae031e5fcfccb6025100d3c8e5606dd747560e466da3bd121c25594d442fc58f03a45a31e915a6a1910 SHA512 1cedc6f6ef4326d20c10eedcc43ba5646f352d494c094842ff00612778edc30f0b11509c229f2708c6ecb93ba333c8ce0e25b874d4421e2ebe79952acdc88d60
-EBUILD conan-1.28.1.ebuild 2490 BLAKE2B 89d467c461604d9636e771e5ed2fc06eeae74e835028e760e1977f31d7206141b8a06721a70c36b60d74014a88e50ec3e656cfed395acf740d15833b675648ba SHA512 b9ebe84ab7326f0ff432926763304c35ce7e394f0b590f06ea674d5a9c1c2784cf4430b7d32e4280e3bb732a72790c26fd62284c6d7b9ed5f3b8b0efbf542538
+DIST conan-1.36.0.tar.gz 1283280 BLAKE2B 024b94debd899adcc561713111494a49822cc721b3da022c34c5625454cc5d80ffdcc2ce6375ee4c719fecc2b0d4771191862a83b74613019b680662304c6761 SHA512 d1259a83795877bd9730e735a5cbea9457b3160d0f358e46a672fcd20c794feb2fa24970efdddc4ca1be8f1299db45793cf5bc7724d259bbf4f8f6a0e502f5a6
+EBUILD conan-1.36.0.ebuild 1871 BLAKE2B 5e815fa2ee82eecb8ab594846eb0d0c896aa9e286b8c6b19b9e490f39bf6ed9eaded3fd77491e8d66d85d6073abd6689f89e6ddd1637e8dcec4704d696cc8585 SHA512 2f7ed222ed5f84bebd75ef897652e42a545b0f14ce799e06482bd0cf8ca643bac78d0910815d9f7dbd6cb4aaa991792bf59dfcb188015eb16b403a20b49d78a3
 MISC metadata.xml 769 BLAKE2B 912e435ff8d086998d1bd865a7162d5a99d3a0ef37ee7d6fec986cd9b01cb2c391d2cf1f0a51ee4fccfab5ef779aa03d65858dbe008e6dad3e260f90d2f6ee54 SHA512 5730a569221578910854ed135c963a6fa60cca712e48818cb7fdf97da1d57fa83f64ddad9b4ae994b6ec6d59071e98526fc6a905d43f7088dc1ff99a586b95f1
diff --git a/dev-util/conan/conan-1.28.0.ebuild b/dev-util/conan/conan-1.28.0.ebuild
deleted file mode 100644
index 1b0a14cfa2e8..000000000000
--- a/dev-util/conan/conan-1.28.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Distributed C/C++ package manager"
-HOMEPAGE="https://conan.io/"
-SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-# overly strict requirements?
-# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
-# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt
-RDEPEND="
-	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/deprecation-2.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/node-semver-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
-	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-DEPEND+="
-	test? (
-		dev-lang/go
-		dev-vcs/git
-		dev-vcs/subversion
-		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-		>=dev-python/parameterized-0.6.3[${PYTHON_USEDEP}]
-		>=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
-		dev-util/cmake
-	)
-"
-
-src_prepare() {
-	default
-	# Fix strict dependencies
-	sed -i \
-		-e "s:six>=1.10.0,<=1.14.0:six>=1.12.0:g" \
-		-e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \
-		-e "s:distro>=1.0.2, <1.2.0:distro>=1.0.2:g" \
-		conans/requirements.txt || die
-}
-
-python_test() {
-	nosetests -v conans.test \
-		-e test_ftp.* -e modify_values_test.* -e test_pkg_config_path.* \
-		-e rpath_optin_test -e test_variables -e system_package_tool_installed_test \
-		-e virtualbuildenv_test -e scm_test -e test_git_shallow -e tools_test \
-		-e test_environment_nested -e devflow_test -e shared_chain_test \
-		-e test_toolchain_linux_0_Debug -e test_toolchain_linux_1_Release \
-		-e virtualenv_test \
-		-A "not rest_api and not local_bottle" || die
-}
diff --git a/dev-util/conan/conan-1.28.1.ebuild b/dev-util/conan/conan-1.36.0.ebuild
index 1d9e06b6f8bc..a90e3576695a 100644
--- a/dev-util/conan/conan-1.28.1.ebuild
+++ b/dev-util/conan/conan-1.36.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
@@ -37,22 +37,13 @@ RDEPEND="
 	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
 	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.7[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.8[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests nose
-DEPEND+="
-	test? (
-		dev-lang/go
-		dev-vcs/git
-		dev-vcs/subversion
-		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-		>=dev-python/parameterized-0.6.3[${PYTHON_USEDEP}]
-		>=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
-		dev-util/cmake
-	)
-"
+# Try to fix it if you're brave enough
+# Conan requires noumerous external toolchain dependencies with restricted
+# versions and cannot be managable outside of a pure CI environment.
+RESTRICT="test"
 
 src_prepare() {
 	default
@@ -62,14 +53,3 @@ src_prepare() {
 		-e 's:==:>=:g' \
 		conans/requirements{,_server}.txt || die
 }
-
-python_test() {
-	nosetests -v conans.test \
-		-e test_ftp.* -e modify_values_test.* -e test_pkg_config_path.* \
-		-e rpath_optin_test -e test_variables -e system_package_tool_installed_test \
-		-e virtualbuildenv_test -e scm_test -e test_git_shallow -e tools_test \
-		-e test_environment_nested -e devflow_test -e shared_chain_test \
-		-e test_toolchain_linux_0_Debug -e test_toolchain_linux_1_Release \
-		-e virtualenv_test -e link_order_test -e test_version \
-		-A "not rest_api and not local_bottle" || die
-}