diff options
| author |   Johannes Huber <johu@gentoo.org> | 2014-03-30 09:13:52 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2014-03-30 09:13:52 +0000 |
| commit | b508f06c8f64623e7cf994839e3fd2059cb0a3a6 (patch) | |
| tree | a1737250f974564714d8eca90bace19bce241bc8 /eclass | |
| parent | Cleaning old (diff) | |
| download | gentoo-2-b508f06c8f64623e7cf994839e3fd2059cb0a3a6.tar.gz gentoo-2-b508f06c8f64623e7cf994839e3fd2059cb0a3a6.tar.bz2 gentoo-2-b508f06c8f64623e7cf994839e3fd2059cb0a3a6.zip | |
Sync with kde overlay. Raise QT_MINIMAL to latest stable and simplify Qt deps
by Michael Palimaka <kensington@gentoo.org>. Add kde-workspace 4.11.8 SRC_URI.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/kde4-base.eclass | 13 |
2 files changed, 13 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index a579283e5dac..6565005651d4 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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 <johu@gentoo.org> kde4-base.eclass: + Sync with kde overlay. Raise QT_MINIMAL to latest stable and simplify Qt deps + by Michael Palimaka <kensington@gentoo.org>. Add kde-workspace 4.11.8 + SRC_URI. 30 Mar 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: Support rewriting symlinks in MULTILIB_CHOST_TOOLS, bug #506062. diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 48a74af50558..e1a153d5c680 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -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 @@ esac # @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 @@ kdecommondepend=" >=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 @@ _calculate_src_uri() { 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" ;; |