From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2A5CD1381F3 for ; Sat, 27 Jul 2013 08:33:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6180E0996; Sat, 27 Jul 2013 08:33:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4991CE0996 for ; Sat, 27 Jul 2013 08:33:51 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50E6633EA57 for ; Sat, 27 Jul 2013 08:33:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 904CAE468F for ; Sat, 27 Jul 2013 08:33:47 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1374914036.7288df4e60114d51a8b60c4c7b9f9a991af89b50.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qt-creator/metadata.xml dev-qt/qt-creator/qt-creator-9999.ebuild X-VCS-Directories: dev-qt/qt-creator/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 7288df4e60114d51a8b60c4c7b9f9a991af89b50 X-VCS-Branch: master Date: Sat, 27 Jul 2013 08:33:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3e50e1f5-f05b-4766-ad0c-f00b8355b1c3 X-Archives-Hash: ed8a747270d9903c133bba6f908c1c7f commit: 7288df4e60114d51a8b60c4c7b9f9a991af89b50 Author: Davide Pesavento gmail com> AuthorDate: Sat Jul 27 08:33:56 2013 +0000 Commit: Davide Pesavento gentoo 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 @@ -qt - - hwoarang@gentoo.org - Markos Chandras - pesa@gentoo.org Davide Pesavento + + hwoarang@gentoo.org + Markos Chandras + +qt Build Android plugin Enable autotools project manager plugin 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/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() {