gentoo resync : 14.07.2019

4 files changed, 74 insertions, 8 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index e3a6eb325f44..7336fd06f735 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index 4518ce41de3d..b6ab5a21e4cb 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,3 +1,4 @@
-DIST platformio-3.6.7.tar.gz 113602 BLAKE2B 1ba828be8dc5f10767571356b61239bf167b6b2bcbfb19dfa007032c3584ba955b18329a16bb1ec079fae7314f46ac27e35dae671b03e379fa8d49a27ae1d6f9 SHA512 0bff99493d38ee803018807bd5a69717fb1e3d0e20c8caee892ca8d689bbf50b78a18121d149e4729a34d79894e116d1183eb5d0ff505d63f721c06469820ddf
-EBUILD platformio-3.6.7.ebuild 980 BLAKE2B 0491f637610576b203e4551299ad35efc2bd948be9d5da803cee250e48d8999be3e7cba6bd2bd6186d03390b8b1a33bb601e9d11867d66e08a90bf85f0ca884c SHA512 06e108d38b33392f6e897760cfd83ba9769b56f0deca2441ff9f6df631a3519e4bf2142b178d58e65fc5baf879afb4d349699049215cab99b86a9d77e54b37b2
+AUX platformio-4.0.0-Make-scripts-compatible-with-py2-and-py3.patch 1954 BLAKE2B 9bda9ae28cd356710e94153b7b54f649bf47a2899105e22a25763155311ce386df8682db16de89eeda89a468261f726276bda489ee8dadb8ccbb39db006fbeba SHA512 f80658f7f19c138270809d03d9a6dcaf3900d7b154d4ce8ae9413c2a6f10fe6e5549f3111c6eac12fe461780984c0ea4b98e1019d1eb4d74ec2a9668e121dd1f
+DIST platformio-4.0.0.tar.gz 139700 BLAKE2B 1b4e6e244a0596f2713c1c07ca117d55986776a0dbdbdf06a313226b04941e4ae22ceb3444eca943cd130a8dd8546050febebf3f4dc435b0407b32c61212b07a SHA512 dddb717e39d9ede8464090599d6bc636e258120e97327d666f3479c2b55c0c6c73708d5c1306118a6a56fa2a85471cec6865d9465726174486a70832e32bc1d7
+EBUILD platformio-4.0.0.ebuild 994 BLAKE2B bb3d8cfefde2544aafc65a90f7127d4c717739b10f5d6b0b20665bf2c1b07b691a33079f1992131cb5db6b321fabfe57b0e2b8ae4d44fe5cb587c9d76d8e6638 SHA512 c692d79032509a00714791903767665a6655327239945efd01e822e52be6ef4f6f3baddcbe047aa2c23e8a23b2a059ae66b701067e5990ee56acbbdc0e45410f
 MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
diff --git a/dev-embedded/platformio/files/platformio-4.0.0-Make-scripts-compatible-with-py2-and-py3.patch b/dev-embedded/platformio/files/platformio-4.0.0-Make-scripts-compatible-with-py2-and-py3.patch
new file mode 100644
index 000000000000..c899105dde6c
--- /dev/null
+++ b/dev-embedded/platformio/files/platformio-4.0.0-Make-scripts-compatible-with-py2-and-py3.patch
@@ -0,0 +1,65 @@
+From e1d5cb23f342269e1e99b017c1082cd6208b8c9d Mon Sep 17 00:00:00 2001
+From: Alexey Shvetsov <alexxy@gentoo.org>
+Date: Fri, 12 Jul 2019 11:26:27 +0300
+Subject: [PATCH] Make scripts compatible with py2 and py3
+
+Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
+---
+ scripts/docspregen.py | 5 +++--
+ scripts/fixsymlink.py | 4 +++-
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/docspregen.py b/scripts/docspregen.py
+index b4e5a67f..ab43bd7c 100644
+--- a/scripts/docspregen.py
++++ b/scripts/docspregen.py
+@@ -11,6 +11,7 @@
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
++from __future__ import print_function
+ 
+ import os
+ import urlparse
+@@ -280,7 +281,7 @@ Packages
+ 
+ 
+ def generate_platform(name, rst_dir):
+-    print "Processing platform: %s" % name
++    print("Processing platform: %s" % name)
+ 
+     compatible_boards = [
+         board for board in BOARDS if name == board['platform']
+@@ -439,7 +440,7 @@ def update_platform_docs():
+ 
+ 
+ def generate_framework(type_, data, rst_dir=None):
+-    print "Processing framework: %s" % type_
++    print("Processing framework: %s" % type_)
+ 
+     compatible_platforms = [
+         m for m in PLATFORM_MANIFESTS
+diff --git a/scripts/fixsymlink.py b/scripts/fixsymlink.py
+index a73a0109..b250b04b 100644
+--- a/scripts/fixsymlink.py
++++ b/scripts/fixsymlink.py
+@@ -12,13 +12,15 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
++from __future__ import print_function
++
+ from os import chdir, getcwd, readlink, remove, symlink, walk
+ from os.path import exists, islink, join, relpath
+ from sys import exit as sys_exit
+ 
+ 
+ def fix_symlink(root, fname, brokenlink):
+-    print root, fname, brokenlink
++    print(root, fname, brokenlink)
+     prevcwd = getcwd()
+ 
+     chdir(root)
+-- 
+2.22.0
+
diff --git a/dev-embedded/platformio/platformio-3.6.7.ebuild b/dev-embedded/platformio/platformio-4.0.0.ebuild
index cb996b8fa124..5200247c4260 100644
--- a/dev-embedded/platformio/platformio-3.6.7.ebuild
+++ b/dev-embedded/platformio/platformio-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
@@ -20,15 +20,15 @@ IUSE=""
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	<dev-python/arrow-1[${PYTHON_USEDEP}]
 	<dev-python/bottle-0.13[${PYTHON_USEDEP}]
 	>=dev-python/click-5[${PYTHON_USEDEP}]
-	<dev-python/click-6[${PYTHON_USEDEP}]
+	<dev-python/click-8[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
-	<dev-python/lockfile-0.13[${PYTHON_USEDEP}]
-	>=dev-python/lockfile-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/pyserial-3[${PYTHON_USEDEP}]
 	<dev-python/pyserial-4[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
 	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.5.0[${PYTHON_USEDEP}]"
+	>=dev-python/semantic_version-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/semantic_version-3[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${P}-Make-scripts-compatible-with-py2-and-py3.patch" )