gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 81 deletions

diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 4d09626f4cfd..b637cad0adae 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,3 @@
-DIST conan-1.19.2.tar.gz 944360 BLAKE2B 190cc2a7dbe25420ae1a6b46705078301cdf1deea2b4be3d1244ade84d27250688e2c26cd5d172d4dab68557d758a2afcfebf37c323e42f0b4514455488903d8 SHA512 e9b868561465bda28314813d4114cb2b6b97440f7683c4c91911ed51b8cb06675b37807c28aaed62d5f7b470ce9040929ad61e0e148c04b0fdba7300cb633b5d
-DIST conan-1.21.1.tar.gz 989780 BLAKE2B 2869ff0ee5df78d8b503a3d19e5a9ad8f5ffade5cbebf45a2b494e79c2765214d917e26494fc4585f02a613df2c7cd6eba67e74615b43443340f4d2a9406435d SHA512 7afc9ef6f073d38ffbfd51914758673daa4836d66c8785af393f601a81985a852d0f65807dbe07d3d7e826c76f4e1d78bdd4c748891ec1ed415a4ccea06f5f22
-EBUILD conan-1.19.2.ebuild 2466 BLAKE2B a8e952d7cba17b9f45d6f5b27beb56ef9f2e56a78894d4e08683be7e31121b3fbcde8f942d8d23406aa77178d02783077e5c4e33f45458fb9e17a50a38f50f8e SHA512 6ad1610a5bf0d752abe69d627c30363fedf5ae4708b6fcf37dca85d4e94d1c94850b47fe8588455a83e90e6a9056a9c66c30ab8e371c861436d82e71511c1797
-EBUILD conan-1.21.1-r1.ebuild 2405 BLAKE2B 0920cba1e65a77f711bb0b6f3476fb9e385b814a9dfc730a051a8679ceac398d86e95c44b3c83d4346e1918d41261f56ebab0b4d9f4c715b549452a1b6977400 SHA512 24e0e52584af9f7e1cffb1674bf55c944780e9091fd07beac9078e2532dbe5999eadc78e8bc486db9e63de1d944614c261debcbbf3c7b1a1d52eaceb0f8eb676
+DIST conan-1.23.0.tar.gz 1024905 BLAKE2B cfa3e130be13ee175b1dc167b6d61666eddaf588b5954d9889c2d167806e8fb115290257ca839f6de407c87079472dba912b730e01a232d70375f2fe63ce7c28 SHA512 fa2b1b726e29ef553774267b50b0ace4f39a30bdf0a6d0e051576bc9b0e6cd1ed6cb166101c446d15734ebef9e89e17a101c10c0ead91c15de5aa1ebb102d0a8
+EBUILD conan-1.23.0.ebuild 2405 BLAKE2B 0920cba1e65a77f711bb0b6f3476fb9e385b814a9dfc730a051a8679ceac398d86e95c44b3c83d4346e1918d41261f56ebab0b4d9f4c715b549452a1b6977400 SHA512 24e0e52584af9f7e1cffb1674bf55c944780e9091fd07beac9078e2532dbe5999eadc78e8bc486db9e63de1d944614c261debcbbf3c7b1a1d52eaceb0f8eb676
 MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
diff --git a/dev-util/conan/conan-1.19.2.ebuild b/dev-util/conan/conan-1.19.2.ebuild
deleted file mode 100644
index 784afa385e65..000000000000
--- a/dev-util/conan/conan-1.19.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-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/astroid-1.6.5[${PYTHON_USEDEP}]
-	>=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-1.16[${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/pylint-2.3.1[${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.10[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.1.0[${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==1.16:patch>=1.16:g" \
-		-e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \
-		-e "s:future==0.16.0:future>=0.16.0: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 \
-		-A "not rest_api and not local_bottle" || die
-}
diff --git a/dev-util/conan/conan-1.21.1-r1.ebuild b/dev-util/conan/conan-1.23.0.ebuild
index c7272407e629..c7272407e629 100644
--- a/dev-util/conan/conan-1.21.1-r1.ebuild
+++ b/dev-util/conan/conan-1.23.0.ebuild