Fix qml plugin support. Remove designer plugin. Bug #360451

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

4 files changed, 36 insertions, 44 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 3cbb8ad2fe36..ada3d329fe3e 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/qt-creator
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.71 2011/03/26 16:17:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.72 2011/04/02 14:07:53 hwoarang Exp $
+
+  02 Apr 2011; Markos Chandras <hwoarang@gentoo.org>
+  qt-creator-2.2.0_beta.ebuild, metadata.xml:
+  Fix qml plugin support. Remove designer plugin. Bug #360451
 
   26 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   qt-creator-1.2.1.ebuild, qt-creator-1.3.1-r1.ebuild:
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index 1323c6bba8f3..a8740e489e41 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -10,23 +10,23 @@ DIST qt-creator-2.2.0-beta-src.zip 29691688 RMD160 cc1586e095dcf54902a595f3544bb
 EBUILD qt-creator-1.2.1.ebuild 2877 RMD160 e4aca527c425aa75859147efc28e68c3af6fdfe7 SHA1 d46d077c817b9e9b537f1263d0db872f5bf03fee SHA256 1522017d43e70515ffacb0c949e87a266d175375359c1b7dc490ce9b2f7513e0
 EBUILD qt-creator-1.3.1-r1.ebuild 3510 RMD160 4305d19303541ff19107339c9c65caaa866982b6 SHA1 c77014296ffdf25f3c8d69043cbdc156dd905933 SHA256 a1544734b070b5978f50cfaf33b9c7fc4fc85f318c18f78aad46eb3aaf256dd0
 EBUILD qt-creator-2.1.0.ebuild 4306 RMD160 a8f6d5eec5cc0376e1e297f3a76a823ac34f8652 SHA1 06e6d2f3bdf8c511ff34fdb430e75ba5bc1bc9c4 SHA256 601bb79945cb7dd281281fd5d22d375d555aaf04cf1013490d8441bb59326337
-EBUILD qt-creator-2.2.0_beta.ebuild 4311 RMD160 a4874bced4d4f12367201a9dd7a171a96d9d5c0b SHA1 24552ff8895763c403f34c7b10fcf7d1dd897bc2 SHA256 2b3ac9f92bef3e271785eb9f8d1a40c9b2b3c01e9ac0f3f39a3b064f90026614
-MISC ChangeLog 10985 RMD160 2835c3193e66741388566f789db773c288d9d8e4 SHA1 a8bd61721421e6b1b59b557f3caa19572457fe97 SHA256 bb20a602aa1c07d426a957f85376dd97dfb937d8fc7ad7669a3fd82bd33c99cf
-MISC metadata.xml 1034 RMD160 ff0e30c74188440729f8a7eb6ac4edb78a58261e SHA1 96e28085ccb41904e21e54ef0a3e160bf13d0acc SHA256 9fad95b6ee7de9a1136b6e780084f2185d3fe5ce111f5d605cea5e0292da7878
+EBUILD qt-creator-2.2.0_beta.ebuild 3726 RMD160 30905e6a2e3765f33a01d371b07cc659d5ae9be9 SHA1 e1068057f6d996fd2c397e38883957e9684b4ef3 SHA256 df28d056a0e796353fcf2183b032e8338afe41e09cc514005e60c755a6b14eb8
+MISC ChangeLog 11146 RMD160 a2a3d1b1bf7a7f1041a2a25695bd1b9d32f5d0ff SHA1 7b7dcdbed6ebae836e6543a501b7b77352401dce SHA256 014cf2d08cea76f814594bca2e95dbd1ad6c9776a55223308b1e6ad639162620
+MISC metadata.xml 1108 RMD160 a9e9f00da1b9504a0fdf3605b6a05ddf1befa66d SHA1 d4541a5cc3c29ee2b8dd35b5b94d387b34765c35 SHA256 8fb6608ad281a48a7e1e606c891effbf484bdc5f97330aea46d271ae083103f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNjhGyAAoJENwGBM22xffeUUkP/ifitqJ2onkG/KUcjt3DLbuy
-2HSL39cdVDWFpQvfpukDQZXLJueNSmi7q33aLsueOFAVhxPEneugt0A1Y/2K5+uK
-oIv4uEBP3GVztq6ILAxyK/UUOym15Ic7YYrRXIBVqy2yVcszaqLCuF/qoO6WbIzl
-akSIzDBsTAOfnCnrv6LTPMwyLcxFJJc8mfbnjMK7Va/FXJVcv8OecO/OCXrXT9/c
-2Jul6Ru98JlcCA4XFT67chgpI12d8rCQL6WbI4XEyUtH93/6XiHZHFs4mINK2/sv
-4zduo1GoExOI/Xah4WYJU31viqh+bYJpOukAFD/58VXQOXbZs5k95Ak6ZReQ4cLR
-G0iSZpIE129tM9jLb0H2lh2WGMsZ72Va5U+SYhFGO/U1kKO2QtQZp+ZRrlNd05xv
-zNIcVnehEO+AXLdPh+f7QWorpJGNFCtgObdf9nhhWz2lJDwwB0V2rKTOFNaptaRt
-10Q4Sqrr6fKDUJVcYwn/AQekRqscIUFx6UyPUHJMjg8M/yJQbIurkHqCtvL2nD//
-q/Yk+GhFg265ntdfH54PZayiteRgWI8vPxeqXSv13wDKTwulA9jFEQNr81XoB9AV
-mg3Xil17y8KXn4HGkhtuaxpPcHdpvpdyLPWWK6zRIq10ip/aHo8602FNQVFS27E5
-kAioyPvhRwPgJnVHdf57
-=BY2W
+iQIcBAEBCgAGBQJNly4MAAoJEPqDWhW0r/LCIFsQAKTCjpU36ORsTAfNuHUkPXae
+2e40j4WiZlzTKJ0fxF65R8Lcl+edbIkBXV6LBePD/cVdKPaulzWlWRA1SGEWM1QQ
+fJEZRzaEIU65axMzs1QUZtpjfNG7EgOLpJqVcg1HSPVI+SBaeG/3EyJngjHQ65v3
+AvlYu+GY4yrf/DmId66rFBgVYHo18x8sh0dKWLSbehzyD8bqGu9CRCZAuCTfFSYt
+EH3P8YEgV1LHCFhMAlBf5qUCnIEgAC2DQTTwl2eGGlrxEfY8Wm+Sw9hnqgmd19Jd
+8E85hT4OcrtZB7TT1CL03/SZXDrYedNkzxTcHjgxnZ5pNJSpFxhZDnPWMWlg34p3
+TB4Z1PQ9ZgVKe4tBMpS8vOJ3ii6pCFyPQydTwf4PsjQV2iej4mw0L1mPSn3/jZ6n
+Sqpf3yUev/mK7jYvmv+RnbyENObpmecdPG0qLi4tVOwFTgJwhP74RkgRq7D5sDEs
+kax61Fg5PvJBXDsAnmyll+tlYDoedwzXOzwWW8M82GL9iekOynGZbpIks4OBEfn/
+wbR1MthulYJXAzfZig165Wq4qFzcCwumbD77gO0SaC89xTYaLc5erdKpvv0rmawK
+YWk3eqR7+XofO/LetxiKPDCUQAlORO6u1vpYe6vKZMusZknbeaoJUENlTUz3i2Vt
+b8QTbi8PbuiNoelD9Kzh
+=eGyy
 -----END PGP SIGNATURE-----
diff --git a/dev-util/qt-creator/metadata.xml b/dev-util/qt-creator/metadata.xml
index 90493d99edf0..2e3ceb9c8c73 100644
--- a/dev-util/qt-creator/metadata.xml
+++ b/dev-util/qt-creator/metadata.xml
@@ -7,6 +7,7 @@
 <name>Markos Chandras</name>
 </maintainer>
 <use>
+	<flag name="bazaar">Add support for bazaar version control system</flag>
 	<flag name="bineditor">enable bineditor plugin</flag>
 	<flag name="bookmarks">enable bookmarks plugin</flag>
 	<flag name="cmake">enable cmake project manager plugin</flag>
diff --git a/dev-util/qt-creator/qt-creator-2.2.0_beta.ebuild b/dev-util/qt-creator/qt-creator-2.2.0_beta.ebuild
index 733377ebfd29..7f4a4d0187e7 100644
--- a/dev-util/qt-creator/qt-creator-2.2.0_beta.ebuild
+++ b/dev-util/qt-creator/qt-creator-2.2.0_beta.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.2.0_beta.ebuild,v 1.1 2011/03/25 13:49:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.2.0_beta.ebuild,v 1.2 2011/04/02 14:07:53 hwoarang Exp $
 
-EAPI="2"
+EAPI="4"
 LANGS="de es fr it ja pl ru sl"
 
 inherit qt4-r2 multilib
@@ -17,7 +17,7 @@ SRC_URI="http://get.qt.nokia.com/${MY_PN}/${MY_P}-src.zip"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bineditor bookmarks +cmake cvs debug +designer doc examples fakevim git
+IUSE="bazaar bineditor bookmarks +cmake cvs debug doc examples fakevim git
 	mercurial perforce +qml qtscript rss subversion"
 QTVER="4.7.1:4"
 DEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]
@@ -33,6 +33,7 @@ DEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]
 	qtscript? ( >=x11-libs/qt-script-${QTVER} )"
 
 RDEPEND="${DEPEND}
+	bazaar? ( dev-vcs/bzr )
 	cmake? ( dev-util/cmake )
 	cvs? ( dev-vcs/cvs )
 	sys-devel/gdb
@@ -41,7 +42,8 @@ RDEPEND="${DEPEND}
 	mercurial? ( dev-vcs/mercurial )
 	subversion? ( dev-vcs/subversion )"
 
-PLUGINS="bookmarks bineditor cmake cvs designer fakevim git mercurial perforce qml qtscript subversion"
+PLUGINS="bookmarks bineditor cmake cvs fakevim git mercurial
+perforce qml qtscript subversion"
 
 S="${WORKDIR}"/"${MY_P}"-src
 
@@ -60,30 +62,15 @@ src_prepare() {
 				plugin="cmakeprojectmanager"
 			elif [[ ${plugin} == "qtscript" ]]; then
 				plugin="qtscripteditor"
-			# 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"
+			elif [[ ${plugin} ==  "qml" ]]; then
+				for x in qmlprojectmanager qmljsinspector qmljseditor qmljstools qmldesigner; do
+					einfo "Disabling ${x} support"
+					sed -i "/plugin_${x}/s:^:#:" src/plugins/plugins.pro \
+						|| die "Failed to disable ${x} plugin"
 					done
 			fi
+			# Now disable the plugins
+			sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro
 		fi
 	done
 
@@ -91,7 +78,7 @@ src_prepare() {
 		ewarn
 		ewarn "You have enabled perforce plugin."
 		ewarn "In order to use it, you need to manually"
-		ewarn "download perforce client from http://www.perforce.com/perforce/downloads/index.html"
+		ewarn "download the perforce client from http://www.perforce.com/perforce/downloads/index.html"
 		ewarn
 	fi
 	# disable rss news on startup ( bug #302978 )