Block x11-misc/notification-daemon as it provides the same D-Bus service. A prerequisite to resolving bug #260686 by Joshua Rich.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 27 insertions, 11 deletions

diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index d76bb93b8e30..ff73214c369b 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX notification-daemon-0.3.7-line-wrapping.patch 605 RMD160 4dc0f4e032f73ebd136e66a011fdd11cc8d6d714 SHA1 c06088339d611b706b8067f02e4c06c3e05191c6 SHA256 91ebac190d53247805c9220ef3cba3577617bf2cc90eac34ca90496aa12ae7d7
 DIST notification-daemon-0.3.7.tar.gz 412184 RMD160 04a226d939f6985ee73e4d603a95598cc8eff221 SHA1 14abf2431b1feb8c752926ff9cb84dc1b66823a6 SHA256 53d2f92c3d14423b49c2ff077855cf3987d38def963c82fd26fba5de379ca540
 DIST notification-daemon-0.4.0.tar.gz 404178 RMD160 349ea655b4fd0a2b5987b59a5d1241158f20f9d5 SHA1 c978d780588f31f4e5b75487ad1f1b7498e51a07 SHA256 0c0c90ec7f2fc7fc5cbefba2e04df6ae311abc7ace23dd34f21dc063e119d808
 EBUILD notification-daemon-0.3.7-r1.ebuild 985 RMD160 44ecf1104a83669c67cc4b5f1625004068ba7c28 SHA1 0409882b2bcb9dddcf4df454d978718628c6622c SHA256 d6e48296c2e6ac73d422c97293a3a023d0f3e7fe80e52c8a4d1432321ee6e21b
 EBUILD notification-daemon-0.3.7.ebuild 836 RMD160 b0930063e7bfdf5e214ad5a25b597ef43e472494 SHA1 285347297bc9b004d499930c40f2d0a9bef5f0a7 SHA256 be20c7b5fde4c09af7f117f2713535ac3376d847bf9db1c19227f029ef3e2dcf
-EBUILD notification-daemon-0.4.0.ebuild 1046 RMD160 4537715baab2e59b7ee66d196e09314cbb3f992e SHA1 bcf9f26d7cf0ada9a8185a3e163f729ecb8a6ba0 SHA256 a59f6a2080b25c96fb851b32a4c40a92fc7873a573580d4ffa005bf4ad200125
-MISC ChangeLog 8291 RMD160 4c5f4c64e98f817278672cc925a1a5e72d8552dc SHA1 743f76b7cd4e49538b372b0446f906ebdd45bcf8 SHA256 8139e7df2d953426176a02852e0f6083a1e8cfbb86d2e6d692ef438c4911e96d
+EBUILD notification-daemon-0.4.0.ebuild 1064 RMD160 120b3d881e524e8e59224b65d058ba9c897932b0 SHA1 fbcd1660b579051da81e7edace0e10258b02f8ce SHA256 ea24084e87b35ef44d48119f4cfce3953f858ba9ff97996ccfa8fa15d7243d85
+MISC ChangeLog 8548 RMD160 5126a15bcd78b5bab987d641a377ec13211af110 SHA1 5bbc31605a2b8a655158d6ec37aef069893e8f3a SHA256 47160ee095044b267aadd17c8f86c0964b740179d2cbdfa77a2619ac2556d149
 MISC metadata.xml 165 RMD160 f8f7dd761c5475651b8e04512e4f3dd043c41984 SHA1 47939c027699c5810cd3f25b4698719e9bd183d2 SHA256 dc2ad50713441100082e32ba283e9dd807b8fc46f69a5b9221fb9b89064deb31
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknV7NgACgkQp5vW4rUFj5pZCQCgwqir2AZ0kAzjqFo0c3dQmNQy
+85AAoJBvfvoqY4XxodEKJAtH4BDK3RHs
+=kJst
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xfce4-notifyd/ChangeLog b/x11-misc/xfce4-notifyd/ChangeLog
index de76b247858f..59bd75651082 100644
--- a/x11-misc/xfce4-notifyd/ChangeLog
+++ b/x11-misc/xfce4-notifyd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xfce4-notifyd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfce4-notifyd/ChangeLog,v 1.1 2009/03/10 14:41:04 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfce4-notifyd/ChangeLog,v 1.2 2009/04/03 10:59:25 chainsaw Exp $
+
+  03 Apr 2009; <chainsaw@gentoo.org> xfce4-notifyd-0.1.0.ebuild:
+  Block x11-misc/notification-daemon as it provides the same D-Bus service.
+  A prerequisite to resolving bug #260686 by Joshua Rich.
 
 *xfce4-notifyd-0.1.0 (10 Mar 2009)
 
diff --git a/x11-misc/xfce4-notifyd/Manifest b/x11-misc/xfce4-notifyd/Manifest
index 41be9e1ae723..2e2230c28676 100644
--- a/x11-misc/xfce4-notifyd/Manifest
+++ b/x11-misc/xfce4-notifyd/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST xfce4-notifyd-0.1.0.tar.bz2 165593 RMD160 2eb552ca6124ee055dbd820a68c711717be533a1 SHA1 18dd2a327df25880c3975b470b8b998fd6bf69ef SHA256 989b0e9ae9ff5bdbdbf56368a44eca039236033f84d05001e311c21c988bd0e1
-EBUILD xfce4-notifyd-0.1.0.ebuild 857 RMD160 7f274ff98e737a13bc2cc7137157fd786f35756c SHA1 a6fb3a8e2d1522ea69f04d2571e438a5523815b0 SHA256 50e02b937d588dd56c3dde37f83f1a4d57425e5db1f7de4d203fae24710d3c23
-MISC ChangeLog 355 RMD160 b333681f7884ea8d5c7e5e907eef42c01f62f060 SHA1 9b99ff6482a1444f0c23aa9f76f8a7aedaf0830b SHA256 ff0b9d87126b30a099625105d4a21c08ad66774aedd0ba9398346b9f94442688
+EBUILD xfce4-notifyd-0.1.0.ebuild 927 RMD160 af3f56f07052393379df0ec6c1db56b4b44b7890 SHA1 6d86afbf4f75a7fbf0fc608e503aea1555785393 SHA256 705c79a075fa4c5ea7f30893db4fa4a0ef1778ad7377157998950acc7ea7058e
+MISC ChangeLog 556 RMD160 b863b5f308cfbd07d6d6ef1d0f984584ddac3c7b SHA1 6dbe04e328b02db637e3727bba6b8df484873f71 SHA256 30d6438978d683ffbe0f3f7f3eba62225ddbd1c0f47c772f2b82011b476dd98d
 MISC metadata.xml 247 RMD160 319fb586335b2ad6e2b964c0b7db75faf0f0c5ad SHA1 aa6033cb7144df97f9a64fc1a617c35f38e866cc SHA256 0c4015d2e1cbfcb1d35b37e74b3b60e3761c8252b02f702b34ad189c2cbed507
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkm2fAcACgkQKhnDs22gwa/r0ACgzxgxVMFGnK3/8DOq4O+TBQ/g
-0d8AoIUXJ7b78lvbZT6q7KFctCwtdEi+
-=RC6N
+iEYEARECAAYFAknV63MACgkQp5vW4rUFj5ro5gCgwc3GR/hbvLSlSQCVYEw4scQz
+x7EAn3r9w8gOj+R4suEidaBC9nLI/iWe
+=C7qd
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xfce4-notifyd/xfce4-notifyd-0.1.0.ebuild b/x11-misc/xfce4-notifyd/xfce4-notifyd-0.1.0.ebuild
index a70ace788e55..64bc54be45c7 100644
--- a/x11-misc/xfce4-notifyd/xfce4-notifyd-0.1.0.ebuild
+++ b/x11-misc/xfce4-notifyd/xfce4-notifyd-0.1.0.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/x11-misc/xfce4-notifyd/xfce4-notifyd-0.1.0.ebuild,v 1.1 2009/03/10 14:41:04 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfce4-notifyd/xfce4-notifyd-0.1.0.ebuild,v 1.2 2009/04/03 10:59:25 chainsaw Exp $
 
 EAPI=1
 
@@ -22,7 +22,9 @@ RDEPEND="dev-libs/dbus-glib
 	>=xfce-base/xfconf-${XFCE_VERSION}
 	libsexy? ( x11-libs/libsexy )"
 DEPEND="${RDEPEND}
-	dev-util/intltool"
+	dev-util/intltool
+	!x11-misc/notification-daemon
+	!xfce-extra/notification-daemon-xfce"
 
 XFCE_CONFIG=" $(use_enable libsexy) --enable-maintainer-mode"