gentoo resync : 25.08.2020

3 files changed, 5 insertions, 80 deletions

diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index f2488da5745c..8a95479a7503 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,3 @@
-DIST conan-1.23.0.tar.gz 1024905 BLAKE2B cfa3e130be13ee175b1dc167b6d61666eddaf588b5954d9889c2d167806e8fb115290257ca839f6de407c87079472dba912b730e01a232d70375f2fe63ce7c28 SHA512 fa2b1b726e29ef553774267b50b0ace4f39a30bdf0a6d0e051576bc9b0e6cd1ed6cb166101c446d15734ebef9e89e17a101c10c0ead91c15de5aa1ebb102d0a8
-DIST conan-1.24.1.tar.gz 1043698 BLAKE2B 33e5aaa975a9819d0808c90ad97260b00aab6f4ae8ba6feb7d2c53622f0e72b87cc469c7c21994e2c228819bd364dc9b20822134c10665978bf996b653c014b9 SHA512 ab6e15c4291862d9d68661682ec9da8c126193ddb00b800e3d8f9dba07a516db307d22e590324ae3f059e39e897bc6bf590e53cc82d69431ce287031be7fe820
-EBUILD conan-1.23.0.ebuild 2405 BLAKE2B 0920cba1e65a77f711bb0b6f3476fb9e385b814a9dfc730a051a8679ceac398d86e95c44b3c83d4346e1918d41261f56ebab0b4d9f4c715b549452a1b6977400 SHA512 24e0e52584af9f7e1cffb1674bf55c944780e9091fd07beac9078e2532dbe5999eadc78e8bc486db9e63de1d944614c261debcbbf3c7b1a1d52eaceb0f8eb676
-EBUILD conan-1.24.1.ebuild 2347 BLAKE2B d1de907aec75daae75f3b5f06b227a6ba4983ff632c23551bead61caecac0a5f5b45e03451cae278d2e9202b785e7e0780e67d1755a9cced494928f92f8b8095 SHA512 331d6ee2a7d3fc563d9d3a4eb17392a46863164b57562b28f881616b78cea9a20e979e958c242226a95283baf1b5145d0affd20024be693ee04c06b93e98c3cd
+DIST conan-1.28.0.tar.gz 1135799 BLAKE2B 774f980b489bc2ee7973447829ac2f9062198ec85a1129e3cfcf34a490b969cb5c04546a8918b542bc15e429d75d8e7fe3bc29f9cd5c6cebb6f7270a921a47f2 SHA512 1366f37d774bcaeadaf27f459d9a3889424a21ad14cc0e59f978ccf77a2d4e1f3497e98533e325fe086735b9bdaee64fd2df6c228e62d7577533142ab28401c8
+EBUILD conan-1.28.0.ebuild 2467 BLAKE2B 49613a3e8404b0c78445740ee6951db73f6fa2c651a46e2c3e8e0ce3a629fe5b1c84417499c00587f1766f68718265f05174d01ba516d33344ace26793f3233f SHA512 4fce3d75d655146adfb2b3fdd7f78fb5e5890da4390941404bae5e355e9bfa34750b0e060875c18e7a6ba3f8d5bc240e6586755ab43cb0d9485f82ff6212e115
 MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
diff --git a/dev-util/conan/conan-1.23.0.ebuild b/dev-util/conan/conan-1.23.0.ebuild
deleted file mode 100644
index c7272407e629..000000000000
--- a/dev-util/conan/conan-1.23.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_{6,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"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-# 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.2[${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}]
-"
-BDEPEND="
-	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:patch-ng==1.17.2:patch-ng>=1.17.2:g" \
-		-e "s:six>=1.10.0,<1.13.0:six>=1.12.0:g" \
-		-e "s:node-semver==0.6.1:node-semver>=0.6.1: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 virtualenv_test \
-		-A "not rest_api and not local_bottle" || die
-}
diff --git a/dev-util/conan/conan-1.24.1.ebuild b/dev-util/conan/conan-1.28.0.ebuild
index 5cedb0a5c462..f56e6bee76f3 100644
--- a/dev-util/conan/conan-1.24.1.ebuild
+++ b/dev-util/conan/conan-1.28.0.ebuild
@@ -57,8 +57,9 @@ src_prepare() {
 	default
 	# Fix strict dependencies
 	sed -i \
-		-e "s:six>=1.10.0,<1.14.0:six>=1.12.0:g" \
+		-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
 }
 
@@ -68,6 +69,7 @@ python_test() {
 		-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
 }