mgorny 15/07/26 21:35:08 Modified: kde-meta-4.14.3.ebuild ChangeLog Log: 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!)
Revision Changes Path 1.7 kde-base/kde-meta/kde-meta-4.14.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-meta/kde-meta-4.14.3.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-meta/kde-meta-4.14.3.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-meta/kde-meta-4.14.3.ebuild?r1=1.6&r2=1.7 Index: kde-meta-4.14.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.14.3.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kde-meta-4.14.3.ebuild 4 Jun 2015 18:39:13 -0000 1.6 +++ kde-meta-4.14.3.ebuild 26 Jul 2015 21:35:07 -0000 1.7 @@ -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 @@ ) !minimal? ( $(add_kdebase_dep kdeplasma-addons) ) " +REQUIRED_USE="minimal? ( !kdepim )" 1.348 kde-base/kde-meta/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-meta/ChangeLog?rev=1.348&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-meta/ChangeLog?rev=1.348&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-meta/ChangeLog?r1=1.347&r2=1.348 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v retrieving revision 1.347 retrieving revision 1.348 diff -u -r1.347 -r1.348 --- ChangeLog 4 Jun 2015 18:39:13 -0000 1.347 +++ ChangeLog 26 Jul 2015 21:35:07 -0000 1.348 @@ -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 <mgo...@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 <kensing...@gentoo.org> kde-meta-4.14.3.ebuild: Move various kde-base packages to kde-apps.
