gentoo resync : 01.10.2021

4 files changed, 2 insertions, 80 deletions

diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 213fc0682ab3..2c84c03d3df2 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,6 +1,3 @@
-AUX qt5ct-1.2-cmake.patch 833 BLAKE2B 6866f26696477cd9de56851569e4f9116557b13a999eb8fcfadb5e78514961a8c0ab4beba625f770a72f9df62ac0923d8b5f882d09dc7e35ce8b2c6c0b388e27 SHA512 8b6173169b904dbf5c5d12bcae82e92cfac5847eb95b3c228fc818b1293c6b1417d3f941219ab458220d5095bb5053c12da372f022263f728182f375208cb257
-DIST qt5ct-1.2.tar.bz2 76052 BLAKE2B bff9dcd6176f856f262f908101f51be5bc5fa56cbf221fb6e1b66cf49867d721f4c1d5707bcd71cb20b1d27d53f5352bcaaa32ed7298f9fe349ac8a90b4a4e23 SHA512 044582440fc3ed8424970a30d7e1562396f9a1651f2c50adbdcb6ec73b35fb8dd23de419df29b92d21a45fea9af4e562b1294f5bfc329419f831775954f8ed6f
 DIST qt5ct-1.3.tar.bz2 80506 BLAKE2B eda2d69fcddf80553358d3c9e9bd0ef33355919c5b62912d8e79a84a36ee5a25d1dab553b6413d78e16ce69435861a01b298ae97202a77f1f50ed805f14445dd SHA512 9f4397d5cfc3dec14330759f213ae99b02ae36d3ea48dfdb3015c3b7d3fe12cde619af855d7320566ca32120e8689e4b39f78e4fdf9886e2472aef570beb75bd
-EBUILD qt5ct-1.2-r1.ebuild 1021 BLAKE2B 86950b3bb7ee8255fccc3f0901b34c9276a790cde1ea3f5aac948dab1bda30d5831b9dd66c7867e1a5e6d0cfa47163cb350f567b68daa86cbf03504d20bef797 SHA512 cfe5f11156a562738f3da050009f1f5d67bdfa72fe72ff04636fcbd5127744cd0f86215cc36c4bbdad2239204532140da0e82154e3fe99985e1a95e911b6361c
-EBUILD qt5ct-1.3.ebuild 985 BLAKE2B efa98c48e71be1df50acbfe7cad6b6461939ec34abb7eaaad521e4e347abebea92af8141bd6fa1327d07570abaae77b48747d2e5294febc7267615f14a8c8788 SHA512 fb10de755ede1717f39ef2963e22392ced10bf1f7a4a08c450dfa70bfcc6281d439371e76454bc5e8e020f0e36ac0cb58d72bfab45bed0e9c52c6a16d3be096c
+EBUILD qt5ct-1.3.ebuild 983 BLAKE2B ee87fbc6d7fdec639af3ccca9d05c87780a1e45d284f1a4988eb3a13daa3189db6cc0065b181c7d1c327524b763ae4374a2779b85ac5f9e94f3c57e8bc1085a2 SHA512 503757a6945405b48a1509ae9602ff451ac1df141c863da09f987c1df61256048a026ae86897c9b93f14b27e906ddd784264692a3564e4aaefbecd5bb0c6a2b0
 MISC metadata.xml 567 BLAKE2B 1593756b7456b9656c81d6884112022fbf1cafedaf8acdeb41589627bb7f176c78f648a0da43c8145d79c268aded1e6f8c8ffee89f251bfc3eab65c4e054adbb SHA512 73894bc13974d9fa795b749c5ef579f450e61197320ca777a40ebed2fc9b94e657ec9bfeb1bffd33c7809715c4025a844a611758f24f5dc23f346ddfe9542e87
diff --git a/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch b/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch
deleted file mode 100644
index 67313d824fa8..000000000000
--- a/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,7 +39,7 @@
- set(QT_QTPATHS_EXECUTABLE ${QT_QTPATHS_EXECUTABLE}/qtpaths)
- 
- if(EXISTS ${QT_QTPATHS_EXECUTABLE})
--    message(STATUS "Found qtpaths executable: " ${QT_QTPATHS_EXECUTABLE})    
-+    message(STATUS "Found qtpaths executable: " ${QT_QTPATHS_EXECUTABLE})
- else()
-     message(FATAL_ERROR "Could NOT find qtpaths executable")
- endif()
-@@ -54,8 +54,8 @@
- add_subdirectory(src/qt5ct-qtplugin)
- add_subdirectory(src/qt5ct-style)
- 
--install(DIRECTORY qss DESTINATION ${CMAKE_INSTALL_DATADIR})
--install(DIRECTORY colors DESTINATION ${CMAKE_INSTALL_DATADIR})
-+install(DIRECTORY qss DESTINATION ${CMAKE_INSTALL_DATADIR}/qt5ct)
-+install(DIRECTORY colors DESTINATION ${CMAKE_INSTALL_DATADIR}/qt5ct)
- 
- if(UNIX)
-     add_custom_target(distclean @echo cleaning for source distribution)
diff --git a/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild b/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild
deleted file mode 100644
index 782e8c460938..000000000000
--- a/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
-HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
-SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+dbus"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5[dbus]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	dev-qt/qtpaths:5
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake.patch
-)
-
-src_install() {
-	cmake_src_install
-
-	newenvd - 98qt5ct <<< '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-1.3.ebuild b/x11-misc/qt5ct/qt5ct-1.3.ebuild
index 726b25b8dd9f..d12ebfa8b546 100644
--- a/x11-misc/qt5ct/qt5ct-1.3.ebuild
+++ b/x11-misc/qt5ct/qt5ct-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="+dbus"
 
 RDEPEND="