Accessibility support is required. Thanks to Hans Nieser in bug 528304.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

3 files changed, 17 insertions, 16 deletions

diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog
index 684f61407caf..576247a4ad16 100644
--- a/dev-qt/qt-creator/ChangeLog
+++ b/dev-qt/qt-creator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qt-creator
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.34 2014/10/14 23:34:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.35 2014/11/07 01:59:17 pesa Exp $
+
+  07 Nov 2014; Davide Pesavento <pesa@gentoo.org> qt-creator-2.8.1.ebuild,
+  qt-creator-3.2.2.ebuild:
+  Accessibility support is required. Thanks to Hans Nieser in bug 528304.
 
 *qt-creator-3.2.2 (14 Oct 2014)
 
diff --git a/dev-qt/qt-creator/qt-creator-2.8.1.ebuild b/dev-qt/qt-creator/qt-creator-2.8.1.ebuild
index 31dabbce7e09..fdcb73934d3c 100644
--- a/dev-qt/qt-creator/qt-creator-2.8.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-2.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.8.1.ebuild,v 1.4 2013/12/21 17:17:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.1.ebuild,v 1.5 2014/11/07 01:59:17 pesa Exp $
 
 EAPI=5
 
@@ -33,20 +33,18 @@ QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
 IUSE="debug doc examples test ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
-QT_PV="4.8.0:4"
+QT_PV="4.8.5:4"
 
 CDEPEND="
 	=dev-libs/botan-1.10*[threads]
+	>=dev-qt/designer-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}[ssl]
-	>=dev-qt/qtdeclarative-${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/qtdeclarative-${QT_PV}[accessibility]
+	>=dev-qt/qtgui-${QT_PV}[accessibility]
 	>=dev-qt/qthelp-${QT_PV}[doc?]
 	>=dev-qt/qtscript-${QT_PV}
 	>=dev-qt/qtsql-${QT_PV}
-	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtsvg-${QT_PV}[accessibility]
 "
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
@@ -83,8 +81,7 @@ src_prepare() {
 	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
+	# remove bundled qbs
 	rm -rf src/shared/qbs || die
 }
 
diff --git a/dev-qt/qt-creator/qt-creator-3.2.2.ebuild b/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
index 93d13c2bbde3..89b00e16b34d 100644
--- a/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v 1.1 2014/10/14 23:34:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v 1.2 2014/11/07 01:59:17 pesa Exp $
 
 EAPI=5
 
@@ -42,12 +42,12 @@ CDEPEND="
 	=dev-libs/botan-1.10*[threads]
 	>=dev-qt/designer-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}[ssl]
-	>=dev-qt/qtdeclarative-${QT_PV}
-	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[accessibility]
+	>=dev-qt/qtgui-${QT_PV}[accessibility]
 	>=dev-qt/qthelp-${QT_PV}[doc?]
 	>=dev-qt/qtscript-${QT_PV}
 	>=dev-qt/qtsql-${QT_PV}
-	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtsvg-${QT_PV}[accessibility]
 	clang? ( >=sys-devel/clang-3.2:= )
 "
 DEPEND="${CDEPEND}