1 |
scarabeus 09/02/10 20:07:24 |
2 |
|
3 |
Modified: kde4-base.eclass kde4-functions.eclass |
4 |
Log: |
5 |
Make NEED_KDE=none packages pick correct kdedir :] Fixed thanks to Tomáš Caithaml and pva for helping with this. Per bug #257616. |
6 |
|
7 |
Revision Changes Path |
8 |
1.29 eclass/kde4-base.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.29&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.29&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.28&r2=1.29 |
13 |
|
14 |
Index: kde4-base.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v |
17 |
retrieving revision 1.28 |
18 |
retrieving revision 1.29 |
19 |
diff -u -r1.28 -r1.29 |
20 |
--- kde4-base.eclass 2 Feb 2009 21:35:08 -0000 1.28 |
21 |
+++ kde4-base.eclass 10 Feb 2009 20:07:24 -0000 1.29 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 2007-2008 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.28 2009/02/02 21:35:08 scarabeus Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.29 2009/02/10 20:07:24 scarabeus Exp $ |
27 |
|
28 |
# @ECLASS: kde4-base.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -439,17 +439,15 @@ |
31 |
|
32 |
# Search for best suitable kde installation for misc kde package. |
33 |
# Computation based on NEED_KDE and KDE_MINIMAL |
34 |
- get_latest_kdedir |
35 |
+ [[ ${NEED_KDE} = latest || ${NEED_KDE} = none ]] && get_latest_kdedir |
36 |
|
37 |
- if [[ $NEED_KDE != none ]]; then |
38 |
- # Set PREFIX |
39 |
- if use kdeprefix; then |
40 |
- KDEDIR="/usr/kde/${_kdedir}" |
41 |
- KDEDIRS="/usr/local/:/usr:${KDEDIR}" |
42 |
- else |
43 |
- KDEDIR="/usr" |
44 |
- KDEDIRS="/usr/local/:/usr" |
45 |
- fi |
46 |
+ # Set PREFIX |
47 |
+ if use kdeprefix; then |
48 |
+ KDEDIR="/usr/kde/${_kdedir}" |
49 |
+ KDEDIRS="/usr/local/:/usr:${KDEDIR}" |
50 |
+ else |
51 |
+ KDEDIR="/usr" |
52 |
+ KDEDIRS="/usr/local/:/usr" |
53 |
fi |
54 |
# Set the prefix based on KDEDIR |
55 |
# Make it a consequence of kdeprefix |
56 |
|
57 |
|
58 |
|
59 |
1.12 eclass/kde4-functions.eclass |
60 |
|
61 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.12&view=markup |
62 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.12&content-type=text/plain |
63 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?r1=1.11&r2=1.12 |
64 |
|
65 |
Index: kde4-functions.eclass |
66 |
=================================================================== |
67 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v |
68 |
retrieving revision 1.11 |
69 |
retrieving revision 1.12 |
70 |
diff -u -r1.11 -r1.12 |
71 |
--- kde4-functions.eclass 12 Jan 2009 19:40:34 -0000 1.11 |
72 |
+++ kde4-functions.eclass 10 Feb 2009 20:07:24 -0000 1.12 |
73 |
@@ -1,6 +1,6 @@ |
74 |
# Copyright 1999-2008 Gentoo Foundation |
75 |
# Distributed under the terms of the GNU General Public License v2 |
76 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.11 2009/01/12 19:40:34 scarabeus Exp $ |
77 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.12 2009/02/10 20:07:24 scarabeus Exp $ |
78 |
|
79 |
# @ECLASS: kde4-functions.eclass |
80 |
# @MAINTAINER: |
81 |
@@ -226,45 +226,43 @@ |
82 |
# We can check for kdelibs because it is the most basic package; no KDE package |
83 |
# working without it. This might be changed in future. |
84 |
get_latest_kdedir() { |
85 |
- if [[ $NEED_KDE = latest && $KDEBASE != kde-base ]]; then |
86 |
- case ${KDE_WANTED} in |
87 |
- # note this will need to be updated as stable moves and so on |
88 |
- live) |
89 |
- _versions="9999 4.1.69 4.1.0" |
90 |
- ;; |
91 |
- snapshot) |
92 |
- _versions="4.1.69 4.1.0 9999" |
93 |
+ case ${KDE_WANTED} in |
94 |
+ # note this will need to be updated as stable moves and so on |
95 |
+ live) |
96 |
+ _versions="9999 4.1.69 4.1.0" |
97 |
+ ;; |
98 |
+ snapshot) |
99 |
+ _versions="4.1.69 4.1.0 9999" |
100 |
+ ;; |
101 |
+ testing) |
102 |
+ _versions="4.1.0 4.1.69 9999" |
103 |
+ ;; |
104 |
+ stable) |
105 |
+ _versions="4.1.0 4.1.69 9999" |
106 |
+ ;; |
107 |
+ *) die "KDE_WANTED=${KDE_WANTED} not supported here." ;; |
108 |
+ esac |
109 |
+ # check if exists and fallback as we go |
110 |
+ for X in ${_versions}; do |
111 |
+ if has_version ">=kde-base/kdelibs-${X}"; then |
112 |
+ # figure out which X we are in and set it into _kdedir |
113 |
+ case ${X} in |
114 |
+ # also keep track here same for kde_wanted |
115 |
+ 9999) |
116 |
+ _kdedir="live" |
117 |
+ break |
118 |
;; |
119 |
- testing) |
120 |
- _versions="4.1.0 4.1.69 9999" |
121 |
+ 4.1.69) |
122 |
+ _kdedir="4.2" |
123 |
+ break |
124 |
;; |
125 |
- stable) |
126 |
- _versions="4.1.0 4.1.69 9999" |
127 |
+ 4.1.0) |
128 |
+ _kdedir="4.1" |
129 |
+ break |
130 |
;; |
131 |
- *) die "KDE_WANTED=${KDE_WANTED} not supported here." ;; |
132 |
- esac |
133 |
- # check if exists and fallback as we go |
134 |
- for X in ${_versions}; do |
135 |
- if has_version ">=kde-base/kdelibs-${X}"; then |
136 |
- # figure out which X we are in and set it into _kdedir |
137 |
- case ${X} in |
138 |
- # also keep track here same for kde_wanted |
139 |
- 9999) |
140 |
- _kdedir="live" |
141 |
- break |
142 |
- ;; |
143 |
- 4.1.69) |
144 |
- _kdedir="4.2" |
145 |
- break |
146 |
- ;; |
147 |
- 4.1.0) |
148 |
- _kdedir="4.1" |
149 |
- break |
150 |
- ;; |
151 |
- esac |
152 |
- fi |
153 |
- done |
154 |
- fi |
155 |
+ esac |
156 |
+ fi |
157 |
+ done |
158 |
} |
159 |
|
160 |
# @FUNCTION: migrate_store_dir |