gentoo resync : 01.10.2020

7 files changed, 110 insertions, 2 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index dd0cc664bd5e..9d9fee5b64f9 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index 51446a1f31c7..8fbad1759fee 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,5 +1,5 @@
 DIST qtnetworkauth-everywhere-src-5.14.2.tar.xz 141424 BLAKE2B 11adc6be96f4bc4247aa04a0b21bb142cc8d63dbe547a271759e7c564dde031193f1eceae4366791afd1bc9734be0eef23b538817feb5431322002bab5d39595 SHA512 9001755ae289213f7d2c994bedbbcc1ca641b3c80fc5279f6829ed48c31eed8cdbd87a0ed0ce451bc9611318ef09ef7c40b795d2c45fface2bd357ee579b15ad
 DIST qtnetworkauth-everywhere-src-5.15.1.tar.xz 141416 BLAKE2B 428f55b4d08c88b837b4c3397e13d7296855fd930df0fc319e564709993b4cc4dc7e1f2179c26f7f08e1b33172f62a4e1f7f373439f9ca341cbc821083dce6dc SHA512 2c22acf4842f2e26c514ea48bd4e21f466571c1993b811495c1eb9fe22ea66a687ca882c9ed09b38c00a9a6616b13d44021e0d9a65020f4ab9495d6e8c64d282
 EBUILD qtnetworkauth-5.14.2.ebuild 377 BLAKE2B cfc5af1d28c83adc26feb60e954d691bb3c68f205e4a82445da360e960aca4d3f0ade463f622e7b56fdb254522abf2489e2d8882f24edb579319a541c38c165f SHA512 8428aa168f5278bd76aa403a14889f58575340fda332f83271f045c1cae60c4864e498cd282dff3e8bca937f9b55d7b55835a8180a70e647ada72d109c529d57
-EBUILD qtnetworkauth-5.15.1.ebuild 380 BLAKE2B 09d2cab1877fd00c93f4d844f425b0ada0337949936513da1176529a2aafd86f73c0264e970ad171f7fbeded8a71f2654459146f357b8c67c5ccbec61c2059ae SHA512 b989dcef797d9a662a2d069a2deb4bb170094bb8e30c34f1db4886f71537d7b9ef3ab3bf74acf6827598ed77aaca7306f724bca0aaf9590de214c6c192b82576
+EBUILD qtnetworkauth-5.15.1.ebuild 387 BLAKE2B 742301fd443101d581d199dc5e458cacdd5eaa2bbc589d883900c5592a50b9ea9181537e6eb5641391f9f31d7d9ff333b2709b1370d26619d9b84342299b5b93 SHA512 bf08b5ff57c011f25067edd3701a1228e5d207c2992b6ae6c69a968da2c4ebe12f20b24aca4026f2414ef12e52437ba5e81f187dfbece328375dfd89c95dd89e
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.1.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.1.ebuild
index bae3d6ce6c91..8ccea6f99079 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.1.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Network authorization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtstyleplugins/Manifest b/dev-qt/qtstyleplugins/Manifest
new file mode 100644
index 000000000000..cd8d50d97864
--- /dev/null
+++ b/dev-qt/qtstyleplugins/Manifest
@@ -0,0 +1,4 @@
+AUX fix-build-qt5.15.patch 2651 BLAKE2B d4b058715e76f2721bd39c6499289b959daabc1ec765af1a87d0796eb934a49bfd589816dbfba6e374c5cd61a3d3b2526f25de21108fe6a0a7f352f57e899e5a SHA512 181bf85ad054ed5788f1bd4c32116729d57f83b8a4fdfcab3d3185ccd1e557b9492468c11c53a8a54c858967bf8298c3bd1a29bc100a8ffc6561ec543361f8b5
+DIST qtstyleplugins-5.0.0_p20170311.tar.gz 306394 BLAKE2B a59343602062ec1d0f215acf568322a5be874552b0c03dec75f268cec2123b1baa30bee524e36c9d522a8c935a58f204b5362feaf028df87ca10ea01dd29b3fb SHA512 e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d
+EBUILD qtstyleplugins-5.0.0_p20170311.ebuild 872 BLAKE2B 27908a1ea8fd57125848ef5d00ae64e2f7dfa3808bb11ac9b7978a558b0b0b374161f09a0b4226d2c19ca7a00584c3baef9e2904350e919452c3a937f3d03676 SHA512 2a65d2b594c62f7e5c65a7393da920ac942a1c281092b01310b0f6d0ff6454ebcbd4a4a426b86a732492001e0573e9a0d7b7f119193c617d45b410b63c3a1adb
+MISC metadata.xml 329 BLAKE2B 0b6512d88b304129461ebe5d0bd6c138528a7d0379a7407736b1d82de2266c265adcfee0ef077a6d2fdf0a5588d6758f2af4c31d6c5a4369b437dee302b14c8e SHA512 be6bd88cfb8875c8c07782b217f4701b2b325199d51e928ea9c4fa45a09dd7e69e04a1f314fc8c0301c5efa1a2ee8e2cda8d276108b5ff3c6de46ec5e3bb5ba0
diff --git a/dev-qt/qtstyleplugins/files/fix-build-qt5.15.patch b/dev-qt/qtstyleplugins/files/fix-build-qt5.15.patch
new file mode 100644
index 000000000000..caedd05baa83
--- /dev/null
+++ b/dev-qt/qtstyleplugins/files/fix-build-qt5.15.patch
@@ -0,0 +1,47 @@
+From: Fabian Vogt <fvogt@suse.de>
+Subject: Fix build against Qt 5.15
+
+With 0a93db4d82c051164923a10e4382b12de9049b45
+("Unify application palette handling between QGuiApplication and QApplication")
+QApplicationPrivate::setSystemPalette does no longer exist.
+
+This style does explictly not support "system colors" defined by the platform
+theme, which have priority over the style provided palette. To prevent the
+theme from overriding the colors, it previously used the system palette
+mechanism (which has priority over the theme), but that way does not work
+anymore. Instead, simply use QApplication::setPalette. While that has
+different behaviour and might break in some applications, it's better than
+having a completely messed up palette with certain themes.
+This is the same change as suggested by gamezelda on
+https://aur.archlinux.org/packages/qt5-styleplugins/#comment-749190.
+
+Index: qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/gtk2/qgtkstyle.cpp
+===================================================================
+--- qtstyleplugins-opensource-src-5.0.0+git20170311.orig/src/plugins/styles/gtk2/qgtkstyle.cpp
++++ qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/gtk2/qgtkstyle.cpp
+@@ -440,7 +440,11 @@ void QGtkStyle::polish(QApplication *app
+     // not supported as these should be entirely determined by
+     // current Gtk settings
+     if (app->desktopSettingsAware() && d->isThemeAvailable()) {
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+         QApplicationPrivate::setSystemPalette(standardPalette());
++#else
++        QApplication::setPalette(standardPalette());
++#endif
+         QApplicationPrivate::setSystemFont(d->getThemeFont());
+         d->applyCustomPaletteHash();
+         if (!d->isKDE4Session())
+Index: qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/gtk2/qgtkstyle_p.cpp
+===================================================================
+--- qtstyleplugins-opensource-src-5.0.0+git20170311.orig/src/plugins/styles/gtk2/qgtkstyle_p.cpp
++++ qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/gtk2/qgtkstyle_p.cpp
+@@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateThe
+       if (oldTheme != QGtkStylePrivate::getThemeName()) {
+           oldTheme = QGtkStylePrivate::getThemeName();
+           QPalette newPalette = qApp->style()->standardPalette();
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+           QApplicationPrivate::setSystemPalette(newPalette);
++#endif
+           QApplication::setPalette(newPalette);
+           if (!QGtkStylePrivate::instances.isEmpty()) {
+               QGtkStylePrivate::instances.last()->initGtkWidgets();
diff --git a/dev-qt/qtstyleplugins/metadata.xml b/dev-qt/qtstyleplugins/metadata.xml
new file mode 100644
index 000000000000..dc9c7c4c678b
--- /dev/null
+++ b/dev-qt/qtstyleplugins/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">qt/qtstyleplugins</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311.ebuild b/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311.ebuild
new file mode 100644
index 000000000000..24e7e83cdc2f
--- /dev/null
+++ b/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+COMMIT="335dbece103e2cbf6c7cf819ab6672c2956b17b3"
+DESCRIPTION="Additional style plugins for Qt5 (gtk2, cleanlook, plastic, motif)"
+HOMEPAGE="https://github.com/qt/qtstyleplugins"
+SRC_URI="https://github.com/qt/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5=
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango
+"
+
+RDEPEND="
+	${DEPEND}
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/fix-build-qt5.15.patch
+)
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+	elog "To make Qt5 use the gtk2 style, set this in your environment:"
+	elog "  QT_QPA_PLATFORMTHEME=gtk2"
+}