commit: cfbbac058369e7d86f0803b883755070345fab9e
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 8 10:45:22 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jul 8 10:45:52 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=cfbbac05
Revert "[eclass] Add RDEPEND on qtchooser."
This is causing blockers because qt-4.8.6 is still masked
This reverts commit ab5c7bec5a9dc95306e571dd48e73f25bf431452.
---
eclass/qt4-build-multilib.eclass | 3 ---
eclass/qt5-build.eclass | 5 +----
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index c685334..71ae1b3 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -50,9 +50,6 @@ DEPEND="
dev-lang/perl
virtual/pkgconfig[${MULTILIB_USEDEP}]
"
-RDEPEND="
- dev-qt/qtchooser
-"
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test
src_install pkg_postinst pkg_postrm
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 4b510ed..99ba8df 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -65,7 +65,7 @@ EGIT_REPO_URI=(
IUSE="debug test"
DEPEND="
- dev-lang/perl
+ >=dev-lang/perl-5.14
virtual/pkgconfig
"
if [[ ${PN} != qttest ]]; then
@@ -75,9 +75,6 @@ if [[ ${PN} != qttest ]]; then
DEPEND+=" test? ( >=dev-qt/qttest-${PV}:5[debug=] )"
fi
fi
-RDEPEND="
- dev-qt/qtchooser
-"
EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile
src_install src_test pkg_postinst pkg_postrm