gentoo resync : 10.02.2020

7 files changed, 13 insertions, 11 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index a4d97cbe18d6..e147d4b6b66f 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest
index 5e5090ea1250..e79e24f2d751 100644
--- a/sci-mathematics/msieve/Manifest
+++ b/sci-mathematics/msieve/Manifest
@@ -6,6 +6,6 @@ AUX reduce-printf.patch 2105 BLAKE2B 3ba089546e8a67100c9ab6849854c91c78a9e74b138
 DIST msieve-1.53.tar.gz 976135 BLAKE2B 587007c4273b9e0ceb6dd17fb9310070b760f68f8f1c56014a168242d0989069a5257de39cba30c939b3b7e02918635d12b3153d05cd2abb9e4a6445c7ef1886 SHA512 e50e8913d38ed4108f5f2ecdbb338968edd416c56c5b7a92d8598b81fc16014ce7c7df963101c65f5bc88d1c7b2d8dbaa572efbecf53d720430a327929c9ce12
 DIST msieve151.tar.gz 623885 BLAKE2B a222f49fb1c6a411e1e46a7ed153e1ba24bbb604b70034c2c0632f69096e6a08a6783b25a44ffcd2d6b6962a8713455c893eb9514fb54a13f28a5b6a9aea3867 SHA512 79c03b5d669de7f05e27fc59fa999f416f513e41cba822376b862c31439fc66cf8749034c1f8f967f745955a5271a484b23e950ffede23d3fa2737ae26dbb0d4
 EBUILD msieve-1.51-r1.ebuild 1444 BLAKE2B 41db7580a8949792af750e712d66818d98c449500b7dc6e4ae0e11770db367b052ac7520adbd1c53f39b311d80f09e2703c961c568594224f7cffb72747d4ed4 SHA512 d25740704f94f2e6ceab9643a20d7013ba6c9cfdfec01983795f55596dff3c95836392294b9c86a6af3efeb6405e8bfc8483bb7d15301e4546aeb49f9c01c714
-EBUILD msieve-1.53-r1.ebuild 1469 BLAKE2B 8325e0ba994c25ce3280287542038f4731b639e0953801379dffef31cdc145d1666fafa326bb7177733af13a35cbc08ef9820f843fc409536fa7db74e2a631f7 SHA512 e8e04b4c66b190f3f43f6dfcf2e36cfb96f90557752cb2c118844c8c980f3327226517358bbda7c0c852c35e25071651cc28c53d5053232dfcf164a000836606
+EBUILD msieve-1.53-r1.ebuild 1457 BLAKE2B 3bc310d4bee6c42909058d0c2e54ef595e0cb732dd459e90fc6f7149f80fb806c6c4dc98beb2d6f38c75cd92e54a668ce13dfd6157a30996b0fbd2e93fe498ee SHA512 9895d4acf1854b7f86ac0e9b9cb62bcc2aa5aba925c1c3116b2fcfd10989dd92d54d4787703b651299ac42b8ddb972f260ce04f14787d729f160a07a65d616dc
 EBUILD msieve-9999.ebuild 1317 BLAKE2B 8cd2cc6925fcecc20e3e78bffbfe2e331c53dcd32e7432be57188f5de1ab081152fc944e5ebd56e1248f9e0dfd0e421e726cf24081c61176556e9ca19bb0f8e8 SHA512 9b7cc2ea8f065e47fcda5b83f043262b59cc6705adf14187d81bd8ec6c05f3d80c08011c7613ab0b040328ba8c5a2f3b6d651916d487fed9c6195f15f8428507
 MISC metadata.xml 417 BLAKE2B ac5b4847814369f3126102ccf20421069b3b7edace1b95951729507d84bd37966d5f02cefff41857d32661fba8353dd29bef4de63097d276018acbf8ace456dd SHA512 a8c43840089c4516cd31bfd2a9fee4202bdb5a264cb28b22dcd7d17cd40669056cdc4a5c7a437b092bc71b1ec9c1bf6d1bc7f0f8f61858818749fad3e93eaf1d
diff --git a/sci-mathematics/msieve/msieve-1.53-r1.ebuild b/sci-mathematics/msieve/msieve-1.53-r1.ebuild
index f590609455e3..dd74649ec4be 100644
--- a/sci-mathematics/msieve/msieve-1.53-r1.ebuild
+++ b/sci-mathematics/msieve/msieve-1.53-r1.ebuild
@@ -46,11 +46,11 @@ src_compile() {
 }
 
 src_install() {
-	mkdir -p "${ED%/}/usr/include/msieve"
-	mkdir -p "${ED%/}/usr/lib/"
-	mkdir -p "${ED%/}/usr/share/doc/${P}/"
-	cp include/* "${ED%/}/usr/include/msieve" || die "Failed to install"
-	cp libmsieve.a "${ED%/}/usr/lib/" || die "Failed to install"
+	mkdir -p "${ED}/usr/include/msieve"
+	mkdir -p "${ED}/usr/lib/"
+	mkdir -p "${ED}/usr/share/doc/${P}/"
+	cp include/* "${ED}/usr/include/msieve" || die "Failed to install"
+	cp libmsieve.a "${ED}/usr/lib/" || die "Failed to install"
 	dobin msieve
-	cp Readme* "${ED%/}/usr/share/doc/${P}/" || die "Failed to install"
+	cp Readme* "${ED}/usr/share/doc/${P}/" || die "Failed to install"
 }
diff --git a/sci-mathematics/relational/Manifest b/sci-mathematics/relational/Manifest
index b28f6137fb52..c8874d38af75 100644
--- a/sci-mathematics/relational/Manifest
+++ b/sci-mathematics/relational/Manifest
@@ -1,3 +1,3 @@
 DIST relational_2.5.orig.tar.gz 118776 BLAKE2B bec1a8c1a3c7973b9200f9a61e65aa144998558a9798e1e869d970ba15d2f7970be8dad865cfa779f05ee535638011851534a3be0c354d216eb35f38f135cb4d SHA512 588e35a57cf915e544d62749b76ed81927ac06fd88271f0d4d88ee5f221928c2c24e2a88165aae63c1b9b120ddaa20e15e21fe9c207eac3150b744274ae45a8a
-EBUILD relational-2.5.ebuild 869 BLAKE2B d066edd39969b95a622ec79950d67a2c907dff527fc469df2b711c714caea7d0cf7a4ef6e457a42cc36e3fa4c0008859b10fef2eaf2cf389b2085ecc0a9ad4a5 SHA512 c7c3f81131c6e2f59ebd8fe136038e3bceb73a4b2c8f8d76537507c65f9800523c0e2fc8bfd3852278b166852ce1082df766a084961823421b6243f94089b631
+EBUILD relational-2.5-r1.ebuild 905 BLAKE2B b925e6d77fe89dc7519e8fa290754b363a838491e8e173a55895e8c4e08a12a3a7849aa31768cd54b4570e88262f40670ce90ba4c37ce3d4dfd71a1cb42d68ce SHA512 778b625db7a3ee0968d671c4d0689271d27df1a6a601d3717d2fb13ddf78ed3b6d1d6eb70ec4cbff47a1d46a825a44c085b67c8a566bbf8da87407a89089c50b
 MISC metadata.xml 329 BLAKE2B 72059e28c196f127a1c314ad5c63025937a9daf16e8457885da10c94c32ccffec36d4c5049f2dcf2faf9ae67fe934d334a7235bc0f2bec0836614362cd41d122 SHA512 18759433ae0bb33800dc14a9bd518bbd383b8bbdbf876b02dad81afcabe3f0eea7828bd6820989e13253d73c70528d2a3bb4637e5e28d2fa5aab28b84aecdf32
diff --git a/sci-mathematics/relational/relational-2.5.ebuild b/sci-mathematics/relational/relational-2.5-r1.ebuild
index fb88c016ff80..5bb400c2b91d 100644
--- a/sci-mathematics/relational/relational-2.5.ebuild
+++ b/sci-mathematics/relational/relational-2.5-r1.ebuild
@@ -18,7 +18,9 @@ IUSE=""
 
 DEPEND="
 	${PYTHON_DEPS}
-	dev-python/PyQt5[gui,webkit,widgets,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,webkit,widgets,${PYTHON_MULTI_USEDEP}]
+	')
 "
 RDEPEND="${DEPEND}"
 
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 9350b6d0e167..adf65b94c5d8 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,3 @@
 DIST z3-4.8.6.tar.gz 4328752 BLAKE2B 4932670f3c1ab9bdba18a6ad80f4fd8812eb70d71705ebdf1f93c3b052ffb632dc10e4f7f4043f098af214288d6d4a4a26ef7f8cc0d1183c9f27b14ef1787c46 SHA512 d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1
-EBUILD z3-4.8.6.ebuild 2337 BLAKE2B 1f8627d18c873c2cfb398e030d5c738458ddb1847cc83623211aa384c623bdf9be4c4a5dd6d5766e508619c77cc7c9fcb2f5c71200b9b8c5df5c0c1dd4aac36d SHA512 ccd2db341b9e425d3bf00d722af24be8028659e3324c638cfd4556a1d0ee633f35dda3076af5c17a3b2d353fd6f97592530d39e7ff2dc851201811cae583cb39
+EBUILD z3-4.8.6.ebuild 2331 BLAKE2B 62d1efd6f32d39fe38a5d45750ccf579755084771f2e501ebcc42ead957581bfe007dab981c976fdd348d9ba08d1d52694fcfe5a0627b3e3b1c02a408905863f SHA512 759a9b8c0a1309226bd14ac0c3c1836c9e1bf70d4d14f82d9a4337a78e3ee4ddf068a8d4d8e421c7cd97697fd11a5a05addc48055de5cf78ee844262b0dbdd74
 MISC metadata.xml 862 BLAKE2B 1d219fcfb0772a48ec398a51b8916748db336730b91b66e336e8df0b8522b9a47df718d6303aff5f305b699e9297aaad9b352c69d529a93f66cf2a1b76c8f094 SHA512 2a5cc11ae87199a23c72ffb7366c65cbb33683bb6ad142d1df84a65b56bd69f50907bca69f066a1c860947254c241089521c026bac9ff92bd405038c266907ef
diff --git a/sci-mathematics/z3/z3-4.8.6.ebuild b/sci-mathematics/z3/z3-4.8.6.ebuild
index 24aed3818759..fe56e09602bd 100644
--- a/sci-mathematics/z3/z3-4.8.6.ebuild
+++ b/sci-mathematics/z3/z3-4.8.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-multilib python-single-r1 toolchain-funcs