diff options
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/kde4-base.eclass | 4 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9af75a38a356..a29c8d1c2170 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.202 2012/04/03 19:21:45 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.203 2012/04/04 15:10:20 johu Exp $ + + 04 Apr 2012; Johannes Huber <johu@gentoo.org> kde4-base.eclass, + kde4-meta.eclass: + Use .xz also for 4.8.x with x>1. 03 Apr 2012; Krzysztof Pawlik <nelchael@gentoo.org> python-distutils-ng.eclass: diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 37c9e5aa03b1..05424844d708 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.113 2012/03/06 22:23:51 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.114 2012/04/04 15:10:20 johu Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -448,7 +448,7 @@ _calculate_src_uri() { 4.[456789].8[05] | 4.[456789].9[0235678]) # Unstable KDE SC releases SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;; - 4.8.1) + 4.8.[12345]) # Stable KDE SC releases with .xz support SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;; *) diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 2fc7b37266db..db2cec7d74ac 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.61 2012/03/24 20:44:51 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.62 2012/04/04 15:10:20 johu Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -210,7 +210,7 @@ kde4-meta_src_extract() { else local abort tarball tarfile f extractlist postfix - if [[ ${PV} == 4.8.1 ]]; then + if [[ ${PV} =~ 4.8.[12345] ]]; then postfix="xz" KMTARPARAMS+=" --xz" else |