diff options
| -rw-r--r-- | dev-qt/qt-creator/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog index 0d247838fd6b..bfe9eb84385c 100644 --- a/dev-qt/qt-creator/ChangeLog +++ b/dev-qt/qt-creator/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qt-creator # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.31 2014/08/03 22:53:06 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.32 2014/08/05 11:41:54 pesa Exp $ + + 05 Aug 2014; Davide Pesavento <pesa@gentoo.org> qt-creator-3.2.0_rc1.ebuild: + Tweak sed expression to correctly disable clang plugin. Bug 519030 by Uwe L. + Korn. 03 Aug 2014; Davide Pesavento <pesa@gentoo.org> -qt-creator-3.0.1.ebuild, metadata.xml, qt-creator-3.2.0_rc1.ebuild: 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 d4c635fdc47c..f638ecd727a0 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,6 +1,6 @@ # 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.2 2014/08/03 22:53:06 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild,v 1.3 2014/08/05 11:41:54 pesa Exp $ EAPI=5 @@ -74,7 +74,8 @@ src_prepare() { for plugin in "${QTC_PLUGINS[@]#[+-]}"; do if ! use ${plugin%:*}; then einfo "Disabling ${plugin%:*} plugin" - sed -i -re "/^\s+${plugin#*:}\>/d" src/plugins/plugins.pro \ + sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)${plugin#*:}\>/d" \ + src/plugins/plugins.pro \ || die "failed to disable ${plugin%:*} plugin" fi done |