--- /usr//portage/dev-qt/qt-creator/qt-creator-3.2.2.ebuild 2014-10-15 01:34:31.000000000 +0200 +++ /usr/local/portage/dev-qt/qt-creator/qt-creator-3.2.2.ebuild 2014-11-07 01:34:06.865443573 +0100 @@ -33,30 +33,44 @@ QTC_PLUGINS=(android autotools:autotoolsprojectmanager baremetal bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial perforce python:pythoneditor qnx subversion valgrind) -IUSE="debug doc examples test ${QTC_PLUGINS[@]%:*}" +IUSE="qt5 debug doc examples test ${QTC_PLUGINS[@]%:*}" # minimum Qt version required -QT_PV="4.8.5:4" +QT4_PV="4.8.5:4" +QT5_PV="5.0.0:5" + +qt_depends() { + for var in "$@" + do + echo "!qt5? ( >=dev-qt/$var-${QT4_PV} ) qt5? ( >=dev-qt/$var-${QT5_PV} )" + done +} CDEPEND=" =dev-libs/botan-1.10*[threads] - >=dev-qt/designer-${QT_PV} - >=dev-qt/qtcore-${QT_PV}[ssl] - >=dev-qt/qtdeclarative-${QT_PV} - >=dev-qt/qtgui-${QT_PV} - >=dev-qt/qthelp-${QT_PV}[doc?] - >=dev-qt/qtscript-${QT_PV} - >=dev-qt/qtsql-${QT_PV} - >=dev-qt/qtsvg-${QT_PV} + !qt5? ( + >=dev-qt/qtcore-${QT4_PV}[ssl] + >=dev-qt/qthelp-${QT4_PV}[doc?] + ) + qt5? ( + >=dev-qt/qtnetwork-${QT5_PV}[ssl] + >=dev-qt/qtconcurrent-${QT5_PV} + >=dev-qt/qtwidgets-${QT5_PV} + >=dev-qt/qthelp-${QT5_PV} + doc? ( >=dev-qt/qdoc-${QT5_PV} ) + ) + $(qt_depends designer qtdeclarative qtgui qtscript qtsql qtsvg) clang? ( >=sys-devel/clang-3.2:= ) " DEPEND="${CDEPEND} virtual/pkgconfig - test? ( >=dev-qt/qttest-${QT_PV} ) + qt5? ( >=dev-qt/linguist-tools-${QT5_PV} ) + test? ( $(qt_depends qttest) ) " RDEPEND="${CDEPEND} >=sys-devel/gdb-7.2[client(+),python] - examples? ( >=dev-qt/qtdemo-${QT_PV} ) + examples? ( $(qt_depends qtdemo) ) " PDEPEND=" autotools? ( sys-devel/autoconf ) @@ -70,6 +84,8 @@ " src_prepare() { + use qt5 && QT_VERSION=5 || QT_VERSION=4 + # disable unwanted plugins for plugin in "${QTC_PLUGINS[@]#[+-]}"; do if ! use ${plugin%:*}; then @@ -91,7 +107,7 @@ src_configure() { EQMAKE4_EXCLUDE="share/qtcreator/templates/* tests/*" - eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)" \ + eqmake${QT_VERSION} IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ LLVM_INSTALL_DIR="${EPREFIX}/usr" \ TEST=$(use test && echo 1 || echo 0) \ @@ -103,7 +119,7 @@ cd tests/auto || die EQMAKE4_EXCLUDE="valgrind/*" - eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)" + eqmake${QT_VERSION} IDE_LIBRARY_BASENAME="$(get_libdir)" default }