From f25fa81e753de082dbc4cb4d771c555dce742646 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Sun, 15 Jan 2012 22:02:31 +0000 Subject: make dependency to qt-assistant[doc] optionally (Portage version: 2.2.0_alpha84/cvs/Linux x86_64) --- dev-util/qt-creator/ChangeLog | 5 ++++- dev-util/qt-creator/qt-creator-2.4.0-r1.ebuild | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog index 93be96310561..cf788f94c288 100644 --- a/dev-util/qt-creator/ChangeLog +++ b/dev-util/qt-creator/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/qt-creator # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.106 2012/01/14 12:01:49 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.107 2012/01/15 22:02:31 hwoarang Exp $ + + 15 Jan 2012; Markos Chandras qt-creator-2.4.0-r1.ebuild: + make dependency to qt-assistant[doc] optionally 14 Jan 2012; Markos Chandras qt-creator-2.4.0-r1.ebuild: x11-libs/qt-assistant is a mandatory dependency. Bug #398583 diff --git a/dev-util/qt-creator/qt-creator-2.4.0-r1.ebuild b/dev-util/qt-creator/qt-creator-2.4.0-r1.ebuild index ef0c0ab60764..bb662a24bd66 100644 --- a/dev-util/qt-creator/qt-creator-2.4.0-r1.ebuild +++ b/dev-util/qt-creator/qt-creator-2.4.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.4.0-r1.ebuild,v 1.2 2012/01/14 12:01:49 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.4.0-r1.ebuild,v 1.3 2012/01/15 22:02:31 hwoarang Exp $ EAPI="4" LANGS="cs de es fr hu it ja pl ru sl uk zh_CN" @@ -30,7 +30,7 @@ CDEPEND=" >=x11-libs/qt-sql-${QTVER} >=x11-libs/qt-svg-${QTVER} debug? ( >=x11-libs/qt-test-${QTVER} ) - >=x11-libs/qt-assistant-${QTVER}[doc] + >=x11-libs/qt-assistant-${QTVER}[doc?] !botan-bundled? ( =dev-libs/botan-1.8* ) " DEPEND="${CDEPEND} -- cgit v1.2.3-65-gdbad