Gentoo Archives: gentoo-commits

From: "Johannes Huber (johu)" <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass
Date: Sun, 30 Mar 2014 09:14:02
Message-Id: 20140330091352.78C0320057@flycatcher.gentoo.org
1 johu 14/03/30 09:13:52
2
3 Modified: ChangeLog kde4-base.eclass
4 Log:
5 Sync with kde overlay. Raise QT_MINIMAL to latest stable and simplify Qt deps
6 by Michael Palimaka <kensington@g.o>. Add kde-workspace 4.11.8 SRC_URI.
7
8 Revision Changes Path
9 1.1188 eclass/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1188&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1188&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1187&r2=1.1188
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
18 retrieving revision 1.1187
19 retrieving revision 1.1188
20 diff -u -r1.1187 -r1.1188
21 --- ChangeLog 30 Mar 2014 08:41:53 -0000 1.1187
22 +++ ChangeLog 30 Mar 2014 09:13:52 -0000 1.1188
23 @@ -1,6 +1,11 @@
24 # ChangeLog for eclass directory
25 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1187 2014/03/30 08:41:53 mgorny Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1188 2014/03/30 09:13:52 johu Exp $
28 +
29 + 30 Mar 2014; Johannes Huber <johu@g.o> kde4-base.eclass:
30 + Sync with kde overlay. Raise QT_MINIMAL to latest stable and simplify Qt deps
31 + by Michael Palimaka <kensington@g.o>. Add kde-workspace 4.11.8
32 + SRC_URI.
33
34 30 Mar 2014; Michał Górny <mgorny@g.o> multilib-build.eclass:
35 Support rewriting symlinks in MULTILIB_CHOST_TOOLS, bug #506062.
36
37
38
39 1.134 eclass/kde4-base.eclass
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.134&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.134&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.133&r2=1.134
44
45 Index: kde4-base.eclass
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
48 retrieving revision 1.133
49 retrieving revision 1.134
50 diff -u -r1.133 -r1.134
51 --- kde4-base.eclass 5 Mar 2014 02:12:51 -0000 1.133
52 +++ kde4-base.eclass 30 Mar 2014 09:13:52 -0000 1.134
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2014 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.133 2014/03/05 02:12:51 patrick Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.134 2014/03/30 09:13:52 johu Exp $
58
59 # @ECLASS: kde4-base.eclass
60 # @MAINTAINER:
61 @@ -200,7 +200,7 @@
62 # @ECLASS-VARIABLE: QT_MINIMAL
63 # @DESCRIPTION:
64 # Determine version of qt we enforce as minimal for the package.
65 -QT_MINIMAL="${QT_MINIMAL:-4.8.0}"
66 +QT_MINIMAL="${QT_MINIMAL:-4.8.5}"
67
68 # Declarative dependencies
69 qtdeclarativedepend="
70 @@ -288,10 +288,8 @@
71 >=dev-qt/qt3support-${QT_MINIMAL}:4[accessibility]
72 >=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support,ssl]
73 >=dev-qt/qtdbus-${QT_MINIMAL}:4
74 - || (
75 - ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] )
76 - <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)]
77 - )
78 + >=dev-qt/designer-${QT_MINIMAL}:4[-phonon]
79 + >=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+)]
80 >=dev-qt/qtscript-${QT_MINIMAL}:4
81 >=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support]
82 >=dev-qt/qtsvg-${QT_MINIMAL}:4
83 @@ -444,6 +442,9 @@
84 4.11.7)
85 # Part of 4.12 actually, sigh. Not stable for next release!
86 SRC_URI="mirror://kde/stable/4.12.3/src/${_kmname_pv}.tar.xz" ;;
87 + 4.11.8)
88 + # Part of 4.12 actually, sigh. Not stable for next release!
89 + SRC_URI="mirror://kde/stable/4.12.4/src/${_kmname_pv}.tar.xz" ;;
90 *)
91 # Stable KDE SC releases
92 SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;