Use flags for plugins. Fixes bug #263087

(Portage version: 2.2_rc26/cvs/Linux x86_64)

5 files changed, 134 insertions, 14 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/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"
+}