1 |
commit: b48a73d6721abb20c8f11af870305dc93257010f |
2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 28 20:33:41 2011 +0000 |
4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 28 20:33:41 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b48a73d6 |
7 |
|
8 |
More fixes for kdebase-4.6.1 |
9 |
|
10 |
--- |
11 |
eclass/kde4-meta.eclass | 19 ++++++++++++++----- |
12 |
1 files changed, 14 insertions(+), 5 deletions(-) |
13 |
|
14 |
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass |
15 |
index 22cff5f..05bfe75 100644 |
16 |
--- a/eclass/kde4-meta.eclass |
17 |
+++ b/eclass/kde4-meta.eclass |
18 |
@@ -214,12 +214,12 @@ kde4-meta_src_extract() { |
19 |
|
20 |
case ${KMNAME} in |
21 |
kdebase-apps) |
22 |
+ # kdebase/apps -> kdebase-apps |
23 |
+ tarball="kdebase-${PV}.tar.${postfix}" |
24 |
case ${PV} in |
25 |
4.6.1) |
26 |
;; |
27 |
*) |
28 |
- # kdebase/apps -> kdebase-apps |
29 |
- tarball="kdebase-${PV}.tar.${postfix}" |
30 |
# Go one level deeper for kdebase-apps in tarballs |
31 |
moduleprefix=apps/ |
32 |
KMTARPARAMS+=" --transform=s|apps/||" |
33 |
@@ -316,9 +316,18 @@ kde4-meta_create_extractlists() { |
34 |
# In those cases you should care to add the relevant files to KMEXTRACTONLY |
35 |
case ${KMNAME} in |
36 |
kdebase) |
37 |
- KMEXTRACTONLY+=" |
38 |
- apps/config-apps.h.cmake |
39 |
- apps/ConfigureChecks.cmake" |
40 |
+ case ${PV} in |
41 |
+ 4.6.1) |
42 |
+ KMEXTRACTONLY+=" |
43 |
+ config-apps.h.cmake |
44 |
+ ConfigureChecks.cmake" |
45 |
+ ;; |
46 |
+ *) |
47 |
+ KMEXTRACTONLY+=" |
48 |
+ apps/config-apps.h.cmake |
49 |
+ apps/ConfigureChecks.cmake" |
50 |
+ ;; |
51 |
+ esac |
52 |
;; |
53 |
kdebase-apps) |
54 |
KMEXTRACTONLY+=" |