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 | 2da8253788f634e6ae719358712611192150627e (patch) | |
| tree | 93b09d81843f0e52ea471cf0411ae8258f24cd1c /eclass | |
| parent | drop old (diff) | |
| download | historical-2da8253788f634e6ae719358712611192150627e.tar.gz historical-2da8253788f634e6ae719358712611192150627e.tar.bz2 historical-2da8253788f634e6ae719358712611192150627e.zip | |
Sync with kde overlay. Remove custom branch calculation for kde workspace. Add kde-workspace 4.11.9 SRC_URI.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/kde4-base.eclass | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index f9227bfb1c99..aeb7eb6734b7 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.1224 2014/04/23 11:53:32 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1225 2014/04/25 19:39:42 johu Exp $ + + 25 Apr 2014; Johannes Huber <johu@gentoo.org> kde4-base.eclass: + Sync with kde overlay. Remove custom branch calculation for kde workspace. + Add kde-workspace 4.11.9 SRC_URI. 23 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> -qt5-build.eclass: Drop qt5-build eclass 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}" ) |