From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/
Date: Sat, 2 Jun 2012 11:56:38 +0000 (UTC) [thread overview]
Message-ID: <1338636205.b5c91cb45dcf606e71b05322f4b8651f00522be1.fordfrog@gentoo> (raw)
commit: b5c91cb45dcf606e71b05322f4b8651f00522be1
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 2 11:23:25 2012 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun 2 11:23:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=b5c91cb4
dev-java/netbeans-ide: unbundled more stuff and cleanup
---
dev-java/netbeans-ide/ChangeLog | 4 +
dev-java/netbeans-ide/Manifest | 6 +-
...beta.ebuild => netbeans-ide-7.2_beta-r1.ebuild} | 64 +++-----------------
...build => netbeans-ide-9999_p20120530-r1.ebuild} | 64 +++-----------------
4 files changed, 25 insertions(+), 113 deletions(-)
diff --git a/dev-java/netbeans-ide/ChangeLog b/dev-java/netbeans-ide/ChangeLog
index 6d773c6..f15e84c 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 02 Jun 2012; Miroslav Šulc <fordfrog@gentoo.org>
+ -netbeans-ide-7.2_beta.ebuild, -netbeans-ide-9999_p20120530.ebuild:
+ unbundled more stuff and cleanup
+
01 Jun 2012; Miroslav Šulc <fordfrog@gentoo.org>
-netbeans-ide-9999_p20120520.ebuild:
removed obsolete version
diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 2dbe9ee..bcd4bef 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -91,9 +91,9 @@ DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9
DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
EBUILD netbeans-ide-7.0.1.ebuild 22653 RMD160 fe693a0abc3253af1850b99bfb4fa0d9a488bd94 SHA1 5b6547694a3193ce89cc2a5dfb8fc134cb81fabe SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356
EBUILD netbeans-ide-7.1.2.ebuild 26834 RMD160 b07d2029d3d736034251b8e3a7b6778d99d14491 SHA1 3236b1541c713cb6fb444725d3b29f6645eb9b19 SHA256 1e57e60a1a00b4530f917319b5d8eef915b9669b9dd3ab82b5afabe171d8959a
-EBUILD netbeans-ide-7.2_beta.ebuild 26873 RMD160 86569fa75b1d41ea96c78721aa998381a52894fa SHA1 c3cb625a7004f96221908e1889c54657ab4dca54 SHA256 1d639a8457bc2bec65af9c148f1430170b061afde16b446d41248dbb181165b2
+EBUILD netbeans-ide-7.2_beta-r1.ebuild 24424 RMD160 c2b048c1cc14cddd882d4bc0a5a3ab87f4e7e687 SHA1 4a84d8ba96716708c8ba712e038fa9f7d20788f8 SHA256 a447660c5d3a65a3c4a2b5c679106ab3dd7b8e747f3dca18d794365405ec4b7c
EBUILD netbeans-ide-9999_p20120524.ebuild 26927 RMD160 5e0042cbf6939d90930b1482e08ef55ab89cbbfa SHA1 61173a5481f9f66482d009edc3ca5c4264a5e076 SHA256 e2e89b08b78148ff8f3a7fa2eeaee5554370a4c6bf037cbff7878dc8995b8ecb
EBUILD netbeans-ide-9999_p20120527.ebuild 26927 RMD160 0f38f55b7acc6371618b87bb8f1c661d853cde0e SHA1 b90d5cc205a041757f460625f65e2955c58e9c34 SHA256 69eeae78ce7671bdcfecdf4da6ccdb65f3e437d8d7d1d58ebbb8229b03e3631c
-EBUILD netbeans-ide-9999_p20120530.ebuild 26927 RMD160 3ab37120f25fb9a892dade2b0f15f2bffcabbee2 SHA1 231ac4e3f047290666411f0a5b3fada815357216 SHA256 fab44260973bc896b993778e1fc92360799cc45286a19e2165c094284e7ab243
-MISC ChangeLog 34530 RMD160 30f760738b1bf4bc164cbf0f128882fb7d7ff858 SHA1 977acf823d1da33389499deb58c255cb1a55ae20 SHA256 3262389028ad1e63c2b5d67cf98d539d6a93633692fcad7cf59fb789e3ef91ae
+EBUILD netbeans-ide-9999_p20120530-r1.ebuild 24478 RMD160 b42fcd26bb3d57a44f77639b3c134d810df7c409 SHA1 6bd0fc4e3190f9eb67a56a51c39ca581c7670f4b SHA256 40c8b1e9de9e961c162737c511e13a8db18ae485c44760606c457ce4c8291742
+MISC ChangeLog 34688 RMD160 be1150724bf9e116d0a09b568711b2d37fdb4405 SHA1 74d90eeb9f6967d34059f608e129acaa60c22f52 SHA256 108deb5e99ab693054e14d57d46c4e15e33ddb13cdf44a344a868495f7903f03
MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-ide/netbeans-ide-7.2_beta.ebuild b/dev-java/netbeans-ide/netbeans-ide-7.2_beta-r1.ebuild
similarity index 88%
rename from dev-java/netbeans-ide/netbeans-ide-7.2_beta.ebuild
rename to dev-java/netbeans-ide/netbeans-ide-7.2_beta-r1.ebuild
index dc7e0d8..cf1997e 100644
--- a/dev-java/netbeans-ide/netbeans-ide-7.2_beta.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-7.2_beta-r1.ebuild
@@ -34,11 +34,9 @@ SRC_URI="${SOURCE_URL}
http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar
http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar
http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar
- http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar
http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip
http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip
http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
- http://hg.netbeans.org/binaries/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar
http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar
http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar
http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar
@@ -93,6 +91,8 @@ CDEPEND="~dev-java/netbeans-harness-${PV}
dev-java/jsr173:0
dev-java/jvyamlb:0
dev-java/log4j:0
+ dev-java/lucene:3.5
+ dev-java/rhino:1.6
dev-java/saxon:9
dev-java/smack:2.2
dev-java/sun-jaf:0
@@ -100,11 +100,11 @@ CDEPEND="~dev-java/netbeans-harness-${PV}
dev-java/ws-commons-util:0
dev-java/xerces:2
dev-vcs/subversion:0[java]"
-# dev-java/lucene:3.5 we do not have slot 3.5 yet
-# dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
# app-text/jing:0 our version is probably too old
+# dev-java/commons-io fails with following error:
+# Missing manifest tag OpenIDE-Module; /var/tmp/portage/dev-java/netbeans-ide-9999_p20110911/work/nbbuild/netbeans/ide/modules/org-apache-commons-io.jar is not a module
# dev-java/ini4j:0 our version is too old
-# java-virtuals/jaf:0 could use this instead of sun-jaf but it returns empty classpath
+# dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
# dev-java/trilead-ssh2:0 in overlay
DEPEND="virtual/jdk:1.6
app-arch/unzip
@@ -137,8 +137,6 @@ src_unpack() {
ln -s "${DISTDIR}"/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar libs.antlr3.runtime/external/antlr-runtime-3.3.jar || die
ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
ln -s "${DISTDIR}"/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar libs.commons_net/external/commons-net-3.0.1.jar || die
- # system commons-io fails with following error:
- # Missing manifest tag OpenIDE-Module; /var/tmp/portage/dev-java/netbeans-ide-9999_p20110911/work/nbbuild/netbeans/ide/modules/org-apache-commons-io.jar is not a module
ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar ||die
ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
ln -s "${DISTDIR}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
@@ -158,11 +156,9 @@ src_unpack() {
ln -s "${DISTDIR}"/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
ln -s "${DISTDIR}"/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
ln -s "${DISTDIR}"/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar html.validation/external/jing.jar || die
- ln -s "${DISTDIR}"/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar html.validation/external/js.jar || die
ln -s "${DISTDIR}"/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip javascript.editing/external/js-domstubs.zip || die
ln -s "${DISTDIR}"/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip javascript.editing/external/jsstubs.zip || die
ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.destroy/external/libpam4j-1.1.jar || die
- ln -s "${DISTDIR}"/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar libs.lucene/external/lucene-core-3.5.0.jar || die
ln -s "${DISTDIR}"/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar html.validation/external/non-schema.jar || die
ln -s "${DISTDIR}"/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype-3.4.100.jar || die
ln -s "${DISTDIR}"/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.1.jar || die
@@ -247,20 +243,15 @@ src_prepare() {
java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
java-pkg_jar-from --into extexecution.destroy/external commons-io-1 commons-io.jar commons-io-1.4.jar
java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_0.jar
- # java-pkg_jar-from --into html.validation/external jing jing.jar jing.jar
java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+ java-pkg_jar-from --into html.validation/external rhino-1.6 js.jar js.jar
java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
- # java-pkg_jar-from --into libs.antlr3.runtime/external antlr-3 antlr3.jar antlr-runtime-3.1.3.jar
- # java-pkg_jar-from --into libs.commons_net/external commons-net commons-net.jar commons-net-1.4.1.jar
java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.8.jar
- # java-pkg_jar-from --into libs.ini4j/external ini4j ini4j.jar ini4j-0.5.1.jar
- # java-pkg_jar-from --into libs.jaxb/external jaxb-2 jaxb-impl.jar jaxb-impl.jar
java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
- # java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+ java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.7.2.jar
- # java-pkg_jar-from --into libs.svnClientAdapter.svnkit/external trilead-ssh2 trilead-ssh2.jar trilead.jar
java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
@@ -269,7 +260,6 @@ src_prepare() {
java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
- # java-pkg_jar-from --into xml.jaxb.api/external jaxb-2 jaxb-api.jar jaxb-api.jar
java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_api.jar
java-pkg-2_src_prepare
@@ -320,65 +310,29 @@ src_install() {
local instdir=${INSTALL_DIR}/modules/ext
pushd "${D}"/${instdir} >/dev/null || die
- # rm antlr-runtime-3.1.3.jar && dosym /usr/share/antlr-3/lib/antlr3.jar ${instdir}/antlr-runtime-3.1.3.jar || die
- # bytelist-0.1.jar
- # rm commons-net-1.4.1.jar && dosym /usr/share/commons-net/lib/commons-net.jar ${instdir}/commons-net-1.4.1.jar || die
- # ddl.jar
rm freemarker-2.3.8.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.8.jar || die
- # html5-datatypes.jar
- # html5-parser.jar
rm icu4j-4_0.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_0.jar || die
- # [[ -f ini4j-0.5.1.jar ]] && java-pkg_jar-from ini4j ini4j.jar ${instdir}/ini4j-0.5.1.jar || die
- # io-xml-util.jar
- # iri.jar
- # isorelax20041111.jar
- # [[ -f jing.jar ]] && java-pkg_jar-from jing jing.jar ${instdir}/jing.jar || die
- # js.jar
+ rm js.jar && dosym /usr/share/rhino-1.6/lib/js.jar ${instdir}/js.jar || die
rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
- # libpam4j-1.1.jar
rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
- # rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+ rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
rm mysql-connector-java-5.1.18-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.18-bin.jar || die
- # non-schema.jar
- # org.eclipse.mylyn.bugzilla.core_3.3.1.jar
- # org.eclipse.mylyn.commons.core_3.3.1.jar
- # org.eclipse.mylyn.commons.net_3.3.0.jar
- # org.eclipse.mylyn.tasks.core_3.3.1.jar
- # org-netbeans-tax.jar
rm postgresql-9.1-901.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.1-901.jdbc4.jar || die
- # processtreekiller-1.0.1.jar
- # resolver-1.2.jar
rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
- # sqljet-1.0.3.jar
- # svnClientAdapter-javahl-1.6.13.jar
- # svnClientAdapter-main-1.6.13.jar
- # svnClientAdapter-svnkit-1.6.13.jar
rm svnjavahl-1.7.2.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl-1.7.2.jar || die
- # svnkit-javahl.jar
- # svnkit-1.3.4.jar
- # swingx-0.9.5.jar
- # [[ -f trilead.jar ]] && java-pkg_jar-from trilead-ssh2 trilead-ssh2.jar ${instdir}/trilead.jar || die
- # ValidationAPI.jar
- # validator.jar
- # webserver.jar
- # winp-1.14-patched.jar
rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
popd >/dev/null || die
local instdir=${INSTALL_DIR}/modules/ext/jaxb
pushd "${D}"/${instdir} >/dev/null || die
rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
- # [[ -f jaxb-impl.jar ]] && java-pkg_jar-from jaxb-2 jaxb-impl.jar ${instdir}/jaxb-impl.jar || die
- # jaxb-xjc.jar
- # jaxb1-impl.jar
popd >/dev/null || die
local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
pushd "${D}"/${instdir} >/dev/null || die
- # [[ -f jaxb-api.jar ]] && java-pkg_jar-from jaxb-2 jaxb-api.jar ${instdir}/jaxb-api.jar || die
rm jsr173_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_api.jar || die
popd >/dev/null || die
diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20120530.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20120530-r1.ebuild
similarity index 88%
rename from dev-java/netbeans-ide/netbeans-ide-9999_p20120530.ebuild
rename to dev-java/netbeans-ide/netbeans-ide-9999_p20120530-r1.ebuild
index edea0e7..26341a5 100644
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20120530.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20120530-r1.ebuild
@@ -34,11 +34,9 @@ SRC_URI="${SOURCE_URL}
http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar
- http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar
http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip
http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip
http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
- http://hg.netbeans.org/binaries/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar
http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar
http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar
http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar
@@ -93,6 +91,8 @@ CDEPEND="~dev-java/netbeans-harness-${PV}
dev-java/jsr173:0
dev-java/jvyamlb:0
dev-java/log4j:0
+ dev-java/lucene:3.5
+ dev-java/rhino:1.6
dev-java/saxon:9
dev-java/smack:2.2
dev-java/sun-jaf:0
@@ -100,11 +100,11 @@ CDEPEND="~dev-java/netbeans-harness-${PV}
dev-java/ws-commons-util:0
dev-java/xerces:2
dev-vcs/subversion:0[java]"
-# dev-java/lucene:3.5 we do not have slot 3.5 yet
-# dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
# app-text/jing:0 our version is probably too old
+# dev-java/commons-io fails with following error:
+# Missing manifest tag OpenIDE-Module; /var/tmp/portage/dev-java/netbeans-ide-9999_p20110911/work/nbbuild/netbeans/ide/modules/org-apache-commons-io.jar is not a module
# dev-java/ini4j:0 our version is too old
-# java-virtuals/jaf:0 could use this instead of sun-jaf but it returns empty classpath
+# dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
# dev-java/trilead-ssh2:0 in overlay
DEPEND="virtual/jdk:1.6
app-arch/unzip
@@ -137,8 +137,6 @@ src_unpack() {
ln -s "${DISTDIR}"/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar libs.antlr3.runtime/external/antlr-runtime-3.3.jar || die
ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
ln -s "${DISTDIR}"/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar libs.commons_net/external/commons-net-3.0.1.jar || die
- # system commons-io fails with following error:
- # Missing manifest tag OpenIDE-Module; /var/tmp/portage/dev-java/netbeans-ide-9999_p20110911/work/nbbuild/netbeans/ide/modules/org-apache-commons-io.jar is not a module
ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar ||die
ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
ln -s "${DISTDIR}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
@@ -158,11 +156,9 @@ src_unpack() {
ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
ln -s "${DISTDIR}"/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar html.validation/external/jing.jar || die
- ln -s "${DISTDIR}"/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar html.validation/external/js.jar || die
ln -s "${DISTDIR}"/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip javascript.editing/external/js-domstubs.zip || die
ln -s "${DISTDIR}"/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip javascript.editing/external/jsstubs.zip || die
ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.destroy/external/libpam4j-1.1.jar || die
- ln -s "${DISTDIR}"/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar libs.lucene/external/lucene-core-3.5.0.jar || die
ln -s "${DISTDIR}"/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar html.validation/external/non-schema.jar || die
ln -s "${DISTDIR}"/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype-3.4.100.jar || die
ln -s "${DISTDIR}"/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.1.jar || die
@@ -247,20 +243,15 @@ src_prepare() {
java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
java-pkg_jar-from --into extexecution.destroy/external commons-io-1 commons-io.jar commons-io-1.4.jar
java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_0.jar
- # java-pkg_jar-from --into html.validation/external jing jing.jar jing.jar
java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+ java-pkg_jar-from --into html.validation/external rhino-1.6 js.jar js.jar
java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
- # java-pkg_jar-from --into libs.antlr3.runtime/external antlr-3 antlr3.jar antlr-runtime-3.1.3.jar
- # java-pkg_jar-from --into libs.commons_net/external commons-net commons-net.jar commons-net-1.4.1.jar
java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.8.jar
- # java-pkg_jar-from --into libs.ini4j/external ini4j ini4j.jar ini4j-0.5.1.jar
- # java-pkg_jar-from --into libs.jaxb/external jaxb-2 jaxb-impl.jar jaxb-impl.jar
java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
- # java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+ java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.7.2.jar
- # java-pkg_jar-from --into libs.svnClientAdapter.svnkit/external trilead-ssh2 trilead-ssh2.jar trilead.jar
java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
@@ -269,7 +260,6 @@ src_prepare() {
java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
- # java-pkg_jar-from --into xml.jaxb.api/external jaxb-2 jaxb-api.jar jaxb-api.jar
java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
java-pkg-2_src_prepare
@@ -320,65 +310,29 @@ src_install() {
local instdir=${INSTALL_DIR}/modules/ext
pushd "${D}"/${instdir} >/dev/null || die
- # rm antlr-runtime-3.1.3.jar && dosym /usr/share/antlr-3/lib/antlr3.jar ${instdir}/antlr-runtime-3.1.3.jar || die
- # bytelist-0.1.jar
- # rm commons-net-1.4.1.jar && dosym /usr/share/commons-net/lib/commons-net.jar ${instdir}/commons-net-1.4.1.jar || die
- # ddl.jar
rm freemarker-2.3.8.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.8.jar || die
- # html5-datatypes.jar
- # html5-parser.jar
rm icu4j-4_0.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_0.jar || die
- # [[ -f ini4j-0.5.1.jar ]] && java-pkg_jar-from ini4j ini4j.jar ${instdir}/ini4j-0.5.1.jar || die
- # io-xml-util.jar
- # iri.jar
- # isorelax20041111.jar
- # [[ -f jing.jar ]] && java-pkg_jar-from jing jing.jar ${instdir}/jing.jar || die
- # js.jar
+ rm js.jar && dosym /usr/share/rhino-1.6/lib/js.jar ${instdir}/js.jar || die
rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
- # libpam4j-1.1.jar
rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
- # rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+ rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
rm mysql-connector-java-5.1.18-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.18-bin.jar || die
- # non-schema.jar
- # org.eclipse.mylyn.bugzilla.core_3.3.1.jar
- # org.eclipse.mylyn.commons.core_3.3.1.jar
- # org.eclipse.mylyn.commons.net_3.3.0.jar
- # org.eclipse.mylyn.tasks.core_3.3.1.jar
- # org-netbeans-tax.jar
rm postgresql-9.1-901.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.1-901.jdbc4.jar || die
- # processtreekiller-1.0.1.jar
- # resolver-1.2.jar
rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
- # sqljet-1.0.3.jar
- # svnClientAdapter-javahl-1.6.13.jar
- # svnClientAdapter-main-1.6.13.jar
- # svnClientAdapter-svnkit-1.6.13.jar
rm svnjavahl-1.7.2.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl-1.7.2.jar || die
- # svnkit-javahl.jar
- # svnkit-1.3.4.jar
- # swingx-0.9.5.jar
- # [[ -f trilead.jar ]] && java-pkg_jar-from trilead-ssh2 trilead-ssh2.jar ${instdir}/trilead.jar || die
- # ValidationAPI.jar
- # validator.jar
- # webserver.jar
- # winp-1.14-patched.jar
rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
popd >/dev/null || die
local instdir=${INSTALL_DIR}/modules/ext/jaxb
pushd "${D}"/${instdir} >/dev/null || die
rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
- # [[ -f jaxb-impl.jar ]] && java-pkg_jar-from jaxb-2 jaxb-impl.jar ${instdir}/jaxb-impl.jar || die
- # jaxb-xjc.jar
- # jaxb1-impl.jar
popd >/dev/null || die
local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
pushd "${D}"/${instdir} >/dev/null || die
- # [[ -f jaxb-api.jar ]] && java-pkg_jar-from jaxb-2 jaxb-api.jar ${instdir}/jaxb-api.jar || die
rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
popd >/dev/null || die
next reply other threads:[~2012-06-02 11:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-02 11:56 Miroslav Šulc [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-10-13 9:47 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/ Miroslav Šulc
2016-03-02 12:38 Miroslav Šulc
2016-02-23 16:28 Miroslav Šulc
2012-09-14 20:12 Miroslav Šulc
2012-06-06 9:50 Miroslav Šulc
2011-08-22 12:02 Miroslav Šulc
2011-03-30 19:26 Miroslav Šulc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1338636205.b5c91cb45dcf606e71b05322f4b8651f00522be1.fordfrog@gentoo \
--to=fordfrog@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox