mgorny 15/07/26 21:34:23 Modified: kdebase-runtime-meta-4.14.3.ebuild ChangeLog Log: Fix conflicts with kf5-based apps. 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.3 kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild?r1=1.2&r2=1.3 Index: kdebase-runtime-meta-4.14.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kdebase-runtime-meta-4.14.3.ebuild 22 Jul 2015 16:02:14 -0000 1.2 +++ kdebase-runtime-meta-4.14.3.ebuild 26 Jul 2015 21:34:23 -0000 1.3 @@ -1,13 +1,13 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild,v 1.2 2015/07/22 16:02:14 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild,v 1.3 2015/07/26 21:34:23 mgorny Exp $ EAPI=5 inherit kde4-meta-pkg DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages" KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="+crash-reporter +handbook minimal nepomuk" +IUSE="crash-reporter +handbook minimal nepomuk" RDEPEND=" $(add_kdeapps_dep kcmshell) @@ -44,6 +44,7 @@ $(add_kdebase_dep khelpcenter) kde-plasma/khelpcenter:5[compat(+)] ) ) + minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') ) nepomuk? ( $(add_kdeapps_dep nepomuk) ) !minimal? ( $(add_kdeapps_dep attica) @@ -52,3 +53,4 @@ $(add_kdeapps_dep knetattach) ) " +REQUIRED_USE="minimal? ( !crash-reporter )" 1.3 kde-apps/kdebase-runtime-meta/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-apps/kdebase-runtime-meta/ChangeLog?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-apps/kdebase-runtime-meta/ChangeLog?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-apps/kdebase-runtime-meta/ChangeLog?r1=1.2&r2=1.3 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/kde-apps/kdebase-runtime-meta/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ChangeLog 22 Jul 2015 16:02:14 -0000 1.2 +++ ChangeLog 26 Jul 2015 21:34:23 -0000 1.3 @@ -1,6 +1,11 @@ # ChangeLog for kde-apps/kdebase-runtime-meta # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdebase-runtime-meta/ChangeLog,v 1.2 2015/07/22 16:02:14 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdebase-runtime-meta/ChangeLog,v 1.3 2015/07/26 21:34:23 mgorny Exp $ + + 26 Jul 2015; Michał Górny <mgo...@gentoo.org> + kdebase-runtime-meta-4.14.3.ebuild: + Fix conflicts with kf5-based apps. https://github.com/gentoo/gentoo-portage- + rsync-mirror/pull/183 by a17r. 22 Jul 2015; Michael Palimaka <kensing...@gentoo.org> kdebase-runtime-meta-4.14.3.ebuild:
