gentoo resync : 31.10.2017

4 files changed, 6 insertions, 6 deletions

diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 89d4f341874a..b778e801bcd6 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -5,7 +5,7 @@ DIST fossil-src-2.3.tar.gz 4898441 SHA256 f073abf455a38ea0a08c3926d7445ab8115b14
 EBUILD fossil-1.34.ebuild 1302 SHA256 2a6b866c5cb85c4113313b534afdfa29d1974f1b1592f7b1fa105792789c18b0 SHA512 b124bf0f3047a20bd73797b3d0ba6720f17eeb24beff74bce70a002d7ab0ed43dee9982a261275e1c88c54469b05ef1c95ebd7afe5a8c1cb8e1e1eaf529ed608 WHIRLPOOL e8ef15a4bb95130520262237888a843b208631d1ba8c9ccc8a8ade246c5804d528509ea8b9240cbaadd4093f70ce45b5d0582f7e7effbbf3b46b2005276f167a
 EBUILD fossil-1.35.ebuild 1280 SHA256 f147b75638ec9a6579ad89e757ca8690e8ff611764d544b46fe968367f9e8187 SHA512 676cb1621623705b4af679afa003814518a62b303d51f8ec8dcb01b9e13a8d4a9a98921ec4352e6190551d0826a0f2a839048e275bb2d3ffcd08a2345122170d WHIRLPOOL 7a3d05b23bb521bfbba35de17ebfb152f9be6a6a651cbc3980833da4c32c3c10e400d29b5df4acb133c53969d8ac49f4718dd502d76a4d87d1abe58fe7480dc3
 EBUILD fossil-2.2.ebuild 1316 SHA256 0a4ce960c822909e0b220aea8802ffe58a5c6f383a9ec14ab8a5c3175410938b SHA512 618f31d1d54d4fa5e29dcc502ebddfbee877d1e99335112052d234a997175a50c2c63a4cd407d413be37e47b01f9b4c0115a1b4fa9deb8d4dd180fd934c7dce8 WHIRLPOOL 09354d573b3e6897ca13f550a6e8955297f696f667ede23d30bac915b8cbf823d5f9d3df6c001186df581b2353d435d1878d7ec75102ac5dd7f9a299ef432fc5
-EBUILD fossil-2.3.ebuild 1412 SHA256 296431c92a822e77087125a2507d2e08747da6d51879949554338fd99c92fafe SHA512 c535541b6411ffefecdde50f1231d6c2bdb81ee7d0aba3d99130418fb1b736601f1142e48721d07e337e22d792263f4d7ee32024e7febb8ebfd9e4f119f5bb4f WHIRLPOOL d3ca5607e60bc102cfd61008281e2905601dddd2c3ec84708f10845e5869f9ab03659cc599e0f994db1813db4f7360bd1e60c5f6174e3c9ac4273b470d21a5bf
+EBUILD fossil-2.3.ebuild 1411 SHA256 2c7f77bd7d19d5e3cb0158e7ea48b647c0b0aee2e6aa157021c1c00872c620f7 SHA512 dfa53e88eab5f66b1a0ca804d4e5f01c1dded2df7f70168654e8610fc52516a2322d9e01aeec274ebb67080f99dd96705fe76b74ef85795052bb40ba8d51a7ad WHIRLPOOL 3105ab2d67b4df29044a30a748f23181a830cbaf616aadefc40cad755542fdfe70119908ab2b35744b1bf1db8231834a17638ef32bcd5e8d3211cc373e46ae66
 MISC ChangeLog 3494 SHA256 43b3d90ea4e74776b33f762d19bfccfd2f240ac7962ff1c95be4a4b475edcc6d SHA512 5fb3097a4b67e78ae1e8e122c4c4523731d12754af2139565445e5711fdedae4da808258ab1851c25a151d343521e102f90aaefff7ee3dbc732cb5a788d59c70 WHIRLPOOL e17b649c26634e81694f8d5ab2b638e4dd74b23cbe4aaa506284fc0a76315b053be223a6b90c0991a421f9b346dc935a35817b0d8b8c9c79606239f133508564
 MISC ChangeLog-2015 4690 SHA256 7733e3b40772982e51448329e0e3b94f7250e8868297c3c09d090a06e6051a70 SHA512 59003f1ff5273969aace16d3a92b4432356f4862b2df86a302fc92885029b3e105dffa25ad44365d9e2caeb813f16f152634fbf200ffb94052d8386dc41557c9 WHIRLPOOL 1077531d9ea072a7f2187782b9afc8cfc5fbceb317c0f76b329f97e9c97f63298ae75272f0929caac8cb2966e89cb855186177bc8f136eeec33275dc5b3c134a
 MISC metadata.xml 1251 SHA256 02a995dad789d4d9dcea032c87631cacf8c0bffa3b3689593080142d713f0502 SHA512 785dec7c66b06d2451287e1db951bd47f53ec2f0b9b736c897ec57342a465ab8dafcd8b643385ae06abfd92e6bf417b09d11dde54a04f05c74b8b751164d8201 WHIRLPOOL a04aa7f2f42c32b7e0fd4a3a01073dc5e301fb94bd8a38e75e6f0e8cf991df5be48010fa74bbbb825d4035bb60e13c4c7697a1233f3774efe64374d47673c670
diff --git a/dev-vcs/fossil/fossil-2.3.ebuild b/dev-vcs/fossil/fossil-2.3.ebuild
index edde085d9afb..ff869df46b88 100644
--- a/dev-vcs/fossil/fossil-2.3.ebuild
+++ b/dev-vcs/fossil/fossil-2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="debug fusefs json legacy-mv-rm -miniz system-sqlite +ssl static tcl th1-docs th1-hooks"
 
 REQUIRED_USE="ssl? ( !miniz )"
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index c92cdd5cae61..8faf02b54056 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,6 +1,6 @@
 DIST tortoisehg-4.3.1.tar.gz 7930491 SHA256 5698db60320574769c73e4f910909e75a8e32ba84adcea902f9457899bbcb753 SHA512 dc43f2acd780a7868b642d6ce8a8dbf8f32be94134ddbb72178d7f1eab1e9f58c8e9bcfc75ad589ec9404cabefd9ccfc697af9ccd037c20bd933ee862e812f99 WHIRLPOOL 0275b5d2d76483559d829a6c32b8888af2134fc58367407ff670da21a8d0ae5d98815410520955f41e227af1eb55dd37052af19534756f49d9cb09a91b441de1
 EBUILD tortoisehg-4.3.1.ebuild 1954 SHA256 acc4212a37154f558b4510722b2e7f35d769c20bbb0e5fec24e3aab34b7785ef SHA512 8116b2589804b468821532503bc8c710236b4ebcabe7ca9c314f2106d95fa2b706197776026c3524929fb647f97ffd278f178e31edeb139209c7041db1bbc6db WHIRLPOOL 2fb0242421c78be37d1d521dcd71bef9da297a535c4d8dea5e7996c6e4683a6620903700fbc7c166c8e7b3aa244e5708daf9325411e06041047ad7a785b62d78
-EBUILD tortoisehg-9999.ebuild 1789 SHA256 15920e095fe180f45944a6c2269b4c97cb1ef0d1c48801b9bb937dfb9135487e SHA512 88ef9206038a2bccc1e2deb28749ac203ed616d4c89be29a33041ec6b08a75cfecb4e7731994446314293fc048777e9dda6b116f0687438d2b997530c59cdbd6 WHIRLPOOL c8e470ef9347457367070758d19ffa09493d7a5b8f45e067e89ac6a6be4dd662358ca667a62367a4fc69ecfedf32c58d5d5e9d103e8ca7efff0a795aed88282f
+EBUILD tortoisehg-9999.ebuild 1799 SHA256 541b5b3eea9650349b3a85a7dca9c743a388276f2edc7ad2275c9597e61b96ab SHA512 b0076fd4cfe1bf9f44dcf6d2b5ea56232c010d8d88060652838036e3df69b738300a784a23dac46a768a5780d97a88ec02fa39c09a1c3c5d366d3cb655b390ae WHIRLPOOL 146f25b98177ed187fe8a58e3292cdbeaf470e11151d0361beb813966d74920d68dd01f52328b4e1e80f7a45575ce13a60357559ee658137800b970db2440696
 MISC ChangeLog 10073 SHA256 200d983f43ee118755ae3384fae47fda659ad4bd799407db923dac060e03a45d SHA512 b5323c8af58261de14c9ecbbd8b1839805aac9fe41b9ecc794dfa155237d0f9872f767b19f15052599c5dbcdc4cb08f838be595e96b35630bfebe82a9b084355 WHIRLPOOL 4bb9c92cbdb4f3fa83156616166d4bf4c6fe2dd9859a6122f5c8609ce857b30a1f48fe5219f4bc72837c4685cd978a387547b541d05b77586030b4f349cdab7d
 MISC ChangeLog-2015 13266 SHA256 25756cfe6cdb0f3c74d5b9f07048246cfa6938debe009a4fc100c030c3e13641 SHA512 847ee89320314e193b8ccb607b5c400ac612053488410049d64469d029151af9d92a6322e5fb7ba09961bd9d017cad5be6f381fffdea249ed36b6ce0726dc3ee WHIRLPOOL 919c3a8d8bd43dc465bb132cdb1a83fa967b23b93157f2ea911da8ee253102df6e4d8080ea75686be5150d46aa059a80141db6b2441423c0c822309a323a7184
 MISC metadata.xml 251 SHA256 59d4a6753275d4f64e51844f8c61bf78d104e103e42c551df15ba14c8e65e9ea SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e WHIRLPOOL 26dafe883e7e85115f4a9a758c911c206f37f2239544b74a4beb392815efc8f35b230528845def4a7032851e037ecfc595280bfa119035dd07ccaba3a8360927
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 11d30fb43625..9fe522559a03 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -27,8 +27,8 @@ IUSE="doc"
 RDEPEND="${HG_DEPEND}
 	dev-python/iniparse[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt4[svg,${PYTHON_USEDEP}]
-	dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]"
+	dev-python/PyQt5[svg,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.3 )"
 
@@ -70,6 +70,6 @@ python_install_all() {
 
 pkg_postinst() {
 	elog "When startup of ${PN} fails with an API version mismatch error"
-	elog "between dev-python/sip and dev-python/PyQt4 please rebuild"
+	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
 	elog "dev-python/qscintilla-python."
 }