diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-07-30 12:47:33 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-07-30 12:47:33 +0000 |
commit | b7cabafa1078f66cbc5eda06e8f44cfa1246ae3f (patch) | |
tree | 8522c740dcd84aff9c755c7a9861445f7fcc926c /kde-base/systemsettings | |
parent | Drop ~sparc-fbsd KEYWORD (diff) | |
download | gentoo-2-b7cabafa1078f66cbc5eda06e8f44cfa1246ae3f.tar.gz gentoo-2-b7cabafa1078f66cbc5eda06e8f44cfa1246ae3f.tar.bz2 gentoo-2-b7cabafa1078f66cbc5eda06e8f44cfa1246ae3f.zip |
Add blocker to prevent file collisions, bug 376829
(Portage version: 2.1.10.9/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/systemsettings')
-rw-r--r-- | kde-base/systemsettings/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/systemsettings/systemsettings-4.7.0.ebuild | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog index 1a8984414e1b..61ad33ba3393 100644 --- a/kde-base/systemsettings/ChangeLog +++ b/kde-base/systemsettings/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/systemsettings # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.111 2011/07/27 14:04:32 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.112 2011/07/30 12:47:33 dilfridge Exp $ + + 30 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> + systemsettings-4.7.0.ebuild: + Add blocker to prevent file collisions, bug 376829 *systemsettings-4.7.0 (27 Jul 2011) diff --git a/kde-base/systemsettings/systemsettings-4.7.0.ebuild b/kde-base/systemsettings/systemsettings-4.7.0.ebuild index 88caf46aa90e..daf029ef5109 100644 --- a/kde-base/systemsettings/systemsettings-4.7.0.ebuild +++ b/kde-base/systemsettings/systemsettings-4.7.0.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/systemsettings/systemsettings-4.7.0.ebuild,v 1.1 2011/07/27 14:04:32 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.0.ebuild,v 1.2 2011/07/30 12:47:33 dilfridge Exp $ EAPI=4 @@ -54,6 +54,7 @@ KMEXTRACTONLY=" add_blocker kcontrol '<4.3.98' add_blocker konqueror '<4.4.70' +add_blocker kdeaccessibility-colorschemes '<4.6.50' PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" ) |