Use flags for plugins. Fixes bug #263087

Package-Manager: portage-2.2_rc26/cvs/Linux x86_64

6 files changed, 138 insertions, 17 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 49856e27052a..649302ce4812 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.8 2009/03/12 17:02:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.9 2009/03/24 18:43:42 hwoarang Exp $
+
+*qt-creator-1.0.0-r1 (24 Mar 2009)
+
+  24 Mar 2009; Markos Chandras <hwoarang@gentoo.org>
+  +files/add_missing_plugins.patch, -files/fix_headers_git.patch,
+  +qt-creator-1.0.0-r1.ebuild:
+  Introduce use flags for qt-creator plugins. Thanks to Livid
+  <g.livid@gmail.com> for his ebuilds,patches and effort. Dropping old
+  obsolete patch
 
   12 Mar 2009; Markos Chandras <hwoarang@gentoo.org> qt-creator-1.0.0:
   Updating homepage
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index 4c11ad138a0a..fdf609d3148d 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -1,6 +1,7 @@
+AUX add_missing_plugins.patch 920 RMD160 9d29a8ca800131d0904d2bd9eeb0ebc0ed5c3c97 SHA1 399af9bf05587a367f264199c3a32338125008b1 SHA256 6ca898640206cfb8f29297db561c3f0b794fe1335dde2bddfa39cfbe43f66803
 AUX docs_gen.patch 603 RMD160 9711ddb1c59e8ddd1ad17ba34f89c8e4c89b4504 SHA1 83cd745baabd1545a1079c59edef6279b254074a SHA256 7428155e6f09201d60f308c3934153aa5fa5b25296a96d86dad80354dc8e3b93
-AUX fix_headers_git.patch 428 RMD160 7877a5d04c4d602cb8577176ea56c4db78a2c8bb SHA1 88e1cd79bee8751ab0f2633239756aeec9e6908a SHA256 ef3c00a697671b29769602854ce137398b2533f31a8a846ad9cfa4f34832ee4b
 DIST qt-creator-1.0.0-src.zip 7434929 RMD160 72467ef938af643edf2b5b6f603d0f3760e66103 SHA1 3f228d1048266e1fefc565b69b51cf9062764b66 SHA256 3b6947b378ad0cf31f30ef5027f54f6bc6e3007db71dcec6eb44fba51b4f60e9
+EBUILD qt-creator-1.0.0-r1.ebuild 2611 RMD160 d26c5267a24bbb9525ddb25b65f6ddf1d53bc699 SHA1 60cc917dcdee9d04850807ecf9578111aeb75e5c SHA256 515b7e656cb6c4f4057baada96df22161f3a9ec004d08cdfd4944a366aae1d95
 EBUILD qt-creator-1.0.0.ebuild 1751 RMD160 3915c88cd43cb8838008500f26050f2d2f6bdac4 SHA1 f9186b0d1189dedcf2a56a5f743fe51cfe13e5d8 SHA256 d12a2da72cc43b48bf71fb0e84d4f160accc86c8c5906eb05e7ece79e381590c
-MISC ChangeLog 1293 RMD160 123f83cb2cfaf51b73c8d9f4fe699efb7b0347b3 SHA1 29a72b26b444c6ce086e3c62fc81eae47aaefbb7 SHA256 d713fc4fb5dfda5ebac66810c0ed818b45e00e29046fd4f1d346254994bac5f5
-MISC metadata.xml 294 RMD160 ac4e1baa0a1839ae0a807a9d4b915134788d6aa1 SHA1 82865de14486cb30dc9ebfe6f1aecc9c86c0075b SHA256 209af586ae032f00659b69da17d4186854660be14b244d31aa0bea2005c2c5ba
+MISC ChangeLog 1630 RMD160 6f7157b4e90adc742b76124860eb2be642542c6e SHA1 8c5719fa2109e610826d27c0c76190a9b3323d8e SHA256 7f337ce896ef3b06d13307be9684d611730a80bbf46c286467261c8ad2579b63
+MISC metadata.xml 724 RMD160 a1121f53664dd88c204ba83de69938274e18f722 SHA1 a41a06901fb56224181f0c3635d57db0a2fb004c SHA256 5ae14c5cd9654b55516722630418b52a5a2c080bd200ff69977ffb6e9b17d01c
diff --git a/dev-util/qt-creator/files/add_missing_plugins.patch b/dev-util/qt-creator/files/add_missing_plugins.patch
new file mode 100644
index 000000000000..85827858f380
--- /dev/null
+++ b/dev-util/qt-creator/files/add_missing_plugins.patch
@@ -0,0 +1,23 @@
+Index: qt-creator-1.0.0-src/src/plugins/plugins.pro
+===================================================================
+--- qt-creator-1.0.0-src.orig/src/plugins/plugins.pro
++++ qt-creator-1.0.0-src/src/plugins/plugins.pro
+@@ -26,15 +26,9 @@ SUBDIRS   = plugin_coreplugin \
+             plugin_qtscripteditor \
+ #            plugin_cpaster \
+             plugin_cmakeprojectmanager \
+-            plugin_fakevim
+-
+-# These two plugins require private headers from Qt and therefore don't work
+-# with an installed/released version of Qt.
+-exists($$(QTDIR)/.qmake.cache) {
+-    SUBDIRS += plugin_designer plugin_resourceeditor
+-} else {
+-    message(Designer and Resource Editor plugins are not build! They require private headers and do not compile with your released/installed version of Qt)
+-}
++            plugin_fakevim \
++	    plugin_designer \
++	    plugin_resourceeditor
+ 
+ plugin_coreplugin.subdir = coreplugin
+ 
diff --git a/dev-util/qt-creator/files/fix_headers_git.patch b/dev-util/qt-creator/files/fix_headers_git.patch
deleted file mode 100644
index e5d032779932..000000000000
--- a/dev-util/qt-creator/files/fix_headers_git.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qt-creator-9999/src/shared/qrceditor/resourcefile_p.h
-===================================================================
---- qt-creator-9999.orig/src/shared/qrceditor/resourcefile_p.h
-+++ qt-creator-9999/src/shared/qrceditor/resourcefile_p.h
-@@ -42,7 +42,7 @@
- #include <QtCore/QStringList>
- #include <QtGui/QIcon>
- 
--#include "shared_global_p.h"
-+#include <QtDesigner/private/shared_global_p.h>
- 
- QT_BEGIN_NAMESPACE
- 
diff --git a/dev-util/qt-creator/metadata.xml b/dev-util/qt-creator/metadata.xml
index d5f9562e2df2..d91f35f226b3 100644
--- a/dev-util/qt-creator/metadata.xml
+++ b/dev-util/qt-creator/metadata.xml
@@ -6,6 +6,15 @@
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
 </maintainer>
+<use>
+	<flag name="cmake">enable cmake project manager plugin</flag>
+	<flag name="debugger">enable debugger plugin</flag>
+	<flag name="designer">enable designer plugin</flag>
+	<flag name="fakevim">enable vim-like key bindings plugin</flag>
+	<flag name="git">enable git plugin</flag>
+	<flag name="perforce">enable perforce software configuration manager plugin</flag>
+	<flag name="subversion">enable subersion plugin</flag>
+</use>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-util/qt-creator/qt-creator-1.0.0-r1.ebuild b/dev-util/qt-creator/qt-creator-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..00e42087ed47
--- /dev/null
+++ b/dev-util/qt-creator/qt-creator-1.0.0-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-1.0.0-r1.ebuild,v 1.1 2009/03/24 18:43:42 hwoarang Exp $
+
+EAPI="2"
+
+inherit qt4 multilib
+
+MY_PN="${PN/-/}"
+MY_P="${P}-src"
+
+DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
+HOMEPAGE="http://labs.qtsoftware.com/page/Projects/Tools/QtCreator"
+SRC_URI="http://download.qtsoftware.com/${MY_PN}/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cmake debug +debugger +designer doc fakevim git perforce subversion"
+
+DEPEND=">=x11-libs/qt-assistant-4.5.0_rc1
+	>=x11-libs/qt-core-4.5.0_rc1
+	>=x11-libs/qt-dbus-4.5.0_rc1
+	>=x11-libs/qt-gui-4.5.0_rc1
+	>=x11-libs/qt-qt3support-4.5.0_rc1
+	>=x11-libs/qt-script-4.5.0_rc1
+	>=x11-libs/qt-sql-4.5.0_rc1
+	>=x11-libs/qt-svg-4.5.0_rc1
+	>=x11-libs/qt-test-4.5.0_rc1
+	>=x11-libs/qt-webkit-4.5.0_rc1
+	cmake? ( dev-util/cmake )
+	debugger? ( sys-devel/gdb )
+	git? ( dev-util/git )
+	subversion? ( dev-util/subversion )"
+
+RDEPEND="${DEPEND}
+	|| ( media-sound/phonon >=x11-libs/qt-phonon-4.5.0_rc1 )"
+
+PLUGINS="cmake debugger designer fakevim git perforce subversion"
+
+PATCHES=(
+	"${FILESDIR}/docs_gen.patch"
+	"${FILESDIR}/add_missing_plugins.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	qt4_src_prepare
+	# bug #261448
+	for target in src/qworkbench.pri src/qworkbenchlibrary.pri src/qworkbenchplugin.pri;do
+		einfo "Fixing ${target}"
+		sed -i "s/lib\/qtcreator/$(get_libdir)\/qtcreator/" \
+			${target} || die "seding ${target} failed"
+	done
+
+	# bug 263087
+	for plugin in ${PLUGINS};do
+		if ! use ${plugin};then
+			einfo "Disabling ${plugin} support"
+			if [[ ${plugin} == "cmake" ]];then
+				plugin="cmakeprojectmanager"
+			fi
+			sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro \
+				|| die "Failed to disabled ${plugin} plugin"
+		fi
+	done
+
+	if use perforce;then
+		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
+		ebeep 5
+	fi
+}
+
+src_configure() {
+	eqmake4 ${MY_PN}.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}/usr" install || die "emake install failed"
+	if use doc;then
+		insinto /usr/share/doc/qtcreator/
+		doins "${S}"/share/doc/qtcreator/qtcreator.qch || die "Installing documentation failed"
+		doins -r "${S}"/doc/html || die "Installing html documentation  failed"
+	fi
+	make_desktop_entry qtcreator QtCreator qtcreator_logo_48 \
+		'Qt;Development;IDE' || die "make_desktop_entry failed"
+}