diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2014-12-26 11:42:21 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-12-26 11:42:21 +0000 |
| commit | beabbac33f68917579d294c40acacd75bc40e832 (patch) | |
| tree | d95e7186246dd13035b5e7ce7533698e5e5ae86a /eclass | |
| parent | Convert to distutils-r1. (diff) | |
| download | gentoo-2-beabbac33f68917579d294c40acacd75bc40e832.tar.gz gentoo-2-beabbac33f68917579d294c40acacd75bc40e832.tar.bz2 gentoo-2-beabbac33f68917579d294c40acacd75bc40e832.zip | |
Sync with KDE overlay.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/kde4-base.eclass | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index c607795038a5..7d86ffddc579 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1473 2014/12/25 23:35:18 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1474 2014/12/26 11:42:21 kensington Exp $ + + 26 Dec 2014; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass: + Sync with KDE overlay. 25 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> waf-utils.eclass: Reflect reality of the status of waf-utils eclass maintenance as announced diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index ddd466db76cc..e4f98f64a995 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.145 2014/12/09 18:38:57 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.146 2014/12/26 11:42:21 kensington Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -474,8 +474,8 @@ _calculate_src_uri() { ;; kdevelop|kdevelop-php*|kdevplatform) case ${KDEVELOP_VERSION} in - 4.[123].[6-9]*) SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;; - *) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;; + 4.[123].[6-9]*) SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz" ;; + *) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz" ;; esac ;; esac @@ -577,7 +577,7 @@ _calculate_live_repo() { fi # default branching - [[ ${PV} != 4.9999* && ${KDEBASE} == kde-base ]] && \ + [[ ${PV} != 4.9999* && ${PV} != 9999 && ${KDEBASE} == kde-base ]] && \ EGIT_BRANCH="KDE/$(get_kde_version)" # default repo uri |