gentoo resync : 20.10.2021

3 files changed, 2 insertions, 54 deletions

diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 042af408bed6..b711a9010d6d 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,6 +1,3 @@
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtdbus-5.15.2-r1.ebuild 856 BLAKE2B 3a6ba7d726b81e51b26b27a542b583fd7a539bfff572d1a2a4ac8679efadc7e2b7316afa92d43ae9950a31df07a543d124d58c55f1600fb8e08d0553bc52acb5 SHA512 01ac379102445c5150cb0d74314eed7f8dc805103ae7e71907451fad5211baee5b9cd70e9f0061ad297f728dc13cc51ec99dbf29f011442db026fdb2ee80e383
-EBUILD qtdbus-5.15.2-r10.ebuild 755 BLAKE2B 28fbd65e1ad97a4e49221497793e9143ee77c91eeef8a7f013a8a146806f7bc80d78d743e1a390e9e144c19daa407227f2ff5a36cd3dfc761ec05e50baffc81c SHA512 a7983c283c9fe4f713ba4129af9d69213c8e2a288f181f61cfa8af85050b298b841468d8496a17052a2aefeed4e3c72588bad0cc1d6a31ee3ec0d0252d6b9c98
+EBUILD qtdbus-5.15.2-r10.ebuild 753 BLAKE2B e785955ed4907a22f7df6f1395318ce790b63e720b3b7b3d344e30edb24355dfd32835cc570c90e5998350c540e43fc16519eed2a3b7572e662ff4fac73ac883 SHA512 bdceaa9884ba7a9483dd0e1f8542b20c01c9dbc0de7d3b5050b4acf25cea8eff71143d32943b27d155acef204c943188f4b288e6c0940e430ec6b8169016d45e
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild b/dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild
deleted file mode 100644
index 3cc9ecda38d2..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 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"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	>=sys-apps/dbus-1.4.20
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtchooser
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/dbus
-	src/tools/qdbusxml2cpp
-	src/tools/qdbuscpp2xml
-)
-
-QT5_GENTOO_CONFIG=(
-	:dbus
-	:dbus-linked:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:dbus
-	:dbus-linked
-)
-
-PATCHES=( "${WORKDIR}"/qtbase-${PV}-gcc11.patch ) # bug 752012
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
index 6ebb1d4d1577..0d2d952579e1 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
@@ -10,7 +10,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 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""