Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
Date: Thu, 22 Feb 2018 22:19:44
Message-Id: 1519337654.0187047ebc112e073b31c7753d4d07d23a31c57a.asturm@gentoo
1 commit: 0187047ebc112e073b31c7753d4d07d23a31c57a
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Thu Feb 22 19:49:40 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 22 22:14:14 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0187047e
7
8 dev-qt/qtcore: Enforce qtchooser qt5-default, block pre-switch qtcore:4
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 dev-qt/qtcore/{qtcore-5.10.1.ebuild => qtcore-5.10.1-r1.ebuild} | 4 +++-
13 dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild | 4 +++-
14 dev-qt/qtcore/qtcore-5.11.9999.ebuild | 4 +++-
15 dev-qt/qtcore/qtcore-5.9.9999.ebuild | 4 +++-
16 dev-qt/qtcore/qtcore-5.9999.ebuild | 4 +++-
17 5 files changed, 15 insertions(+), 5 deletions(-)
18
19 diff --git a/dev-qt/qtcore/qtcore-5.10.1.ebuild b/dev-qt/qtcore/qtcore-5.10.1-r1.ebuild
20 similarity index 96%
21 rename from dev-qt/qtcore/qtcore-5.10.1.ebuild
22 rename to dev-qt/qtcore/qtcore-5.10.1-r1.ebuild
23 index 368fe44d..9e4d7aab 100644
24 --- a/dev-qt/qtcore/qtcore-5.10.1.ebuild
25 +++ b/dev-qt/qtcore/qtcore-5.10.1-r1.ebuild
26 @@ -22,7 +22,9 @@ DEPEND="
27 !icu? ( virtual/libiconv )
28 systemd? ( sys-apps/systemd:= )
29 "
30 -RDEPEND="${DEPEND}"
31 +RDEPEND="${DEPEND}
32 + !<dev-qt/qtcore-4.8.7-r4:4
33 +"
34
35 QT5_TARGET_SUBDIRS=(
36 src/tools/bootstrap
37
38 diff --git a/dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild b/dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild
39 index 368fe44d..9e4d7aab 100644
40 --- a/dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild
41 +++ b/dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild
42 @@ -22,7 +22,9 @@ DEPEND="
43 !icu? ( virtual/libiconv )
44 systemd? ( sys-apps/systemd:= )
45 "
46 -RDEPEND="${DEPEND}"
47 +RDEPEND="${DEPEND}
48 + !<dev-qt/qtcore-4.8.7-r4:4
49 +"
50
51 QT5_TARGET_SUBDIRS=(
52 src/tools/bootstrap
53
54 diff --git a/dev-qt/qtcore/qtcore-5.11.9999.ebuild b/dev-qt/qtcore/qtcore-5.11.9999.ebuild
55 index 368fe44d..9e4d7aab 100644
56 --- a/dev-qt/qtcore/qtcore-5.11.9999.ebuild
57 +++ b/dev-qt/qtcore/qtcore-5.11.9999.ebuild
58 @@ -22,7 +22,9 @@ DEPEND="
59 !icu? ( virtual/libiconv )
60 systemd? ( sys-apps/systemd:= )
61 "
62 -RDEPEND="${DEPEND}"
63 +RDEPEND="${DEPEND}
64 + !<dev-qt/qtcore-4.8.7-r4:4
65 +"
66
67 QT5_TARGET_SUBDIRS=(
68 src/tools/bootstrap
69
70 diff --git a/dev-qt/qtcore/qtcore-5.9.9999.ebuild b/dev-qt/qtcore/qtcore-5.9.9999.ebuild
71 index 368fe44d..9e4d7aab 100644
72 --- a/dev-qt/qtcore/qtcore-5.9.9999.ebuild
73 +++ b/dev-qt/qtcore/qtcore-5.9.9999.ebuild
74 @@ -22,7 +22,9 @@ DEPEND="
75 !icu? ( virtual/libiconv )
76 systemd? ( sys-apps/systemd:= )
77 "
78 -RDEPEND="${DEPEND}"
79 +RDEPEND="${DEPEND}
80 + !<dev-qt/qtcore-4.8.7-r4:4
81 +"
82
83 QT5_TARGET_SUBDIRS=(
84 src/tools/bootstrap
85
86 diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
87 index 368fe44d..9e4d7aab 100644
88 --- a/dev-qt/qtcore/qtcore-5.9999.ebuild
89 +++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
90 @@ -22,7 +22,9 @@ DEPEND="
91 !icu? ( virtual/libiconv )
92 systemd? ( sys-apps/systemd:= )
93 "
94 -RDEPEND="${DEPEND}"
95 +RDEPEND="${DEPEND}
96 + !<dev-qt/qtcore-4.8.7-r4:4
97 +"
98
99 QT5_TARGET_SUBDIRS=(
100 src/tools/bootstrap