Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
Date: Tue, 08 Jul 2014 10:46:11
Message-Id: 1404816352.cfbbac058369e7d86f0803b883755070345fab9e.kensington@gentoo
1 commit: cfbbac058369e7d86f0803b883755070345fab9e
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 8 10:45:22 2014 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 8 10:45:52 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=cfbbac05
7
8 Revert "[eclass] Add RDEPEND on qtchooser."
9
10 This is causing blockers because qt-4.8.6 is still masked
11
12 This reverts commit ab5c7bec5a9dc95306e571dd48e73f25bf431452.
13
14 ---
15 eclass/qt4-build-multilib.eclass | 3 ---
16 eclass/qt5-build.eclass | 5 +----
17 2 files changed, 1 insertion(+), 7 deletions(-)
18
19 diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
20 index c685334..71ae1b3 100644
21 --- a/eclass/qt4-build-multilib.eclass
22 +++ b/eclass/qt4-build-multilib.eclass
23 @@ -50,9 +50,6 @@ DEPEND="
24 dev-lang/perl
25 virtual/pkgconfig[${MULTILIB_USEDEP}]
26 "
27 -RDEPEND="
28 - dev-qt/qtchooser
29 -"
30
31 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
32
33
34 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
35 index 4b510ed..99ba8df 100644
36 --- a/eclass/qt5-build.eclass
37 +++ b/eclass/qt5-build.eclass
38 @@ -65,7 +65,7 @@ EGIT_REPO_URI=(
39 IUSE="debug test"
40
41 DEPEND="
42 - dev-lang/perl
43 + >=dev-lang/perl-5.14
44 virtual/pkgconfig
45 "
46 if [[ ${PN} != qttest ]]; then
47 @@ -75,9 +75,6 @@ if [[ ${PN} != qttest ]]; then
48 DEPEND+=" test? ( >=dev-qt/qttest-${PV}:5[debug=] )"
49 fi
50 fi
51 -RDEPEND="
52 - dev-qt/qtchooser
53 -"
54
55 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm