Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
Date: Tue, 27 May 2014 10:49:01
Message-Id: 1401128177.52bcb4af3258474d1be5bd6c24c1126d2b915b86.pesa@gentoo
1 commit: 52bcb4af3258474d1be5bd6c24c1126d2b915b86
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 26 18:16:17 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Mon May 26 18:16:17 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=52bcb4af
7
8 [dev-qt/qtcore:4] Remove redundant code.
9
10 We always run qmake with CONFIG+=nostrip, so these lines are unnecessary.
11
12 Package-Manager: portage-2.2.10
13
14 ---
15 dev-qt/qtcore/qtcore-4.8.9999.ebuild | 7 +------
16 1 file changed, 1 insertion(+), 6 deletions(-)
17
18 diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
19 index 85a3a37..12b17dd 100644
20 --- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
21 +++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
22 @@ -19,7 +19,7 @@ IUSE="+glib iconv icu qt3support ssl"
23 DEPEND="
24 sys-libs/zlib
25 glib? ( dev-libs/glib:2 )
26 - icu? ( >=dev-libs/icu-49:= )
27 + icu? ( dev-libs/icu:= )
28 ssl? ( dev-libs/openssl:0 )
29 "
30 RDEPEND="${DEPEND}"
31 @@ -66,11 +66,6 @@ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
32 QCONFIG_DEFINE="QT_ZLIB"
33
34 src_prepare() {
35 - # Don't pre-strip, bug 235026
36 - for i in kr jp cn tw; do
37 - echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
38 - done
39 -
40 qt4-build-multilib_src_prepare
41
42 # bug 172219