summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-02-15 00:58:55 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-02-22 20:15:45 +0100
commit0b94bf7676964f887842ca524d90821ad64dca9e (patch)
tree007c92e19c237d76c7c5c96986bbef8e4c7d6a0d /dev-qt/qtcore
parentqt5-build.eclass: Set qtchooser default.conf link to qt5.conf (diff)
downloadgentoo-0b94bf7676964f887842ca524d90821ad64dca9e.tar.gz
gentoo-0b94bf7676964f887842ca524d90821ad64dca9e.tar.bz2
gentoo-0b94bf7676964f887842ca524d90821ad64dca9e.zip
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
Diffstat (limited to 'dev-qt/qtcore')
-rw-r--r--dev-qt/qtcore/qtcore-4.8.7-r4.ebuild (renamed from dev-qt/qtcore/qtcore-4.8.7-r3.ebuild)0
-rw-r--r--dev-qt/qtcore/qtcore-5.7.1-r4.ebuild (renamed from dev-qt/qtcore/qtcore-5.7.1-r3.ebuild)6
-rw-r--r--dev-qt/qtcore/qtcore-5.9.4-r2.ebuild (renamed from dev-qt/qtcore/qtcore-5.9.4-r1.ebuild)4
3 files changed, 7 insertions, 3 deletions
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild
index 86ae786cc2ce..86ae786cc2ce 100644
--- a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
+++ b/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
index f68f4635ff7b..cbc2d6de22ea 100644
--- 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
index 368fe44dbac8..9e4d7aab4e2b 100644
--- 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