Add a blocker for kcontrol-4.4 because of file collisions, bug 394991

(Portage version: 2.1.10.40/cvs/Linux x86_64)

4 files changed, 17 insertions, 4 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index df8da8ca9d67..e292346b80c4 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.809 2011/12/12 01:08:49 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.810 2011/12/16 22:26:44 dilfridge Exp $
+
+  16 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdelibs-4.7.3-r1.ebuild, kdelibs-4.7.3-r11.ebuild, kdelibs-4.7.4.ebuild:
+  Add a blocker for kcontrol-4.4 because of file collisions, bug 394991
 
   12 Dec 2011; Jonathan Callen <abcd@gentoo.org>
   -files/kdelibs-4.3.80-module-suffix.patch,
diff --git a/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild b/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild
index 55de089ff49b..ee6d739292c2 100644
--- a/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild,v 1.4 2011/12/07 22:13:49 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild,v 1.5 2011/12/16 22:26:44 dilfridge Exp $
 
 EAPI=4
 
@@ -118,6 +118,9 @@ PDEPEND="
 # Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
 add_blocker plasma-workspace 4.7.1
 
+# file collision, bug 394991
+add_blocker kcontrol 4.4.50
+
 PATCHES=(
 	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
 	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
diff --git a/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild b/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild
index 9e1b666992f5..fbdb321714a3 100644
--- a/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild,v 1.1 2011/11/29 21:39:30 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild,v 1.2 2011/12/16 22:26:44 dilfridge Exp $
 
 EAPI=4
 
@@ -119,6 +119,9 @@ PDEPEND="
 # Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
 add_blocker plasma-workspace 4.7.1
 
+# file collision, bug 394991
+add_blocker kcontrol 4.4.50
+
 PATCHES=(
 	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
 	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
diff --git a/kde-base/kdelibs/kdelibs-4.7.4.ebuild b/kde-base/kdelibs/kdelibs-4.7.4.ebuild
index 49b38b59b768..bab97d8cac93 100644
--- a/kde-base/kdelibs/kdelibs-4.7.4.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.4.ebuild,v 1.1 2011/12/11 18:52:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.4.ebuild,v 1.2 2011/12/16 22:26:44 dilfridge Exp $
 
 EAPI=4
 
@@ -119,6 +119,9 @@ PDEPEND="
 # Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
 add_blocker plasma-workspace 4.7.1
 
+# file collision, bug 394991
+add_blocker kcontrol 4.4.50
+
 PATCHES=(
 	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
 	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"