[gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     7288df4e60114d51a8b60c4c7b9f9a991af89b50
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Jul 27 08:33:56 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 08:33:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7288df4e

[dev-qt/qt-creator] Sync with portage.

Package-Manager: portage-2.2.0_alpha190

---
 dev-qt/qt-creator/metadata.xml           | 10 +++++-----
 dev-qt/qt-creator/qt-creator-9999.ebuild | 11 +++++++++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 78606ab..027096a 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
-<maintainer>
-	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
-</maintainer>
 <maintainer>
 	<email>pesa@gentoo.org</email>
 	<name>Davide Pesavento</name>
 </maintainer>
+<maintainer>
+	<email>hwoarang@gentoo.org</email>
+	<name>Markos Chandras</name>
+</maintainer>
+<herd>qt</herd>
 <use>
 	<flag name="android">Build Android plugin</flag>
 	<flag name="autotools">Enable autotools project manager plugin</flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 0b82e9d..325a737 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.7.1.ebuild,v 1.1 2013/06/03 08:01:44 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.0.ebuild,v 1.1 2013/07/27 07:49:01 pesa Exp $
 
 EAPI=5
 
@@ -39,7 +39,10 @@ CDEPEND="
 	=dev-libs/botan-1.10*
 	>=dev-qt/qtcore-${QT_PV}[ssl]
 	>=dev-qt/qtdeclarative-${QT_PV}
-	>=dev-qt/qtgui-${QT_PV}
+	|| (
+		( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 )
+		( >=dev-qt/qtgui-${QT_PV} <dev-qt/qtgui-4.8.5:4 )
+	)
 	>=dev-qt/qthelp-${QT_PV}[doc?]
 	>=dev-qt/qtscript-${QT_PV}
 	>=dev-qt/qtsql-${QT_PV}
@@ -79,6 +82,10 @@ src_prepare() {
 	# fix translations
 	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
 		share/qtcreator/translations/translations.pro || die
+
+	# remove bundled qbs for now
+	# TODO: package it and re-enable the plugin
+	rm -rf src/shared/qbs || die
 }
 
 src_configure() {