| 1 |
commit: fd78df39dfe6fbc13d8e3358157dcf3201ef12bc |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 25 17:23:51 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 25 17:24:17 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=fd78df39 |
| 7 |
|
| 8 |
dev-qt/qtcore: disable iconv if icu is enabled |
| 9 |
|
| 10 |
See qtbase commit fd9e5d90333c385ad191a289b2e95e918c58b242. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 13 |
|
| 14 |
dev-qt/qtcore/qtcore-5.8.0.ebuild | 4 ++-- |
| 15 |
dev-qt/qtcore/qtcore-5.8.9999.ebuild | 6 +++--- |
| 16 |
dev-qt/qtcore/qtcore-5.9999.ebuild | 6 +++--- |
| 17 |
3 files changed, 8 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-qt/qtcore/qtcore-5.8.0.ebuild b/dev-qt/qtcore/qtcore-5.8.0.ebuild |
| 20 |
index 02eb34e..79ce95f 100644 |
| 21 |
--- a/dev-qt/qtcore/qtcore-5.8.0.ebuild |
| 22 |
+++ b/dev-qt/qtcore/qtcore-5.8.0.ebuild |
| 23 |
@@ -19,8 +19,8 @@ DEPEND=" |
| 24 |
dev-libs/glib:2 |
| 25 |
>=dev-libs/libpcre-8.38[pcre16,unicode] |
| 26 |
>=sys-libs/zlib-1.2.5 |
| 27 |
- virtual/libiconv |
| 28 |
icu? ( dev-libs/icu:= ) |
| 29 |
+ !icu? ( virtual/libiconv ) |
| 30 |
systemd? ( sys-apps/systemd:= ) |
| 31 |
" |
| 32 |
RDEPEND="${DEPEND}" |
| 33 |
@@ -36,7 +36,7 @@ QT5_TARGET_SUBDIRS=( |
| 34 |
|
| 35 |
src_configure() { |
| 36 |
local myconf=( |
| 37 |
- $(qt_use icu) |
| 38 |
+ $(usex icu '-icu -no-iconv' '-iconv -no-icu') |
| 39 |
$(qt_use systemd journald) |
| 40 |
) |
| 41 |
qt5-build_src_configure |
| 42 |
|
| 43 |
diff --git a/dev-qt/qtcore/qtcore-5.8.9999.ebuild b/dev-qt/qtcore/qtcore-5.8.9999.ebuild |
| 44 |
index ad9f43c..79ce95f 100644 |
| 45 |
--- a/dev-qt/qtcore/qtcore-5.8.9999.ebuild |
| 46 |
+++ b/dev-qt/qtcore/qtcore-5.8.9999.ebuild |
| 47 |
@@ -1,4 +1,4 @@ |
| 48 |
-# Copyright 1999-2016 Gentoo Foundation |
| 49 |
+# Copyright 1999-2017 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Id$ |
| 52 |
|
| 53 |
@@ -19,8 +19,8 @@ DEPEND=" |
| 54 |
dev-libs/glib:2 |
| 55 |
>=dev-libs/libpcre-8.38[pcre16,unicode] |
| 56 |
>=sys-libs/zlib-1.2.5 |
| 57 |
- virtual/libiconv |
| 58 |
icu? ( dev-libs/icu:= ) |
| 59 |
+ !icu? ( virtual/libiconv ) |
| 60 |
systemd? ( sys-apps/systemd:= ) |
| 61 |
" |
| 62 |
RDEPEND="${DEPEND}" |
| 63 |
@@ -36,7 +36,7 @@ QT5_TARGET_SUBDIRS=( |
| 64 |
|
| 65 |
src_configure() { |
| 66 |
local myconf=( |
| 67 |
- $(qt_use icu) |
| 68 |
+ $(usex icu '-icu -no-iconv' '-iconv -no-icu') |
| 69 |
$(qt_use systemd journald) |
| 70 |
) |
| 71 |
qt5-build_src_configure |
| 72 |
|
| 73 |
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild |
| 74 |
index ad9f43c..79ce95f 100644 |
| 75 |
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild |
| 76 |
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild |
| 77 |
@@ -1,4 +1,4 @@ |
| 78 |
-# Copyright 1999-2016 Gentoo Foundation |
| 79 |
+# Copyright 1999-2017 Gentoo Foundation |
| 80 |
# Distributed under the terms of the GNU General Public License v2 |
| 81 |
# $Id$ |
| 82 |
|
| 83 |
@@ -19,8 +19,8 @@ DEPEND=" |
| 84 |
dev-libs/glib:2 |
| 85 |
>=dev-libs/libpcre-8.38[pcre16,unicode] |
| 86 |
>=sys-libs/zlib-1.2.5 |
| 87 |
- virtual/libiconv |
| 88 |
icu? ( dev-libs/icu:= ) |
| 89 |
+ !icu? ( virtual/libiconv ) |
| 90 |
systemd? ( sys-apps/systemd:= ) |
| 91 |
" |
| 92 |
RDEPEND="${DEPEND}" |
| 93 |
@@ -36,7 +36,7 @@ QT5_TARGET_SUBDIRS=( |
| 94 |
|
| 95 |
src_configure() { |
| 96 |
local myconf=( |
| 97 |
- $(qt_use icu) |
| 98 |
+ $(usex icu '-icu -no-iconv' '-iconv -no-icu') |
| 99 |
$(qt_use systemd journald) |
| 100 |
) |
| 101 |
qt5-build_src_configure |
Archives