summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc/notification-daemon')
-rw-r--r--x11-misc/notification-daemon/ChangeLog7
-rw-r--r--x11-misc/notification-daemon/notification-daemon-0.4.0.ebuild7
2 files changed, 10 insertions, 4 deletions
diff --git a/x11-misc/notification-daemon/ChangeLog b/x11-misc/notification-daemon/ChangeLog
index 06f970aca43d..cc73ed08b715 100644
--- a/x11-misc/notification-daemon/ChangeLog
+++ b/x11-misc/notification-daemon/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-misc/notification-daemon
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.55 2009/03/26 18:12:55 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.56 2009/04/03 11:02:43 chainsaw Exp $
+
+ 03 Apr 2009; <chainsaw@gentoo.org> notification-daemon-0.4.0.ebuild:
+ Block x11-misc/xfce4-notifyd as it provides the same D-Bus service. A
+ prerequisite to resolving bug #260686 by Joshua Rich. Also remove
+ unnecessary inherit of autotools eclass.
26 Mar 2009; Brent Baude <ranger@gentoo.org>
notification-daemon-0.4.0.ebuild:
diff --git a/x11-misc/notification-daemon/notification-daemon-0.4.0.ebuild b/x11-misc/notification-daemon/notification-daemon-0.4.0.ebuild
index 81fb3a5e585d..345e63887105 100644
--- a/x11-misc/notification-daemon/notification-daemon-0.4.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-0.4.0.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.4.0.ebuild,v 1.5 2009/03/26 18:12:55 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.4.0.ebuild,v 1.6 2009/04/03 11:02:43 chainsaw Exp $
WANT_AUTOMAKE="1.9"
-inherit gnome2 eutils autotools
+inherit gnome2 eutils
DESCRIPTION="Notifications daemon"
HOMEPAGE="http://www.galago-project.org/"
@@ -27,7 +27,8 @@ RDEPEND=">=dev-libs/glib-2.4.0
DEPEND="${RDEPEND}
dev-util/intltool
>=sys-devel/gettext-0.14
- !xfce-extra/notification-daemon-xfce"
+ !xfce-extra/notification-daemon-xfce
+ !x11-misc/xfce4-notifyd"
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS"