diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-28 02:17:07 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-28 02:17:07 +0000 |
commit | ecb7b174bcb78a9d0a6ed8acde754230e9612e44 (patch) | |
tree | 073aa12a7c1964717d1670c2c0426b72bc312296 /x11-misc/notification-daemon | |
parent | New notification daemon, x11-misc/qtnotifydaemon (diff) | |
download | gentoo-2-ecb7b174bcb78a9d0a6ed8acde754230e9612e44.tar.gz gentoo-2-ecb7b174bcb78a9d0a6ed8acde754230e9612e44.tar.bz2 gentoo-2-ecb7b174bcb78a9d0a6ed8acde754230e9612e44.zip |
Block x11-misc/qtnotifydaemon because it's using same .service file.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/notification-daemon')
-rw-r--r-- | x11-misc/notification-daemon/ChangeLog | 8 | ||||
-rw-r--r-- | x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild | 7 | ||||
-rw-r--r-- | x11-misc/notification-daemon/notification-daemon-0.7.3.ebuild | 7 |
3 files changed, 14 insertions, 8 deletions
diff --git a/x11-misc/notification-daemon/ChangeLog b/x11-misc/notification-daemon/ChangeLog index 1f4ed2a50c11..d1c814fda80e 100644 --- a/x11-misc/notification-daemon/ChangeLog +++ b/x11-misc/notification-daemon/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/notification-daemon -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.84 2011/10/19 02:14:33 ssuominen Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.85 2012/01/28 02:17:07 ssuominen Exp $ + + 28 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> + notification-daemon-0.5.0.ebuild, notification-daemon-0.7.3.ebuild: + Block x11-misc/qtnotifydaemon because it's using same .service file. 19 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> notification-daemon-0.7.3.ebuild: diff --git a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild index ee3320a7fbf5..3af49367bc94 100644 --- a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild +++ b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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.5.0.ebuild,v 1.12 2011/10/19 02:06:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild,v 1.13 2012/01/28 02:17:07 ssuominen Exp $ EAPI=3 GCONF_DEBUG=no @@ -25,7 +25,8 @@ RDEPEND=">=dev-libs/glib-2.4:2 x11-libs/libnotify x11-libs/libwnck:1 x11-libs/libX11 - !x11-misc/notify-osd" + !x11-misc/notify-osd + !x11-misc/qtnotifydaemon" DEPEND="${RDEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.14" diff --git a/x11-misc/notification-daemon/notification-daemon-0.7.3.ebuild b/x11-misc/notification-daemon/notification-daemon-0.7.3.ebuild index 934d92a5286a..392e8b8ac2ce 100644 --- a/x11-misc/notification-daemon/notification-daemon-0.7.3.ebuild +++ b/x11-misc/notification-daemon/notification-daemon-0.7.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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.7.3.ebuild,v 1.3 2011/10/19 02:35:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.7.3.ebuild,v 1.4 2012/01/28 02:17:07 ssuominen Exp $ EAPI=4 inherit gnome.org @@ -19,7 +19,8 @@ RDEPEND=">=dev-libs/glib-2.28 media-libs/libcanberra[gtk3] >=x11-libs/libnotify-0.7 x11-libs/libX11 - !x11-misc/notify-osd" + !x11-misc/notify-osd + !x11-misc/qtnotifydaemon" DEPEND="${RDEPEND} app-arch/xz-utils >=dev-util/intltool-0.40 |