Add blocker for solid-4.4 because of file collisions, bug 395001

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

diff --git a/kde-base/solid-runtime/ChangeLog b/kde-base/solid-runtime/ChangeLog
index 082e1126b3972f77195da7449053bee754240869..643f1fdd77bd899caf9923992aea08d137918feb 100644 (file)
--- a/kde-base/solid-runtime/ChangeLog
+++ b/kde-base/solid-runtime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/solid-runtime
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/ChangeLog,v 1.53 2011/12/11 18:52:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/ChangeLog,v 1.54 2011/12/16 22:43:18 dilfridge Exp $
+
+  16 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  solid-runtime-4.7.3.ebuild, solid-runtime-4.7.4.ebuild:
+  Add blocker for solid-4.4 because of file collisions, bug 395001
 
 *solid-runtime-4.7.4 (11 Dec 2011)
 

diff --git a/kde-base/solid-runtime/solid-runtime-4.7.3.ebuild b/kde-base/solid-runtime/solid-runtime-4.7.3.ebuild
index 97a545718eb91aa56a049b05e81b32635eb91f1a..3b689c0df16aec1595718f4a34b90106b3b2da23 100644 (file)
--- a/kde-base/solid-runtime/solid-runtime-4.7.3.ebuild
+++ b/kde-base/solid-runtime/solid-runtime-4.7.3.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/solid-runtime/solid-runtime-4.7.3.ebuild,v 1.3 2011/12/07 22:13:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/solid-runtime-4.7.3.ebuild,v 1.4 2011/12/16 22:43:18 dilfridge Exp $
 
 EAPI=4
 
@@ -19,3 +19,6 @@ KMEXTRA="
        solidautoeject/
        soliduiserver/
 "
+
+# file collisions, bug 395001
+add_blocker solid 4.4.50

diff --git a/kde-base/solid-runtime/solid-runtime-4.7.4.ebuild b/kde-base/solid-runtime/solid-runtime-4.7.4.ebuild
index f4bba28797d59b8dcd4b03b4c5c13c06a10c9d70..736285f546e6be872aa66f83a7f7232d57e882eb 100644 (file)
--- a/kde-base/solid-runtime/solid-runtime-4.7.4.ebuild
+++ b/kde-base/solid-runtime/solid-runtime-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/solid-runtime/solid-runtime-4.7.4.ebuild,v 1.1 2011/12/11 18:52:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/solid-runtime-4.7.4.ebuild,v 1.2 2011/12/16 22:43:18 dilfridge Exp $
 
 EAPI=4
 
@@ -19,3 +19,6 @@ KMEXTRA="
        solidautoeject/
        soliduiserver/
 "
+
+# file collisions, bug 395001
+add_blocker solid 4.4.50