* [gentoo-commits] gentoo-x86 commit in dev-util/netbeans: ChangeLog netbeans-6.5-r1.ebuild
@ 2008-11-23 17:05 Miroslav Sulc (fordfrog)
0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Sulc (fordfrog) @ 2008-11-23 17:05 UTC (permalink / raw
To: gentoo-commits
fordfrog 08/11/23 17:05:12
Modified: ChangeLog netbeans-6.5-r1.ebuild
Log:
Fixed issues reported by Peter Volkov <pva@gentoo.org> and Jeremy Olexa <darkside@gentoo.org> in gentoo-dev@lists.gentoo.org. Also fixed compilation in case 'nb' module is not specified.
(Portage version: 2.2_rc15/cvs/Linux 2.6.27-gentoo x86_64)
Revision Changes Path
1.89 dev-util/netbeans/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.89&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.89&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?r1=1.88&r2=1.89
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- ChangeLog 22 Nov 2008 18:11:25 -0000 1.88
+++ ChangeLog 23 Nov 2008 17:05:12 -0000 1.89
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/netbeans
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.88 2008/11/22 18:11:25 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.89 2008/11/23 17:05:12 fordfrog Exp $
+
+ 23 Nov 2008; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.5-r1.ebuild:
+ Fixed issues reported by Peter Volkov <pva@gentoo.org> and Jeremy Olexa
+ <darkside@gentoo.org> in gentoo-dev@lists.gentoo.org. Also fixed
+ compilation in case 'nb' module is not specified.
*netbeans-6.5-r1 (22 Nov 2008)
1.2 dev-util/netbeans/netbeans-6.5-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?r1=1.1&r2=1.2
Index: netbeans-6.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netbeans-6.5-r1.ebuild 22 Nov 2008 18:11:25 -0000 1.1
+++ netbeans-6.5-r1.ebuild 23 Nov 2008 17:05:12 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.1 2008/11/22 18:11:25 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.2 2008/11/23 17:05:12 fordfrog Exp $
EAPI="2"
WANT_SPLIT_ANT="true"
@@ -238,38 +238,38 @@
pkg_setup() {
if use netbeans_modules_apisupport && ! ( use netbeans_modules_harness && use netbeans_modules_ide && use netbeans_modules_java ) ; then
- eerror "'apisupport' USE flag requires 'harness', 'ide' and 'java' USE flags"
- exit 1
+ eerror "'apisupport' module requires 'harness', 'ide' and 'java' modules"
+ die
fi
if use netbeans_modules_cnd && ! use netbeans_modules_ide ; then
- eerror "'cnd' USE flag requires 'ide' USE flag"
- exit 1
+ eerror "'cnd' module requires 'ide' module"
+ die
fi
if use netbeans_modules_groovy && ! (use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_java ) ; then
- eerror "'groovy' USE flag requires 'gsf', 'ide' and 'java'"
- exit 1
+ eerror "'groovy' module requires 'gsf', 'ide' and 'java' modules"
+ die
fi
if use netbeans_modules_gsf && ! use netbeans_modules_ide ; then
- eerror "'gsf' USE flag requires 'ide' USE flag"
- exit 1
+ eerror "'gsf' module requires 'ide' module"
+ die
fi
if use netbeans_modules_identity && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then
- eerror "'identity' USE flag requires 'gsf', 'ide', 'j2ee' and 'java' USE flags"
- exit 1
+ eerror "'identity' module requires 'gsf', 'ide', 'j2ee' and 'java' modules"
+ die
fi
if use netbeans_modules_j2ee && ! ( use netbeans_modules_groovy && use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_java ) ; then
- eerror "'j2ee' USE flag requires 'groovy', 'gsf', 'ide' and 'java' USE flags"
- exit 1
+ eerror "'j2ee' module requires 'groovy', 'gsf', 'ide' and 'java' modules"
+ die
fi
if use netbeans_modules_java && ! ( use netbeans_modules_ide && use netbeans_modules_websvccommon ) ; then
- eerror "'java' USE flag requires 'ide' and 'websvccommon' USE flag"
- exit 1
+ eerror "'java' module requires 'ide' and 'websvccommon' module"
+ die
fi
# because of bug http://www.netbeans.org/issues/show_bug.cgi?id=151535 'j2ee' cluster is also
@@ -277,53 +277,59 @@
# because of bug http://www.netbeans.org/issues/show_bug.cgi?id=151538 'apisupport' cluster is also
# needed to build 'mobility' cluster
if use netbeans_modules_mobility && ! ( use netbeans_modules_apisupport && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then
- eerror "'mobility' USE flag requires 'apisupport', 'ide', 'j2ee' and 'java' USE flags"
- exit 1
+ eerror "'mobility' module requires 'apisupport', 'ide', 'j2ee' and 'java' modules"
+ die
fi
if use netbeans_modules_nb && ! ( use netbeans_modules_harness && use netbeans_modules_ide ) ; then
- eerror "'nb' USE flag requires 'harness' and 'ide' USE flag"
- exit 1
+ eerror "'nb' module requires 'harness' and 'ide' module"
+ die
fi
if use netbeans_modules_php && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_websvccommon ) ; then
- eerror "'php' USE flag requires 'gsf', 'ide' and 'websvccommon' USE flags"
- exit 1
+ eerror "'php' module requires 'gsf', 'ide' and 'websvccommon' modules"
+ die
fi
if use netbeans_modules_profiler && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then
- eerror "'profiler' USE flag requires 'gsf', 'ide', 'j2ee' and 'java' USE flags"
- exit 1
+ eerror "'profiler' module requires 'gsf', 'ide', 'j2ee' and 'java' modules"
+ die
fi
#if use netbeans_modules_ruby && ! ( use netbeans_modules_gsf && use netbeans_modules_ide ) ; then
- # eerror "'ruby' USE flag requires 'gsf' and 'ide' USE flag"
- # exit 1
+ # eerror "'ruby' module requires 'gsf' and 'ide' module"
+ # die
#fi
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
- eerror "'soa' USE flag requires 'gsf', 'ide', 'j2ee', 'java' and 'xml' USE flags"
- exit 1
+ eerror "'soa' module requires 'gsf', 'ide', 'j2ee', 'java' and 'xml' modules"
+ die
fi
if use netbeans_modules_visualweb && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then
- eerror "'visualweb' USE flag requires 'gsf', 'ide', 'j2ee' and 'java' USE flags"
- exit 1
+ eerror "'visualweb' module requires 'gsf', 'ide', 'j2ee' and 'java' modules"
+ die
fi
if use netbeans_modules_webcommon && ! ( use netbeans_modules_gsf && use netbeans_modules_ide ) ; then
- eerror "'webcommon' USE flag requires 'gsf' and 'ide' USE flags"
- exit 1
+ eerror "'webcommon' module requires 'gsf' and 'ide' modules"
+ die
fi
if use netbeans_modules_websvccommon && ! use netbeans_modules_ide ; then
- eerror "'websvccommon' USE flag requires 'ide' USE flag"
- exit 1
+ eerror "'websvccommon' module requires 'ide' module"
+ die
fi
if use netbeans_modules_xml && ! use netbeans_modules_ide ; then
- eerror "'xml' USE flag requires 'ide' USE flag"
- exit 1
+ eerror "'xml' module requires 'ide' module"
+ die
+ fi
+
+ if ! use netbeans_modules_nb ; then
+ ewarn "You are building netbeans without 'nb' module, this way you will build only specified"
+ ewarn "clusters, not a functional IDE. In case you want functional IDE, add 'nb' to NETBEANS_MODULES."
+ epause 5
fi
java-pkg-2_pkg_setup
@@ -352,91 +358,73 @@
# We do not remove the jars that we ar not able to unbundle atm
# More info at: https://overlays.gentoo.org/proj/java/wiki/Netbeans_Maintenance
- local tmpfileplatform="${T}/platform.txt"
- cat ${tmpfile} | grep -v "libs.jna/external/jna-3.0.2.jar" > ${tmpfileplatform}
- mv ${tmpfileplatform} ${tmpfile}
+ sed -e "/libs\.jna\/external\/jna-3\.0\.2\.jar/d" -i ${tmpfile} || die
if use netbeans_modules_groovy ; then
- local tmpfilegroovy="${T}/bundled-groovy.txt"
- cat ${tmpfile} | grep -v "groovy.editor/external/groovy-all-1.5.6.jar" > ${tmpfilegroovy}
- mv ${tmpfilegroovy} ${tmpfile}
+ sed -e "/groovy\.editor\/external\/groovy-all-1\.5\.6\.jar/d" -i ${tmpfile} || die
fi
if use netbeans_modules_ide ; then
- local tmpfileide="${T}/bundled-ide.txt"
- cat ${tmpfile} | grep -v "libs.jaxb/external/jaxb-xjc.jar" | \
- grep -v "libs.jaxb/external/jaxb-impl.jar" | \
- grep -v "libs.svnClientAdapter/external/svnClientAdapter-1.4.0.jar" | \
- grep -v "o.apache.xml.resolver/external/resolver-1.2.jar" | \
- grep -v "libs.javacapi/external/javac-api-nb-7.0-b07.jar" | \
- grep -v "httpserver/external/tomcat-webserver-3.2.jar" | \
- grep -v "libs.ini4j/external/ini4j-0.2.6.jar" > ${tmpfileide}
- mv ${tmpfileide} ${tmpfile}
+ sed -e "/libs\.jaxb\/external\/jaxb-xjc\.jar/d" -i ${tmpfile} || die
+ sed -e "/libs\.jaxb\/external\/jaxb-impl\.jar/d" -i ${tmpfile} || die
+ sed -e "/libs\.svnClientAdapter\/external\/svnClientAdapter-1\.4\.0\.jar/d" -i ${tmpfile} || die
+ sed -e "/o\.apache\.xml\.resolver\/external\/resolver-1\.2\.jar/d" -i ${tmpfile} || die
+ sed -e "/libs\.javacapi\/external\/javac-api-nb-7\.0-b07\.jar/d" -i ${tmpfile} || die
+ sed -e "/httpserver\/external\/tomcat-webserver-3\.2\.jar/d" -i ${tmpfile} || die
+ sed -e "/libs\.ini4j\/external\/ini4j-0\.2\.6\.jar/d" -i ${tmpfile} || die
fi
if use netbeans_modules_j2ee ; then
- local tmpfilej2ee="${T}/bundled-j2ee.txt"
- cat ${tmpfile} | grep -v "j2eeapis/external/jsr88javax.jar" | \
- grep -v "servletjspapi/external/servlet2.5-jsp2.1-api.jar" | \
- grep -v "web.jspparser/external/glassfish-jspparser-2.0.jar" | \
- grep -v "j2ee.sun.appsrv81/external/appservapis-2.0.58.3.jar" | \
- grep -v "j2ee.sun.appsrv81/external/org-netbeans-modules-j2ee-sun-appsrv81.jar" | \
- grep -v "libs.glassfish_logging/external/glassfish-logging-2.0.jar" | \
- grep -v "spring.webmvc/external/spring-webmvc-2.5.jar" | \
- grep -v "web.jsf/external/shale-remoting-1.0.4.jar" | \
- grep -v "websvc.restlib/external/jsr311-api-doc.jar" | \
- grep -v "websvc.restlib/external/jersey-api-doc.jar" > ${tmpfilej2ee}
- mv ${tmpfilej2ee} ${tmpfile}
+ sed -e "/j2eeapis\/external\/jsr88javax\.jar/d" -i ${tmpfile} || die
+ sed -e "/servletjspapi\/external\/servlet2\.5-jsp2\.1-api\.jar/d" -i ${tmpfile} || die
+ sed -e "/web\.jspparser\/external\/glassfish-jspparser-2\.0\.jar/d" -i ${tmpfile} || die
+ sed -e "/j2ee\.sun\.appsrv81\/external\/appservapis-2\.0\.58\.3\.jar/d" -i ${tmpfile} || die
+ sed -e "/j2ee\.sun\.appsrv81\/external\/org-netbeans-modules-j2ee-sun-appsrv81\.jar/d" -i ${tmpfile} || die
+ sed -e "/libs\.glassfish_logging\/external\/glassfish-logging-2\.0\.jar" -i ${tmpfile} || die
+ sed -e "/spring\.webmvc\/external\/spring-webmvc-2\.5\.jar/d" -i ${tmpfile} || die
+ sed -e "/web\.jsf\/external\/shale-remoting-1\.0\.4\.jar/d" -i ${tmpfile} || die
+ sed -e "/websvc\.restlib\/external\/jsr311-api-doc\.jar/d" -i ${tmpfile} || die
+ sed -e "/websvc\.restlib\/external\/jersey-api-doc\.jar/d" -i ${tmpfile} || die
fi
if use netbeans_modules_java ; then
- local tmpfilejava="${T}/bundled-java.txt"
- cat ${tmpfile} | grep -v "libs.javacimpl/external/javac-impl-nb-7.0-b07.jar" | \
- grep -v "j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar" | \
- grep -v "junit/external/Ant-1.7.1-binary-patch-72080.jar" | \
- grep -v "libs.springframework/external/spring-2.5.jar" | \
- grep -v "junit/external/junit-4.5-src.jar" |
- grep -v "swingapp/external/appframework-1.0.3.jar" > ${tmpfilejava}
- mv ${tmpfilejava} ${tmpfile}
+ sed -e "/libs\.javacimpl\/external\/javac-impl-nb-7\.0-b07\.jar/d" -i ${tmpfile} || die
+ sed -e "/j2ee\.toplinklib\/external\/glassfish-persistence-v2ur1-build-09d\.jar/d" -i ${tmpfile} || die
+ sed -e "/junit\/external\/Ant-1\.7\.1-binary-patch-72080\.jar/d" -i ${tmpfile} || die
+ sed -e "/libs\.springframework\/external\/spring-2\.5\.jar/d" -i ${tmpfile} || die
+ sed -e "/junit\/external\/junit-4\.5-src\.jar/d" -i ${tmpfile} || die
+ sed -e "/swingapp\/external\/appframework-1\.0\.3\.jar/d" -i ${tmpfile} || die
fi
if use netbeans_modules_mobility ; then
- local tmpfilemobility="${T}/bundled-mobility.txt"
- cat ${tmpfile} | grep -v "o.n.mobility.lib.activesync/external/nbactivesync-5.0.jar" | \
- grep -v "j2me.cdc.project.bdj/external/security.jar" | \
- grep -v "j2me.cdc.project.bdj/external/bdjo.jar" | \
- grep -v "j2me.cdc.project.ricoh/external/RicohAntTasks-2.0.jar" | \
- grep -v "mobility.databindingme/lib/netbeans_databindingme.jar" | \
- grep -v "mobility.databindingme/lib/netbeans_databindingme_pim.jar" | \
- grep -v "mobility.databindingme/lib/netbeans_databindingme_svg.jar" | \
- grep -v "mobility.deployment.webdav/external/jakarta-slide-ant-webdav-2.1.jar" | \
- grep -v "mobility.j2meunit/external/jmunit4cldc11-1.2.1.jar" | \
- grep -v "mobility.j2meunit/external/jmunit4cldc10-1.2.1.jar" | \
- grep -v "svg.perseus/external/perseus-nb-1.0.jar" | \
- grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" | \
- grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" | \
- grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" | \
- grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" > ${tmpfilemobility}
- mv ${tmpfilemobility} ${tmpfile}
+ sed -e "/o\.n\.mobility\.lib\.activesync\/external\/nbactivesync-5\.0\.jar/d" -i ${tmpfile} || die
+ sed -e "/j2me\.cdc\.project\.bdj\/external\/security\.jar/d" -i ${tmpfile} || die
+ sed -e "/j2me\.cdc\.project\.bdj\/external\/bdjo\.jar/d" -i ${tmpfile} || die
+ sed -e "/j2me\.cdc\.project\.ricoh\/external\/RicohAntTasks-2\.0\.jar/d" -i ${tmpfile} || die
+ sed -e "/mobility\.databindingme\/lib\/netbeans_databindingme\.jar/d" -i ${tmpfile} || die
+ sed -e "/mobility\.databindingme\/lib\/netbeans_databindingme_pim\.jar/d" -i ${tmpfile} || die
+ sed -e "/mobility\.databindingme\/lib\/netbeans_databindingme_svg\.jar/d" -i ${tmpfile} || die
+ sed -e "/mobility\.deployment\.webdav\/external\/jakarta-slide-ant-webdav-2\.1\.jar/d" -i ${tmpfile} || die
+ sed -e "/mobility\.j2meunit\/external\/jmunit4cldc11-1\.2\.1\.jar/d" -i ${tmpfile} || die
+ sed -e "/mobility\.j2meunit\/external\/jmunit4cldc10-1\.2\.1\.jar/d" -i ${tmpfile} || die
+ sed -e "/svg\.perseus\/external/perseus-nb-1\.0\.jar/d" -i ${tmpfile} || die
+ sed -e "/vmd\.components\.midp\/netbeans_midp_components_basic\/dist\/netbeans_midp_components_basic\.jar/d" -i ${tmpfile} || die
+ sed -e "/vmd\.components\.midp\.pda\/netbeans_midp_components_pda\/dist\/netbeans_midp_components_pda\.jar/d" -i ${tmpfile} || die
+ sed -e "/vmd\.components\.midp\.wma\/netbeans_midp_components_wma\/dist\/netbeans_midp_components_wma\.jar/d" -i ${tmpfile} || die
+ sed -e "/vmd\.components\.svg\/nb_svg_midp_components\/dist\/nb_svg_midp_components\.jar/d" -i ${tmpfile} || die
fi
if use netbeans_modules_soa ; then
- local tmpfilesoa="${T}/bundled-soa.txt"
- cat ${tmpfile} | grep -v "bpel.debugger.bdi/external/bdi-1.0.0.jar" | \
- grep -v "o.n.soa.libs.jgo/external/JGoLayout5.1.jar" | \
- grep -v "o.n.soa.libs.jgo/external/JGo5.1.jar" | \
- grep -v "o.n.soa.libs.jgo/external/JGoInstruments5.1.jar" > ${tmpfilesoa}
- mv ${tmpfilesoa} ${tmpfile}
+ sed -e "/bpel\.debugger\.bdi\/external\/bdi-1\.0\.0\.jar/d" -i ${tmpfile} || die
+ sed -e "/o\.n\.soa\.libs\.jgo\/external\/JGoLayout5\.1\.jar/d" -i ${tmpfile} || die
+ sed -e "/o\.n\.soa\.libs\.jgo\/external\/JGo5\.1\.jar/d" -i ${tmpfile} || die
+ sed -e "/o\.n\.soa\.libs\.jgo\/external\/JGoInstruments5\.1\.jar/d" -i ${tmpfile} || die
fi
if use netbeans_modules_xml ; then
- local tmpfilexml="${T}/bundled-xml.txt"
- cat ${tmpfile} | grep -v "libs.jxpath/external/jxpath1.1.jar" | \
- grep -v "o.n.soa.libs.jbiadmincommon/external/jbi-admin-common.jar" > ${tmpfilexml}
- mv ${tmpfilexml} ${tmpfile}
+ sed -e "/libs\.jxpath\/external\/jxpath1\.1\.jar/d" -i ${tmpfile} || die
+ sed -e "/o\.n\.soa\.libs\.jbiadmincommon\/external\/jbi-admin-common\.jar/d" -i ${tmpfile} || die
fi
-
- cat ${tmpfile} | xargs rm -v
}
src_compile() {
@@ -469,13 +457,21 @@
use netbeans_modules_websvccommon && clusters="${clusters},nb.cluster.websvccommon"
use netbeans_modules_xml && clusters="${clusters},nb.cluster.xml"
+ local build_target=""
+ if use netbeans_modules_nb ; then
+ build_target="build-nozip"
+ else
+ build_target="build-clusters"
+ mkdir -p ${BUILDDESTINATION} || die
+ fi
+
# Fails to compile
java-pkg_filter-compiler ecj-3.1 ecj-3.2
# Build the clusters
#use netbeans_modules_ruby && addpredict /root/.jruby
ANT_TASKS="ant-nodeps"
- ANT_OPTS="-Xmx1g -Djava.awt.headless=true" eant ${antflags} ${clusters} -f nbbuild/build.xml build-nozip
+ ANT_OPTS="-Xmx1g -Djava.awt.headless=true" eant ${antflags} ${clusters} -f nbbuild/build.xml ${build_target}
use linguas_de && compile_locale_support "${antflags}" de
use linguas_es && compile_locale_support "${antflags}" es
@@ -530,6 +526,7 @@
# Install Gentoo Netbeans ID
# This ID is used to identify our netbeans package while contacting update center
+ mkdir -p ${BUILDDESTINATION}/nb${SLOT}/config || die
echo "NBGNT" > ${BUILDDESTINATION}/nb${SLOT}/config/productid || die "Could not set Gentoo Netbeans ID"
# fix paths per bug# 163483
@@ -624,9 +621,11 @@
}
pkg_postinst() {
- einfo "If you want to use specific locale of netbeans, use --locale argument, for example:"
- einfo "${PN}-${SLOT} --locale de"
- einfo "${PN}-${SLOT} --locale pt:BR"
+ if use netbeans_modules_nb ; then
+ einfo "If you want to use specific locale of netbeans, use --locale argument, for example:"
+ einfo "${PN}-${SLOT} --locale de"
+ einfo "${PN}-${SLOT} --locale pt:BR"
+ fi
}
# Supporting functions for this ebuild
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-util/netbeans: ChangeLog netbeans-6.5-r1.ebuild
@ 2008-11-23 17:46 Miroslav Sulc (fordfrog)
0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Sulc (fordfrog) @ 2008-11-23 17:46 UTC (permalink / raw
To: gentoo-commits
fordfrog 08/11/23 17:46:04
Modified: ChangeLog netbeans-6.5-r1.ebuild
Log:
Fixed issues introduced by previous update
(Portage version: 2.2_rc15/cvs/Linux 2.6.27-gentoo x86_64)
Revision Changes Path
1.90 dev-util/netbeans/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?r1=1.89&r2=1.90
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- ChangeLog 23 Nov 2008 17:05:12 -0000 1.89
+++ ChangeLog 23 Nov 2008 17:46:03 -0000 1.90
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/netbeans
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.89 2008/11/23 17:05:12 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.90 2008/11/23 17:46:03 fordfrog Exp $
+
+ 23 Nov 2008; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.5-r1.ebuild:
+ Fixed issues introduced by previous update
23 Nov 2008; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.5-r1.ebuild:
Fixed issues reported by Peter Volkov <pva@gentoo.org> and Jeremy Olexa
1.3 dev-util/netbeans/netbeans-6.5-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?r1=1.2&r2=1.3
Index: netbeans-6.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- netbeans-6.5-r1.ebuild 23 Nov 2008 17:05:12 -0000 1.2
+++ netbeans-6.5-r1.ebuild 23 Nov 2008 17:46:03 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.2 2008/11/23 17:05:12 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.3 2008/11/23 17:46:03 fordfrog Exp $
EAPI="2"
WANT_SPLIT_ANT="true"
@@ -380,7 +380,7 @@
sed -e "/web\.jspparser\/external\/glassfish-jspparser-2\.0\.jar/d" -i ${tmpfile} || die
sed -e "/j2ee\.sun\.appsrv81\/external\/appservapis-2\.0\.58\.3\.jar/d" -i ${tmpfile} || die
sed -e "/j2ee\.sun\.appsrv81\/external\/org-netbeans-modules-j2ee-sun-appsrv81\.jar/d" -i ${tmpfile} || die
- sed -e "/libs\.glassfish_logging\/external\/glassfish-logging-2\.0\.jar" -i ${tmpfile} || die
+ sed -e "/libs\.glassfish_logging\/external\/glassfish-logging-2\.0\.jar/d" -i ${tmpfile} || die
sed -e "/spring\.webmvc\/external\/spring-webmvc-2\.5\.jar/d" -i ${tmpfile} || die
sed -e "/web\.jsf\/external\/shale-remoting-1\.0\.4\.jar/d" -i ${tmpfile} || die
sed -e "/websvc\.restlib\/external\/jsr311-api-doc\.jar/d" -i ${tmpfile} || die
@@ -407,7 +407,7 @@
sed -e "/mobility\.deployment\.webdav\/external\/jakarta-slide-ant-webdav-2\.1\.jar/d" -i ${tmpfile} || die
sed -e "/mobility\.j2meunit\/external\/jmunit4cldc11-1\.2\.1\.jar/d" -i ${tmpfile} || die
sed -e "/mobility\.j2meunit\/external\/jmunit4cldc10-1\.2\.1\.jar/d" -i ${tmpfile} || die
- sed -e "/svg\.perseus\/external/perseus-nb-1\.0\.jar/d" -i ${tmpfile} || die
+ sed -e "/svg\.perseus\/external\/perseus-nb-1\.0\.jar/d" -i ${tmpfile} || die
sed -e "/vmd\.components\.midp\/netbeans_midp_components_basic\/dist\/netbeans_midp_components_basic\.jar/d" -i ${tmpfile} || die
sed -e "/vmd\.components\.midp\.pda\/netbeans_midp_components_pda\/dist\/netbeans_midp_components_pda\.jar/d" -i ${tmpfile} || die
sed -e "/vmd\.components\.midp\.wma\/netbeans_midp_components_wma\/dist\/netbeans_midp_components_wma\.jar/d" -i ${tmpfile} || die
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-util/netbeans: ChangeLog netbeans-6.5-r1.ebuild
@ 2008-11-26 19:47 Miroslav Sulc (fordfrog)
0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Sulc (fordfrog) @ 2008-11-26 19:47 UTC (permalink / raw
To: gentoo-commits
fordfrog 08/11/26 19:47:07
Modified: ChangeLog netbeans-6.5-r1.ebuild
Log:
Fixed bug #248904, also fixed problem with visualweb not being installed
(Portage version: 2.1.6_rc1/cvs/Linux 2.6.27-gentoo x86_64)
Revision Changes Path
1.91 dev-util/netbeans/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?r1=1.90&r2=1.91
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- ChangeLog 23 Nov 2008 17:46:03 -0000 1.90
+++ ChangeLog 26 Nov 2008 19:47:07 -0000 1.91
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/netbeans
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.90 2008/11/23 17:46:03 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.91 2008/11/26 19:47:07 fordfrog Exp $
+
+ 26 Nov 2008; Miroslav Šulc <fordfrog@gentoo.org>
+ +files/6.5/all-visualweb.insync.JspxSerializer.java.patch,
+ netbeans-6.5-r1.ebuild:
+ Fixed bug #248904, also fixed problem with visualweb not being installed
23 Nov 2008; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.5-r1.ebuild:
Fixed issues introduced by previous update
1.4 dev-util/netbeans/netbeans-6.5-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?r1=1.3&r2=1.4
Index: netbeans-6.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- netbeans-6.5-r1.ebuild 23 Nov 2008 17:46:03 -0000 1.3
+++ netbeans-6.5-r1.ebuild 26 Nov 2008 19:47:07 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.3 2008/11/23 17:46:03 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.4 2008/11/26 19:47:07 fordfrog Exp $
EAPI="2"
WANT_SPLIT_ANT="true"
@@ -237,37 +237,65 @@
JAVA_PKG_BSFIX="off"
pkg_setup() {
- if use netbeans_modules_apisupport && ! ( use netbeans_modules_harness && use netbeans_modules_ide && use netbeans_modules_java ) ; then
- eerror "'apisupport' module requires 'harness', 'ide' and 'java' modules"
+ # direct deps: harness, ide, java
+ if use netbeans_modules_apisupport && ! ( \
+ use netbeans_modules_harness && \
+ use netbeans_modules_ide && \
+ use netbeans_modules_java && \
+ use netbeans_modules_websvccommon ) ; then
+ eerror "'apisupport' module requires 'harness', 'ide', 'java' and 'websvccommon' modules"
die
fi
+ # direct deps: ide
if use netbeans_modules_cnd && ! use netbeans_modules_ide ; then
eerror "'cnd' module requires 'ide' module"
die
fi
- if use netbeans_modules_groovy && ! (use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_java ) ; then
- eerror "'groovy' module requires 'gsf', 'ide' and 'java' modules"
+ # direct deps: gsf, ide, java
+ if use netbeans_modules_groovy && ! ( \
+ use netbeans_modules_gsf && \
+ use netbeans_modules_ide && \
+ use netbeans_modules_java && \
+ use netbeans_modules_websvccommon ) ; then
+ eerror "'groovy' module requires 'gsf', 'ide', 'java' and 'websvccommon' modules"
die
fi
+ # direct deps: ide
if use netbeans_modules_gsf && ! use netbeans_modules_ide ; then
eerror "'gsf' module requires 'ide' module"
die
fi
- if use netbeans_modules_identity && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then
- eerror "'identity' module requires 'gsf', 'ide', 'j2ee' and 'java' modules"
+ # direct deps: gsf, ide, j2ee, java
+ if use netbeans_modules_identity && ! ( \
+ use netbeans_modules_groovy && \
+ use netbeans_modules_gsf && \
+ use netbeans_modules_ide && \
+ use netbeans_modules_j2ee && \
+ use netbeans_modules_java && \
+ use netbeans_modules_websvccommon ) ; then
+ eerror "'identity' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java' and 'websvccommon' modules"
die
fi
- if use netbeans_modules_j2ee && ! ( use netbeans_modules_groovy && use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_java ) ; then
- eerror "'j2ee' module requires 'groovy', 'gsf', 'ide' and 'java' modules"
+ # direct deps: groovy, gsf, ide, java
+ if use netbeans_modules_j2ee && ! ( \
+ use netbeans_modules_groovy && \
+ use netbeans_modules_gsf && \
+ use netbeans_modules_ide && \
+ use netbeans_modules_java && \
+ use netbeans_modules_websvccommon ) ; then
+ eerror "'j2ee' module requires 'groovy', 'gsf', 'ide', 'java' and 'websvccommon' modules"
die
fi
- if use netbeans_modules_java && ! ( use netbeans_modules_ide && use netbeans_modules_websvccommon ) ; then
+ # direct deps: ide, websvccommon
+ if use netbeans_modules_java && ! ( \
+ use netbeans_modules_ide && \
+ use netbeans_modules_websvccommon ) ; then
eerror "'java' module requires 'ide' and 'websvccommon' module"
die
fi
@@ -276,51 +304,95 @@
# needed to build 'mobility' cluster
# because of bug http://www.netbeans.org/issues/show_bug.cgi?id=151538 'apisupport' cluster is also
# needed to build 'mobility' cluster
- if use netbeans_modules_mobility && ! ( use netbeans_modules_apisupport && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then
- eerror "'mobility' module requires 'apisupport', 'ide', 'j2ee' and 'java' modules"
+ # direct deps: apisupport, ide, j2ee, java
+ if use netbeans_modules_mobility && ! ( \
+ use netbeans_modules_apisupport && \
+ use netbeans_modules_groovy && \
+ use netbeans_modules_gsf && \
+ use netbeans_modules_harness && \
+ use netbeans_modules_ide && \
+ use netbeans_modules_j2ee && \
+ use netbeans_modules_java && \
+ use netbeans_modules_websvccommon ) ; then
+ eerror "'mobility' module requires 'apisupport', 'groovy', 'gsf', 'harness', 'ide', 'j2ee', 'java' and 'websvccommon' modules"
die
fi
- if use netbeans_modules_nb && ! ( use netbeans_modules_harness && use netbeans_modules_ide ) ; then
+ # direct deps: harness, ide
+ if use netbeans_modules_nb && ! ( \
+ use netbeans_modules_harness && \
+ use netbeans_modules_ide ) ; then
eerror "'nb' module requires 'harness' and 'ide' module"
die
fi
- if use netbeans_modules_php && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_websvccommon ) ; then
+ # direct deps: gsf, ide, websvccommon
+ if use netbeans_modules_php && ! ( \
+ use netbeans_modules_gsf && \
+ use netbeans_modules_ide && \
+ use netbeans_modules_websvccommon ) ; then
eerror "'php' module requires 'gsf', 'ide' and 'websvccommon' modules"
die
fi
- if use netbeans_modules_profiler && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then
- eerror "'profiler' module requires 'gsf', 'ide', 'j2ee' and 'java' modules"
+ # direct deps: gsf, ide, j2ee, java
+ if use netbeans_modules_profiler && ! ( \
+ use netbeans_modules_groovy && \
+ use netbeans_modules_gsf && \
+ use netbeans_modules_ide && \
+ use netbeans_modules_j2ee && \
+ use netbeans_modules_java && \
+ use netbeans_modules_websvccommon ) ; then
+ eerror "'profiler' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java' and 'websvccommon' modules"
die
fi
+ # direct deps: gsf, ide
#if use netbeans_modules_ruby && ! ( use netbeans_modules_gsf && use netbeans_modules_ide ) ; then
# eerror "'ruby' module requires 'gsf' and 'ide' module"
# die
#fi
- 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
- eerror "'soa' module requires 'gsf', 'ide', 'j2ee', 'java' and 'xml' modules"
+ # direct deps: gsf, ide, j2ee, java, xml
+ if use netbeans_modules_soa && ! ( \
+ use netbeans_modules_groovy && \
+ use netbeans_modules_gsf && \
+ use netbeans_modules_ide && \
+ use netbeans_modules_j2ee && \
+ use netbeans_modules_java && \
+ use netbeans_modules_websvccommon && \
+ use netbeans_modules_xml ) ; then
+ eerror "'soa' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java', 'websvccommon' and 'xml' modules"
die
fi
- if use netbeans_modules_visualweb && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then
- eerror "'visualweb' module requires 'gsf', 'ide', 'j2ee' and 'java' modules"
+ # direct deps: gsf, ide, j2ee, java
+ if use netbeans_modules_visualweb && ! ( \
+ use netbeans_modules_groovy && \
+ use netbeans_modules_gsf && \
+ use netbeans_modules_ide && \
+ use netbeans_modules_j2ee && \
+ use netbeans_modules_java && \
+ use netbeans_modules_websvccommon ) ; then
+ eerror "'visualweb' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java' and 'websvccommon' modules"
die
fi
- if use netbeans_modules_webcommon && ! ( use netbeans_modules_gsf && use netbeans_modules_ide ) ; then
+ # direct deps: gsf, ide
+ if use netbeans_modules_webcommon && ! ( \
+ use netbeans_modules_gsf && \
+ use netbeans_modules_ide ) ; then
eerror "'webcommon' module requires 'gsf' and 'ide' modules"
die
fi
+ # direct deps: ide
if use netbeans_modules_websvccommon && ! use netbeans_modules_ide ; then
eerror "'websvccommon' module requires 'ide' module"
die
fi
+ # direct deps: ide
if use netbeans_modules_xml && ! use netbeans_modules_ide ; then
eerror "'xml' module requires 'ide' module"
die
@@ -341,6 +413,11 @@
epatch "${FILESDIR}"/${SLOT}/nbbuild_build.xml.patch \
"${FILESDIR}"/${SLOT}/nbbuild_templates_projectized.xml.patch
+ if use netbeans_modules_visualweb ; then
+ cd ${S}/visualweb.insync/src/org/netbeans/modules/visualweb/insync/markup || die
+ epatch "${FILESDIR}"/${SLOT}/all-visualweb.insync.JspxSerializer.java.patch
+ fi
+
# Clean up nbbuild
einfo "Removing prebuilt *.class files from nbbuild"
find "${S}" -name "*.class" -delete
@@ -453,6 +530,7 @@
use netbeans_modules_profiler && clusters="${clusters},nb.cluster.profiler"
#use netbeans_modules_ruby && clusters="${clusters},nb.cluster.ruby"
use netbeans_modules_soa && clusters="${clusters},nb.cluster.soa"
+ use netbeans_modules_visualweb && clusters="${clusters},nb.cluster.visualweb"
use netbeans_modules_webcommon && clusters="${clusters},nb.cluster.webcommon"
use netbeans_modules_websvccommon && clusters="${clusters},nb.cluster.websvccommon"
use netbeans_modules_xml && clusters="${clusters},nb.cluster.xml"
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-util/netbeans: ChangeLog netbeans-6.5-r1.ebuild
@ 2008-11-30 1:36 Miroslav Sulc (fordfrog)
0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Sulc (fordfrog) @ 2008-11-30 1:36 UTC (permalink / raw
To: gentoo-commits
fordfrog 08/11/30 01:36:44
Modified: ChangeLog netbeans-6.5-r1.ebuild
Log:
Fixed default NETBEANS_MODULES dependency (bug #249204).
(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27-gentoo x86_64)
Revision Changes Path
1.92 dev-util/netbeans/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?r1=1.91&r2=1.92
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ChangeLog 26 Nov 2008 19:47:07 -0000 1.91
+++ ChangeLog 30 Nov 2008 01:36:44 -0000 1.92
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/netbeans
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.91 2008/11/26 19:47:07 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.92 2008/11/30 01:36:44 fordfrog Exp $
+
+ 30 Nov 2008; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.5-r1.ebuild:
+ Fixed default NETBEANS_MODULES dependency (bug #249204).
26 Nov 2008; Miroslav Šulc <fordfrog@gentoo.org>
+files/6.5/all-visualweb.insync.JspxSerializer.java.patch,
1.5 dev-util/netbeans/netbeans-6.5-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?r1=1.4&r2=1.5
Index: netbeans-6.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netbeans-6.5-r1.ebuild 26 Nov 2008 19:47:07 -0000 1.4
+++ netbeans-6.5-r1.ebuild 30 Nov 2008 01:36:44 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.4 2008/11/26 19:47:07 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.5 2008/11/30 01:36:44 fordfrog Exp $
EAPI="2"
WANT_SPLIT_ANT="true"
@@ -35,7 +35,7 @@
netbeans_modules_soa
netbeans_modules_visualweb
netbeans_modules_webcommon
- netbeans_modules_websvccommon
+ +netbeans_modules_websvccommon
netbeans_modules_xml"
IUSE_LINGUAS="
linguas_de
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-util/netbeans: ChangeLog netbeans-6.5-r1.ebuild
@ 2008-12-01 15:21 Miroslav Sulc (fordfrog)
0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Sulc (fordfrog) @ 2008-12-01 15:21 UTC (permalink / raw
To: gentoo-commits
fordfrog 08/12/01 15:21:15
Modified: ChangeLog netbeans-6.5-r1.ebuild
Log:
Netbeans still depends on com.sun packages so added dependency on java-virtuals/jdk-with-com-sun.
(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27-gentoo x86_64)
Revision Changes Path
1.93 dev-util/netbeans/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?r1=1.92&r2=1.93
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- ChangeLog 30 Nov 2008 01:36:44 -0000 1.92
+++ ChangeLog 1 Dec 2008 15:21:15 -0000 1.93
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/netbeans
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.92 2008/11/30 01:36:44 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.93 2008/12/01 15:21:15 fordfrog Exp $
+
+ 01 Dec 2008; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.5-r1.ebuild:
+ Netbeans still depends on com.sun packages so added dependency on
+ java-virtuals/jdk-with-com-sun.
30 Nov 2008; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.5-r1.ebuild:
Fixed default NETBEANS_MODULES dependency (bug #249204).
1.6 dev-util/netbeans/netbeans-6.5-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?r1=1.5&r2=1.6
Index: netbeans-6.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- netbeans-6.5-r1.ebuild 30 Nov 2008 01:36:44 -0000 1.5
+++ netbeans-6.5-r1.ebuild 1 Dec 2008 15:21:15 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.5 2008/11/30 01:36:44 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.6 2008/12/01 15:21:15 fordfrog Exp $
EAPI="2"
WANT_SPLIT_ANT="true"
@@ -53,6 +53,7 @@
IUSE="debug doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
RDEPEND=">=virtual/jdk-1.5
+ java-virtuals/jdk-with-com-sun
>=dev-java/ant-core-1.7.1_beta2
netbeans_modules_gsf? (
dev-java/bytelist:0
@@ -153,6 +154,7 @@
DEPEND=">=virtual/jdk-1.5
+ java-virtuals/jdk-with-com-sun
app-arch/unzip
>=dev-java/ant-core-1.7.1_beta2
>=dev-java/ant-nodeps-1.7.1
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-12-01 15:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-30 1:36 [gentoo-commits] gentoo-x86 commit in dev-util/netbeans: ChangeLog netbeans-6.5-r1.ebuild Miroslav Sulc (fordfrog)
-- strict thread matches above, loose matches on Subject: below --
2008-12-01 15:21 Miroslav Sulc (fordfrog)
2008-11-26 19:47 Miroslav Sulc (fordfrog)
2008-11-23 17:46 Miroslav Sulc (fordfrog)
2008-11-23 17:05 Miroslav Sulc (fordfrog)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox