gentoo resync : 25.11.2020

3 files changed, 2 insertions, 47 deletions

diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 8342235e6ae9..94a9a48b90d9 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
-EBUILD qtdbus-5.14.2.ebuild 684 BLAKE2B faf088083550c090c5d2348442f272870d7f82ffec6f7f8f2988e9fbc21d81825df4b0a2db4bb6c44404b38671f6933e038251f9076bc7e82509dc6cf8fa0f24 SHA512 5ec14c86fc61b3d1031681e7655c18301727fcbec1d9f19a6e6a4321d122e456425eb17de9ece5adb0804cf8df51df0ff4b2fbca8a6d3dec10c665807217c824
-EBUILD qtdbus-5.15.1.ebuild 690 BLAKE2B c05fa4051750c9007e616f8cce01b32d0b1061bada85b5a90a2f146db7a0cb904e1d9f5aeeea8a15dea05f09a05cbcf48758f288ffaedcb47195cc533911926b SHA512 dcabbe196e3a3401e0c7aa998934a3cb819e69ece7706709bdf8c9dc8aa6c10c76d0c28e249b41f4df3265d8263f72e1c18ca98a95ff133c36a112e8fd4128ac
+EBUILD qtdbus-5.15.1.ebuild 684 BLAKE2B faf088083550c090c5d2348442f272870d7f82ffec6f7f8f2988e9fbc21d81825df4b0a2db4bb6c44404b38671f6933e038251f9076bc7e82509dc6cf8fa0f24 SHA512 5ec14c86fc61b3d1031681e7655c18301727fcbec1d9f19a6e6a4321d122e456425eb17de9ece5adb0804cf8df51df0ff4b2fbca8a6d3dec10c665807217c824
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/qtdbus-5.14.2.ebuild b/dev-qt/qtdbus/qtdbus-5.14.2.ebuild
deleted file mode 100644
index f0425f0dc006..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.14.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	>=sys-apps/dbus-1.4.20
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/dbus
-	src/tools/qdbusxml2cpp
-	src/tools/qdbuscpp2xml
-)
-
-QT5_GENTOO_CONFIG=(
-	:dbus
-	:dbus-linked:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:dbus
-	:dbus-linked
-)
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdbus/qtdbus-5.15.1.ebuild b/dev-qt/qtdbus/qtdbus-5.15.1.ebuild
index 098360958680..f0425f0dc006 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.1.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""