summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-11-04 18:19:03 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-11-04 18:19:03 +0000
commit54a6b701ec53721a4c1da311d8f6ae8e11633642 (patch)
tree4da5d45586b93de31d4b916c0a7dd56520be102e /net-irc
parentia64/s390/sh/sparc stable wrt #284689 (diff)
downloadgentoo-2-54a6b701ec53721a4c1da311d8f6ae8e11633642.tar.gz
gentoo-2-54a6b701ec53721a4c1da311d8f6ae8e11633642.tar.bz2
gentoo-2-54a6b701ec53721a4c1da311d8f6ae8e11633642.zip
Reorder deps in order to not duplicate them
(Portage version: 2.2_rc48/cvs/Linux x86_64)
Diffstat (limited to 'net-irc')
-rw-r--r--net-irc/quassel/ChangeLog5
-rw-r--r--net-irc/quassel/quassel-9999.ebuild46
2 files changed, 26 insertions, 25 deletions
diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 5cd83a222943..ff537983e1e3 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-irc/quassel
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.69 2009/11/04 16:02:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.70 2009/11/04 18:19:03 scarabeus Exp $
+
+ 04 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> quassel-9999.ebuild:
+ Reorder deps in order to not duplicate them
04 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> quassel-9999.ebuild:
Depend on plasma-indicatordisplay for ayatana in kde.
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 9a3bdc954d50..c302188fe493 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.28 2009/11/04 16:02:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.29 2009/11/04 18:19:03 scarabeus Exp $
EAPI="2"
@@ -17,34 +17,32 @@ KEYWORDS=""
SLOT="0"
IUSE="ayatana dbus debug kde monolithic phonon postgres +server +ssl webkit +X"
+SERVER_RDEPEND="
+ !postgres? ( x11-libs/qt-sql:4[sqlite] dev-db/sqlite[threadsafe] )
+ postgres? ( x11-libs/qt-sql:4[postgres] )
+ x11-libs/qt-script:4
+"
+
+GUI_RDEPEND="
+ x11-libs/qt-gui:4
+ yatana? ( dev-libs/libindicate-qt )
+ kde? (
+ >=kde-base/kdelibs-4.3
+ ayatana? ( kde-misc/plasma-indicatordisplay )
+ )
+ phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
+ webkit? ( x11-libs/qt-webkit:4 )
+"
+
RDEPEND="
dbus? ( x11-libs/qt-dbus:4 )
monolithic? (
- !postgres? ( x11-libs/qt-sql:4[sqlite] dev-db/sqlite[threadsafe] )
- postgres? ( x11-libs/qt-sql:4[postgres] >=virtual/postgresql-base-8.3 )
- x11-libs/qt-script:4
- x11-libs/qt-gui:4
- ayatana? ( dev-libs/libindicate-qt )
- kde? (
- >=kde-base/kdelibs-4.3
- ayatana? ( kde-misc/plasma-indicatordisplay )
- )
- phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
- webkit? ( x11-libs/qt-webkit:4 )
+ ${SERVER_RDEPEND}
+ ${GUI_RDEPEND}
)
!monolithic? (
- server? (
- !postgres? ( x11-libs/qt-sql:4[sqlite] dev-db/sqlite[threadsafe] )
- postgres? ( x11-libs/qt-sql:4[postgres] )
- x11-libs/qt-script:4
- )
- X? (
- x11-libs/qt-gui:4
- ayatana? ( dev-libs/libindicate-qt )
- kde? ( >=kde-base/kdelibs-4.1 )
- phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
- webkit? ( x11-libs/qt-webkit:4 )
- )
+ server? ( ${SERVER_RDEPEND} )
+ X? ( ${GUI_RDEPEND} )
)
ssl? ( x11-libs/qt-core:4[ssl] )
"