1 |
scarabeus 09/01/12 19:40:34 |
2 |
|
3 |
Modified: kde4-base.eclass kde4-functions.eclass |
4 |
kde4-meta.eclass |
5 |
Log: |
6 |
Add one missed patch for the eclasses. Affect only live stuff so no breakage for tree users. Thanks reavertm for pointing out. |
7 |
|
8 |
Revision Changes Path |
9 |
1.23 eclass/kde4-base.eclass |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.23&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.23&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.22&r2=1.23 |
14 |
|
15 |
Index: kde4-base.eclass |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v |
18 |
retrieving revision 1.22 |
19 |
retrieving revision 1.23 |
20 |
diff -u -r1.22 -r1.23 |
21 |
--- kde4-base.eclass 12 Jan 2009 17:25:59 -0000 1.22 |
22 |
+++ kde4-base.eclass 12 Jan 2009 19:40:34 -0000 1.23 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 2007-2008 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.22 2009/01/12 17:25:59 scarabeus Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.23 2009/01/12 19:40:34 scarabeus Exp $ |
28 |
|
29 |
# @ECLASS: kde4-base.eclass |
30 |
# @MAINTAINER: |
31 |
@@ -465,30 +465,7 @@ |
32 |
debug-print-function $FUNCNAME "$@" |
33 |
|
34 |
if [[ $BUILD_TYPE = live ]]; then |
35 |
- local cleandir |
36 |
- cleandir="${ESVN_STORE_DIR}/KDE" |
37 |
- if [[ -d "${cleandir}" ]]; then |
38 |
- ewarn "'${cleandir}' has been found. Moving contents to new location." |
39 |
- addwrite "${ESVN_STORE_DIR}" |
40 |
- # Split kdebase |
41 |
- local module |
42 |
- if pushd "${cleandir}"/kdebase/kdebase > /dev/null; then |
43 |
- for module in `find . -maxdepth 1 -type d -name [a-z0-9]\*`; do |
44 |
- module="${module#./}" |
45 |
- mkdir -p "${ESVN_STORE_DIR}/kdebase-${module}" && mv -f "${module}" "${ESVN_STORE_DIR}/kdebase-${module}" || \ |
46 |
- die "Failed to move to '${ESVN_STORE_DIR}/kdebase-${module}'." |
47 |
- done |
48 |
- popd > /dev/null |
49 |
- rm -fr "${cleandir}/kdebase" || \ |
50 |
- die "Failed to remove ${cleandir}/kdebase. You need to remove it manually." |
51 |
- fi |
52 |
- # Move the rest |
53 |
- local pkg |
54 |
- for pkg in "${cleandir}"/*; do |
55 |
- mv -f "${pkg}" "${ESVN_STORE_DIR}"/ || eerror "failed to move ${pkg}" |
56 |
- done |
57 |
- rmdir "${cleandir}" || die "Could not move obsolete KDE store dir. Please move '${cleandir}' contents to appropriate location (possibly ${ESVN_STORE_DIR}) and manually remove '${cleandir}' in order to continue." |
58 |
- fi |
59 |
+ migrate_store_dir |
60 |
subversion_src_unpack |
61 |
else |
62 |
[[ -z $KDE_S ]] && KDE_S="${S}" |
63 |
|
64 |
|
65 |
|
66 |
1.11 eclass/kde4-functions.eclass |
67 |
|
68 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.11&view=markup |
69 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.11&content-type=text/plain |
70 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?r1=1.10&r2=1.11 |
71 |
|
72 |
Index: kde4-functions.eclass |
73 |
=================================================================== |
74 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v |
75 |
retrieving revision 1.10 |
76 |
retrieving revision 1.11 |
77 |
diff -u -r1.10 -r1.11 |
78 |
--- kde4-functions.eclass 12 Jan 2009 17:25:59 -0000 1.10 |
79 |
+++ kde4-functions.eclass 12 Jan 2009 19:40:34 -0000 1.11 |
80 |
@@ -1,6 +1,6 @@ |
81 |
# Copyright 1999-2008 Gentoo Foundation |
82 |
# Distributed under the terms of the GNU General Public License v2 |
83 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.10 2009/01/12 17:25:59 scarabeus Exp $ |
84 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.11 2009/01/12 19:40:34 scarabeus Exp $ |
85 |
|
86 |
# @ECLASS: kde4-functions.eclass |
87 |
# @MAINTAINER: |
88 |
@@ -267,6 +267,37 @@ |
89 |
fi |
90 |
} |
91 |
|
92 |
+# @FUNCTION: migrate_store_dir |
93 |
+# @DESCRIPTION: |
94 |
+# Migrate the remnants of ${ESVN_STORE_DIR}/KDE/ to ${ESVN_STORE_DIR}/. |
95 |
+# Perform experimental split of kdebase to kdebase-apps. |
96 |
+migrate_store_dir() { |
97 |
+ local cleandir |
98 |
+ cleandir="${ESVN_STORE_DIR}/KDE" |
99 |
+ if [[ -d "${cleandir}" ]]; then |
100 |
+ ewarn "'${cleandir}' has been found. Moving contents to new location." |
101 |
+ addwrite "${ESVN_STORE_DIR}" |
102 |
+ # Split kdebase |
103 |
+ local module |
104 |
+ if pushd "${cleandir}"/kdebase/kdebase > /dev/null; then |
105 |
+ for module in `find . -maxdepth 1 -type d -name [a-z0-9]\*`; do |
106 |
+ module="${module#./}" |
107 |
+ mkdir -p "${ESVN_STORE_DIR}/kdebase-${module}" && mv -f "${module}" "${ESVN_STORE_DIR}/kdebase-${module}" || \ |
108 |
+ die "Failed to move to '${ESVN_STORE_DIR}/kdebase-${module}'." |
109 |
+ done |
110 |
+ popd > /dev/null |
111 |
+ rm -fr "${cleandir}/kdebase" || \ |
112 |
+ die "Failed to remove ${cleandir}/kdebase. You need to remove it manually." |
113 |
+ fi |
114 |
+ # Move the rest |
115 |
+ local pkg |
116 |
+ for pkg in "${cleandir}"/*; do |
117 |
+ mv -f "${pkg}" "${ESVN_STORE_DIR}"/ || eerror "failed to move ${pkg}" |
118 |
+ done |
119 |
+ rmdir "${cleandir}" || die "Could not move obsolete KDE store dir. Please move '${cleandir}' contents to appropriate location (possibly ${ESVN_STORE_DIR}) and manually remove '${cleandir}' in order to continue." |
120 |
+ fi |
121 |
+} |
122 |
+ |
123 |
# Functions handling KMLOADLIBS and KMSAVELIBS |
124 |
|
125 |
# @FUNCTION: save_library_dependencies |
126 |
|
127 |
|
128 |
|
129 |
1.10 eclass/kde4-meta.eclass |
130 |
|
131 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.10&view=markup |
132 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.10&content-type=text/plain |
133 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?r1=1.9&r2=1.10 |
134 |
|
135 |
Index: kde4-meta.eclass |
136 |
=================================================================== |
137 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v |
138 |
retrieving revision 1.9 |
139 |
retrieving revision 1.10 |
140 |
diff -u -r1.9 -r1.10 |
141 |
--- kde4-meta.eclass 12 Jan 2009 17:25:59 -0000 1.9 |
142 |
+++ kde4-meta.eclass 12 Jan 2009 19:40:34 -0000 1.10 |
143 |
@@ -1,6 +1,6 @@ |
144 |
# Copyright 1999-2008 Gentoo Foundation |
145 |
# Distributed under the terms of the GNU General Public License v2 |
146 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.9 2009/01/12 17:25:59 scarabeus Exp $ |
147 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.10 2009/01/12 19:40:34 scarabeus Exp $ |
148 |
# |
149 |
# @ECLASS: kde4-meta.eclass |
150 |
# @MAINTAINER: |
151 |
@@ -163,7 +163,12 @@ |
152 |
kde4-meta_src_unpack() { |
153 |
debug-print-function ${FUNCNAME} "$@" |
154 |
if [[ $BUILD_TYPE = live ]]; then |
155 |
- kde4-base_src_unpack |
156 |
+ migrate_store_dir |
157 |
+ S="${WORKDIR}/${PN}-${PV}" |
158 |
+ mkdir -p "${S}" |
159 |
+ ESVN_RESTRICT="export" subversion_src_unpack |
160 |
+ subversion_wc_info |
161 |
+ subversion_bootstrap |
162 |
kde4-meta_src_extract |
163 |
else |
164 |
kde4-meta_src_extract |