gentoo resync : 03.07.2021

3 files changed, 2 insertions, 56 deletions

diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 5e692133329b..10250245f496 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,6 +1,4 @@
 AUX qt5ct-1.2-cmake.patch 833 BLAKE2B 6866f26696477cd9de56851569e4f9116557b13a999eb8fcfadb5e78514961a8c0ab4beba625f770a72f9df62ac0923d8b5f882d09dc7e35ce8b2c6c0b388e27 SHA512 8b6173169b904dbf5c5d12bcae82e92cfac5847eb95b3c228fc818b1293c6b1417d3f941219ab458220d5095bb5053c12da372f022263f728182f375208cb257
-DIST qt5ct-1.1.tar.bz2 79890 BLAKE2B e816d76ea35b2133891ccf63be47a227d95dc9783b6f2ac18ee7a7c67bae545fbdc7109103e63c18f093458942ae0b9bab3d1847c40abea9761ab0c314de6357 SHA512 0df00c0680aefb0eada1ddb70886fd63641c403ab42843f8d209413a56895dce0a88eb88a98d09d23a30df3b15ca1d595237592958769a1be86719f2a16cbdf7
 DIST qt5ct-1.2.tar.bz2 76052 BLAKE2B bff9dcd6176f856f262f908101f51be5bc5fa56cbf221fb6e1b66cf49867d721f4c1d5707bcd71cb20b1d27d53f5352bcaaa32ed7298f9fe349ac8a90b4a4e23 SHA512 044582440fc3ed8424970a30d7e1562396f9a1651f2c50adbdcb6ec73b35fb8dd23de419df29b92d21a45fea9af4e562b1294f5bfc329419f831775954f8ed6f
-EBUILD qt5ct-1.1.ebuild 1043 BLAKE2B f204afa68a682ca0ccb96d938dedc9f3bfe80a5f6d362411d356aff92db2b6e378cbae79c8c8597cad07e7916b9fdac1d0081e7d1524fce7018cf813ddc70ac3 SHA512 dcdbe854ab9834d3019cae1a640a4cb43aa1112c4c91bca9135e541983a1d737bf65cbc235f7089fe037e86d31b953ef3f70bc2d6804a5d6b8d009000d15e0c2
-EBUILD qt5ct-1.2-r1.ebuild 1023 BLAKE2B 6431cd7a5a8a3e54d735646f9bd92034247c06bce42015776bd0b27adead7e3ed1ac0321acb5b6fa3a013c4483fb71ee716c755bb38ad08c6c2de3b38e5c9501 SHA512 cfe4aed8c37902a0df8d6852b292b5e9a31505d353f823270a76a2fcecbcf5301e421df430bbbd02b2674a94e40363d02480d6b74aefdde93ef873842497250e
+EBUILD qt5ct-1.2-r1.ebuild 1021 BLAKE2B 86950b3bb7ee8255fccc3f0901b34c9276a790cde1ea3f5aac948dab1bda30d5831b9dd66c7867e1a5e6d0cfa47163cb350f567b68daa86cbf03504d20bef797 SHA512 cfe5f11156a562738f3da050009f1f5d67bdfa72fe72ff04636fcbd5127744cd0f86215cc36c4bbdad2239204532140da0e82154e3fe99985e1a95e911b6361c
 MISC metadata.xml 566 BLAKE2B dbb30222ccd1079489ce54e50d5d4ce9a3b9e9acf38d4cc30a402f81418685a3cf86f1adae23d85a409f9866ca11ec1321e543e14bd37ed13a45d02a32accc15 SHA512 d40c24dd0cc2d0b2c79251cf1fb2540dbec484653817469198f4ad7e41164a8c518442c5d11764f0c8aa53bd7ae9758629acc7ba4a4c9f2a374af13cbdaf67c1
diff --git a/x11-misc/qt5ct/qt5ct-1.1.ebuild b/x11-misc/qt5ct/qt5ct-1.1.ebuild
deleted file mode 100644
index 5ec0690f1e18..000000000000
--- a/x11-misc/qt5ct/qt5ct-1.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-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}
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	eqmake5 DISABLE_DBUS=$(usex dbus 0 1)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	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.2-r1.ebuild b/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild
index 419efe47f940..782e8c460938 100644
--- a/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild
+++ b/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+dbus"
 
 RDEPEND="