Add patch to make qt-creator-1.3.1 compile against Qt-4.7. Thanks to David Flogeras <dflogeras2@gmail.com>. Bug #361813

(Portage version: 2.1.9.44/cvs/Linux x86_64)

5 files changed, 136 insertions, 105 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index ada3d329fe3e..d1fe202bb6f8 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,13 @@
 # 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.72 2011/04/02 14:07:53 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.73 2011/04/04 07:59:40 hwoarang Exp $
+
+*qt-creator-1.3.1-r2 (04 Apr 2011)
+
+  04 Apr 2011; Markos Chandras <hwoarang@gentoo.org> -qt-creator-1.2.1.ebuild,
+  +qt-creator-1.3.1-r2.ebuild, +files/qt-creator-1.3.1-qt47.patch:
+  Add patch to make qt-creator-1.3.1 compile against Qt-4.7. Thanks to David
+  Flogeras <dflogeras2@gmail.com>. Bug #361813
 
   02 Apr 2011; Markos Chandras <hwoarang@gentoo.org>
   qt-creator-2.2.0_beta.ebuild, metadata.xml:
diff --git a/dev-util/qt-creator/files/qt-creator-1.3.1-qt47.patch b/dev-util/qt-creator/files/qt-creator-1.3.1-qt47.patch
new file mode 100644
index 000000000000..1b50fb96d54c
--- /dev/null
+++ b/dev-util/qt-creator/files/qt-creator-1.3.1-qt47.patch
@@ -0,0 +1,12 @@
+--- qt-creator-1.3.1-src/src/libs/cplusplus/TypePrettyPrinter.cpp.orig	2011-04-03 14:31:36.000000000 -0300
++++ qt-creator-1.3.1-src/src/libs/cplusplus/TypePrettyPrinter.cpp	2011-04-03 14:22:39.000000000 -0300
+@@ -69,8 +69,7 @@
+ }
+ 
+ TypePrettyPrinter::TypePrettyPrinter(const Overview *overview)
+-    : _overview(overview),
+-      _name(0)
++    : _overview(overview)
+ { }
+ 
+ TypePrettyPrinter::~TypePrettyPrinter()
diff --git a/dev-util/qt-creator/metadata.xml b/dev-util/qt-creator/metadata.xml
index 2e3ceb9c8c73..f3654acca173 100644
--- a/dev-util/qt-creator/metadata.xml
+++ b/dev-util/qt-creator/metadata.xml
@@ -11,7 +11,6 @@
 	<flag name="bineditor">enable bineditor plugin</flag>
 	<flag name="bookmarks">enable bookmarks plugin</flag>
 	<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>
diff --git a/dev-util/qt-creator/qt-creator-1.2.1.ebuild b/dev-util/qt-creator/qt-creator-1.2.1.ebuild
deleted file mode 100644
index 8ed5f7ab58b8..000000000000
--- a/dev-util/qt-creator/qt-creator-1.2.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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-1.2.1.ebuild,v 1.10 2011/03/26 16:17:39 dilfridge Exp $
-
-EAPI="2"
-
-inherit qt4 multilib
-
-MY_PN="${PN/-/}"
-MY_P="${P}-src"
-
-DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
-HOMEPAGE="http://qt.nokia.com/products/developer-tools"
-SRC_URI="http://download.qtsoftware.com/${MY_PN}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="bineditor bookmarks +cmake debug +debugger +designer doc examples fakevim git kde perforce qtscript subversion"
-
-DEPEND="app-arch/unzip
-	>=x11-libs/qt-assistant-4.5.0_rc1
-	>=x11-libs/qt-gui-4.5.0_rc1[qt3support]"
-
-RDEPEND="${DEPEND}
-	>=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
-	!kde? ( || ( >=x11-libs/qt-phonon-4.5.0_rc1 media-libs/phonon ) )
-	kde? ( media-libs/phonon )
-	cmake? ( dev-util/cmake )
-	debugger? ( sys-devel/gdb )
-	examples? ( >=x11-libs/qt-demo-4.5.0_rc1 )
-	git? ( dev-vcs/git )
-	qtscript? ( >=x11-libs/qt-script-4.5.0_rc1 )
-	subversion? ( dev-vcs/subversion )"
-
-PLUGINS="bookmarks bineditor cmake debugger designer fakevim git perforce qtscript subversion"
-
-PATCHES=(
-	"${FILESDIR}/docs_gen.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="de es it ja ru"
-
-for x in ${LANGS}; do
-	IUSE="${IUSE} linguas_${x}"
-done
-
-src_prepare() {
-	qt4_src_prepare
-
-	# bug 263087
-	for plugin in ${PLUGINS};do
-		if ! use ${plugin};then
-			einfo "Disabling ${plugin} support"
-			if [[ ${plugin} == "cmake" ]];then
-				plugin="cmakeprojectmanager"
-			elif [[ ${plugin} == "qtscript" ]];then
-				plugin="qtscripteditor"
-			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 IDE_LIBRARY_BASENAME="$(get_libdir)"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}/usr" install_subtargets || die "emake install failed"
-	# because qtcreator.bin executable make nosense
-	mv "${D}"/usr/bin/${MY_PN}.bin "${D}"/usr/bin/${MY_PN} || die "failed to rename executable"
-	if use doc;then
-		emake INSTALL_ROOT="${D}/usr" install_qch_docs || die "emake install qch_docs failed"
-	fi
-	make_desktop_entry ${MY_PN} QtCreator qtcreator_logo_48 \
-		'Qt;Development;IDE' || die "make_desktop_entry failed"
-
-	# install translations
-	insinto /usr/share/${MY_PN}/translations/
-	for x in ${LINGUAS};do
-		for lang in ${LANGS};do
-			if [[ ${x} == ${lang} ]];then
-				doins share/${MY_PN}/translations/${MY_PN}_${x}.qm
-			fi
-		done
-	done
-}
diff --git a/dev-util/qt-creator/qt-creator-1.3.1-r2.ebuild b/dev-util/qt-creator/qt-creator-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..516435053d7c
--- /dev/null
+++ b/dev-util/qt-creator/qt-creator-1.3.1-r2.ebuild
@@ -0,0 +1,116 @@
+# 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-1.3.1-r2.ebuild,v 1.1 2011/04/04 07:59:40 hwoarang Exp $
+
+EAPI="2"
+LANGS="de es fr it ja pl ru sl"
+
+inherit qt4-r2 multilib
+MY_PN="${PN/-/}"
+
+DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
+HOMEPAGE="http://qt.nokia.com/products/developer-tools"
+SRC_URI="http://get.qt.nokia.com/${MY_PN}/${P}-src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="bineditor bookmarks +cmake cvs debug +designer doc examples fakevim git
+kde mercurial perforce qml qtscript rss subversion"
+
+DEPEND=">=x11-libs/qt-assistant-4.6.0:4
+	>=x11-libs/qt-gui-4.6.0:4[qt3support]"
+
+RDEPEND="${DEPEND}
+	>=x11-libs/qt-sql-4.6.1:4
+	>=x11-libs/qt-svg-4.6.1:4
+	>=x11-libs/qt-test-4.6.1:4
+	>=x11-libs/qt-webkit-4.6.1:4
+	!kde? ( || ( >=x11-libs/qt-phonon-4.6.1:4 media-libs/phonon ) )
+	kde? ( media-libs/phonon )
+	cmake? ( dev-util/cmake )
+	cvs? ( dev-vcs/cvs )
+	sys-devel/gdb
+	examples? ( >=x11-libs/qt-demo-4.6.1:4 )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	qtscript? ( >=x11-libs/qt-script-4.6.1:4 )
+	subversion? ( dev-vcs/subversion )"
+
+PLUGINS="bookmarks bineditor cmake cvs designer fakevim git mercurial perforce qml qtscript subversion"
+
+S="${WORKDIR}"/"${P}"-src
+
+PATCHES=(
+	# build against Qt-4.7. Bug #361813
+	"${FILESDIR}"/${P}-qt47.patch
+)
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	# bug 263087
+	for plugin in ${PLUGINS};do
+		if ! use ${plugin};then
+			einfo "Disabling ${plugin} support"
+			if [[ ${plugin} == "cmake" ]];then
+				plugin="cmakeprojectmanager"
+			elif [[ ${plugin} == "qtscript" ]];then
+				plugin="qtscripteditor"
+			fi
+			if [[ ${plugin} == "qml" ]]; then
+				plugin="qmleditor"
+				einfo "Disabling qmlprojectmanager support"
+				sed -i "/plugin_qmlprojectmanager/s:^:#:" src/plugins/plugins.pro \
+					|| die "Failed to disable qmlprojectmanager plugin"
+			fi
+			if [[ ${plugin} == "designer" ]]; then
+				sed -i "/plugin_qt4projectmanager/s:^:#:" \
+					src/plugins/plugins.pro \
+					|| die "Failed to disable qt4projectmanager plugin"
+			fi
+			sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro \
+				|| die "Failed to disable ${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
+	# disable rss news on startup ( bug #302978 )
+	if ! use rss; then
+		einfo "Disabling RSS welcome news"
+		sed -i "/m_rssFetcher->fetch/s:^:\/\/:" \
+			src/plugins/welcome/communitywelcomepagewidget.cpp \
+			|| die "failed to disable rss"
+	fi
+}
+
+src_configure() {
+	eqmake4 ${MY_PN}.pro IDE_LIBRARY_BASENAME="$(get_libdir)"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets || die "emake install failed"
+	# fix binary name bug 275859
+	mv "${D%/}${EPREFIX}"/usr/bin/${MY_PN}.bin \
+		"${D%/}${EPREFIX}"/usr/bin/${MY_PN} || die "failed to rename executable"
+	if use doc;then
+		emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_qch_docs || die "emake install qch_docs failed"
+	fi
+	make_desktop_entry ${MY_PN} QtCreator qtcreator_logo_48 \
+		'Qt;Development;IDE' || die "make_desktop_entry failed"
+
+	# install translations
+	for lang in ${LANGS};do
+		if ! hasq ${lang} ${LINGUAS}; then
+			rm "${D}"/usr/share/${MY_PN}/translations/${MY_PN}_${lang}.qm \
+					|| die "failed to remove ${lang} translation"
+		fi
+	done
+}