gentoo resync : 10.02.2020

7 files changed, 49 insertions, 36 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 72e81b6ce0a1..54e1c28740a1 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -17,10 +17,10 @@ DIST kicad-5.1.4.tar.xz 14198672 BLAKE2B 99d317df6f2446611614c8d4294b4f8ff81082d
 DIST kicad-5.1.5.tar.xz 14203632 BLAKE2B cda7bf95c8edbddd36489f299dca9393ee51658e828f7e9f37bfa56955924785186908b0d8c91ae3e895f15cdba50c7579cf7a450e525f4a2ba215a721df26dd SHA512 5ca19e219da07a906f13e236849eb4497c9f827726a5cd13aceffe1d8c7dee480823bf3e949527f59a805eb3b8176fad51576ae663dd07b10e2822f2b37866a5
 DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce SHA512 9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f
 DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360
-EBUILD kicad-4.0.7.ebuild 6660 BLAKE2B 01d74a7d0953864d95605db9646457ed92a68552bec80ef5d8ada67800dedf5b7c49c467d75897eee4b05ab5ea37cb13c5dbf88f9cc31195963c65ae9d22b9d5 SHA512 944610406b0f01930142fb8cdc7aa6a9e2aa0d733db9b2cc7a7e8a0eee3acbfc165a462c88efe2146c0e6192ef4a8a6560bc4786306da94d5731f06607ac3754
-EBUILD kicad-5.0.1.ebuild 3470 BLAKE2B ba72236bf9f3cc2b54d88bde68d529f9ee826f78aee2a8c2f5ad234d18bab2d36c76f7f51a6192dd63b2925081a614ba94d29155e280e91a9ecfb4063392a682 SHA512 5b8070be9d7fca9f95a138dc81b2ec5eabee8c970da129c5efcf61806310e235e2fc3339a0ecd8108e8b030af09aff5970894893c49a3414f76d5dd3784ffbe3
-EBUILD kicad-5.1.0-r1.ebuild 3547 BLAKE2B f8fe35fce1d7a6f27d807483e96eb2986dc79601313762fc5f340bb32e9841572f4fa27fb9152b41f77db72b724b815dd2c32775b734995e987b7eea7bba15af SHA512 6c7205cdbd66bf6f52aea0906ff9f22884154b3499c95aae28eb9fd3b004ec2b62584ead6a4c0a4c73ca6bc161551516b6af311a67640a339ec2b120319c36a0
-EBUILD kicad-5.1.2-r1.ebuild 3623 BLAKE2B 76621467d79af219a63784e9147fcb76ff474bafd79d958e22a80e747e9a48845844df626fd3f34acc46a25ac498a4f7884a5a513a10156e8975a532531868ec SHA512 67cc9e308c5535da54b6e765be5e77c8dd0fcf7501887a04fbf649bd46b07a3dcf5b8beef916ff1e9649475d7169d1c2cfa1e2c6db870215b3002071519d6acc
-EBUILD kicad-5.1.4.ebuild 3587 BLAKE2B 1acd2ae60530e70c734bcaf97a831d4ccf5d9270f7818974939a32f69c44e752a7d3b0a09bdf3210f4f3f6e5ef1c4d568500f7783fbe6e123d1a5772fd4bfafd SHA512 0c5be7637cc9383f61a080bf91de4c5babda0b11658cbd7e43d0fb936f8105b344346f95ab2fc4a190702aa34eec49a63e6435c8514b67d469c4a2c379934c95
-EBUILD kicad-5.1.5.ebuild 3558 BLAKE2B 7a8680f1cdf6ac6d740c8045e9d2ba5e149ba75a39bb2bc3d35e53b4d528da2aee6c1c3cf8caf38835b602f547eee766ea02472d7b958bee06534d6b03a1b089 SHA512 933e6571e81f07ba3c3bbe20bc1990e9b587f8f9ead8541fe0c40356ee7580a9b9f19f9537043d70accb5f4a627b8781865cb44f948bdf429953382e42b2be0e
+EBUILD kicad-4.0.7-r1.ebuild 6708 BLAKE2B 9c1b70aaa068b9d874ee8f84c8bd79b849a02a91577c43e5b27881b856579248d56de03299300a900e9583d0f2d639ca15e150382236671521f690769c1cce2b SHA512 f2f426f0936148dd8a1d46f81be89cdbbdacf4e363755848bc06f2742600f92e39ab8438a825c1180f2811d9689161fb203e1f49457d7b2a8630a042e604e1c4
+EBUILD kicad-5.0.1.ebuild 3518 BLAKE2B 15af18ad991caad4460be0cf829db0976a94e4fabce761f7b7818114af96043a75d1da0ec678a707a975a114a94d32140806543742a21f8f835633b5e13ccdff SHA512 81425f12c0d9af2539d7d1cff5315981a3bb35d8e542b8cd7ac0e1a1bd25f7ac8273d3c5057de8987ab3351f40cc8f894d66aad75aa6e709c9bbcd03d45f72ca
+EBUILD kicad-5.1.0-r1.ebuild 3595 BLAKE2B f984c162f1428611d095d59e50a0c8b59b4c8d45b7eb2e5b2db3c19839afbc641a4d2fe12679885a11ba3b9153187cde10e2f357d3a3152b4e29f241f8e297a2 SHA512 0789cdbeb5c9b9a15b64747da7b9ac5e35137e04575b8892d3f3cb0b703081f039c779d616d9ee9b865872fc4d94f42c4cf9e1c502a4a42c1441903e85ea1e2c
+EBUILD kicad-5.1.2-r1.ebuild 3671 BLAKE2B 6d616a76af85f50bcdcd4ba41309bb751d1f6473ab80a324d7ba1605dd03058a905d35b9c33191e3e8f0947a543c9d81d237f26283fda497c3be7ab76e220f47 SHA512 da8bac8636848543650a31bc5a9f5393c0777aefb34155e77b909027349d3a6847587611d8c217069e91a84c9738d3713df7a450b418293cf9da93dc7c366296
+EBUILD kicad-5.1.4.ebuild 3635 BLAKE2B 2490a6ff3792c72d40f46a068fa6af55f5621e0e5149856653a43737ea3fb9659b0d878a31bbd1baa5f682cbca2a508bbff09b610e8ced2d66e9d54e130e17d8 SHA512 fd2481a4b79a589bbec56ebae97a418aa21871e9b6398d4f902136e9048701170956e8da76b795b76176006236463a64a983faca816c77a2603c1d697767108d
+EBUILD kicad-5.1.5-r1.ebuild 3649 BLAKE2B da171ac440addee60f742f61adb8d0a980e7ac131489cd9dbe7f2a556e07ad5897fabb2c644a0999392ba0bd0ef79bbd62d7920075e0e10a47aa95d33684e56c SHA512 ad484976d8e9fba7345f1c0aa7324239225987ec800671a949654227fc4482387920cbf5dd1144ae8d40b4c019a9218b3e506650fa7b40d2a723b8469ab52b28
 MISC metadata.xml 1181 BLAKE2B dadb380f3a2c422a93f349ede59cd4a6bf03dac69306357df08ef88931f76329669e5713f741507ce37ec4bb10445351ed293ed13174ed38de6c284e2234e2f8 SHA512 60c76ec7d665f273fb538c10e4993ac6d30c567d9cb8c0c862175c63a59d45cc9fdeacbb2ba6a3cff12e722124ef6c7466828ea792ddd405c587bd0bac65472c
diff --git a/sci-electronics/kicad/kicad-4.0.7.ebuild b/sci-electronics/kicad/kicad-4.0.7-r1.ebuild
index 624172e8994a..a85b949bc42d 100644
--- a/sci-electronics/kicad/kicad-4.0.7.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.7-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=6
@@ -33,11 +33,13 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
 	github? (
 		libressl? ( dev-libs/libressl:0= )
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/sci-electronics/kicad/kicad-5.0.1.ebuild b/sci-electronics/kicad/kicad-5.0.1.ebuild
index a9f2e30229b2..cb1d50631ac0 100644
--- a/sci-electronics/kicad/kicad-5.0.1.ebuild
+++ b/sci-electronics/kicad/kicad-5.0.1.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=6
@@ -23,11 +23,13 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
 	github? ( net-misc/curl:=[ssl] )
 	media-libs/glew:0=
 	media-libs/glm
diff --git a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
index 6646e63fac8c..8c93a13852a0 100644
--- a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.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
 
 # Can switch to EAPI=7 when wxwidgets eclass also supports it
@@ -24,11 +24,13 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
 	github? ( net-misc/curl:=[ssl] )
 	media-libs/glew:0=
 	media-libs/glm
diff --git a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
index eaf36e9596e6..377f42f962a0 100644
--- a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
@@ -24,11 +24,13 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
 	github? ( net-misc/curl:=[ssl] )
 	media-libs/glew:0=
 	media-libs/glm
diff --git a/sci-electronics/kicad/kicad-5.1.4.ebuild b/sci-electronics/kicad/kicad-5.1.4.ebuild
index b442e402be32..68c690312a8a 100644
--- a/sci-electronics/kicad/kicad-5.1.4.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.4.ebuild
@@ -24,11 +24,13 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
 	github? ( net-misc/curl:=[ssl] )
 	media-libs/glew:0=
 	>=media-libs/glm-0.9.9.1
diff --git a/sci-electronics/kicad/kicad-5.1.5.ebuild b/sci-electronics/kicad/kicad-5.1.5-r1.ebuild
index 46baaff613c7..af08ef9e488c 100644
--- a/sci-electronics/kicad/kicad-5.1.5.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.5-r1.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	>=dev-libs/boost-1.61:=[context,nls,threads]
 	media-libs/freeglut
 	media-libs/glew:0=
 	>=media-libs/glm-0.9.9.1
@@ -39,7 +39,10 @@ COMMON_DEPEND="
 	occ? ( >=sci-libs/opencascade-6.8.0:= )
 	oce? ( sci-libs/oce )
 	python? (
-		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.61:=[context,nls,threads,python,${PYTHON_MULTI_USEDEP}]
+			dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)
 "