diff options
Diffstat (limited to 'kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild')
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild | 5 |
1 files changed, 4 insertions, 1 deletions
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" |