johu        14/03/30 09:13:52

  Modified:             ChangeLog kde4-base.eclass
  Log:
  Sync with kde overlay. Raise QT_MINIMAL to latest stable and simplify Qt deps
  by Michael Palimaka <[email protected]>. Add kde-workspace 4.11.8 SRC_URI.

Revision  Changes    Path
1.1188               eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1188&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1188&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1187&r2=1.1188

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1187
retrieving revision 1.1188
diff -u -r1.1187 -r1.1188
--- ChangeLog   30 Mar 2014 08:41:53 -0000      1.1187
+++ ChangeLog   30 Mar 2014 09:13:52 -0000      1.1188
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1187 2014/03/30 
08:41:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1188 2014/03/30 
09:13:52 johu Exp $
+
+  30 Mar 2014; Johannes Huber <[email protected]> kde4-base.eclass:
+  Sync with kde overlay. Raise QT_MINIMAL to latest stable and simplify Qt deps
+  by Michael Palimaka <[email protected]>. Add kde-workspace 4.11.8
+  SRC_URI.
 
   30 Mar 2014; Michał Górny <[email protected]> multilib-build.eclass:
   Support rewriting symlinks in MULTILIB_CHOST_TOOLS, bug #506062.



1.134                eclass/kde4-base.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.134&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.134&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.133&r2=1.134

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- kde4-base.eclass    5 Mar 2014 02:12:51 -0000       1.133
+++ kde4-base.eclass    30 Mar 2014 09:13:52 -0000      1.134
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.133 2014/03/05 
02:12:51 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.134 2014/03/30 
09:13:52 johu Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -200,7 +200,7 @@
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Determine version of qt we enforce as minimal for the package.
-QT_MINIMAL="${QT_MINIMAL:-4.8.0}"
+QT_MINIMAL="${QT_MINIMAL:-4.8.5}"
 
 # Declarative dependencies
 qtdeclarativedepend="
@@ -288,10 +288,8 @@
        >=dev-qt/qt3support-${QT_MINIMAL}:4[accessibility]
        >=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support,ssl]
        >=dev-qt/qtdbus-${QT_MINIMAL}:4
-       || (
-               ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] 
dev-qt/designer:4[-phonon] )
-               <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)]
-       )
+       >=dev-qt/designer-${QT_MINIMAL}:4[-phonon]
+       >=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+)]
        >=dev-qt/qtscript-${QT_MINIMAL}:4
        >=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support]
        >=dev-qt/qtsvg-${QT_MINIMAL}:4
@@ -444,6 +442,9 @@
                                4.11.7)
                                        # Part of 4.12 actually, sigh. Not 
stable for next release!
                                        
SRC_URI="mirror://kde/stable/4.12.3/src/${_kmname_pv}.tar.xz" ;;
+                               4.11.8)
+                                       # Part of 4.12 actually, sigh. Not 
stable for next release!
+                                       
SRC_URI="mirror://kde/stable/4.12.4/src/${_kmname_pv}.tar.xz" ;;
                                *)
                                        # Stable KDE SC releases
                                        
SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;




Reply via email to