summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2009-03-09 22:24:17 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2009-03-09 22:24:17 +0000
commitf04556a3198c110cc66a8cda2882a5fe699394c6 (patch)
tree740562abe531bd0a4ec776a3c7c8447f0aee6ef6
parentAdd needed app-crypt/qca:2 dep (diff)
downloadgentoo-2-f04556a3198c110cc66a8cda2882a5fe699394c6.tar.gz
gentoo-2-f04556a3198c110cc66a8cda2882a5fe699394c6.tar.bz2
gentoo-2-f04556a3198c110cc66a8cda2882a5fe699394c6.zip
Raise audacious version to 1.5 so we always have dbus.
(Portage version: 2.2_rc20/cvs/Linux 2.6.29-rc6 i686)
-rw-r--r--app-admin/conky/ChangeLog6
-rw-r--r--app-admin/conky/conky-1.6.1.ebuild9
-rw-r--r--app-admin/conky/conky-1.6.2_pre1355.ebuild4
3 files changed, 14 insertions, 5 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 9d38ca4aa725..8fc84fc5c78e 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/conky
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.108 2009/03/09 20:20:41 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.109 2009/03/09 22:24:17 betelgeuse Exp $
+
+ 09 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> conky-1.6.1.ebuild,
+ conky-1.6.2_pre1355.ebuild:
+ Raise audacious version to 1.5 so we always have dbus.
09 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> conky-1.6.1.ebuild,
conky-1.6.2_pre1355.ebuild:
diff --git a/app-admin/conky/conky-1.6.1.ebuild b/app-admin/conky/conky-1.6.1.ebuild
index acba03c61031..3e1ec72768a8 100644
--- a/app-admin/conky/conky-1.6.1.ebuild
+++ b/app-admin/conky/conky-1.6.1.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/app-admin/conky/conky-1.6.1.ebuild,v 1.11 2009/03/09 20:20:41 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.1.ebuild,v 1.12 2009/03/09 22:24:17 betelgeuse Exp $
EAPI="2"
@@ -26,7 +26,12 @@ DEPEND_COMMON="
x11-libs/libXdamage
x11-libs/libXft
truetype? ( >=media-libs/freetype-2 )
- audacious? ( >=media-sound/audacious-1.4.0[dbus] )
+ audacious? (
+ || (
+ >=media-sound/audacious-1.5
+ =media-sound/audacious-1.4*[dbus]
+ )
+ )
bmpx? ( media-sound/bmpx
>=sys-apps/dbus-0.35
)
diff --git a/app-admin/conky/conky-1.6.2_pre1355.ebuild b/app-admin/conky/conky-1.6.2_pre1355.ebuild
index c02bb286fb6a..31e2db5f32ce 100644
--- a/app-admin/conky/conky-1.6.2_pre1355.ebuild
+++ b/app-admin/conky/conky-1.6.2_pre1355.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/app-admin/conky/conky-1.6.2_pre1355.ebuild,v 1.2 2009/03/09 20:20:41 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.2_pre1355.ebuild,v 1.3 2009/03/09 22:24:17 betelgeuse Exp $
EAPI="2"
@@ -26,7 +26,7 @@ DEPEND_COMMON="
x11-libs/libXdamage
x11-libs/libXft
truetype? ( >=media-libs/freetype-2 )
- audacious? ( >=media-sound/audacious-1.4.0[dbus] )
+ audacious? ( >=media-sound/audacious-1.5 )
bmpx? ( media-sound/bmpx
>=sys-apps/dbus-0.35
)