4 files changed, 16 insertions, 5 deletions
diff --git a/razorqt-base/razorqt-data/ChangeLog b/razorqt-base/razorqt-data/ChangeLog
index bf8db6a37d81..fc491ceacf82 100644
--- a/razorqt-base/razorqt-data/ChangeLog
+++ b/razorqt-base/razorqt-data/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for razorqt-base/razorqt-data
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-data/ChangeLog,v 1.2 2012/10/20 07:21:02 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-data/ChangeLog,v 1.3 2012/10/22 09:52:10 yngwin Exp $
+
+  22 Oct 2012; Ben de Groot <yngwin@gentoo.org> razorqt-data-0.5.0.ebuild:
+  Add more blockers to prevent file collisions (bug #438716)
 
   20 Oct 2012; Ben de Groot <yngwin@gentoo.org> razorqt-data-0.5.0.ebuild:
   Add blocker to old x11-misc/lightdm-razorqt-greeter, to fix bug #438716
diff --git a/razorqt-base/razorqt-data/razorqt-data-0.5.0.ebuild b/razorqt-base/razorqt-data/razorqt-data-0.5.0.ebuild
index bb13506bca4b..3757293258de 100644
--- a/razorqt-base/razorqt-data/razorqt-data-0.5.0.ebuild
+++ b/razorqt-base/razorqt-data/razorqt-data-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-data/razorqt-data-0.5.0.ebuild,v 1.2 2012/10/20 07:21:02 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-data/razorqt-data-0.5.0.ebuild,v 1.3 2012/10/22 09:52:10 yngwin Exp $
 
 EAPI=4
 inherit cmake-utils
@@ -23,7 +23,9 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="doc"
 
-RDEPEND="!x11-misc/lightdm-razorqt-greeter
+RDEPEND="!<razorqt-base/razorqt-lightdm-greeter-0.5.0
+	!<razorqt-base/razorqt-meta-0.5.0
+	!x11-misc/lightdm-razorqt-greeter
 	!x11-wm/razorqt"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
diff --git a/razorqt-base/razorqt-meta/ChangeLog b/razorqt-base/razorqt-meta/ChangeLog
index b5ed0597a758..13e67c5e65de 100644
--- a/razorqt-base/razorqt-meta/ChangeLog
+++ b/razorqt-base/razorqt-meta/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for razorqt-base/razorqt-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-meta/ChangeLog,v 1.1 2012/10/15 10:32:00 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-meta/ChangeLog,v 1.2 2012/10/22 09:53:51 yngwin Exp $
+
+  22 Oct 2012; Ben de Groot <yngwin@gentoo.org> razorqt-meta-0.5.0.ebuild:
+  Add more blockers to prevent file collisions (bug #438716)
 
 *razorqt-meta-0.5.0 (15 Oct 2012)
 
diff --git a/razorqt-base/razorqt-meta/razorqt-meta-0.5.0.ebuild b/razorqt-base/razorqt-meta/razorqt-meta-0.5.0.ebuild
index 07062b0e7675..fd9670429e60 100644
--- a/razorqt-base/razorqt-meta/razorqt-meta-0.5.0.ebuild
+++ b/razorqt-base/razorqt-meta/razorqt-meta-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-meta/razorqt-meta-0.5.0.ebuild,v 1.1 2012/10/15 10:32:00 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-meta/razorqt-meta-0.5.0.ebuild,v 1.2 2012/10/22 09:53:51 yngwin Exp $
 
 EAPI=4
 
@@ -44,4 +44,7 @@ RDEPEND="~razorqt-base/libqtxdg-${PV}
 		x11-wm/sawfish
 		x11-wm/windowmaker
 	)
+	!<razorqt-base/razorqt-lightdm-greeter-0.5.0
+	!<razorqt-base/razorqt-meta-0.5.0
+	!x11-misc/lightdm-razorqt-greeter
 	!x11-wm/razorqt"