diff options
author | Johannes Huber <johu@gentoo.org> | 2014-04-25 19:39:42 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2014-04-25 19:39:42 +0000 |
commit | 1b9ff414715bea6925a7fb3f70a1172655abae3a (patch) | |
tree | 67316d6d1274f64845b54866d2d7973d2fd15b07 /eclass/kde4-base.eclass | |
parent | drop old (diff) | |
download | gentoo-2-1b9ff414715bea6925a7fb3f70a1172655abae3a.tar.gz gentoo-2-1b9ff414715bea6925a7fb3f70a1172655abae3a.tar.bz2 gentoo-2-1b9ff414715bea6925a7fb3f70a1172655abae3a.zip |
Sync with kde overlay. Remove custom branch calculation for kde workspace. Add kde-workspace 4.11.9 SRC_URI.
Diffstat (limited to 'eclass/kde4-base.eclass')
-rw-r--r-- | eclass/kde4-base.eclass | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index e1a153d5c680..fb9d1ec23e74 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.134 2014/03/30 09:13:52 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.135 2014/04/25 19:39:42 johu Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -445,6 +445,9 @@ _calculate_src_uri() { 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" ;; + 4.11.9) + # Part of 4.12 actually, sigh. Not stable for next release! + SRC_URI="mirror://kde/stable/4.12.5/src/${_kmname_pv}.tar.xz" ;; *) # Stable KDE SC releases SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;; @@ -558,10 +561,6 @@ _calculate_live_repo() { [[ ${PV} != 9999* && ${KDEBASE} == kde-base ]] && \ EGIT_BRANCH="KDE/$(get_kde_version)" - # kde-workspace master needs Qt5/kf5 - [[ ${PV} == 9999 && ${_kmname} == kde-workspace ]] && \ - EGIT_BRANCH="KDE/4.11" - # default repo uri EGIT_REPO_URI+=( "${EGIT_MIRROR}/${_kmname}" ) |