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
commit042748e12def99628a9cfeb853675b593a8fa0c0 (patch)
treec7bc23c98e16035a6baf7de2cb9f6eec1b8fc05c /net-irc
parentia64/s390/sh/sparc stable wrt #284689 (diff)
downloadhistorical-042748e12def99628a9cfeb853675b593a8fa0c0.tar.gz
historical-042748e12def99628a9cfeb853675b593a8fa0c0.tar.bz2
historical-042748e12def99628a9cfeb853675b593a8fa0c0.zip
Reorder deps in order to not duplicate them
Package-Manager: portage-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/Manifest4
-rw-r--r--net-irc/quassel/quassel-9999.ebuild46
3 files changed, 28 insertions, 27 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/Manifest b/net-irc/quassel/Manifest
index 65fbd1cc00fa..3d400a9f9344 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -6,6 +6,6 @@ DIST quassel-0.5.0.tar.bz2 3288293 RMD160 6c29690449aa740b1ef781536426795f2e06b6
EBUILD quassel-0.4.3-r50.ebuild 3635 RMD160 703662785bd975effcd63861f17da8393a2b0332 SHA1 d2e074d2cc8896c8265a0b012082ffc70b7be245 SHA256 451048d3d5bdc29015fee1170f9d4b05c660df2ccaad357751b9c17bec5de8a4
EBUILD quassel-0.4.3.ebuild 3536 RMD160 0d3875b042bc87e48a659d5d52b0d8e546671303 SHA1 04aab028c72b6d9722f655298fb94ad5c55687a4 SHA256 43fc8a8492238f49737817a129f976c3e9ebd227b4c9904e00b7dd9f17be491e
EBUILD quassel-0.5.0.ebuild 3218 RMD160 15df1bddf83cf31a8bf1178adbc7e12badc93078 SHA1 27b378ccfb052baae5cc25607b3d677594d9471d SHA256 dcd946447395444bec4e1993a92ce9bbebb1b515ac777ae49899fdf3a7cbfeab
-EBUILD quassel-9999.ebuild 3113 RMD160 d82b9a1c69e7c2d4751a6e3048f4624fb35999a4 SHA1 7805ce522ab8958001506acf56c103cccfd2a004 SHA256 b285cfe977402fe853411e3a01a846a8bc4bf6a969389d81277a85918abe3853
-MISC ChangeLog 12766 RMD160 3f72977e6ccc95e0463303105de7feda98b6be1e SHA1 7a24a89cf5430c5a9f1d78502ffee57b278c9da4 SHA256 f4bebfc975c8d6a6601f69d4899b0c489699585d61106c963766caa472c921ab
+EBUILD quassel-9999.ebuild 2843 RMD160 936193a18b116669674df90b9bc3ef8417d726e7 SHA1 c81e7f96d7ffe197310c5406251e327c06711086 SHA256 b7ceda5b5410dac98fcf7b29162ef41161219935cfe2e491db7864a5268cacb8
+MISC ChangeLog 12889 RMD160 0d310a5b872c6a5f078e583d7c2fe979f87558f2 SHA1 a0985294eff6e0dee2af7a97bbff5b9c771a84b5 SHA256 95a525619a81c3b9f3b608cd7b48440de2b64b32af3d47e96e06baedaab2002c
MISC metadata.xml 1904 RMD160 0d6920637ae95ecf65ddeed89b533f7d38c2a9e7 SHA1 1184f2d819596ca938d3528b9db95c93bdd264dd SHA256 b3e24e86bcd423d041692bd6f18dbc72729444eb4a484adc6b3bab77ded76741
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] )
"