summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2008-03-19 07:14:26 +0000
committerChristian Faulhammer <fauli@gentoo.org>2008-03-19 07:14:26 +0000
commit6c35ecb7de1235cdb3708e650a1704403506d8ba (patch)
tree39d3c2bc775c0e184405299b844c1fcdf75aa203 /app-admin/conky
parentAdd quotes. (diff)
downloadhistorical-6c35ecb7de1235cdb3708e650a1704403506d8ba.tar.gz
historical-6c35ecb7de1235cdb3708e650a1704403506d8ba.tar.bz2
historical-6c35ecb7de1235cdb3708e650a1704403506d8ba.zip
audacious >= 1.5.0 has dbus support always enabled so adjust the test for that feature
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'app-admin/conky')
-rw-r--r--app-admin/conky/ChangeLog7
-rw-r--r--app-admin/conky/Manifest14
-rw-r--r--app-admin/conky/conky-1.4.9-r1.ebuild4
3 files changed, 20 insertions, 5 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index f178a6bcbd2e..497dcd1b4aa4 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/conky
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.67 2008/03/02 23:59:46 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.68 2008/03/19 07:14:26 opfer Exp $
+
+ 19 Mar 2008; Christian Faulhammer <opfer@gentoo.org>
+ conky-1.4.9-r1.ebuild:
+ audacious >= 1.5.0 has dbus support always enabled so adjust the test for
+ that feature
03 Mar 2008; Christian Faulhammer <opfer@gentoo.org>
conky-1.4.9-r1.ebuild:
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 2f9db69188ba..77ded82784f4 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST conky-1.4.9.tar.bz2 412510 RMD160 d708ea0eae60cf1c1ca4d176fa20f8a464b803e1 SHA1 26f233588ea83b157729bb7dd56a64ffae856d20 SHA256 a6c98aa34932c8684e19e97fad460c04c2b7848c897bdaa293d37fbcc4d7949b
-EBUILD conky-1.4.9-r1.ebuild 3555 RMD160 1f97d524179c497850474f65e911acb65f1a3b5a SHA1 3ba1c38e9dd9b747899396ee40cb591bbdecf48b SHA256 12c576034c7de5d410f0d445adcaecb44d0e4c85feee4ea593757343702ff56c
-MISC ChangeLog 10627 RMD160 a64688c440908f3c6518a09573f023e0c3381966 SHA1 d58e4d71d915c29c62b1ca265ef7f3aaa4b77765 SHA256 c9bf75f2b56e39b002232880f9797cf95a2f34a245c3cf7b16fa412264ab2731
+EBUILD conky-1.4.9-r1.ebuild 3599 RMD160 d70b8f876d104d67a5443a7b30b33513a30b8a3d SHA1 81d97f3ba329276cfdab2eed5828f5af8458d77d SHA256 846f55e1a48f4fd0b2e97335d180556bdbf8de8d6643931e5e0d67e588a8ee0e
+MISC ChangeLog 10799 RMD160 94a791b16bb3842bc2079405c053fc6ad7d1f095 SHA1 93b064e0f61a7b0de0dd4c5c0391b2883d3d0781 SHA256 c4469827992aeb02258341feabc9021af1336e535389e0307d0c1a94ec06e432
MISC metadata.xml 569 RMD160 b366c022728c365d2c27ddd7d558e4d7815bd512 SHA1 55b29887fc494ea60ff7e6100c3a85857eabf3a7 SHA256 1cfb216faf8f26ef4032857408246f0addf6fd09e50f0d4f1cb67789b506832b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH4L38NQqtfCuFneMRAuJBAJ9271tO7sbfAoLds7KgXHt0gfa6lQCeJVEl
+JWFtYlNlzNvakRwkMWBtc+8=
+=HCet
+-----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.4.9-r1.ebuild b/app-admin/conky/conky-1.4.9-r1.ebuild
index 928889199e59..61b196fc41b1 100644
--- a/app-admin/conky/conky-1.4.9-r1.ebuild
+++ b/app-admin/conky/conky-1.4.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.9-r1.ebuild,v 1.8 2008/03/02 23:59:46 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.9-r1.ebuild,v 1.9 2008/03/19 07:14:26 opfer Exp $
inherit eutils
# used for epause
@@ -51,7 +51,7 @@ DEPEND="
pkg_setup() {
if use audacious; then
- if ! built_with_use media-sound/audacious dbus; then
+ if has_version <media-sound/audacious-1.5.0 && ! built_with_use media-sound/audacious dbus; then
eerror "media-sound/audacious is not built with dbus USE flag."
eerror "Please add 'dbus' to your USE flags, and re-emerge media-sound/audacious."
die "media-sound/audacious needs USE=dbus"