1 |
fordfrog 08/11/23 17:05:12 |
2 |
|
3 |
Modified: ChangeLog netbeans-6.5-r1.ebuild |
4 |
Log: |
5 |
Fixed issues reported by Peter Volkov <pva@g.o> and Jeremy Olexa <darkside@g.o> in gentoo-dev@l.g.o. Also fixed compilation in case 'nb' module is not specified. |
6 |
(Portage version: 2.2_rc15/cvs/Linux 2.6.27-gentoo x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.89 dev-util/netbeans/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.89&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.89&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?r1=1.88&r2=1.89 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v |
18 |
retrieving revision 1.88 |
19 |
retrieving revision 1.89 |
20 |
diff -u -r1.88 -r1.89 |
21 |
--- ChangeLog 22 Nov 2008 18:11:25 -0000 1.88 |
22 |
+++ ChangeLog 23 Nov 2008 17:05:12 -0000 1.89 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for dev-util/netbeans |
25 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.88 2008/11/22 18:11:25 fordfrog Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.89 2008/11/23 17:05:12 fordfrog Exp $ |
28 |
+ |
29 |
+ 23 Nov 2008; Miroslav Ć ulc <fordfrog@g.o> netbeans-6.5-r1.ebuild: |
30 |
+ Fixed issues reported by Peter Volkov <pva@g.o> and Jeremy Olexa |
31 |
+ <darkside@g.o> in gentoo-dev@l.g.o. Also fixed |
32 |
+ compilation in case 'nb' module is not specified. |
33 |
|
34 |
*netbeans-6.5-r1 (22 Nov 2008) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.2 dev-util/netbeans/netbeans-6.5-r1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: netbeans-6.5-r1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- netbeans-6.5-r1.ebuild 22 Nov 2008 18:11:25 -0000 1.1 |
52 |
+++ netbeans-6.5-r1.ebuild 23 Nov 2008 17:05:12 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2008 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.1 2008/11/22 18:11:25 fordfrog Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.2 2008/11/23 17:05:12 fordfrog Exp $ |
58 |
|
59 |
EAPI="2" |
60 |
WANT_SPLIT_ANT="true" |
61 |
@@ -238,38 +238,38 @@ |
62 |
|
63 |
pkg_setup() { |
64 |
if use netbeans_modules_apisupport && ! ( use netbeans_modules_harness && use netbeans_modules_ide && use netbeans_modules_java ) ; then |
65 |
- eerror "'apisupport' USE flag requires 'harness', 'ide' and 'java' USE flags" |
66 |
- exit 1 |
67 |
+ eerror "'apisupport' module requires 'harness', 'ide' and 'java' modules" |
68 |
+ die |
69 |
fi |
70 |
|
71 |
if use netbeans_modules_cnd && ! use netbeans_modules_ide ; then |
72 |
- eerror "'cnd' USE flag requires 'ide' USE flag" |
73 |
- exit 1 |
74 |
+ eerror "'cnd' module requires 'ide' module" |
75 |
+ die |
76 |
fi |
77 |
|
78 |
if use netbeans_modules_groovy && ! (use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_java ) ; then |
79 |
- eerror "'groovy' USE flag requires 'gsf', 'ide' and 'java'" |
80 |
- exit 1 |
81 |
+ eerror "'groovy' module requires 'gsf', 'ide' and 'java' modules" |
82 |
+ die |
83 |
fi |
84 |
|
85 |
if use netbeans_modules_gsf && ! use netbeans_modules_ide ; then |
86 |
- eerror "'gsf' USE flag requires 'ide' USE flag" |
87 |
- exit 1 |
88 |
+ eerror "'gsf' module requires 'ide' module" |
89 |
+ die |
90 |
fi |
91 |
|
92 |
if use netbeans_modules_identity && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then |
93 |
- eerror "'identity' USE flag requires 'gsf', 'ide', 'j2ee' and 'java' USE flags" |
94 |
- exit 1 |
95 |
+ eerror "'identity' module requires 'gsf', 'ide', 'j2ee' and 'java' modules" |
96 |
+ die |
97 |
fi |
98 |
|
99 |
if use netbeans_modules_j2ee && ! ( use netbeans_modules_groovy && use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_java ) ; then |
100 |
- eerror "'j2ee' USE flag requires 'groovy', 'gsf', 'ide' and 'java' USE flags" |
101 |
- exit 1 |
102 |
+ eerror "'j2ee' module requires 'groovy', 'gsf', 'ide' and 'java' modules" |
103 |
+ die |
104 |
fi |
105 |
|
106 |
if use netbeans_modules_java && ! ( use netbeans_modules_ide && use netbeans_modules_websvccommon ) ; then |
107 |
- eerror "'java' USE flag requires 'ide' and 'websvccommon' USE flag" |
108 |
- exit 1 |
109 |
+ eerror "'java' module requires 'ide' and 'websvccommon' module" |
110 |
+ die |
111 |
fi |
112 |
|
113 |
# because of bug http://www.netbeans.org/issues/show_bug.cgi?id=151535 'j2ee' cluster is also |
114 |
@@ -277,53 +277,59 @@ |
115 |
# because of bug http://www.netbeans.org/issues/show_bug.cgi?id=151538 'apisupport' cluster is also |
116 |
# needed to build 'mobility' cluster |
117 |
if use netbeans_modules_mobility && ! ( use netbeans_modules_apisupport && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then |
118 |
- eerror "'mobility' USE flag requires 'apisupport', 'ide', 'j2ee' and 'java' USE flags" |
119 |
- exit 1 |
120 |
+ eerror "'mobility' module requires 'apisupport', 'ide', 'j2ee' and 'java' modules" |
121 |
+ die |
122 |
fi |
123 |
|
124 |
if use netbeans_modules_nb && ! ( use netbeans_modules_harness && use netbeans_modules_ide ) ; then |
125 |
- eerror "'nb' USE flag requires 'harness' and 'ide' USE flag" |
126 |
- exit 1 |
127 |
+ eerror "'nb' module requires 'harness' and 'ide' module" |
128 |
+ die |
129 |
fi |
130 |
|
131 |
if use netbeans_modules_php && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_websvccommon ) ; then |
132 |
- eerror "'php' USE flag requires 'gsf', 'ide' and 'websvccommon' USE flags" |
133 |
- exit 1 |
134 |
+ eerror "'php' module requires 'gsf', 'ide' and 'websvccommon' modules" |
135 |
+ die |
136 |
fi |
137 |
|
138 |
if use netbeans_modules_profiler && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then |
139 |
- eerror "'profiler' USE flag requires 'gsf', 'ide', 'j2ee' and 'java' USE flags" |
140 |
- exit 1 |
141 |
+ eerror "'profiler' module requires 'gsf', 'ide', 'j2ee' and 'java' modules" |
142 |
+ die |
143 |
fi |
144 |
|
145 |
#if use netbeans_modules_ruby && ! ( use netbeans_modules_gsf && use netbeans_modules_ide ) ; then |
146 |
- # eerror "'ruby' USE flag requires 'gsf' and 'ide' USE flag" |
147 |
- # exit 1 |
148 |
+ # eerror "'ruby' module requires 'gsf' and 'ide' module" |
149 |
+ # die |
150 |
#fi |
151 |
|
152 |
if use netbeans_modules_soa && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java && use netbeans_modules_xml ) ; then |
153 |
- eerror "'soa' USE flag requires 'gsf', 'ide', 'j2ee', 'java' and 'xml' USE flags" |
154 |
- exit 1 |
155 |
+ eerror "'soa' module requires 'gsf', 'ide', 'j2ee', 'java' and 'xml' modules" |
156 |
+ die |
157 |
fi |
158 |
|
159 |
if use netbeans_modules_visualweb && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then |
160 |
- eerror "'visualweb' USE flag requires 'gsf', 'ide', 'j2ee' and 'java' USE flags" |
161 |
- exit 1 |
162 |
+ eerror "'visualweb' module requires 'gsf', 'ide', 'j2ee' and 'java' modules" |
163 |
+ die |
164 |
fi |
165 |
|
166 |
if use netbeans_modules_webcommon && ! ( use netbeans_modules_gsf && use netbeans_modules_ide ) ; then |
167 |
- eerror "'webcommon' USE flag requires 'gsf' and 'ide' USE flags" |
168 |
- exit 1 |
169 |
+ eerror "'webcommon' module requires 'gsf' and 'ide' modules" |
170 |
+ die |
171 |
fi |
172 |
|
173 |
if use netbeans_modules_websvccommon && ! use netbeans_modules_ide ; then |
174 |
- eerror "'websvccommon' USE flag requires 'ide' USE flag" |
175 |
- exit 1 |
176 |
+ eerror "'websvccommon' module requires 'ide' module" |
177 |
+ die |
178 |
fi |
179 |
|
180 |
if use netbeans_modules_xml && ! use netbeans_modules_ide ; then |
181 |
- eerror "'xml' USE flag requires 'ide' USE flag" |
182 |
- exit 1 |
183 |
+ eerror "'xml' module requires 'ide' module" |
184 |
+ die |
185 |
+ fi |
186 |
+ |
187 |
+ if ! use netbeans_modules_nb ; then |
188 |
+ ewarn "You are building netbeans without 'nb' module, this way you will build only specified" |
189 |
+ ewarn "clusters, not a functional IDE. In case you want functional IDE, add 'nb' to NETBEANS_MODULES." |
190 |
+ epause 5 |
191 |
fi |
192 |
|
193 |
java-pkg-2_pkg_setup |
194 |
@@ -352,91 +358,73 @@ |
195 |
# We do not remove the jars that we ar not able to unbundle atm |
196 |
# More info at: https://overlays.gentoo.org/proj/java/wiki/Netbeans_Maintenance |
197 |
|
198 |
- local tmpfileplatform="${T}/platform.txt" |
199 |
- cat ${tmpfile} | grep -v "libs.jna/external/jna-3.0.2.jar" > ${tmpfileplatform} |
200 |
- mv ${tmpfileplatform} ${tmpfile} |
201 |
+ sed -e "/libs\.jna\/external\/jna-3\.0\.2\.jar/d" -i ${tmpfile} || die |
202 |
|
203 |
if use netbeans_modules_groovy ; then |
204 |
- local tmpfilegroovy="${T}/bundled-groovy.txt" |
205 |
- cat ${tmpfile} | grep -v "groovy.editor/external/groovy-all-1.5.6.jar" > ${tmpfilegroovy} |
206 |
- mv ${tmpfilegroovy} ${tmpfile} |
207 |
+ sed -e "/groovy\.editor\/external\/groovy-all-1\.5\.6\.jar/d" -i ${tmpfile} || die |
208 |
fi |
209 |
|
210 |
if use netbeans_modules_ide ; then |
211 |
- local tmpfileide="${T}/bundled-ide.txt" |
212 |
- cat ${tmpfile} | grep -v "libs.jaxb/external/jaxb-xjc.jar" | \ |
213 |
- grep -v "libs.jaxb/external/jaxb-impl.jar" | \ |
214 |
- grep -v "libs.svnClientAdapter/external/svnClientAdapter-1.4.0.jar" | \ |
215 |
- grep -v "o.apache.xml.resolver/external/resolver-1.2.jar" | \ |
216 |
- grep -v "libs.javacapi/external/javac-api-nb-7.0-b07.jar" | \ |
217 |
- grep -v "httpserver/external/tomcat-webserver-3.2.jar" | \ |
218 |
- grep -v "libs.ini4j/external/ini4j-0.2.6.jar" > ${tmpfileide} |
219 |
- mv ${tmpfileide} ${tmpfile} |
220 |
+ sed -e "/libs\.jaxb\/external\/jaxb-xjc\.jar/d" -i ${tmpfile} || die |
221 |
+ sed -e "/libs\.jaxb\/external\/jaxb-impl\.jar/d" -i ${tmpfile} || die |
222 |
+ sed -e "/libs\.svnClientAdapter\/external\/svnClientAdapter-1\.4\.0\.jar/d" -i ${tmpfile} || die |
223 |
+ sed -e "/o\.apache\.xml\.resolver\/external\/resolver-1\.2\.jar/d" -i ${tmpfile} || die |
224 |
+ sed -e "/libs\.javacapi\/external\/javac-api-nb-7\.0-b07\.jar/d" -i ${tmpfile} || die |
225 |
+ sed -e "/httpserver\/external\/tomcat-webserver-3\.2\.jar/d" -i ${tmpfile} || die |
226 |
+ sed -e "/libs\.ini4j\/external\/ini4j-0\.2\.6\.jar/d" -i ${tmpfile} || die |
227 |
fi |
228 |
|
229 |
if use netbeans_modules_j2ee ; then |
230 |
- local tmpfilej2ee="${T}/bundled-j2ee.txt" |
231 |
- cat ${tmpfile} | grep -v "j2eeapis/external/jsr88javax.jar" | \ |
232 |
- grep -v "servletjspapi/external/servlet2.5-jsp2.1-api.jar" | \ |
233 |
- grep -v "web.jspparser/external/glassfish-jspparser-2.0.jar" | \ |
234 |
- grep -v "j2ee.sun.appsrv81/external/appservapis-2.0.58.3.jar" | \ |
235 |
- grep -v "j2ee.sun.appsrv81/external/org-netbeans-modules-j2ee-sun-appsrv81.jar" | \ |
236 |
- grep -v "libs.glassfish_logging/external/glassfish-logging-2.0.jar" | \ |
237 |
- grep -v "spring.webmvc/external/spring-webmvc-2.5.jar" | \ |
238 |
- grep -v "web.jsf/external/shale-remoting-1.0.4.jar" | \ |
239 |
- grep -v "websvc.restlib/external/jsr311-api-doc.jar" | \ |
240 |
- grep -v "websvc.restlib/external/jersey-api-doc.jar" > ${tmpfilej2ee} |
241 |
- mv ${tmpfilej2ee} ${tmpfile} |
242 |
+ sed -e "/j2eeapis\/external\/jsr88javax\.jar/d" -i ${tmpfile} || die |
243 |
+ sed -e "/servletjspapi\/external\/servlet2\.5-jsp2\.1-api\.jar/d" -i ${tmpfile} || die |
244 |
+ sed -e "/web\.jspparser\/external\/glassfish-jspparser-2\.0\.jar/d" -i ${tmpfile} || die |
245 |
+ sed -e "/j2ee\.sun\.appsrv81\/external\/appservapis-2\.0\.58\.3\.jar/d" -i ${tmpfile} || die |
246 |
+ sed -e "/j2ee\.sun\.appsrv81\/external\/org-netbeans-modules-j2ee-sun-appsrv81\.jar/d" -i ${tmpfile} || die |
247 |
+ sed -e "/libs\.glassfish_logging\/external\/glassfish-logging-2\.0\.jar" -i ${tmpfile} || die |
248 |
+ sed -e "/spring\.webmvc\/external\/spring-webmvc-2\.5\.jar/d" -i ${tmpfile} || die |
249 |
+ sed -e "/web\.jsf\/external\/shale-remoting-1\.0\.4\.jar/d" -i ${tmpfile} || die |
250 |
+ sed -e "/websvc\.restlib\/external\/jsr311-api-doc\.jar/d" -i ${tmpfile} || die |
251 |
+ sed -e "/websvc\.restlib\/external\/jersey-api-doc\.jar/d" -i ${tmpfile} || die |
252 |
fi |
253 |
|
254 |
if use netbeans_modules_java ; then |
255 |
- local tmpfilejava="${T}/bundled-java.txt" |
256 |
- cat ${tmpfile} | grep -v "libs.javacimpl/external/javac-impl-nb-7.0-b07.jar" | \ |
257 |
- grep -v "j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar" | \ |
258 |
- grep -v "junit/external/Ant-1.7.1-binary-patch-72080.jar" | \ |
259 |
- grep -v "libs.springframework/external/spring-2.5.jar" | \ |
260 |
- grep -v "junit/external/junit-4.5-src.jar" | |
261 |
- grep -v "swingapp/external/appframework-1.0.3.jar" > ${tmpfilejava} |
262 |
- mv ${tmpfilejava} ${tmpfile} |
263 |
+ sed -e "/libs\.javacimpl\/external\/javac-impl-nb-7\.0-b07\.jar/d" -i ${tmpfile} || die |
264 |
+ sed -e "/j2ee\.toplinklib\/external\/glassfish-persistence-v2ur1-build-09d\.jar/d" -i ${tmpfile} || die |
265 |
+ sed -e "/junit\/external\/Ant-1\.7\.1-binary-patch-72080\.jar/d" -i ${tmpfile} || die |
266 |
+ sed -e "/libs\.springframework\/external\/spring-2\.5\.jar/d" -i ${tmpfile} || die |
267 |
+ sed -e "/junit\/external\/junit-4\.5-src\.jar/d" -i ${tmpfile} || die |
268 |
+ sed -e "/swingapp\/external\/appframework-1\.0\.3\.jar/d" -i ${tmpfile} || die |
269 |
fi |
270 |
|
271 |
if use netbeans_modules_mobility ; then |
272 |
- local tmpfilemobility="${T}/bundled-mobility.txt" |
273 |
- cat ${tmpfile} | grep -v "o.n.mobility.lib.activesync/external/nbactivesync-5.0.jar" | \ |
274 |
- grep -v "j2me.cdc.project.bdj/external/security.jar" | \ |
275 |
- grep -v "j2me.cdc.project.bdj/external/bdjo.jar" | \ |
276 |
- grep -v "j2me.cdc.project.ricoh/external/RicohAntTasks-2.0.jar" | \ |
277 |
- grep -v "mobility.databindingme/lib/netbeans_databindingme.jar" | \ |
278 |
- grep -v "mobility.databindingme/lib/netbeans_databindingme_pim.jar" | \ |
279 |
- grep -v "mobility.databindingme/lib/netbeans_databindingme_svg.jar" | \ |
280 |
- grep -v "mobility.deployment.webdav/external/jakarta-slide-ant-webdav-2.1.jar" | \ |
281 |
- grep -v "mobility.j2meunit/external/jmunit4cldc11-1.2.1.jar" | \ |
282 |
- grep -v "mobility.j2meunit/external/jmunit4cldc10-1.2.1.jar" | \ |
283 |
- grep -v "svg.perseus/external/perseus-nb-1.0.jar" | \ |
284 |
- grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" | \ |
285 |
- grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" | \ |
286 |
- grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" | \ |
287 |
- grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" > ${tmpfilemobility} |
288 |
- mv ${tmpfilemobility} ${tmpfile} |
289 |
+ sed -e "/o\.n\.mobility\.lib\.activesync\/external\/nbactivesync-5\.0\.jar/d" -i ${tmpfile} || die |
290 |
+ sed -e "/j2me\.cdc\.project\.bdj\/external\/security\.jar/d" -i ${tmpfile} || die |
291 |
+ sed -e "/j2me\.cdc\.project\.bdj\/external\/bdjo\.jar/d" -i ${tmpfile} || die |
292 |
+ sed -e "/j2me\.cdc\.project\.ricoh\/external\/RicohAntTasks-2\.0\.jar/d" -i ${tmpfile} || die |
293 |
+ sed -e "/mobility\.databindingme\/lib\/netbeans_databindingme\.jar/d" -i ${tmpfile} || die |
294 |
+ sed -e "/mobility\.databindingme\/lib\/netbeans_databindingme_pim\.jar/d" -i ${tmpfile} || die |
295 |
+ sed -e "/mobility\.databindingme\/lib\/netbeans_databindingme_svg\.jar/d" -i ${tmpfile} || die |
296 |
+ sed -e "/mobility\.deployment\.webdav\/external\/jakarta-slide-ant-webdav-2\.1\.jar/d" -i ${tmpfile} || die |
297 |
+ sed -e "/mobility\.j2meunit\/external\/jmunit4cldc11-1\.2\.1\.jar/d" -i ${tmpfile} || die |
298 |
+ sed -e "/mobility\.j2meunit\/external\/jmunit4cldc10-1\.2\.1\.jar/d" -i ${tmpfile} || die |
299 |
+ sed -e "/svg\.perseus\/external/perseus-nb-1\.0\.jar/d" -i ${tmpfile} || die |
300 |
+ sed -e "/vmd\.components\.midp\/netbeans_midp_components_basic\/dist\/netbeans_midp_components_basic\.jar/d" -i ${tmpfile} || die |
301 |
+ sed -e "/vmd\.components\.midp\.pda\/netbeans_midp_components_pda\/dist\/netbeans_midp_components_pda\.jar/d" -i ${tmpfile} || die |
302 |
+ sed -e "/vmd\.components\.midp\.wma\/netbeans_midp_components_wma\/dist\/netbeans_midp_components_wma\.jar/d" -i ${tmpfile} || die |
303 |
+ sed -e "/vmd\.components\.svg\/nb_svg_midp_components\/dist\/nb_svg_midp_components\.jar/d" -i ${tmpfile} || die |
304 |
fi |
305 |
|
306 |
if use netbeans_modules_soa ; then |
307 |
- local tmpfilesoa="${T}/bundled-soa.txt" |
308 |
- cat ${tmpfile} | grep -v "bpel.debugger.bdi/external/bdi-1.0.0.jar" | \ |
309 |
- grep -v "o.n.soa.libs.jgo/external/JGoLayout5.1.jar" | \ |
310 |
- grep -v "o.n.soa.libs.jgo/external/JGo5.1.jar" | \ |
311 |
- grep -v "o.n.soa.libs.jgo/external/JGoInstruments5.1.jar" > ${tmpfilesoa} |
312 |
- mv ${tmpfilesoa} ${tmpfile} |
313 |
+ sed -e "/bpel\.debugger\.bdi\/external\/bdi-1\.0\.0\.jar/d" -i ${tmpfile} || die |
314 |
+ sed -e "/o\.n\.soa\.libs\.jgo\/external\/JGoLayout5\.1\.jar/d" -i ${tmpfile} || die |
315 |
+ sed -e "/o\.n\.soa\.libs\.jgo\/external\/JGo5\.1\.jar/d" -i ${tmpfile} || die |
316 |
+ sed -e "/o\.n\.soa\.libs\.jgo\/external\/JGoInstruments5\.1\.jar/d" -i ${tmpfile} || die |
317 |
fi |
318 |
|
319 |
if use netbeans_modules_xml ; then |
320 |
- local tmpfilexml="${T}/bundled-xml.txt" |
321 |
- cat ${tmpfile} | grep -v "libs.jxpath/external/jxpath1.1.jar" | \ |
322 |
- grep -v "o.n.soa.libs.jbiadmincommon/external/jbi-admin-common.jar" > ${tmpfilexml} |
323 |
- mv ${tmpfilexml} ${tmpfile} |
324 |
+ sed -e "/libs\.jxpath\/external\/jxpath1\.1\.jar/d" -i ${tmpfile} || die |
325 |
+ sed -e "/o\.n\.soa\.libs\.jbiadmincommon\/external\/jbi-admin-common\.jar/d" -i ${tmpfile} || die |
326 |
fi |
327 |
- |
328 |
- cat ${tmpfile} | xargs rm -v |
329 |
} |
330 |
|
331 |
src_compile() { |
332 |
@@ -469,13 +457,21 @@ |
333 |
use netbeans_modules_websvccommon && clusters="${clusters},nb.cluster.websvccommon" |
334 |
use netbeans_modules_xml && clusters="${clusters},nb.cluster.xml" |
335 |
|
336 |
+ local build_target="" |
337 |
+ if use netbeans_modules_nb ; then |
338 |
+ build_target="build-nozip" |
339 |
+ else |
340 |
+ build_target="build-clusters" |
341 |
+ mkdir -p ${BUILDDESTINATION} || die |
342 |
+ fi |
343 |
+ |
344 |
# Fails to compile |
345 |
java-pkg_filter-compiler ecj-3.1 ecj-3.2 |
346 |
|
347 |
# Build the clusters |
348 |
#use netbeans_modules_ruby && addpredict /root/.jruby |
349 |
ANT_TASKS="ant-nodeps" |
350 |
- ANT_OPTS="-Xmx1g -Djava.awt.headless=true" eant ${antflags} ${clusters} -f nbbuild/build.xml build-nozip |
351 |
+ ANT_OPTS="-Xmx1g -Djava.awt.headless=true" eant ${antflags} ${clusters} -f nbbuild/build.xml ${build_target} |
352 |
|
353 |
use linguas_de && compile_locale_support "${antflags}" de |
354 |
use linguas_es && compile_locale_support "${antflags}" es |
355 |
@@ -530,6 +526,7 @@ |
356 |
|
357 |
# Install Gentoo Netbeans ID |
358 |
# This ID is used to identify our netbeans package while contacting update center |
359 |
+ mkdir -p ${BUILDDESTINATION}/nb${SLOT}/config || die |
360 |
echo "NBGNT" > ${BUILDDESTINATION}/nb${SLOT}/config/productid || die "Could not set Gentoo Netbeans ID" |
361 |
|
362 |
# fix paths per bug# 163483 |
363 |
@@ -624,9 +621,11 @@ |
364 |
} |
365 |
|
366 |
pkg_postinst() { |
367 |
- einfo "If you want to use specific locale of netbeans, use --locale argument, for example:" |
368 |
- einfo "${PN}-${SLOT} --locale de" |
369 |
- einfo "${PN}-${SLOT} --locale pt:BR" |
370 |
+ if use netbeans_modules_nb ; then |
371 |
+ einfo "If you want to use specific locale of netbeans, use --locale argument, for example:" |
372 |
+ einfo "${PN}-${SLOT} --locale de" |
373 |
+ einfo "${PN}-${SLOT} --locale pt:BR" |
374 |
+ fi |
375 |
} |
376 |
|
377 |
# Supporting functions for this ebuild |