gentoo resync : 18.11.2019

3 files changed, 34 insertions, 22 deletions

diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 59897bf6feb4..abd6130aec72 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,4 +1,5 @@
 DIST conan-1.18.1.tar.gz 532813 BLAKE2B d4c8ec62100b8c4038f9bef8338aa0afccc38ab39d8d953c41934efc43d6ba8e5abda1438e3f8c3f4bba4b770b871a1afc5ef19749771a55873b35f28a427b1b SHA512 f9c4c4cb768c3f015a84adb3d4926cf91a372a8dae6655df9396b645c24c8694f47795064c0e93ee799864d19f6f77983da0a1679ad511d8f11702250ae95124
-EBUILD conan-1.18.1-r1.ebuild 2125 BLAKE2B 75ff8ec78323e05ca876ece3ef3d8a2c8d7b63f0f5ace559bcc1aa77e9071150dbbeec4eb853bf7b5f6c844b8b5d8f7c3ce85a932d63d5dda2d9a4f1a02ab76f SHA512 f19fc00d9b34a65a0c9e9c97b3029433dbe2471eddd91f4af119f00fc47832d1c2126194027f9f8ec2ad30e5b2fe4ef9e972e959ba00ac83d3f26f8bcadeaeb7
-EBUILD conan-1.18.1.ebuild 1957 BLAKE2B 3e33f1d58e6bcccd4fc02c6ecd6a28afe33106bf532c90e85958a385dbf610b19c3bdc4f74d861ddb9f6459a4adaa57d14bf5b88ce9f844d1d57c394aa80b2d2 SHA512 2c77ea4a0223e62a9f211b99622598becaeeed8010152fa1a469939e5b74ee3b7856cbc8b9f3da1ca1fc280c898fb6da3e1e55a8bd07a15cd06df641d8f718e1
+DIST conan-1.19.2.tar.gz 944360 BLAKE2B 190cc2a7dbe25420ae1a6b46705078301cdf1deea2b4be3d1244ade84d27250688e2c26cd5d172d4dab68557d758a2afcfebf37c323e42f0b4514455488903d8 SHA512 e9b868561465bda28314813d4114cb2b6b97440f7683c4c91911ed51b8cb06675b37807c28aaed62d5f7b470ce9040929ad61e0e148c04b0fdba7300cb633b5d
+EBUILD conan-1.18.1-r1.ebuild 2153 BLAKE2B 1013cd95766fb0f682e7b6c9a7f98353fe56a6c5603003ed3018b6a89eefd4b9772832baf615d69748371a1ed5b25a9c9d713e0041f727c7976065af5dc4c0fd SHA512 e0629e9f020f2c277da9b2e2d9c7af5cd52f7a7fd8795b581e085b45427221ecf9f1bbcc95208869259c1fbcd99044c0edac9fb3d469d4daeca0f9ac8722c121
+EBUILD conan-1.19.2.ebuild 2470 BLAKE2B 771276957b7fc7c276f3d6d158c8c0a0bb18d1970dddf236219d07700cb4a51f9399d88241ac2a25aa75925ca835f338381f12c009a09cd63c926ad235aaa4cb SHA512 a3ca61ee0f6e80732bcd0692ab0143001e0f2c3026afe91b9181c5599483776ebb6fa0061d9cfc2f01620a59212340b4acc90003a5c583ff7c45f7c42e445ddf
 MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
diff --git a/dev-util/conan/conan-1.18.1-r1.ebuild b/dev-util/conan/conan-1.18.1-r1.ebuild
index 35a7c3ffe908..c026c884daf6 100644
--- a/dev-util/conan/conan-1.18.1-r1.ebuild
+++ b/dev-util/conan/conan-1.18.1-r1.ebuild
@@ -17,6 +17,8 @@ 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
diff --git a/dev-util/conan/conan-1.18.1.ebuild b/dev-util/conan/conan-1.19.2.ebuild
index 150071e1dc00..c640b3e36bfa 100644
--- a/dev-util/conan/conan-1.18.1.ebuild
+++ b/dev-util/conan/conan-1.19.2.ebuild
@@ -10,43 +10,48 @@ inherit distutils-r1
 
 DESCRIPTION="Distributed C/C++ package manager"
 HOMEPAGE="https://conan.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+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/pyjwt-1.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	>=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/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/patch-1.16[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	>=dev-python/node-semver-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/deprecation-2.0[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pylint-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
 	>=dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/astroid-1.6.5[${PYTHON_USEDEP}]
-	>=dev-python/deprecation-2.0[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.28.1[${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}]
 "
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
-		${RDEPEND}
 		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/nose-parameterized-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/parameterized-0.6.3[${PYTHON_USEDEP}]
 		>=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
 		dev-util/cmake
 	)
@@ -59,10 +64,14 @@ src_prepare() {
 		-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
+		conans/requirements.txt || die
 }
 
 python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	PYTHONPATH=. nosetests -v . || die
+	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
 }