gentoo resync : 18.08.2019

3 files changed, 73 insertions, 3 deletions

diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 2e1ed4fd7524..e406b1cc4ab9 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,3 +1,5 @@
 DIST conan-1.0.4.tar.gz 580404 BLAKE2B a3099e7f5bdb882591bab031da267f3df5582975d93a840cd7bf42d7b5b57850d42a28ea33440f6570149b7db8c2ae6a395460f375fee084a9336435d42e7df6 SHA512 47fe9632b0007cdc0456004e6c9122df387869c33b58694b4a2dca9956daf977532f79c204207b21d3a4e7d90337a25dba49cf84cba98c1f9bde3170f1a185a9
+DIST conan-1.18.1.tar.gz 532813 BLAKE2B d4c8ec62100b8c4038f9bef8338aa0afccc38ab39d8d953c41934efc43d6ba8e5abda1438e3f8c3f4bba4b770b871a1afc5ef19749771a55873b35f28a427b1b SHA512 f9c4c4cb768c3f015a84adb3d4926cf91a372a8dae6655df9396b645c24c8694f47795064c0e93ee799864d19f6f77983da0a1679ad511d8f11702250ae95124
 EBUILD conan-1.0.4-r1.ebuild 1612 BLAKE2B c8ad7f6357da3783488241aedfee8414d9ece36cdd2313dc4d765413eb509f995ea1229211ef755191cec69cee6d9a1c3df64f9b49bc0f9dce7d86a790e3eb4f SHA512 0d41b2e92bcead2243fdc18181202302490a5d2a53ca660036049b46fe4b770c8e961e5872227e44f2d606d61771036a7a5a93aa894b94acdcf3bb5555956722
-MISC metadata.xml 735 BLAKE2B 0897f7e1776d123435a6843abf5f61168f1d089ed0bc3e62497961e552ba6e5826c1e09a77dcf5760f8559417c5db850455caa12cf0c8f77684abdaaabc55d06 SHA512 410e22e6701f402d13447f034e0c72180ca739fac1c18efc0b52739c9d11aea90125db1f732d5811ac798d9d74a2d7616c18bd779321ec4d8bbaf67a8a1d93dc
+EBUILD conan-1.18.1.ebuild 1957 BLAKE2B 3e33f1d58e6bcccd4fc02c6ecd6a28afe33106bf532c90e85958a385dbf610b19c3bdc4f74d861ddb9f6459a4adaa57d14bf5b88ce9f844d1d57c394aa80b2d2 SHA512 2c77ea4a0223e62a9f211b99622598becaeeed8010152fa1a469939e5b74ee3b7856cbc8b9f3da1ca1fc280c898fb6da3e1e55a8bd07a15cd06df641d8f718e1
+MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
diff --git a/dev-util/conan/conan-1.18.1.ebuild b/dev-util/conan/conan-1.18.1.ebuild
new file mode 100644
index 000000000000..150071e1dc00
--- /dev/null
+++ b/dev-util/conan/conan-1.18.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed C/C++ package manager"
+HOMEPAGE="https://conan.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# overly strict requirements?
+# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
+RDEPEND="
+	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${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/distro-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pylint-2.3.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/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.1.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-lang/go
+		>=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/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
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	PYTHONPATH=. nosetests -v . || die
+}
diff --git a/dev-util/conan/metadata.xml b/dev-util/conan/metadata.xml
index af7e11d6bb6c..eec79f76ea9f 100644
--- a/dev-util/conan/metadata.xml
+++ b/dev-util/conan/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>beschindler@gmail.com</email>
-    <name>Benjamin Schindler</name>
+    <email>azamat.hackimov@gmail.com</email>
+    <name>Azamat H. Hackimov</name>
   </maintainer>
   <maintainer type="project">
   <email>proxy-maint@gentoo.org</email>