From 0c82be3720803a8a4578a9db20f07fac254a7c4a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Fri, 16 Dec 2011 22:43:18 +0000 Subject: [PATCH] Add blocker for solid-4.4 because of file collisions, bug 395001 Package-Manager: portage-2.1.10.40/cvs/Linux x86_64 --- kde-base/solid-runtime/ChangeLog | 6 +++++- kde-base/solid-runtime/solid-runtime-4.7.3.ebuild | 5 ++++- kde-base/solid-runtime/solid-runtime-4.7.4.ebuild | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/kde-base/solid-runtime/ChangeLog b/kde-base/solid-runtime/ChangeLog index 082e1126b397..643f1fdd77bd 100644 --- 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 + 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 97a545718eb9..3b689c0df16a 100644 --- 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 f4bba28797d5..736285f546e6 100644 --- 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 -- 2.26.2