gentoo resync : 10.02.2020

10 files changed, 29 insertions, 21 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 2e08e6fd7444..3486db8db09c 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/gonvert/Manifest b/sci-calculators/gonvert/Manifest
index 6d46dd854dc9..8bb5e440c4a1 100644
--- a/sci-calculators/gonvert/Manifest
+++ b/sci-calculators/gonvert/Manifest
@@ -1,4 +1,4 @@
 AUX 0.2.23-paths.patch 2756 BLAKE2B 6cfdc09e6a6e09e144b4e06ea16742311056eb56aff957846267174434abc983c59ab8ea033801bc05b155ebd6e3c203629287cb86296a90ed425bf4515d0b47 SHA512 72ec21802f0c365efc1dff067f17c4ea07ad74a84588859de000efec2f7830e330ea0470ea04983c8622aa2f8099ddef4336a23d3367caaf0033e19dc90b978e
 DIST gonvert-0.2.39.tar.gz 125040 BLAKE2B 359a2d616ec63b4a343600395b2fdd5a4bc266f847cedf0ac03f7578906a88628dbf8406265ddf21affa790e96572c2f099adf32203f1b80e5ddf48be1c203a1 SHA512 508c4fe4a453f68ea48787843b96b7f6ee6706e7a264c5698ceb5cba3b90996f506e67230d37b2750db69921aba90f56d4eca2a21531c33aa5cdd95e2ca9ea4b
-EBUILD gonvert-0.2.39.ebuild 783 BLAKE2B 2d567eb59ace66573fc8baea222c3629ce21b5fe149f73984e556d3568af2198f6fec1eea4d73e77d3771e3f2e9ea064223a6fa97221729041721d07aacbd1a5 SHA512 2266e50bd041e3536ac3e0363f1fc0d0b5967a6453a9d49ac5eedbe4627c8d9ccd316a790694670fc588d2fb4531c4563865272f8e603695f7c996a88247a58d
+EBUILD gonvert-0.2.39-r1.ebuild 816 BLAKE2B 36231a1e4bc8dfc7f2ebba3d47ec4e81db708970f27fd41cfa132aba0b4a8330e3318f3cd01537c469c777df19bdb6989bc8f63a1599a9e8432ea4692e1027a5 SHA512 705beb469d53af31a3c80f65b66725be944a625941b32e6dbdcaeb199229909576435120d3248e591a5a73a1128b16d0040d1109c1dfd153ed0ed47831322edf
 MISC metadata.xml 708 BLAKE2B a684e94e0169269142c1f915a10593cfeddac8d2321af3eaa57ac7c5b4467030210c6bc03207e66918ad3f97fad70aa7bdabbd74d1bb70633fc8e01bd0d7755a SHA512 c88b8e10790e10f415ddd0c1453f976767c5b51722936d37a9c423f016c6ac3ae0e19e1103a61f09fb381f6ffc64318012068df50b53e2655e92cbfef663edd5
diff --git a/sci-calculators/gonvert/gonvert-0.2.39.ebuild b/sci-calculators/gonvert/gonvert-0.2.39-r1.ebuild
index 5650b346b056..94ef697d8f02 100644
--- a/sci-calculators/gonvert/gonvert-0.2.39.ebuild
+++ b/sci-calculators/gonvert/gonvert-0.2.39-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/0.2.23-paths.patch )
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index 7673bb997f61..7317ea5123a2 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -5,8 +5,8 @@ DIST qalculate-gtk-0.9.9.tar.gz 1283947 BLAKE2B 68904e19a4810ef7c83b2508d952195a
 DIST qalculate-gtk-2.2.0.tar.gz 2339951 BLAKE2B 87a2a9328314b994a780f2f616b6f43b53848131db3e5940863432360da44f1e50084076b63c2fac01fe339d5845a55133f5d453bf3d6eec432ce8e43a524921 SHA512 a761383021448f2d8542fad2c51a57e9d98a09264a1467e8e4555ab1930151651f0a40cd9869bb88e18b716fdbe4c664ce69ec02b6623698f42f34e708f55dea
 DIST qalculate-gtk-2.8.1.tar.gz 2650577 BLAKE2B 9a28afb846f28730bf29c705ec51abda96ccca1864d973588bfd855ae3dc2027765d0bb9b26d817d4b5cfd9189f02c0b889ac74d66d48ebde4bdda2790eb1234 SHA512 fa5ede37bfed3b5f5b46cdf07e3d83456d8144f9b9eda1ae081267d73c06ea032e1012cb7bd01ff36c87aa1a88fc20794fd9477a8d3ece2950785e7aa0b32acc
 DIST qalculate-gtk-3.2.0.tar.gz 2987908 BLAKE2B 038203fab563bb0b74c2c23fd2f4077f7b4c8dc5ebb40c8246dd55c5ce311e19906f664040ccdff8a993fbc0bf8e2e89745bd99c66cb86874097462ec799e5ad SHA512 c9c00bec9ef9fc9526c1ed1d81df06e2fa5c947962cfd981fc3f4036612336ac2dc8027855d505101e78379840d9499f4dda492b98219f9073d91d9237f37528
-EBUILD qalculate-gtk-0.9.9.ebuild 749 BLAKE2B 0fb03650941e4ed3b604046fe9c4bac06584c0b8728dadc65c8f96d854e84c5f67e441f3ea0da767faef59c4ee62f4b5d946a56e605f94751f5323d4947be552 SHA512 249ddcee49486bbf0af72d30ba7c63daecb733d4a87c269d005e2287bb1e92dec641c3b8078dc06eb8dee934a2c63f69a5607f851d887f213498b5f333d7537c
+EBUILD qalculate-gtk-0.9.9.ebuild 747 BLAKE2B 04175d6536ee0b5ba2bc729676f6f8d1924c61ddbc17897a56527f85efb4b25e2816649d63b568046c6cdfcc90f6b60f64882c7621e637bf23fcdcca6ad85707 SHA512 f77e07a90a217ec22500050043d3d14f254465014eab50a4394630f51c180c1fa438c84ebdc4e2513bd50f66950608822e5236484b1b23ac6d84dbaefd48a746
 EBUILD qalculate-gtk-2.2.0.ebuild 754 BLAKE2B a7b2fef7909b3d5a72a43938d0c235eaca8a1c635b3a6c05b613c60d1d00f0eab3a62a3a8146a083fd50eae999bdf6f585477effea023686985291c53812612b SHA512 d4361e3e16d2ac608295aa8844bd6e9b76c37aba2a88a9a8541705e2190f100ffba95ef103993e4f36a41e39198244cb5379779ba63c9a7fdc6afc55777173eb
 EBUILD qalculate-gtk-2.8.1.ebuild 873 BLAKE2B 61f85295dbd95cf588a222f086524c06f43f11f6c1a1e2f6e741e44f692c5b775e8c53cedafd124f6c8a1720c264a5f3a9c2218e3aa20cd2504cfb583c56ffa5 SHA512 ba3fd210d311f27b97c89e700f21aa1b6fad7ebf61f904aeb1f14cbfc1502fd3d176cfe932f832890a455f0fbde1f2be0aefc9a3bac27d26b9261088097d6bbe
-EBUILD qalculate-gtk-3.2.0-r1.ebuild 876 BLAKE2B 055d2aab09e6cb21af7159d387bc12dfdced8f8be151739fdf7d4eb71f3e23686d1f919bcd61e401a4b9f488ec194648ba1006a9c8a4ca0cfb6de7125b3ff832 SHA512 b40afcc848fa3cafee39dadec38b8eacc416d367ba312836dd0d630f2e872466cbd7fd7e2766862597a467e6c29a1fe49cb8ebbbaeb53eda8f305cf3202d7252
+EBUILD qalculate-gtk-3.2.0-r1.ebuild 876 BLAKE2B e5953c21231321472b0511d6deaab12538ec84cb9b8ad660388f3edca12031a6d62fec5e68b7ce144cde0efab6e447c668be0788927052ce3be0665357b7c0e5 SHA512 cfff3fbb0bef254fc4d494f55b2bf6dfad72aa5202bcf507aa36c229974f14c936e778466cea8ce4a0be7f5e754907569e706cf6398ca20b10979f6dfe931b98
 MISC metadata.xml 606 BLAKE2B 0d52327ba35512f67f66d9c98323e941e177b2d7f9479e1ed94aea588427b8979624fe5e62f33e8f7b2071ec79f10b1546fbc83437572d0f5ea9da387f9e6b10 SHA512 596bbb4219292b494c2b1c367190ccdd09045fe4c00d1a935ef6180cc1bfedd1d0b233ce98855cb4162766a6bf4c1fe5be3e7e2d582d321c94848c9a4921eaca
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild
index fdcbc8da7e7e..610e170750aa 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gnome"
 
 RDEPEND=">=sci-libs/libqalculate-0.9.9:=
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild
index 773b746ab3d2..788b51e00b10 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.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=6
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
-	>=sci-libs/libqalculate-2.8.1:=
+	>=sci-libs/libqalculate-3.2.0:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 8f4b424e207e..1d028439fcb4 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -2,7 +2,7 @@ AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457
 DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091
 DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7
 DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8
-EBUILD units-2.16.ebuild 1296 BLAKE2B 7117e96c3b62b660c4a8d129640c67c83cb820e4cf4f831596f1f1b719fe457b347b32c9e0ce2d6f55001c7133eaf48222a85db03ec2fb7f7cc5a9ed1720d848 SHA512 2432bb0d90de7d0267cb10e559aa4f1172c2fffa5a93fd7b9233e29a010c17cbc8b3eb00b254969d8ace5d8a78c07adf2953bd9eb2752cc438d916782946d3d3
-EBUILD units-2.18.ebuild 1402 BLAKE2B feb1491d08673e70a88e43991eeec1e9d36c6b6a69bcf420b7540b7dc144bb635e4ea703a21bce3349768842144943f98890f3b92a054946cd1e8db9b5894cd9 SHA512 cf02dbae3d89041fd7ac6cfa41d3f837ef2d6ac235247b157dde27897bdd72b4725100f9f749925b5bd03742fae354a89bdbfc96425b07d28285d336f9b00388
-EBUILD units-2.19.ebuild 1376 BLAKE2B 9c0fc3b7e29f71c3b466dd14be7a70be1949af943fcf94ff9fd94b24c25535e571203809bbc49bb76d2a87930c5a1d0f7faa9efd7607593b08dc9008ca0c3ea8 SHA512 d2e2298215ee48877144de3043f630c729538295034cb8896b7ad69df4d0f03fe539db704a351ed94f9dfd5e03a09c80f703f64c03795f49f3c2ccac03bc1eb7
+EBUILD units-2.16-r1.ebuild 1335 BLAKE2B 6fd6f978c8577c2754a2b98566d4b48f13caf2e1af7c23a9854f5c8847f81e6c4d76d4f6d6723144fa575aef0c0395428c8607e85d65ea95654feb37f8ced2c6 SHA512 b5c9b5a411f4bedd431620632dee2650835fc986ecdd2f2fc0b1b6fcbd640621c2dbf7c6d86d52ae27d53ffda7dd3fd6dd05ec130404c19aeb65dce7afd2e8aa
+EBUILD units-2.18.ebuild 1441 BLAKE2B f6bcb25778a136c98c52d8d0e79562aa2b984f25e16ead86a1485e1bdbefd54a907581b73b867b31b6b584aa0488d6e11e1adc683dceb2bee6cd04d6d89df4ee SHA512 7518fd6a8b4964224380513dcfa623d27af1d2d43089e1dd86df50e48272f62366a8164ca9797ca42d1096792bbc2df43f661d466f0260daee4c669fb66264b0
+EBUILD units-2.19-r1.ebuild 1415 BLAKE2B 587877310c05932b5e283d0f250f613993d61f0327b7acf9025d93678109576ef72f6be889c102a666bdcf2855b8ddf52df3803665aee232e69fa9d5ae380b5d SHA512 87e6a5da5a4174798b50045d1c348e3ed5370a43feebefbc66850737ff71b69c526a448b46f8a473aa3222d36a55dc3670439309b9d3d4c54aaf03e9f018b58e
 MISC metadata.xml 342 BLAKE2B 5dfe07ae92c9b1741b7c2f49f8f0ba853aebfaa20d156685ed5a8fe9c8f0bb094bc240f197e3fb57f65494d4a41b037d7d4e2631c11d26e4fbada04f2916b749 SHA512 c648f964163e26133e70b40687d317d57067fa3bdff11080a33123b7fbf9e9af3aff1d4890ce4e75283b86ef026896804606283c888cb2dbc0c66a171dca8657
diff --git a/sci-calculators/units/units-2.16.ebuild b/sci-calculators/units/units-2.16-r1.ebuild
index 9a722304b0b4..b6e116cc86eb 100644
--- a/sci-calculators/units/units-2.16.ebuild
+++ b/sci-calculators/units/units-2.16-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit eutils python-single-r1
 
 DESCRIPTION="Unit conversion program"
@@ -19,8 +19,10 @@ RDEPEND="
 	sys-libs/readline:=
 	units--cur? (
 		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 "
 DEPEND="
diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.18.ebuild
index ab70dde6bd9a..119605f9309f 100644
--- a/sci-calculators/units/units-2.18.ebuild
+++ b/sci-calculators/units/units-2.18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit eutils python-single-r1
 
 DESCRIPTION="Unit conversion program"
@@ -19,8 +19,10 @@ RDEPEND="
 	sys-libs/readline:=
 	units--cur? (
 		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 "
 DEPEND="
diff --git a/sci-calculators/units/units-2.19.ebuild b/sci-calculators/units/units-2.19-r1.ebuild
index 33e0d4159977..13c2f13963c0 100644
--- a/sci-calculators/units/units-2.19.ebuild
+++ b/sci-calculators/units/units-2.19-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit python-single-r1
 
 DESCRIPTION="Unit conversion program"
@@ -19,8 +19,10 @@ RDEPEND="
 	sys-libs/readline:=
 	units--cur? (
 		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 "
 DEPEND="