summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-03-04 23:19:12 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-03-04 23:19:12 +0000
commit7ccde94b9d171e137b67ae8be75da321bac0d2bf (patch)
tree8ccc40b9c5701b7244b91a1bc797dd303f77566e /eclass
parentVersion bump. (diff)
downloadgentoo-2-7ccde94b9d171e137b67ae8be75da321bac0d2bf.tar.gz
gentoo-2-7ccde94b9d171e137b67ae8be75da321bac0d2bf.tar.bz2
gentoo-2-7ccde94b9d171e137b67ae8be75da321bac0d2bf.zip
Add the missing kde4-meta.eclass patch that makes kde-4.6.1 actually build
Diffstat (limited to 'eclass')
-rw-r--r--eclass/kde4-meta.eclass29
1 files changed, 22 insertions, 7 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 0da5f709825c..8246680956aa 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.48 2011/01/12 21:24:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.49 2011/03/04 23:19:12 dilfridge Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -216,9 +216,15 @@ kde4-meta_src_extract() {
kdebase-apps)
# kdebase/apps -> kdebase-apps
tarball="kdebase-${PV}.tar.${postfix}"
- # Go one level deeper for kdebase-apps in tarballs
- moduleprefix=apps/
- KMTARPARAMS+=" --transform=s|apps/||"
+ case ${PV} in
+ 4.6.1)
+ ;;
+ *)
+ # Go one level deeper for kdebase-apps in tarballs
+ moduleprefix=apps/
+ KMTARPARAMS+=" --transform=s|apps/||"
+ ;;
+ esac
;;
kdepim)
if [[ ${PV} == 4.5.93 ]] ; then
@@ -312,9 +318,18 @@ kde4-meta_create_extractlists() {
# In those cases you should care to add the relevant files to KMEXTRACTONLY
case ${KMNAME} in
kdebase)
- KMEXTRACTONLY+="
- apps/config-apps.h.cmake
- apps/ConfigureChecks.cmake"
+ case ${PV} in
+ 4.6.1)
+ KMEXTRACTONLY+="
+ config-apps.h.cmake
+ ConfigureChecks.cmake"
+ ;;
+ *)
+ KMEXTRACTONLY+="
+ apps/config-apps.h.cmake
+ apps/ConfigureChecks.cmake"
+ ;;
+ esac
;;
kdebase-apps)
KMEXTRACTONLY+="