diff options
| -rw-r--r-- | dev-qt/qt-creator/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-3.2.2.ebuild | 18 | ||||
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-3.4.0.ebuild | 11 |
3 files changed, 28 insertions, 8 deletions
diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog index 3e81078cabd1..5e4cb6436346 100644 --- a/dev-qt/qt-creator/ChangeLog +++ b/dev-qt/qt-creator/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-qt/qt-creator # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.49 2015/04/28 16:11:47 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.50 2015/05/04 00:09:31 pesa Exp $ + + 04 May 2015; Davide Pesavento <pesa@gentoo.org> qt-creator-3.2.2.ebuild, + qt-creator-3.4.0.ebuild: + Add webkit USE flag wrt bug 538236. Remove unused debug USE flag from 3.4 + ebuild. 28 Apr 2015; Davide Pesavento <pesa@gentoo.org> qt-creator-3.4.0.ebuild: Raise dev-util/qbs dep to match bundled version and to fix bug 537244. diff --git a/dev-qt/qt-creator/qt-creator-3.2.2.ebuild b/dev-qt/qt-creator/qt-creator-3.2.2.ebuild index 10a643dab81e..805ad0fe1a85 100644 --- a/dev-qt/qt-creator/qt-creator-3.2.2.ebuild +++ b/dev-qt/qt-creator/qt-creator-3.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.2.ebuild,v 1.7 2015/04/01 20:57:55 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v 1.8 2015/05/04 00:09:31 pesa Exp $ EAPI=5 @@ -32,7 +32,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86" 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 test ${QTC_PLUGINS[@]%:*}" +IUSE="debug doc test webkit ${QTC_PLUGINS[@]%:*}" # minimum Qt version required QT_PV="4.8.5:4" @@ -47,8 +47,9 @@ RDEPEND=" >=dev-qt/qtscript-${QT_PV} >=dev-qt/qtsql-${QT_PV} >=dev-qt/qtsvg-${QT_PV}[accessibility] - >=sys-devel/gdb-7.4[client(+),python] + >=sys-devel/gdb-7.5[client,python] clang? ( >=sys-devel/clang-3.2:= ) + webkit? ( >=dev-qt/qtwebkit-${QT_PV} ) " DEPEND="${RDEPEND} virtual/pkgconfig @@ -75,6 +76,12 @@ src_prepare() { fi done + # automagic dep on qtwebkit (bug 538236) + if ! use webkit; then + sed -i -e 's/contains(QT_CONFIG, webkit).*$/DEFINES += QT_NO_WEBKIT/' \ + src/plugins/help/help.pro || die "failed to disable webkit" + fi + # disable broken or unreliable tests sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die @@ -112,9 +119,10 @@ src_install() { # install documentation if use doc; then emake docs - insinto /usr/share/doc/${PF} + # don't use ${PF} or the doc will not be found + insinto /usr/share/doc/qtcreator doins share/doc/qtcreator/qtcreator{,-dev}.qch - docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch + docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch fi # install desktop file diff --git a/dev-qt/qt-creator/qt-creator-3.4.0.ebuild b/dev-qt/qt-creator/qt-creator-3.4.0.ebuild index 8601e3b97e84..e0c5eba70216 100644 --- a/dev-qt/qt-creator/qt-creator-3.4.0.ebuild +++ b/dev-qt/qt-creator/qt-creator-3.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.4.0.ebuild,v 1.2 2015/04/28 16:11:47 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0.ebuild,v 1.3 2015/05/04 00:09:31 pesa Exp $ EAPI=5 @@ -32,7 +32,7 @@ KEYWORDS="~amd64 ~arm ~x86" QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt) -IUSE="debug doc systemd test ${QTC_PLUGINS[@]%:*}" +IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}" # minimum Qt version required QT_PV="5.3.2:5" @@ -59,6 +59,7 @@ RDEPEND=" clang? ( >=sys-devel/clang-3.2:= ) qbs? ( >=dev-util/qbs-1.4.0 ) systemd? ( sys-apps/systemd:= ) + webkit? ( >=dev-qt/qtwebkit-${QT_PV} ) " DEPEND="${RDEPEND} >=dev-qt/linguist-tools-${QT_PV} @@ -93,6 +94,12 @@ src_prepare() { fi done + # automagic dep on qtwebkit (bug 538236) + if ! use webkit; then + sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \ + src/plugins/help/help.pro || die "failed to disable webkit" + fi + # disable broken or unreliable tests sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die |