summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/kde5.eclass11
2 files changed, 13 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 6b24473ab04e..0e6c1dc961a2 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1417 2014/11/13 04:19:51 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1418 2014/11/13 04:34:05 kensington Exp $
+
+ 13 Nov 2014; Michael Palimaka <kensington@gentoo.org> kde5.eclass:
+ Sync with KDE overlay. Raise kde-frameworks/kf-env dependency and update
+ SRC_URI for Frameworks 5.4.0
13 Nov 2014; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass:
Add kde-workspace 4.11.14 SRC_URI.
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 306286aaafe9..7b4753f7b8ea 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.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/kde5.eclass,v 1.1 2014/10/15 12:48:57 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.2 2014/11/13 04:34:05 kensington Exp $
# @ECLASS: kde5.eclass
# @MAINTAINER:
@@ -109,7 +109,7 @@ case ${KDE_AUTODEPS} in
fi
DEPEND+=" >=dev-libs/extra-cmake-modules-${ecm_version}"
- RDEPEND+=" >=kde-frameworks/kf-env-2"
+ RDEPEND+=" >=kde-frameworks/kf-env-3"
COMMONDEPEND+=" >=dev-qt/qtcore-${QT_MINIMAL}:5"
if [[ ${CATEGORY} = kde-base ]]; then
@@ -197,7 +197,12 @@ _calculate_src_uri() {
case ${CATEGORY} in
kde-frameworks)
- SRC_URI="mirror://kde/stable/frameworks/${PV}/${_kmname}-${PV}.tar.xz"
+ case ${PV} in
+ 5.0.0|5.1.0|5.2.0|5.3.0)
+ SRC_URI="mirror://kde/stable/frameworks/${PV}/${_kmname}-${PV}.tar.xz" ;;
+ *)
+ SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
+ esac
;;
kde-base)
case ${PV} in