[dev-util/qt-creator] Sync with 2.4.0-r1.

4 files changed, 64 insertions, 119 deletions

diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index 3db563e5..8b1fd047 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -1,23 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX qtcreator_logo_48.png 2230 RMD160 23b90749fca6519a1ad9ac5995d371bf31f7516b SHA1 8f392295d6986d73e8782d5af9fb890aedcc2a88 SHA256 aab4c2771865d24a535eb48d08fdd623503248b9b82812d6cbf7f4ec0134326a
-EBUILD qt-creator-9999.ebuild 5130 RMD160 7b1df19d23b811b440fbb3c70e9cd9487841e86b SHA1 1937aa6c2cf50a33efcfd2ba06715f7298df9e64 SHA256 62aa35d580562d8dc7b1fc98d1a691201de59e10fba8cb47cacaac48578d52ce
-MISC metadata.xml 1076 RMD160 0d8770a9dcd896c5e798f4c5a3b1c8e1e2be40be SHA1 59af1cbf3071902003417b7bc9c93c18a09419dc SHA256 712d202fa5df37a6695da30e5e30d48a4285e01e64fc01c060c82fad7d4a774b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCgAGBQJO+IwdAAoJENXLsxwXqFxyIVoP/AgGmYBPU2TwDznWSZxKr1g/
-zhMOz4MRXUFzZEkUN3A4yZcSKUczWVhYXk742A56Cw2rWOSewcoWSTF1iASowTUL
-Iev8GNhUR+SiMaXIb//1h+vprtg8sLkc0PkvCo1RrbdcP4bjk7OZ3TMw28jDLK8a
-qy0/tgbFyObbtUzrIoBl70wn/m5jcTDzRK3BkToKrrGe5epYWuhGJGaVjbmyqERl
-fa9Kh1XWveGpZi9WmuE+IiQw1NluhYP3NYr9/FRdh5pgnAvEafMCdD2EuFarqogV
-45DLpaTZotXKJEt1+tYvMK0OHcxD9O1MDlcFfGPaZxnBaR4L6BREAiLH+wS1D/Cn
-WwmW6pA9QfYQwhxMkVu3jirvlkIs4x6ySy16/ji9MuoimnGl+sySu90bs1c4uDio
-XhKicdH4UoXLOvNDoVg7k8m+Ab3Qux9x1KxkxwBxJcbT8oKpCRmFNOinVsYjUei5
-8sYxPeywC9zjSTuPdvAAb0FoqBSzs5RJUZppqjKWDuhn+YT6erAEvUaa1cNB23Kv
-bqVVTZ+NbRyI0BJ5byalWA6upBktG8DNjuKmPtHqRfk0VNvtIi741H9OBgHKrmpf
-Hk9yZW/PHw9WZMKRFu5FYLS7BQX2gFW9WtYST/7wU6SvCLJIkSRKwoAK0RemqK2h
-qWzY6jeXtsjaSBB2mNe5
-=bEoK
------END PGP SIGNATURE-----
+EBUILD qt-creator-9999.ebuild 3983 RMD160 6deef0d1c928e077875515f4bc4f7bda6f295fad SHA1 48cb50d0167977f3745a22a78748ed14aadbb478 SHA256 65c8a905fad2237a56380366cc028868b8773517b3ae1b5820618831d29ae4f6
+MISC metadata.xml 1142 RMD160 f61d3bec92083dc0c92012651b5e9b13b6407a93 SHA1 8d77e5cb7c51a4b6b1c324241b34f097f8a56a97 SHA256 22d390696502ab9c829b2f55aacd8e9dc87e1a988442a8b42a714ade1b2c6dc0
diff --git a/dev-util/qt-creator/files/qtcreator_logo_48.png b/dev-util/qt-creator/files/qtcreator_logo_48.png
deleted file mode 100644
index fca5342d..00000000
--- a/dev-util/qt-creator/files/qtcreator_logo_48.png
+++ /dev/null
diff --git a/dev-util/qt-creator/metadata.xml b/dev-util/qt-creator/metadata.xml
index fa77f16f..44282bdb 100644
--- a/dev-util/qt-creator/metadata.xml
+++ b/dev-util/qt-creator/metadata.xml
@@ -3,24 +3,22 @@
 <pkgmetadata>
 <herd>qt</herd>
 <maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
+	<email>hwoarang@gentoo.org</email>
+	<name>Markos Chandras</name>
+</maintainer>
+<maintainer>
+	<email>pesa@gentoo.org</email>
+	<name>Davide Pesavento</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="botan-bundled">Use the bundled copy of dev-libs/botan</flag>
-	<flag name="cmake">enable cmake project manager plugin</flag>
-	<flag name="fakevim">enable vim-like key bindings plugin</flag>
-	<flag name="git">enable git plugin</flag>
-	<flag name="mercurial">enable mercurial plugin</flag>
-	<flag name="perforce">enable perforce software configuration manager plugin</flag>
-	<flag name="qml">Simple way of building UIs based on Qt Declarative module</flag>
-	<flag name="qtscript">enable qt script editor plugin</flag>
-	<flag name="subversion">enable subversion plugin</flag>
+	<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
+	<flag name="botan-bundled">Use the bundled copy of <pkg>dev-libs/botan</pkg></flag>
+	<flag name="cmake">Enable cmake project manager plugin</flag>
+	<flag name="fakevim">Enable support for vim-like key bindings</flag>
+	<flag name="git">Add support for <pkg>dev-vcs/git</pkg> version control system</flag>
+	<flag name="madde">Enable integration with MADDE (Maemo Application Development and Debugging Environment)</flag>
+	<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
+	<flag name="perforce">Enable perforce software configuration manager plugin</flag>
+	<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
 </use>
-<longdescription lang="en">
-</longdescription>
 </pkgmetadata>
-
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
index 397afe95..bc199c68 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="4"
 LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
 
-inherit multilib qt4-edge git-2
+inherit multilib eutils flag-o-matic qt4-edge git-2
 
-MY_PN="${PN/-/}"
+MY_P=${PN}-${PV/_/-}-src
 
 DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
 HOMEPAGE="http://qt.nokia.com/products/developer-tools"
@@ -17,83 +17,63 @@ EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="bazaar bineditor bookmarks +botan-bundled +cmake cvs debug doc examples fakevim git
-	mercurial perforce +qml qtscript rss subversion"
+
+QTC_PLUGINS=(bazaar cmake:cmakeprojectmanager cvs fakevim
+	git madde mercurial perforce subversion valgrind)
+IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"
 
 QTVER="4.7.4:4"
-CDEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]
+CDEPEND="
+	>=x11-libs/qt-core-${QTVER}[private-headers(+)]
+	>=x11-libs/qt-declarative-${QTVER}[private-headers(+)]
+	>=x11-libs/qt-gui-${QTVER}[private-headers(+)]
+	>=x11-libs/qt-script-${QTVER}[private-headers(+)]
 	>=x11-libs/qt-sql-${QTVER}
 	>=x11-libs/qt-svg-${QTVER}
-	!qml? ( >=x11-libs/qt-gui-${QTVER} )
-	qml? (
-		>=x11-libs/qt-declarative-${QTVER}[private-headers(+)]
-		>=x11-libs/qt-core-${QTVER}[private-headers(+)]
-		>=x11-libs/qt-gui-${QTVER}[private-headers(+)]
-		>=x11-libs/qt-script-${QTVER}[private-headers(+)]
-	)
-	qtscript? ( >=x11-libs/qt-script-${QTVER} )
-	!botan-bundled? ( =dev-libs/botan-1.8* )"
-
+	debug? ( >=x11-libs/qt-test-${QTVER} )
+	doc? ( >=x11-libs/qt-assistant-${QTVER}[doc] )
+	!botan-bundled? ( =dev-libs/botan-1.8* )
+"
 DEPEND="${CDEPEND}
-	!botan-bundled? ( dev-util/pkgconfig )"
-
+	!botan-bundled? ( dev-util/pkgconfig )
+"
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[python]
+	examples? ( >=x11-libs/qt-demo-${QTVER} )
+"
+PDEPEND="
 	bazaar? ( dev-vcs/bzr )
 	cmake? ( dev-util/cmake )
 	cvs? ( dev-vcs/cvs )
-	examples? ( >=x11-libs/qt-demo-${QTVER} )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )"
-
-PLUGINS="bookmarks bineditor cmake cvs fakevim git mercurial perforce
-	qml qtscript rss subversion"
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
 
 src_prepare() {
 	qt4-edge_src_prepare
 
-	# fix library path for styleplugin
-	sed -i -e "/target.path/s:lib:$(get_libdir):" \
-		"${S}"/src/libs/qtcomponents/styleitem/styleitem.pro \
-		|| die "Failed to fix multilib dir for styleplugin"
-
-	# 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"
-			elif [[ ${plugin} == "rss" ]]; then
-				plugin="welcome"
-			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
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -e "/^[[:space:]]\+plugin_${plugin#*:}/d" 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 "You have enabled the perforce plugin."
+		ewarn "In order to use it, you need to manually download the perforce client from"
+		ewarn "  http://www.perforce.com/perforce/downloads/index.html"
 		ewarn
 	fi
 
 	# fix translations
-	sed -i "/^LANGUAGES/s:=.*:= ${LANGS}:" \
-		share/${MY_PN}/translations/translations.pro || die
-
-	# add rpath to make qtcreator actual find its *own* plugins
-	sed -i "/^LIBS/s:+=:& -Wl,-rpath,/usr/$(get_libdir)/${MY_PN} :" qtcreator.pri || die
+	sed -i -e "/^LANGUAGES/s:=.*:= ${LANGS}:" \
+		share/qtcreator/translations/translations.pro || die
 
 	if ! use botan-bundled; then
 		# identify system botan and pkg-config file
@@ -112,22 +92,17 @@ src_prepare() {
 		sed -i -e "/botan.pri/d" "${S}"/src/libs/utils/utils_dependencies.pri || die
 		sed -i -e "/botan.pri/d" "${S}"/tests/manual/preprocessor/preprocessor.pro || die
 		# link to system botan
-		sed -i -e "/LIBS/s:$: ${lib_botan}:" "${S}"/${MY_PN}.pri || die
+		sed -i -e "/LIBS/s:$: ${lib_botan}:" "${S}"/qtcreator.pri || die
 		sed -i -e "s:-lBotan:${lib_botan}:" "${S}"/tests/manual/appwizards/appwizards.pro || die
 		# append botan refs to compiler flags
 		append-flags $(pkg-config --cflags --libs botan-${botan_version})
 	fi
-
 }
 
 src_configure() {
-	# the path must NOT be empty
-	local qtheaders="False"
-	use qml && qtheaders="/usr/include/qt4/"
-	eqmake4 \
-		${MY_PN}.pro \
+	eqmake4 qtcreator.pro \
 		IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		QT_PRIVATE_HEADERS=${qtheaders}
+		IDE_PACKAGE_MODE=true
 }
 
 src_compile() {
@@ -136,29 +111,22 @@ src_compile() {
 }
 
 src_install() {
-	# Install wrapper
-	dobin bin/${MY_PN} bin/qtpromaker
-	if use qml; then
-		# qmlpuppet component. Bug #367383
-		dobin bin/qmlpuppet
-	fi
+	emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install
 
-	emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets
 	if use doc; then
-		[[ -e "${S}"/share/doc/${MY_PN}/${MY_PN}.qch ]] || due "${MY_PN}.qch is	missing"
-		emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_qch_docs
+		emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_docs
 	fi
 
-	# Install missing icon
-	doicon "${FILESDIR}"/${MY_PN}_logo_48.png || die "failed to install icon"
-	make_desktop_entry ${MY_PN} "Qt Creator" qtcreator_logo_48 \
-		'Qt;Development;IDE' || die "make_desktop_entry failed"
+	# Install icon & desktop file
+	doicon src/plugins/coreplugin/images/logo/128/qtcreator.png || die
+	make_desktop_entry qtcreator 'Qt Creator' qtcreator 'Qt;Development;IDE' || die
 
 	# Remove unneeded translations
+	local lang
 	for lang in ${LANGS}; do
-		if ! has $lang ${LINGUAS}; then
-			rm "${D}"/usr/share/${MY_PN}/translations/${MY_PN}_${lang}.qm \
-					|| die "failed to remove translations"
+		if ! has ${lang} ${LINGUAS}; then
+			rm "${D}"/usr/share/qtcreator/translations/qtcreator_${lang}.qm \
+				|| eqawarn "failed to remove ${lang} translation"
 		fi
 	done
 }