diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-18 11:19:12 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-18 11:19:12 +0000 |
| commit | efe44d161e1df74875f739fd4dde771edfee9fc7 (patch) | |
| tree | a4d518d0e759130a940a16c180c34fba2870fb23 /kde-base | |
| parent | Version bump. (diff) | |
| download | gentoo-2-efe44d161e1df74875f739fd4dde771edfee9fc7.tar.gz gentoo-2-efe44d161e1df74875f739fd4dde771edfee9fc7.tar.bz2 gentoo-2-efe44d161e1df74875f739fd4dde771edfee9fc7.zip | |
Add blocker for the knetworkmanager due to file collision. Per bug #367715.
(Portage version: 2.2.0_alpha34/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
3 files changed, 16 insertions, 4 deletions
diff --git a/kde-base/kdebase-desktoptheme/ChangeLog b/kde-base/kdebase-desktoptheme/ChangeLog index e023eab914ff..a7fa37636eb0 100644 --- a/kde-base/kdebase-desktoptheme/ChangeLog +++ b/kde-base/kdebase-desktoptheme/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase-desktoptheme # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/ChangeLog,v 1.70 2011/05/09 22:41:55 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/ChangeLog,v 1.71 2011/05/18 11:19:12 scarabeus Exp $ + + 18 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> + kdebase-desktoptheme-4.6.2.ebuild, kdebase-desktoptheme-4.6.3.ebuild: + Add blocker for the knetworkmanager due to file collision. Per bug #367715. 09 May 2011; Markos Chandras <hwoarang@gentoo.org> kdebase-desktoptheme-4.6.2.ebuild: diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.2.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.2.ebuild index ae5c0979b67f..886f0df0e471 100644 --- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.2.ebuild +++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.2.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/kdebase-desktoptheme/kdebase-desktoptheme-4.6.2.ebuild,v 1.3 2011/05/09 22:41:55 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.2.ebuild,v 1.4 2011/05/18 11:19:12 scarabeus Exp $ EAPI=3 @@ -11,3 +11,7 @@ inherit kde4-meta DESCRIPTION="Oxygen KDE4 desktop theme." IUSE="" KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +RDEPEND=" + !<=kde-misc/knetworkmanager-4.4.0_p20100820 +" diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.3.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.3.ebuild index 26aeb0ad85af..3ce52845de5d 100644 --- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.3.ebuild +++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.3.ebuild,v 1.1 2011/05/07 10:48:00 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.3.ebuild,v 1.2 2011/05/18 11:19:12 scarabeus Exp $ -EAPI=4 +EAPI=3 KMNAME="kdebase-runtime" KMMODULE="desktoptheme" @@ -11,3 +11,7 @@ inherit kde4-meta DESCRIPTION="Oxygen KDE4 desktop theme." IUSE="" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +RDEPEND=" + !<=kde-misc/knetworkmanager-4.4.0_p20100820 +" |