diff options
Diffstat (limited to 'dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild')
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild b/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild index 1a3ef9ec7a9f..d4c635fdc47c 100644 --- a/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild +++ b/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild,v 1.1 2014/08/03 14:09:49 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild,v 1.2 2014/08/03 22:53:06 pesa Exp $ EAPI=5 PLOCALES="cs de fr ja pl ru sl zh_CN zh_TW" -inherit eutils l10n multilib qt4-r2 +inherit eutils l10n multilib qmake-utils DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator" @@ -29,27 +29,26 @@ fi SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~x86" +# TODO: qbs:qbsprojectmanager, winrt (both require qt5) QTC_PLUGINS=(android autotools:autotoolsprojectmanager baremetal bazaar - clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs fakevim git + clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial perforce python:pythoneditor qnx subversion valgrind) IUSE="debug doc examples test ${QTC_PLUGINS[@]%:*}" # minimum Qt version required -QT_PV="4.8.0:4" +QT_PV="4.8.5:4" 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-4.8.5:4 dev-qt/designer:4 ) - ( >=dev-qt/qtgui-${QT_PV} <dev-qt/qtgui-4.8.5:4 ) - ) + >=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} - clang? ( >=sys-devel/clang-3.2 ) + clang? ( >=sys-devel/clang-3.2:= ) " DEPEND="${CDEPEND} virtual/pkgconfig @@ -71,8 +70,6 @@ PDEPEND=" " src_prepare() { - qt4-r2_src_prepare - # disable unwanted plugins for plugin in "${QTC_PLUGINS[@]#[+-]}"; do if ! use ${plugin%:*}; then @@ -86,8 +83,7 @@ src_prepare() { sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \ share/qtcreator/translations/translations.pro || die - # remove bundled qbs for now - # TODO: package it and re-enable the plugin + # remove bundled qbs rm -rf src/shared/qbs || die } @@ -96,9 +92,9 @@ src_configure() { tests/*" eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ + LLVM_INSTALL_DIR="${EPREFIX}/usr" \ TEST=$(use test && echo 1 || echo 0) \ - USE_SYSTEM_BOTAN=1 \ - LLVM_INSTALL_DIR=$(use clang && echo $(get_libdir)) + USE_SYSTEM_BOTAN=1 } src_test() { @@ -108,7 +104,7 @@ src_test() { EQMAKE4_EXCLUDE="valgrind/*" eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)" - emake check + default } src_install() { |