[gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/

[Andreas Sturmlechner]

commit:     0187047ebc112e073b31c7753d4d07d23a31c57a
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Feb 22 19:49:40 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 22:14:14 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=0187047e

dev-qt/qtcore: Enforce qtchooser qt5-default, block pre-switch qtcore:4

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qtcore/{qtcore-5.10.1.ebuild => qtcore-5.10.1-r1.ebuild} | 4 +++-
 dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild                        | 4 +++-
 dev-qt/qtcore/qtcore-5.11.9999.ebuild                           | 4 +++-
 dev-qt/qtcore/qtcore-5.9.9999.ebuild                            | 4 +++-
 dev-qt/qtcore/qtcore-5.9999.ebuild                              | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.10.1.ebuild 
b/dev-qt/qtcore/qtcore-5.10.1-r1.ebuild
similarity index 96%
rename from dev-qt/qtcore/qtcore-5.10.1.ebuild
rename to dev-qt/qtcore/qtcore-5.10.1-r1.ebuild
index 368fe44d..9e4d7aab 100644
--- a/dev-qt/qtcore/qtcore-5.10.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.10.1-r1.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

diff --git a/dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild 
b/dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild
index 368fe44d..9e4d7aab 100644
--- a/dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.0_alpha.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

diff --git a/dev-qt/qtcore/qtcore-5.11.9999.ebuild 
b/dev-qt/qtcore/qtcore-5.11.9999.ebuild
index 368fe44d..9e4d7aab 100644
--- a/dev-qt/qtcore/qtcore-5.11.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.9999.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

diff --git a/dev-qt/qtcore/qtcore-5.9.9999.ebuild 
b/dev-qt/qtcore/qtcore-5.9.9999.ebuild
index 368fe44d..9e4d7aab 100644
--- a/dev-qt/qtcore/qtcore-5.9.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.9999.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

diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild 
b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 368fe44d..9e4d7aab 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.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