gentoo resync : 16.01.2020

8 files changed, 18 insertions, 20 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index cdfa66312cab..bc2ba1c52bb1 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index fc16aa351f13..80fdb2fdbb51 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -3,5 +3,5 @@ DIST openocd-0.9.0.tar.gz 4970346 BLAKE2B 96421b32a3e64fc1ed362288f5a444cc1249f3
 EBUILD openocd-0.10.0-r1.ebuild 2806 BLAKE2B 0ebf96676f1f826d64de6af8ac4311bf5973ef1781b2f4f038637fbe6ca4d57dee3405eb2828e51b84e48efafe89fda6c89462cb637b2c34815f0f0f0df797e5 SHA512 2741dbac39b556681a78690c14be02947c467171cfa1a628b66e1e9fb54abc2ce212253ab5ca39ae5fa0e1ad84e759ca9abba046e07ad9042ab7e8879185de0a
 EBUILD openocd-0.10.0.ebuild 2787 BLAKE2B 33c90c335a3b21eafa6d62eef353fc93f767044f1643d6b75335173dff63a8324a9a740a516a5d640763e46082bf28fe802d055b36d5ab372c936da026f353a7 SHA512 bd33f8487f420ce308c157580ba56604fb37e8f53bca6c37ce28118cfeeec1419ac0d01da6e78afe540634b64fc509c228f1d6ebb764d5672a7ff8c519d8aeb6
 EBUILD openocd-0.9.0.ebuild 2648 BLAKE2B b97c24d80399668aa3dbbf9ad03a358f779da66b38bee58a29c704125de6e0d5ed85f12b19687c2fce3e08ad7c9489c76266bc606bc64f0e00f878cd5a2cabc9 SHA512 7b437860ca4ea98c2bf37e7f69bea3b080d3c47a5bf72473d4fb31aa36631239d349a2a38199f222367a9fb2d92c2096b61d6021a2a803010c13db0545f49e17
-EBUILD openocd-9999.ebuild 2806 BLAKE2B 0ebf96676f1f826d64de6af8ac4311bf5973ef1781b2f4f038637fbe6ca4d57dee3405eb2828e51b84e48efafe89fda6c89462cb637b2c34815f0f0f0df797e5 SHA512 2741dbac39b556681a78690c14be02947c467171cfa1a628b66e1e9fb54abc2ce212253ab5ca39ae5fa0e1ad84e759ca9abba046e07ad9042ab7e8879185de0a
+EBUILD openocd-9999.ebuild 2812 BLAKE2B 4db91883d83ce818f14d2a8ce3a3ef67905a7fbd272a966d91be6cfcc637ed3f99b5d7aab2ac0f675a398684a74f9a6bd80cf0809f78dbb5418f097f90979446 SHA512 3afc8701b055f6023d30b40c834e06241cd707682c0f1177e0d04b6355ac897cf01acd395769ccea91a1b99e818306dd719f7323c51d22556635029c16789346
 MISC metadata.xml 882 BLAKE2B f7ec7fcd46485cf4f0c9039718cda564607f6f048646b326781cf09b2383c8665b8d624a19070a659df718673f4639bc918808ae950d6013016a0349a9fa6cb3 SHA512 bd6d73764a65fb4df85ce70552f0db5d18d876a54f1f1b4f75cba7865bdc425de78797f747b77f96b1c1e5b342106dd883d02f9c638875914d91987604ea8b76
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 168fc2499564..61f5947f9e67 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	acct-group/plugdev
 	>=dev-lang/jimtcl-0.76:0=
 	cmsis-dap? ( dev-libs/hidapi )
-	jlink? ( dev-embedded/libjaylink )
+	jlink? ( >=dev-embedded/libjaylink-0.2 )
 	usb? (
 		virtual/libusb:0
 		virtual/libusb:1
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index 7e2740a90161..83d4e1ebbe9a 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,3 +1,3 @@
 DIST platformio-4.1.0.tar.gz 157907 BLAKE2B e90d2b155121cd2be0b0d77a7a196e7fe03580083444056d06a86a343166c920cd1ac6252a0003acee4de5d3933fead939b8be8d67233e93c05537511344e27b SHA512 e4d6c29ebb8fb1b2b556affbc1a50ec84d12e878bb7e6cfb253861eb5429236d8226d1a29f1a3812c0aa2c5b4895f0354184a9cb28c300db2e2e5a2ededb82fe
-EBUILD platformio-4.1.0.ebuild 1190 BLAKE2B 3bcb5c77ebbae4a5334574c36fd2dc409835fe74fdeded19792ab31d74449c56078c32902aa473d04ca5ba40c6eacb3197ddb3ecad29c815688b7f68821bd149 SHA512 4c08ba2077ce72b84b022c6c25355038fe2e9b124a5f500890b55ed420788f296fc8694ac3f98481a24fea1347d5d427d65e3fee0c6581b16084bd12b368df48
+EBUILD platformio-4.1.0.ebuild 1180 BLAKE2B cd22a0a6810f93bd713b8e2297eacf5b8aaef91d05f40b5abac79c8750023c28a51e48f9dd9001bd651bdc204122156d01e9e5be04660e3c11af0812d550d27f SHA512 7d39f20df7bd1c512d0f737e88651d721896af77f72c3ccff3c8731f96202c18199d0f96cd5d350590ab8be4529e5253fb57d8a2b3901fcc959b7aa80e70f3b0
 MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
diff --git a/dev-embedded/platformio/platformio-4.1.0.ebuild b/dev-embedded/platformio/platformio-4.1.0.ebuild
index 97f26d127964..29d4e2ad7b49 100644
--- a/dev-embedded/platformio/platformio-4.1.0.ebuild
+++ b/dev-embedded/platformio/platformio-4.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index a8222e96fa90..f166c90a8fa5 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,6 +1,6 @@
 AUX sdcc-3.8.0-override-override.patch 1078 BLAKE2B f1e1e135b9ee972e8f7f6a08af736de227c8534d181f160b00f6eecef0e7f4366e39fc5a8f6034bfffa64531423d28377c778055d6be8671527971ce183ebab5 SHA512 fbc13832bea859409f2ae525a82927424dd474db9c6077d1311b9775d0a4a8728d79db7465c928271faa54221b53982ee539537e4fe8a70209c0f453b95105aa
 DIST sdcc-doc-3.8.0.tar.bz2 965465 BLAKE2B 541ed3ba4d3a23dd3fcea248de84d887fdcd8ddaf3ed0f9f810bf8cb9fcb5b10eb2cd96099d83c5a0fda240cdd3d11fd247e576a67a32047a4f7a705b8401637 SHA512 63319b7c344b320600e6a7c158d1a5e69abe595dfd6b8d32a95f15678c3bc2f6fe72c959516c4b1f812deb089854c6a51c31438ef6a6c7f9fcb4d419d8cce3cf
 DIST sdcc-src-3.8.0.tar.bz2 18987862 BLAKE2B 7e8ddea41ae02842bb1376c53364c386a0fb47a1acdcc97cc72f002e78a2854fc43adfd0177f94dd1173dbd81052c390c5b2fef302c73f0b830ec83eea70869c SHA512 38145ea3e9560eb8894c54bd7213da67a20163739c944c3247fa8fa456dfedaaa469746169d3e114affcab48b73db4cd8c9a0a367e7368f2471de64761a3e04a
-EBUILD sdcc-3.8.0-r1.ebuild 3172 BLAKE2B 163f8a7661e0d0b6257686bf4e7408fb3056cc14e731c0dc5be6cf819d30b2b1b96ba45ada2943bb57f1445334c2615bd33b93140fb3d5534486d7fab7889469 SHA512 99d12ad53ffce563606c4dddf59431057eb0c7d04d8614d734ce8012dd775e12b936a7fba952aa52829d16ad13b2dc300fd407988f98da6c2b594286b1319ed5
-EBUILD sdcc-9999.ebuild 3174 BLAKE2B f9a9c96ce5f65c64f64804f0ed9c950dca6df2a9b639e75c13761e0408547e24a42fc0b0e25deec42d25f78401b7c33ff5d54383892cae0ef9b32b43e8353176 SHA512 8ad8ae7622209bf0d6c9aa9e64aac840666540688a63cc9b38ace027b0f60608737bf10bd19524dc9145469c1a96ffc84b8b7c7e8277aace7fc5272fdd66beb4
+EBUILD sdcc-3.8.0-r1.ebuild 3232 BLAKE2B 2e8966239d962b3c282a3aac8af2c025fd1469810c6aea3d1fb69acd753209b6568974631b0e1339eb92747d7279f25874ee0f3aada2820e76c988ad35fdd0fa SHA512 08b079da05f688f75e6cada2b2ba691501492ebf9faac512e210ece89e02dfaca02200518c911c92782b7f39066a5649152d13de6da7548b559a1c2ec136e9cc
+EBUILD sdcc-9999.ebuild 3234 BLAKE2B 4ba8a068055f1585d5daf851e6925490619726a5d0c8da4c8c6c419ea5a83b8c3a0a4932097967e1c1661d18af7fb7dc7501b5de5afbcdf04be4812faff279e8 SHA512 90b6882c012c1a0cccef1cb2b37a180e22499ac025046fcca0942a6f44433d3756bd97f492bd58fedf2d8cc97bb102e469441f6aeb5f543af84c5ff6b6bc490b
 MISC metadata.xml 2284 BLAKE2B e3fdd79032b8f663940903ed11a92c199048bcc485d24c3d7ab99757e3cdad1438c319cc7327f53921f7c853a59fe0a6bc4dfc5df84d4edfd92feae42459b858 SHA512 cd4b8ed438d294e239e67f0037d1f0f044215d2c6da8a13a661ebd56c3501df0ed7ecb41fb0c34f150345c5008dc3d37d9df127da60bb6c59bb630f1c695c118
diff --git a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
index 08e64f35f2be..b756e19cec47 100644
--- a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -68,17 +68,16 @@ src_prepare() {
 			-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
 			{} + || die
 
-	# https://sourceforge.net/p/sdcc/bugs/2398/
-	sed -i -e '1iAR = @AR@' Makefile.common.in || die
-	sed -i \
-		-e "/^AR =/s:=.*:=$(tc-getAR):" \
-		support/cpp/Makefile.in || die
-
 	# Make sure timestamps don't get messed up.
 	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
 
 	default
 	eautoreconf
+
+	# Avoid 'bfd.info' rebuild with 'makeinfo': bug #705424
+	# Build dependencies are: eautoreconf->Makefile.in->bfdver.texi->bfd.info
+	touch support/sdbinutils/bfd/doc/bfdver.texi || die
+	touch support/sdbinutils/bfd/doc/bfd.info || die
 }
 
 src_configure() {
diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index 23c2e5edc149..73a2c6190d44 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -68,17 +68,16 @@ src_prepare() {
 			-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
 			{} + || die
 
-	# https://sourceforge.net/p/sdcc/bugs/2398/
-	sed -i -e '1iAR = @AR@' Makefile.common.in || die
-	sed -i \
-		-e "/^AR =/s:=.*:=$(tc-getAR):" \
-		support/cpp/Makefile.in || die
-
 	# Make sure timestamps don't get messed up.
 	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
 
 	default
 	eautoreconf
+
+	# Avoid 'bfd.info' rebuild with 'makeinfo': bug #705424
+	# Build dependencies are: eautoreconf->Makefile.in->bfdver.texi->bfd.info
+	touch support/sdbinutils/bfd/doc/bfdver.texi || die
+	touch support/sdbinutils/bfd/doc/bfd.info || die
 }
 
 src_configure() {