diff options
author | Michał Górny <mgorny@gentoo.org> | 2015-07-26 21:36:03 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2015-07-26 21:36:03 +0000 |
commit | ce0e1d3b9b15d747430f35d650c4d94087da551b (patch) | |
tree | f030a110bdea2109e201086a870c25f78bc496df /profiles/targets | |
parent | Fix conflict with kf5-based kdepim. https://github.com/gentoo/gentoo-portage-... (diff) | |
download | gentoo-2-ce0e1d3b9b15d747430f35d650c4d94087da551b.tar.gz gentoo-2-ce0e1d3b9b15d747430f35d650c4d94087da551b.tar.bz2 gentoo-2-ce0e1d3b9b15d747430f35d650c4d94087da551b.zip |
Fix plasma5 vs kde4 conflicts. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/183 by a17r.
Diffstat (limited to 'profiles/targets')
-rw-r--r-- | profiles/targets/desktop/kde/package.use | 5 | ||||
-rw-r--r-- | profiles/targets/desktop/plasma/package.use | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/profiles/targets/desktop/kde/package.use b/profiles/targets/desktop/kde/package.use index b163c3966ac4..1b1599a7359e 100644 --- a/profiles/targets/desktop/kde/package.use +++ b/profiles/targets/desktop/kde/package.use @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/kde/package.use,v 1.9 2015/07/01 15:25:25 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/kde/package.use,v 1.10 2015/07/26 21:36:03 mgorny Exp $ # Required by kde-base/pykde4 dev-python/PyQt4 script sql webkit @@ -25,3 +25,6 @@ dev-qt/qt-mobility multimedia # Required by app-office/libreoffice media-libs/phonon designer + +# Enable crash-reporter here instead of in ebuild +kde-apps/kdebase-runtime-meta crash-reporter diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use index 020436f4bfc9..1342308a661a 100644 --- a/profiles/targets/desktop/plasma/package.use +++ b/profiles/targets/desktop/plasma/package.use @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/plasma/package.use,v 1.9 2015/07/01 15:25:25 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/plasma/package.use,v 1.10 2015/07/26 21:36:03 mgorny Exp $ # Not required, but makes life easier with Qt; bug 457934 app-arch/unzip natspec @@ -38,11 +38,12 @@ kde-apps/kde4-l10n minimal kde-apps/kdeartwork-meta minimal kde-apps/kdebase-kioslaves minimal kde-apps/kdebase-meta minimal -kde-apps/kdebase-runtime-meta minimal +kde-apps/kdebase-runtime-meta -crash-reporter minimal kde-apps/kdesu -handbook +kde-apps/solid-runtime -bluetooth kde-base/baloo minimal kde-base/kactivities minimal -kde-base/kde-meta minimal +kde-base/kde-meta -kdepim minimal net-libs/libkpeople minimal sys-auth/polkit-kde-agent minimal |