diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-07-26 21:35:07 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-07-26 21:35:07 +0000 |
| commit | 7d91d757bb8fec36b111a02a4c1f0392a222a3b8 (patch) | |
| tree | 15001cc46490ed20cdc963bb4a4fd70217de392d /kde-base | |
| parent | Fix conflicts with kf5-based apps. https://github.com/gentoo/gentoo-portage-r... (diff) | |
| download | gentoo-2-7d91d757bb8fec36b111a02a4c1f0392a222a3b8.tar.gz gentoo-2-7d91d757bb8fec36b111a02a4c1f0392a222a3b8.tar.bz2 gentoo-2-7d91d757bb8fec36b111a02a4c1f0392a222a3b8.zip | |
Fix conflict with kf5-based kdepim. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/183 by a17r.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kde-meta/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kde-meta/kde-meta-4.14.3.ebuild | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/kde-base/kde-meta/ChangeLog b/kde-base/kde-meta/ChangeLog index 7c1362ff0691..e1ebe8b2c3b0 100644 --- a/kde-base/kde-meta/ChangeLog +++ b/kde-base/kde-meta/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kde-meta # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.347 2015/06/04 18:39:13 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.348 2015/07/26 21:35:07 mgorny Exp $ + + 26 Jul 2015; Michał Górny <mgorny@gentoo.org> kde-meta-4.14.3.ebuild: + Fix conflict with kf5-based kdepim. https://github.com/gentoo/gentoo-portage- + rsync-mirror/pull/183 by a17r. 04 Jun 2015; Michael Palimaka <kensington@gentoo.org> kde-meta-4.14.3.ebuild: Move various kde-base packages to kde-apps. diff --git a/kde-base/kde-meta/kde-meta-4.14.3.ebuild b/kde-base/kde-meta/kde-meta-4.14.3.ebuild index daa56a95af3b..ab26d261b0d8 100644 --- a/kde-base/kde-meta/kde-meta-4.14.3.ebuild +++ b/kde-base/kde-meta/kde-meta-4.14.3.ebuild @@ -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/kde-base/kde-meta/kde-meta-4.14.3.ebuild,v 1.6 2015/06/04 18:39:13 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.14.3.ebuild,v 1.7 2015/07/26 21:35:07 mgorny Exp $ EAPI=5 inherit kde4-meta-pkg @@ -31,3 +31,4 @@ RDEPEND=" ) !minimal? ( $(add_kdebase_dep kdeplasma-addons) ) " +REQUIRED_USE="minimal? ( !kdepim )" |