| 1 |
mgorny 15/07/26 21:35:08 |
| 2 |
|
| 3 |
Modified: kde-meta-4.14.3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix conflict with kf5-based kdepim. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/183 by a17r. |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.7 kde-base/kde-meta/kde-meta-4.14.3.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-meta/kde-meta-4.14.3.ebuild?rev=1.7&view=markup |
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: kde-meta-4.14.3.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.14.3.ebuild,v |
| 19 |
retrieving revision 1.6 |
| 20 |
retrieving revision 1.7 |
| 21 |
diff -u -r1.6 -r1.7 |
| 22 |
--- kde-meta-4.14.3.ebuild 4 Jun 2015 18:39:13 -0000 1.6 |
| 23 |
+++ kde-meta-4.14.3.ebuild 26 Jul 2015 21:35:07 -0000 1.7 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2015 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
inherit kde4-meta-pkg |
| 32 |
@@ -31,3 +31,4 @@ |
| 33 |
) |
| 34 |
!minimal? ( $(add_kdebase_dep kdeplasma-addons) ) |
| 35 |
" |
| 36 |
+REQUIRED_USE="minimal? ( !kdepim )" |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.348 kde-base/kde-meta/ChangeLog |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-meta/ChangeLog?rev=1.348&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-meta/ChangeLog?rev=1.348&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-meta/ChangeLog?r1=1.347&r2=1.348 |
| 45 |
|
| 46 |
Index: ChangeLog |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v |
| 49 |
retrieving revision 1.347 |
| 50 |
retrieving revision 1.348 |
| 51 |
diff -u -r1.347 -r1.348 |
| 52 |
--- ChangeLog 4 Jun 2015 18:39:13 -0000 1.347 |
| 53 |
+++ ChangeLog 26 Jul 2015 21:35:07 -0000 1.348 |
| 54 |
@@ -1,6 +1,10 @@ |
| 55 |
# ChangeLog for kde-base/kde-meta |
| 56 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.347 2015/06/04 18:39:13 kensington Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.348 2015/07/26 21:35:07 mgorny Exp $ |
| 59 |
+ |
| 60 |
+ 26 Jul 2015; Michał Górny <mgorny@g.o> kde-meta-4.14.3.ebuild: |
| 61 |
+ Fix conflict with kf5-based kdepim. https://github.com/gentoo/gentoo-portage- |
| 62 |
+ rsync-mirror/pull/183 by a17r. |
| 63 |
|
| 64 |
04 Jun 2015; Michael Palimaka <kensington@g.o> kde-meta-4.14.3.ebuild: |
| 65 |
Move various kde-base packages to kde-apps. |
Archives