gentoo resync : 15.01.2020

5 files changed, 2 insertions, 151 deletions

diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 68baebc976ae..e72a73a913aa 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,8 +1,3 @@
-AUX qt5ct-0.35-fix-qtdbus-automagic.patch 1194 BLAKE2B 7a076ca63cdbcae61a517f91c501eeb48a93dd484b6472d95fca2e4ffcbd7240b2169d316e9f5f10385c7fadcfd89195ed13ab673b2de8769d71520e7f594874 SHA512 e90688a59a3fe81cb8ffcce290d061728dcc662b3763e258745361e2eea2a6b32efd51e0e338378b83d2fe5ba73c7984e8d5f858e8ad772ffc19246b4465de60
-DIST qt5ct-0.35.tar.bz2 62547 BLAKE2B dd61f151e1c6c58095889b90cb30bb2baaf21fd8f181af37ee43c1d00404655d57c941cee905e737aff29122ae3f588d5c7ba46dc80ca76d749cc2dd66f35d57 SHA512 2bd24221d391c420e73488738ff10762d27eb21fb28dc69da27dcbfface0cd0f16049768b55867a059c93da07eddb76da1bc63aefd516e07e5049c847da3970a
-DIST qt5ct-0.36.tar.bz2 68181 BLAKE2B b2bf21a1e3f4c6045af5f2e633c2a839bdb49165eb7f3a7d84021faa1c178e4ab84556460c2aa5e2b530fa32fdf29e0f7d3b37c9c839b7bbc7cfc8b77dffbb70 SHA512 dfd6f85328fe8f14c8f2349bc0cac698e549350e2c000a73ac26474ca38ec5f44fd4ebed9b6976fc3423dda8322fd80355eafa6ecbec17495d1e2278c3189a88
 DIST qt5ct-0.41.tar.bz2 73009 BLAKE2B de6360feb16a82b262c13e6a3cbe226b7be7c3e95b1f1262b3802de59fc3bb8820c935b170a15a88e80164e6167f6259777c65fda6a3f8fbf1d115a63ddcc1f2 SHA512 a94f9996dc2198d3c8c9af8610912d12b915b8c547a49c36f7bc083b6f237b318d7903e91fb6fcfe06996a319c361104c1923e6d0c49446b6fb66a1e44fae009
-EBUILD qt5ct-0.35.ebuild 1092 BLAKE2B e429fdfa2eb628ad2b6ca420258dc45873fb1b4d3d904905c06dd9489bb69a913b8c69c6e5136e0f422700c8c9f32717b36c4ba3dd8d6e4bdc29096d09f88578 SHA512 57ae70772ae917725776b4debcd2a90264655d2c4c5705fb7c07c12da2fba77917152f47832dcb537990803649e0152e16a09ad25750a2c954868ea2b612f600
-EBUILD qt5ct-0.36.ebuild 1006 BLAKE2B 8fa017e3c33f1b112eea963812b79d68e631e4ba7a80f4feab0d9c9d3ed9bdc864d4d7c80f096372f5a39e181224c98c2deb4d2261c4a9aebc1aa1959e32284b SHA512 6ead937acf5c95faeb93cd4d4cebfbf97dfeea957c603b0e17860434596d67f53be5fe479726da3cbdbed67268bfe9cc91e71aca6ad67cd75b68f73ef56d91cc
-EBUILD qt5ct-0.41.ebuild 1028 BLAKE2B 2181cc64c94ab108d01ac515edc841c49d590cdd913e546e81f04cc2be1490799209714b68360560903f9d239a20d34af669a885bb5f983b5b3e82e7758208ce SHA512 e80db966a56257d75f7e3c13f708b05682701902d877d4ee4a3b1ae8cc8f86a70a2282b93e4bbdb672192083407a0a574b391beddcb9f56d07d501e14169b3f5
+EBUILD qt5ct-0.41.ebuild 1026 BLAKE2B 64c305e03b1bb2d1b534cb1fae06816821606bf28fedda93c326e0c7b7c23c49f846a3ab08be11cab61a45a75c3e7644d60c0605b353ddac582f4ad6a6321a49 SHA512 9a58316f68fe1c57b1e94594c47504bb0cbc4091e403b86fccf0be6ff74e745703d7d2f7b60c511cd7078da73e10d228fe6f2fabf49331b1c4bd3ae3de0be23d
 MISC metadata.xml 566 BLAKE2B dbb30222ccd1079489ce54e50d5d4ce9a3b9e9acf38d4cc30a402f81418685a3cf86f1adae23d85a409f9866ca11ec1321e543e14bd37ed13a45d02a32accc15 SHA512 d40c24dd0cc2d0b2c79251cf1fb2540dbec484653817469198f4ad7e41164a8c518442c5d11764f0c8aa53bd7ae9758629acc7ba4a4c9f2a374af13cbdaf67c1
diff --git a/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch b/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch
deleted file mode 100644
index 2363e559370a..000000000000
--- a/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: src/qt5ct/qt5ct.pro
-===================================================================
-diff --git a/src/qt5ct/qt5ct.pro b/src/qt5ct/qt5ct.pro
---- a/src/qt5ct/qt5ct.pro	(revision 485)
-+++ b/src/qt5ct/qt5ct.pro	(revision 486)
-@@ -5,7 +5,7 @@
- QT += widgets
-
- greaterThan(QT_MINOR_VERSION, 8) {
--  QT += gui-private theme_support-private
-+  QT += gui-private
- }
-
- SOURCES += \
-Index: src/qt5ct-qtplugin/qt5ct-qtplugin.pro
-===================================================================
-diff --git a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro
---- a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro	(revision 485)
-+++ b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro	(revision 486)
-@@ -4,13 +4,14 @@
- TARGET = qt5ct
- CONFIG += plugin
-
--greaterThan(QT_MINOR_VERSION, 7) {
--  QT += gui-private theme_support-private
--} else {
--  QT += gui-private platformsupport-private
--}
-+QT += gui-private
-
- !equals(DISABLE_DBUS, 1):qtHaveModule(dbus):greaterThan(QT_MINOR_VERSION, 5) {
-+    greaterThan(QT_MINOR_VERSION, 7) {
-+        QT += theme_support-private
-+    } else {
-+        QT += platformsupport-private
-+    }
-     QT += dbus
-     message(D-Bus support: Enabled)
- } else {
diff --git a/x11-misc/qt5ct/qt5ct-0.35.ebuild b/x11-misc/qt5ct/qt5ct-0.35.ebuild
deleted file mode 100644
index 267aa5d98901..000000000000
--- a/x11-misc/qt5ct/qt5ct-0.35.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
-HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+dbus"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5[dbus]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-qtdbus-automagic.patch" )
-
-src_configure() {
-	eqmake5 DISABLE_DBUS=$(usex !dbus 1 0)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	echo 'QT_QPA_PLATFORMTHEME=qt5ct' > "${T}"/98${PN} || die
-	doenvd "${T}"/98${PN}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		ewarn "qt5ct configuration won't be applied to the currently running sessions."
-		ewarn "Please relogin."
-	fi
-	if ! has_version 'dev-qt/qtsvg:5'; then
-		elog
-		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
-		elog
-	fi
-}
diff --git a/x11-misc/qt5ct/qt5ct-0.36.ebuild b/x11-misc/qt5ct/qt5ct-0.36.ebuild
deleted file mode 100644
index d69df2963cda..000000000000
--- a/x11-misc/qt5ct/qt5ct-0.36.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
-HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dbus"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5[dbus]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	eqmake5 DISABLE_DBUS=$(usex !dbus 1 0)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	newenvd - 98${PN} <<< 'QT_QPA_PLATFORMTHEME=qt5ct'
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		ewarn "qt5ct configuration won't be applied to the currently running sessions."
-		ewarn "Please relogin."
-	fi
-	if ! has_version 'dev-qt/qtsvg:5'; then
-		elog
-		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
-		elog
-	fi
-}
diff --git a/x11-misc/qt5ct/qt5ct-0.41.ebuild b/x11-misc/qt5ct/qt5ct-0.41.ebuild
index cb755d5ac746..575ed6982d0c 100644
--- a/x11-misc/qt5ct/qt5ct-0.41.ebuild
+++ b/x11-misc/qt5ct/qt5ct-0.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+dbus"
 
 RDEPEND="