| 1 |
commit: 0b94bf7676964f887842ca524d90821ad64dca9e |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 14 23:58:55 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 22 19:15:45 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b94bf76 |
| 7 |
|
| 8 |
dev-qt/qtcore: Revbumps to enforce qtchooser qt5-default |
| 9 |
|
| 10 |
Follow-up to a888955 and 5d7ff88 |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/564622 |
| 13 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 14 |
|
| 15 |
dev-qt/qtcore/{qtcore-4.8.7-r3.ebuild => qtcore-4.8.7-r4.ebuild} | 0 |
| 16 |
dev-qt/qtcore/{qtcore-5.7.1-r3.ebuild => qtcore-5.7.1-r4.ebuild} | 6 ++++-- |
| 17 |
dev-qt/qtcore/{qtcore-5.9.4-r1.ebuild => qtcore-5.9.4-r2.ebuild} | 4 +++- |
| 18 |
3 files changed, 7 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild |
| 21 |
similarity index 100% |
| 22 |
rename from dev-qt/qtcore/qtcore-4.8.7-r3.ebuild |
| 23 |
rename to dev-qt/qtcore/qtcore-4.8.7-r4.ebuild |
| 24 |
|
| 25 |
diff --git a/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild b/dev-qt/qtcore/qtcore-5.7.1-r4.ebuild |
| 26 |
similarity index 90% |
| 27 |
rename from dev-qt/qtcore/qtcore-5.7.1-r3.ebuild |
| 28 |
rename to dev-qt/qtcore/qtcore-5.7.1-r4.ebuild |
| 29 |
index f68f4635ff7..cbc2d6de22e 100644 |
| 30 |
--- a/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild |
| 31 |
+++ b/dev-qt/qtcore/qtcore-5.7.1-r4.ebuild |
| 32 |
@@ -1,4 +1,4 @@ |
| 33 |
-# Copyright 1999-2017 Gentoo Foundation |
| 34 |
+# Copyright 1999-2018 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
|
| 37 |
EAPI=6 |
| 38 |
@@ -22,7 +22,9 @@ DEPEND=" |
| 39 |
icu? ( dev-libs/icu:= ) |
| 40 |
systemd? ( sys-apps/systemd:= ) |
| 41 |
" |
| 42 |
-RDEPEND="${DEPEND}" |
| 43 |
+RDEPEND="${DEPEND} |
| 44 |
+ !<dev-qt/qtcore-4.8.7-r4:4 |
| 45 |
+" |
| 46 |
|
| 47 |
PATCHES=( |
| 48 |
"${FILESDIR}"/${PN}-5.6.2-plugins.patch |
| 49 |
|
| 50 |
diff --git a/dev-qt/qtcore/qtcore-5.9.4-r1.ebuild b/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild |
| 51 |
similarity index 96% |
| 52 |
rename from dev-qt/qtcore/qtcore-5.9.4-r1.ebuild |
| 53 |
rename to dev-qt/qtcore/qtcore-5.9.4-r2.ebuild |
| 54 |
index 368fe44dbac..9e4d7aab4e2 100644 |
| 55 |
--- a/dev-qt/qtcore/qtcore-5.9.4-r1.ebuild |
| 56 |
+++ b/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild |
| 57 |
@@ -22,7 +22,9 @@ DEPEND=" |
| 58 |
!icu? ( virtual/libiconv ) |
| 59 |
systemd? ( sys-apps/systemd:= ) |
| 60 |
" |
| 61 |
-RDEPEND="${DEPEND}" |
| 62 |
+RDEPEND="${DEPEND} |
| 63 |
+ !<dev-qt/qtcore-4.8.7-r4:4 |
| 64 |
+" |
| 65 |
|
| 66 |
QT5_TARGET_SUBDIRS=( |
| 67 |
src/tools/bootstrap |
Archives