gentoo resync : 10.11.2017

5 files changed, 33 insertions, 3 deletions

diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest
index 123bddd5becd..447baf11ad82 100644
--- a/kde-frameworks/kdelibs/Manifest
+++ b/kde-frameworks/kdelibs/Manifest
@@ -18,5 +18,5 @@ AUX kdelibs-4.9.3-werror.patch 1525 SHA256 a4af430a72079fa481a3e0b00efece509820e
 DIST kdelibs-4.14.34.tar.xz 11644736 SHA256 777d3433555b3257fe67167723020bb7f0da7b16daeace9910751e4b9bf9bcfb SHA512 57ba1591e6996af79f03e8a3d4d0c278c027ad65c717fcbdb857df68a3df47ddec6b7c34dfd682d590bfa9ed6800974b53ff29aa7ab73522caebc9897cbd81c0 WHIRLPOOL 7c1f318edadb6625acef33891e8fb751dd0c783a05f0e4bb2b77376791c43fbfee20bf8b72aab719bcfd8d271294263f2fc57912fd09edb38589a37d8a01c968
 DIST kdelibs-4.14.37.tar.xz 11642272 SHA256 4e9e4a1bf32f28427899b01bf19db01acee974e2e008ca659102a01cc0f3e430 SHA512 b25a845b7c1edae0c66b0a0881801dd3c57febc4cb57186ddddfd32c3253e492b7ff866fb38a10e4fb489233ecee71e80f3a1806f293a29607ea5f68d60ab6e1 WHIRLPOOL 4c0d6cb48d61eac89ad410b0555741809bcbb5adf2f1ecd53763fae04e79dc478104ad05db8dd4fcd43052a63d6b62db0f33e0d845a8d2c9d09f85c92e9233e1
 EBUILD kdelibs-4.14.34.ebuild 6481 SHA256 67f32757ece4c8b65a9517446398cc498292cf0aca9502d00ad29bc0e15a2764 SHA512 ba37459f47ea6ff709dcc92595f10c01d39b0bbd3a487cce18ef5b3188681385190fd12299db19aa4d9b23fad66613904bd44b7b44b1ed4f8c71c21afc2759ee WHIRLPOOL 781a62b5a70edbbe0e7a0b8c9eb515d558e1bbeb261f6bc54d23e2977d3a78238d099c3d28b9512d8e3dddfa6ff1aa3512ca1e514343c9753b5f82666c4a8ee6
-EBUILD kdelibs-4.14.37.ebuild 6706 SHA256 bcb383787f99e55fb171a5baefe3636d5ff44ab7b7cad6823f24a1f5ef02102b SHA512 dccdd0408d14ec0ac0cfe44d559dba64bee1fe02f185ab58d3fd50593fac14aa4fc63878741e31111dd76d03e7b5d918328b3eb2ef7c5d7b5dafe37b41c5c5df WHIRLPOOL b543132a161e00f0875be4f02785074517275f7eb7093ce6f11dc90a92b99f338a1c56b51923cf9d6ae94fe7f74eff778ba9ad38f18cc179a0cecc557c8c56ca
+EBUILD kdelibs-4.14.37.ebuild 6704 SHA256 4ffe790ea858451bb72d3f148bc9154741e34fedc8a07d2ee66d95504372bd88 SHA512 532cb2ef5230dcc4387bc344c2a1b25ee6006c173952717753601b76bffaf4ed0325ca0429337472b223841f354021057539a6f11e228bbdb743b2055f99acb1 WHIRLPOOL 437d7c90fabc3751455443ad214d5a72ba5b187e2e1fcce4d57fc8dc1a65505b5d24fd62f1dfa658c7e2ccf2c39b186ebb704b14e723e48425c952e5402e12ce
 MISC metadata.xml 426 SHA256 7250bebf1ca3aeca7542d2a6f6652b248cd62ddbcb7604bc6ea3b30358e6e309 SHA512 ea96586720b37b26dd5f95225ec84a53cc2ef8732343ae882e1ea5ca20a077a2ca3b7d9f94a7a075f3a1f01858b70f7a4a933036f826c0c2d681bc63abfda2ee WHIRLPOOL 5fd82160dfff17a6e6c914f0724800c129e3b1d9b036e19506a73fd1708669a6e460a7fda10385d7c627e2a09f0e0237a961450e4369dcb08460dc4d0a20b821
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
index 80d84e09116f..e02222c8285a 100644
--- a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Libraries needed for programs by KDE"
 [[ ${KDE_BUILD_TYPE} != live ]] && \
 SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
 IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam jpeg2k kerberos
 libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 03023bc871ed..03da615ec21d 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,7 +1,8 @@
+AUX kirigami-5.39.0-qt57.patch 1023 SHA256 f5ee42b3e920c989b9893dd9eb8422380bd4090cdaa804d1c82be4fb43391ef4 SHA512 d78578e5a6aeaa25f2f20b80d5230894c0c7a57a9f852fce3755c3cc5cd2a5af45dab90d6246a72d61f58d27e2701b089213cb4b4c5e76507df2b841e64e66e6 WHIRLPOOL 948d89c95e7f305d1c64a594c2dcdd8283c2cd05afc94899b3c9c71dbf33b5028d3a487d192eac11be2190d5bffabf4ae9417699dcb297d28569c4679307cf97
 DIST kirigami-1.1.0.tar.xz 262152 SHA256 6677af0c486a4c9cfefe74a0951e85dad53435010031bf2b7fcdf9c5df6b3edd SHA512 83d1c0600fed7838b25ddfa3d20e1abef594c8e5fa202314ef1c22b6548573db36058f02620236cd9bba9f65f45f8821fa37558689b49776f9fe3119c89b0b63 WHIRLPOOL b1d4cc22a0759f561c16bb61bf2a47494e92cc766401862b97866156dfe1cda452e1db01a62805fe902320fc106708794b7f545abfbd2ff5c0d8909acd024bc1
 DIST kirigami2-5.37.0.tar.xz 278452 SHA256 ad252c1ff20060f1de5afd41fade9b86e046bc9a7da38af6ca507f8ba2ce82fc SHA512 fcbeda787b571e9cad820b5dba9fc1fcf51e9411820765138bf350f57e8be01356d157d4207a78954901d96c3ca9db4c47604b054daeecc1cf10b0a769c5cf10 WHIRLPOOL ba3abe68200c96741ce2803a62fdc632127deec79adfce6218d4a583d4a36999667c2e35a8c8cf69f450133d8d259fd2701eaa1ca3af1102286059e6988a5d92
 DIST kirigami2-5.39.0.tar.xz 290808 SHA256 2714ee82dbcc2cd1b799d5f12193cae5637136466295567426c74b4f26f5ef6a SHA512 ed6605072b8cd28bb9a6c70ab0f9d65e559795bf6cdd3118d63d36588a6c397a7b8656e80201ba320ae9b85a38f31550897762dcbee8347cd9e657efc6e8af11 WHIRLPOOL b993c99ff3c0f5d577e79ab6f1b28e097ff62c6d11881bf3f2b06f4e16be230c1853da0e0410dca2784974c03617022ecd7fabd46ebf4b6710c38009a4278956
 EBUILD kirigami-1.1.0.ebuild 803 SHA256 2ac91ce41ad4ae4b72bc0f237a1515e8ea7ac6bb2107a98987bedf46611017a2 SHA512 1b1a3204c7332978ed57199d0402eed4fd21b945a0333a310e4d6678abdddc76c619c467974a9f133e8655491554c72a91242ac638ea9f39716aeefd87fe5271 WHIRLPOOL 56f78bfafa538a4aaa136531ccab12a1672e98398f4f44727812a1b768845aeff777bf83a9a11f0f6967a5017af286e6f374def8dff9243f7fb364d1cfb93cf7
 EBUILD kirigami-5.37.0.ebuild 978 SHA256 54a2810b07f24a06eea6685cc1bb9082e024f1db3f8ed8a2d70de782fb9f9f54 SHA512 fa644faa805bd22ac949a5b4dee6c8469f8a5a5e8ad99b685347d59b9ccabc0a612e54d648ab89f84266ba7fa776f80e858bd74c47a4a669e924e68617b549cb WHIRLPOOL 6b6901fb620bb362e9566dd8982457e4cf90dd3e3615b70db7028cb9ad42ac98306b29bf18a7f6ff2d0a7fc47aff39299837ebaf273c326d4b7cdaee115ab483
-EBUILD kirigami-5.39.0.ebuild 918 SHA256 16993dd9d21ca351c92c941ff0812332f6d29556b4a8304874cd574572d9c19c SHA512 01fbf0721e85efa1656180d467d79cbe0e72c1fe71a845fe13f8740d56d9e80b8db013c4de7d71f058bd464b4d9f76497eea5581bdb1a7d2eabe05d7be9b0fbf WHIRLPOOL 63b794240ba058c36d5ed768101d8003daffe971df9bcb451326afa358cc94c38a251843d79a5778bebec4fed09517a8d1e1b40d29ceff95ae4f6f50cee04da2
+EBUILD kirigami-5.39.0-r1.ebuild 961 SHA256 d1ac3a4a82610c8d5f7268da965390498ecdd6fc8f0c754587ceb00affaf13c0 SHA512 2a214d5c9cf2ee17d9bb5ba7ab2817275e424fa5a9c67f04c3ce51b51ca9d23235b0d85e9158205d6c67630f0f3577d9e95803ab5979a43e751eaa68ffbdc762 WHIRLPOOL 5cd7ef6ed96947eebb1fe6a8dc81f5caddeb55050fdc770c2e933d4b444d9d8be26e76dc4f00e9fe3db05a9e85c0e4b598555a97b8d136fe083dcfd4d93320d2
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kirigami/files/kirigami-5.39.0-qt57.patch b/kde-frameworks/kirigami/files/kirigami-5.39.0-qt57.patch
new file mode 100644
index 000000000000..de33976061db
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.39.0-qt57.patch
@@ -0,0 +1,27 @@
+From eed28bbd8aec29cb9a045a5188ceb0e27ff33344 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Fri, 3 Nov 2017 16:57:11 +0100
+Subject: [PATCH] syntax working on older Qt 5.7
+
+BUG:385785
+---
+ src/controls/Page.qml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/controls/Page.qml b/src/controls/Page.qml
+index c2d0307..4498e40 100644
+--- a/src/controls/Page.qml
++++ b/src/controls/Page.qml
+@@ -256,7 +256,8 @@ T2.Page {
+             right: parent.right
+             bottom: parent.bottom
+         }
+-        property T2.Page page: root
++        //It should be T2.Page, Qt 5.7 doesn't like it
++        property Item page: root
+         height: item ? item.height : 0
+         source: (applicationWindow().header && applicationWindow().header.toString().indexOf("ToolBarApplicationHeader") === 0) ||
+                 (applicationWindow().footer && applicationWindow().footer.visible && applicationWindow().footer.toString().indexOf("ToolBarApplicationHeader") === 0)
+-- 
+2.13.6
+
diff --git a/kde-frameworks/kirigami/kirigami-5.39.0.ebuild b/kde-frameworks/kirigami/kirigami-5.39.0-r1.ebuild
index d3fa319c2d78..f18881398a78 100644
--- a/kde-frameworks/kirigami/kirigami-5.39.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.39.0-r1.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 # requires package to already be installed
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-qt57.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_EXAMPLES=$(usex examples)