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 | de6f6de4bce5a4deebace1b80670509b5b3fef41 (patch) | |
| tree | da461c1c631b69dd8a3809b62a3bfccb1e0a858b | |
| parent | Fix conflict with kf5-based kdepim. https://github.com/gentoo/gentoo-portage-... (diff) | |
| download | historical-de6f6de4bce5a4deebace1b80670509b5b3fef41.tar.gz historical-de6f6de4bce5a4deebace1b80670509b5b3fef41.tar.bz2 historical-de6f6de4bce5a4deebace1b80670509b5b3fef41.zip | |
Fix plasma5 vs kde4 conflicts. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/183 by a17r.
| -rw-r--r-- | profiles/ChangeLog | 7 | ||||
| -rw-r--r-- | profiles/targets/desktop/kde/package.use | 5 | ||||
| -rw-r--r-- | profiles/targets/desktop/plasma/package.use | 7 |
3 files changed, 14 insertions, 5 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 5f4372d0b64c..bc8c3a4a1c5c 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,16 @@ # ChangeLog for profile directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.10207 2015/07/26 20:54:56 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.10208 2015/07/26 21:36:02 mgorny Exp $ # # This ChangeLog should include records for all changes in profiles directory. # Only typo fixes which don't affect portage/repoman behaviour could be avoided # here. If in doubt put a record here! + 26 Jul 2015; Michał Górny <mgorny@gentoo.org> + targets/desktop/kde/package.use, targets/desktop/plasma/package.use: + Fix plasma5 vs kde4 conflicts. + https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/183 by a17r. + 26 Jul 2015; Ryan Hill <rhill@gentoo.org> desc/linguas.desc: Add a few locales from poedit. 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 |