dev-qt/qtcore: Revbumps to enforce qtchooser qt5-default

Follow-up to a888955 and 5d7ff88

Bug: https://bugs.gentoo.org/564622
Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild
similarity index 100%
rename from dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
rename to dev-qt/qtcore/qtcore-4.8.7-r4.ebuild

diff --git a/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild b/dev-qt/qtcore/qtcore-5.7.1-r4.ebuild
similarity index 90%
rename from dev-qt/qtcore/qtcore-5.7.1-r3.ebuild
rename to dev-qt/qtcore/qtcore-5.7.1-r4.ebuild
index f68f4635ff7bb2093b80e393cbeca782399f8083..cbc2d6de22eab17d4ec8c6f653a2e9faf7c0c624 100644 (file)
--- a/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,9 @@ DEPEND="
        icu? ( dev-libs/icu:= )
        systemd? ( sys-apps/systemd:= )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !<dev-qt/qtcore-4.8.7-r4:4
+"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-5.6.2-plugins.patch

diff --git a/dev-qt/qtcore/qtcore-5.9.4-r1.ebuild b/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild
similarity index 96%
rename from dev-qt/qtcore/qtcore-5.9.4-r1.ebuild
rename to dev-qt/qtcore/qtcore-5.9.4-r2.ebuild
index 368fe44dbac8d9ddf247382f373415c30415cdec..9e4d7aab4e2b100d75cbe43db5c9f3252396325c 100644 (file)
--- a/dev-qt/qtcore/qtcore-5.9.4-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild
@@ -22,7 +22,9 @@ DEPEND="
        !icu? ( virtual/libiconv )
        systemd? ( sys-apps/systemd:= )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !<dev-qt/qtcore-4.8.7-r4:4
+"
 
 QT5_TARGET_SUBDIRS=(
        src/tools/bootstrap