summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2015-05-12 14:15:37 +0000
committerMichael Palimaka <kensington@gentoo.org>2015-05-12 14:15:37 +0000
commitcbd607b6c191efcce1ca5e4a06890998167edc6f (patch)
treea07db1c61be8440bad00a9b9c66d981add8fc045 /profiles
parentIntroduce blocker on net-libs/libkpeople to avoid file collisions wrt bug #54... (diff)
downloadgentoo-2-cbd607b6c191efcce1ca5e4a06890998167edc6f.tar.gz
gentoo-2-cbd607b6c191efcce1ca5e4a06890998167edc6f.tar.bz2
gentoo-2-cbd607b6c191efcce1ca5e4a06890998167edc6f.zip
Avoid net-libs/libkpeople blockers with KF5.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/targets/desktop/plasma/package.use3
2 files changed, 7 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b25f3d92bb08..7b98329a2c4a 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9989 2015/05/10 14:33:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9990 2015/05/12 14:15:37 kensington 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!
+ 12 May 2015; Michael Palimaka <kensington@gentoo.org>
+ targets/desktop/plasma/package.use:
+ Avoid net-libs/libkpeople blockers with KF5.
+
10 May 2015; Mike Gilbert <floppym@gentoo.org> package.mask:
Also mask open-vm-tools-kmod snapshots.
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index daf85770fa40..4588a589dac6 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.4 2015/05/07 18:09:23 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/plasma/package.use,v 1.5 2015/05/12 14:15:37 kensington Exp $
# Not required, but makes life easier with Qt; bug 457934
app-arch/unzip natspec
@@ -42,4 +42,5 @@ kde-base/kdeartwork-meta minimal
kde-base/kdebase-kioslaves minimal
kde-base/kdebase-meta minimal
kde-base/kdebase-runtime-meta minimal
+net-libs/libkpeople minimal
sys-auth/polkit-kde-agent minimal