Revbump to fix building when qml is disabled. Bug #345757

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

3 files changed, 37 insertions, 20 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 06143399b505..b994a3ab4ba4 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,15 @@
 # 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.64 2010/11/15 21:35:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.65 2010/11/17 09:31:57 hwoarang Exp $
+
+*qt-creator-2.1.0_beta2-r1 (17 Nov 2010)
+
+  17 Nov 2010; Markos Chandras <hwoarang@gentoo.org>
+  -qt-creator-2.1.0_beta2.ebuild, +qt-creator-2.1.0_beta2-r1.ebuild:
+  Revbump to fix broken package when building with -qml. At this point, qml
+  is by far the safest choice in order to have a fully working qt-creator.
+  Building with -qml is ideal for pure C++ development yet many qt-creator
+  plugins will be missing because of this. Bug #345757
 
   15 Nov 2010; Markos Chandras <hwoarang@gentoo.org>
   qt-creator-2.0.1.ebuild, qt-creator-2.1.0_beta2.ebuild, metadata.xml:
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index 61efa9bc4e6d..b5dd9e1ca3c3 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 3709 RMD160 4722d7b2d381adaedb57569f03c547fa9526cbfd SHA1 3689a5f31667d8db7a7e727c865afe7252ab53ee SHA256 5e678f50361961559747f0695c8e5c067df5ad0a591108270f2df9dc99a8a50a
-EBUILD qt-creator-2.1.0_beta2.ebuild 3849 RMD160 52a23a93c8fa4099b825273e47961a7fdc0d557d SHA1 310c25ab295ca92372f18a8a771e5b89fc9d8ec1 SHA256 25ade845badb257e762b997b21f6606bbf1c9a57cdb897ca2eac530720f3549d
-MISC ChangeLog 9453 RMD160 5f45e2b792d2395c33a7143432db28fd8a96acb1 SHA1 adcbcaec88ff57e898557e566b0627a29378253b SHA256 24006d364c704db459f72cbdaabccff49053c9098fce693f89eef83270790362
+EBUILD qt-creator-2.1.0_beta2-r1.ebuild 4254 RMD160 55085b5c22943c01a230ba009a19035bc8bd8bbc SHA1 2b193ba6dfcf4ac7eb1ccd0be1a30c79bb09e40d SHA256 8f99b79b8d03db15a87b4bbdc956638eb3f4eac2f9f1c68d79d0da4deb599c62
+MISC ChangeLog 9899 RMD160 2ef183d5dca5641e3345846ab5b5de4dfc82e632 SHA1 6b652349faa86f85666800cbd14b0aaf7455541d SHA256 251d1bc6ea27a49abd5957df95bed0568d0374e46dd7e0eaad8ae79c29debe51
 MISC metadata.xml 1034 RMD160 ff0e30c74188440729f8a7eb6ac4edb78a58261e SHA1 96e28085ccb41904e21e54ef0a3e160bf13d0acc SHA256 9fad95b6ee7de9a1136b6e780084f2185d3fe5ce111f5d605cea5e0292da7878
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzhp7oACgkQ9/cejkQaxBBbHwCfde37XKvNHwL3IrMO0vuaW0lX
-yVIAmgOek6zycN6mhY0yG84dfCqiD1um
-=9yyv
+iEYEARECAAYFAkzjoTMACgkQ9/cejkQaxBCKRgCbBXctXuY0MNIcN5QzJD37gl6A
+/fMAnj7w/GpgJVhBXRS/QWgWNQu6sPey
+=+axf
 -----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-r1.ebuild
index 2bad29125448..0c2e31b46d6c 100644
--- a/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild
+++ b/dev-util/qt-creator/qt-creator-2.1.0_beta2-r1.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.4 2010/11/15 21:35:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.1.0_beta2-r1.ebuild,v 1.1 2010/11/17 09:31:57 hwoarang Exp $
 
 EAPI="2"
 LANGS="de es fr it ja pl ru sl"
@@ -19,7 +19,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bineditor bookmarks +cmake cvs debug +designer doc examples fakevim git
 	mercurial perforce +qml qtscript rss subversion"
-
 QTVER="4.7.1:4"
 DEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]
 	>=x11-libs/qt-sql-${QTVER}
@@ -57,21 +56,30 @@ src_prepare() {
 				plugin="cmakeprojectmanager"
 			elif [[ ${plugin} == "qtscript" ]]; then
 				plugin="qtscripteditor"
-			elif [[ ${plugin} == "qml" ]]; then
-				plugins="qmljseditor"
-				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:^:#:" \
-					src/plugins/plugins.pro \
-					|| die "Failed to disable qt4projectmanager plugin"
+			# Make sure that qt4project manager does NOT depend
+			# on designer
+			elif [[ ${plugin} == "designer" ]];then
+				plugin="designer"
+				sed -i -e "/designer/d" \
+					src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri \
+					|| die "failed to disable qml plugin"
 			fi
+			# Now disable the plugins
 			sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro \
 				|| die "Failed to disable ${plugin} plugin"
+			# qml needs special treatment
+			if [[ ${plugin} == "qml" ]]; then
+				# remove qml support from debugger and qt4project manager
+				sed -i -e "/^include(qml\/qml.pri)/d" \
+						src/plugins/debugger/debugger.pro \
+					-e "/qmljseditor/d" \
+						src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
+					# drop all the qml plugins
+					for x in qmlprojectmanager qmljsinspector qmljseditor qmldesigner; do
+						sed -i "/plugin_${x}/s:^:#:" src/plugins/plugins.pro \
+							|| die "Failed to disable ${x} plugin"
+					done
+			fi
 		fi
 	done