diff options
| author |   Johannes Huber <johu@gentoo.org> | 2012-09-04 14:08:24 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-09-04 14:08:24 +0000 |
| commit | c627be6aa1b684adbaad9df1e7e206168d329fdf (patch) | |
| tree | 9acea0f33e074510f2b88f7f80f538bb04d1fdea /eclass | |
| parent | Remove old (diff) | |
| download | historical-c627be6aa1b684adbaad9df1e7e206168d329fdf.tar.gz historical-c627be6aa1b684adbaad9df1e7e206168d329fdf.tar.bz2 historical-c627be6aa1b684adbaad9df1e7e206168d329fdf.zip | |
Dont try to extract cmake/modules for kdegames > 4.9.0. Its removed from top-level directory by upstream, fixes bug #431924.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 492cfd4218bc..9a4e5ca71094 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.386 2012/09/01 20:49:01 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.387 2012/09/04 14:08:24 johu Exp $ + + 04 Sep 2012; Johannes Huber <johu@gentoo.org> kde4-meta.eclass: + Dont try to extract cmake/modules for kdegames > 4.9.0. Its removed from + top-level directory by upstream, fixes bug #431924. 01 Sep 2012; Vadim Kuznetsov vadimk@gentoo.org -vmware.eclass, -vmware-mod.eclass: diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 090759ac7069..0e6ed149f19f 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.67 2012/08/19 11:12:35 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.68 2012/09/04 14:08:24 johu Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -342,7 +342,8 @@ kde4-meta_create_extractlists() { # it may be possible to formulate this shorter, but it should also # still be understandable... if [[ ${KMNAME} != kdegraphics || ( ( $(get_kde_version) != 4.6 || ${PV} < 4.6.2 ) && $(get_kde_version) < 4.7 ) ]] \ - && ! [[ ${KMNAME} == kdeedu && ( ${PV} == 4.6.4 || ${PV} == 4.6.5 ) ]]; then + && ! [[ ${KMNAME} == kdeedu && ( ${PV} == 4.6.4 || ${PV} == 4.6.5 ) ]] \ + && ! [[ ${KMNAME} == kdegames && ${PV} > 4.9.0 ]]; then case ${KMNAME} in kdebase-runtime|kde-runtime|kdebase-workspace|kde-workspace|kdeedu|kdegames|kdegraphics) KMEXTRACTONLY+=" |