diff options
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/qt-creator/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/qt-creator/Manifest | 10 | ||||
| -rw-r--r-- | dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild | 11 |
3 files changed, 18 insertions, 10 deletions
diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog index 149a288392a6..95eb8445cf95 100644 --- a/dev-util/qt-creator/ChangeLog +++ b/dev-util/qt-creator/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/qt-creator # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.61 2010/11/10 15:28:58 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.62 2010/11/11 12:58:21 hwoarang Exp $ + + 11 Nov 2010; Markos Chandras <hwoarang@gentoo.org> + qt-creator-2.1.0_beta2.ebuild: + Disable qt4designer plugins when qml is disabled. Bug #344957. Force qml + use flag as well *qt-creator-2.1.0_beta2 (10 Nov 2010) diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest index 8ded87c24176..e8b5b064df39 100644 --- a/dev-util/qt-creator/Manifest +++ b/dev-util/qt-creator/Manifest @@ -9,13 +9,13 @@ DIST qt-creator-2.1.0-beta2-src.zip 26509840 RMD160 b6ba77e5e91192aad352b2c021c9 EBUILD qt-creator-1.2.1.ebuild 2877 RMD160 416a97236be7bc7eb755e767ebf2303faf9830ec SHA1 01f6cb828301c5a805e1213a531b16f077a115c4 SHA256 77de0b2c402e7c12ee3b6309211af0a7c3d9984a3741a3646ebdebbccea92cfc EBUILD qt-creator-1.3.1-r1.ebuild 3512 RMD160 980433faeab74fe06ed1e09f6994f4b9611fa204 SHA1 790dcda8f70f83c652306bb4ae6f4aa882f382f9 SHA256 bd9986ca4aca5377813d040e38a1b153df2277feb33fa3038ebd83ba27cbfd29 EBUILD qt-creator-2.0.1.ebuild 3888 RMD160 9c524593d0c27bc81cabf86a03ef4f58175713b1 SHA1 0b22a833609b6f6068fad681eb387dece82cad8f SHA256 b114d1d5e66964e6417b8c084f9501a647117d07bc059bf72c939b18c98304e9 -EBUILD qt-creator-2.1.0_beta2.ebuild 3907 RMD160 abe0318a9fc878ac2906e4d8690e4065698104ba SHA1 ceb0376f9de6a4bccde29829d698730b1530d9f8 SHA256 0c5cc34cc4250d3626416f5e9981eadcb9b8b9eae7d73d2e180c76fa55625f88 -MISC ChangeLog 8860 RMD160 3ed4933ac12c3686ba1468db58e5d6c431a036fa SHA1 655db4bc6f91e1a80db5174a43eb10ed7748d6e3 SHA256 43efc1806631aeca441a5202426bff770b3380b6f78fd2f33927ae520a0f8204 +EBUILD qt-creator-2.1.0_beta2.ebuild 4033 RMD160 c8ea32d337a0a2e19341a5625db8fcf8a35266bd SHA1 287a676f2fca44eafc02bb2a33dd0b6911b75c51 SHA256 3617be14b2957bd9cdae81e46a7212ede9e0d99c2da278f952e8930ced4c7c9f +MISC ChangeLog 9041 RMD160 c2a321d264d66d1e1069f3961bb2dff1f8d7a3fb SHA1 66346c1f3ce7667737cb050292424d403b6c457f SHA256 b2885d4b8425b8767cc375d75c59cab1d587166ef23e51c88e2cf4a73e829f2c MISC metadata.xml 1034 RMD160 ff0e30c74188440729f8a7eb6ac4edb78a58261e SHA1 96e28085ccb41904e21e54ef0a3e160bf13d0acc SHA256 9fad95b6ee7de9a1136b6e780084f2185d3fe5ce111f5d605cea5e0292da7878 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkzaulgACgkQ9/cejkQaxBCMuwCfSkpwq0wEGvjlxWhkjhSgL9ph -7zMAniuF/B4avcj/ZrTZ+kjMZFQs8whk -=mbXF +iEYEARECAAYFAkzb6I0ACgkQ9/cejkQaxBCAWACfRv5t9xwYSVBEl7N+HDXPEIUE +mBwAnRMdHe/1xA9mZcDygLpgrOJqpX7+ +=0wCS -----END PGP SIGNATURE----- diff --git a/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild b/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild index fe2e3266aa04..d616173243a7 100644 --- a/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild +++ b/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild,v 1.1 2010/11/10 15:28:58 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild,v 1.2 2010/11/11 12:58:21 hwoarang Exp $ EAPI="2" LANGS="de es fr it ja pl ru sl" @@ -46,7 +46,7 @@ RDEPEND="${DEPEND} subversion? ( dev-vcs/subversion )" PLUGINS="bookmarks bineditor cmake cvs designer fakevim git mercurial perforce - qml qtscript subversion" + +qml qtscript subversion" S="${WORKDIR}"/"${MY_P}"-src @@ -63,8 +63,11 @@ src_prepare() { plugin="qtscripteditor" elif [[ ${plugin} == "qml" ]]; then plugins="qmljseditor" - sed -i "/^include(qml\/qml.pri)/d" \ - src/plugins/debugger/debugger.pro + sed -i -e "/^include(qml\/qml.pri)/d" \ + src/plugins/debugger/debugger.pro \ + -e "/plugin_qt4projectmanager/s:^:#:" \ + src/plugins/plugins.pro \ + || die "failed to disable qml plugins" fi if [[ ${plugin} == "designer" ]]; then sed -i "/plugin_qt4projectmanager/s:^:#:" \ |