| 1 |
commit: b5c91cb45dcf606e71b05322f4b8651f00522be1 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 2 11:23:25 2012 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 2 11:23:25 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=b5c91cb4 |
| 7 |
|
| 8 |
dev-java/netbeans-ide: unbundled more stuff and cleanup |
| 9 |
|
| 10 |
--- |
| 11 |
dev-java/netbeans-ide/ChangeLog | 4 + |
| 12 |
dev-java/netbeans-ide/Manifest | 6 +- |
| 13 |
...beta.ebuild => netbeans-ide-7.2_beta-r1.ebuild} | 64 +++----------------- |
| 14 |
...build => netbeans-ide-9999_p20120530-r1.ebuild} | 64 +++----------------- |
| 15 |
4 files changed, 25 insertions(+), 113 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-java/netbeans-ide/ChangeLog b/dev-java/netbeans-ide/ChangeLog |
| 18 |
index 6d773c6..f15e84c 100644 |
| 19 |
--- a/dev-java/netbeans-ide/ChangeLog |
| 20 |
+++ b/dev-java/netbeans-ide/ChangeLog |
| 21 |
@@ -2,6 +2,10 @@ |
| 22 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
+ 02 Jun 2012; Miroslav Šulc <fordfrog@g.o> |
| 26 |
+ -netbeans-ide-7.2_beta.ebuild, -netbeans-ide-9999_p20120530.ebuild: |
| 27 |
+ unbundled more stuff and cleanup |
| 28 |
+ |
| 29 |
01 Jun 2012; Miroslav Šulc <fordfrog@g.o> |
| 30 |
-netbeans-ide-9999_p20120520.ebuild: |
| 31 |
removed obsolete version |
| 32 |
|
| 33 |
diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest |
| 34 |
index 2dbe9ee..bcd4bef 100644 |
| 35 |
--- a/dev-java/netbeans-ide/Manifest |
| 36 |
+++ b/dev-java/netbeans-ide/Manifest |
| 37 |
@@ -91,9 +91,9 @@ DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9 |
| 38 |
DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24 |
| 39 |
EBUILD netbeans-ide-7.0.1.ebuild 22653 RMD160 fe693a0abc3253af1850b99bfb4fa0d9a488bd94 SHA1 5b6547694a3193ce89cc2a5dfb8fc134cb81fabe SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356 |
| 40 |
EBUILD netbeans-ide-7.1.2.ebuild 26834 RMD160 b07d2029d3d736034251b8e3a7b6778d99d14491 SHA1 3236b1541c713cb6fb444725d3b29f6645eb9b19 SHA256 1e57e60a1a00b4530f917319b5d8eef915b9669b9dd3ab82b5afabe171d8959a |
| 41 |
-EBUILD netbeans-ide-7.2_beta.ebuild 26873 RMD160 86569fa75b1d41ea96c78721aa998381a52894fa SHA1 c3cb625a7004f96221908e1889c54657ab4dca54 SHA256 1d639a8457bc2bec65af9c148f1430170b061afde16b446d41248dbb181165b2 |
| 42 |
+EBUILD netbeans-ide-7.2_beta-r1.ebuild 24424 RMD160 c2b048c1cc14cddd882d4bc0a5a3ab87f4e7e687 SHA1 4a84d8ba96716708c8ba712e038fa9f7d20788f8 SHA256 a447660c5d3a65a3c4a2b5c679106ab3dd7b8e747f3dca18d794365405ec4b7c |
| 43 |
EBUILD netbeans-ide-9999_p20120524.ebuild 26927 RMD160 5e0042cbf6939d90930b1482e08ef55ab89cbbfa SHA1 61173a5481f9f66482d009edc3ca5c4264a5e076 SHA256 e2e89b08b78148ff8f3a7fa2eeaee5554370a4c6bf037cbff7878dc8995b8ecb |
| 44 |
EBUILD netbeans-ide-9999_p20120527.ebuild 26927 RMD160 0f38f55b7acc6371618b87bb8f1c661d853cde0e SHA1 b90d5cc205a041757f460625f65e2955c58e9c34 SHA256 69eeae78ce7671bdcfecdf4da6ccdb65f3e437d8d7d1d58ebbb8229b03e3631c |
| 45 |
-EBUILD netbeans-ide-9999_p20120530.ebuild 26927 RMD160 3ab37120f25fb9a892dade2b0f15f2bffcabbee2 SHA1 231ac4e3f047290666411f0a5b3fada815357216 SHA256 fab44260973bc896b993778e1fc92360799cc45286a19e2165c094284e7ab243 |
| 46 |
-MISC ChangeLog 34530 RMD160 30f760738b1bf4bc164cbf0f128882fb7d7ff858 SHA1 977acf823d1da33389499deb58c255cb1a55ae20 SHA256 3262389028ad1e63c2b5d67cf98d539d6a93633692fcad7cf59fb789e3ef91ae |
| 47 |
+EBUILD netbeans-ide-9999_p20120530-r1.ebuild 24478 RMD160 b42fcd26bb3d57a44f77639b3c134d810df7c409 SHA1 6bd0fc4e3190f9eb67a56a51c39ca581c7670f4b SHA256 40c8b1e9de9e961c162737c511e13a8db18ae485c44760606c457ce4c8291742 |
| 48 |
+MISC ChangeLog 34688 RMD160 be1150724bf9e116d0a09b568711b2d37fdb4405 SHA1 74d90eeb9f6967d34059f608e129acaa60c22f52 SHA256 108deb5e99ab693054e14d57d46c4e15e33ddb13cdf44a344a868495f7903f03 |
| 49 |
MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 |
| 50 |
|
| 51 |
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 |
| 52 |
similarity index 88% |
| 53 |
rename from dev-java/netbeans-ide/netbeans-ide-7.2_beta.ebuild |
| 54 |
rename to dev-java/netbeans-ide/netbeans-ide-7.2_beta-r1.ebuild |
| 55 |
index dc7e0d8..cf1997e 100644 |
| 56 |
--- a/dev-java/netbeans-ide/netbeans-ide-7.2_beta.ebuild |
| 57 |
+++ b/dev-java/netbeans-ide/netbeans-ide-7.2_beta-r1.ebuild |
| 58 |
@@ -34,11 +34,9 @@ SRC_URI="${SOURCE_URL} |
| 59 |
http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar |
| 60 |
http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar |
| 61 |
http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar |
| 62 |
- http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar |
| 63 |
http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip |
| 64 |
http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip |
| 65 |
http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar |
| 66 |
- http://hg.netbeans.org/binaries/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar |
| 67 |
http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar |
| 68 |
http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar |
| 69 |
http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar |
| 70 |
@@ -93,6 +91,8 @@ CDEPEND="~dev-java/netbeans-harness-${PV} |
| 71 |
dev-java/jsr173:0 |
| 72 |
dev-java/jvyamlb:0 |
| 73 |
dev-java/log4j:0 |
| 74 |
+ dev-java/lucene:3.5 |
| 75 |
+ dev-java/rhino:1.6 |
| 76 |
dev-java/saxon:9 |
| 77 |
dev-java/smack:2.2 |
| 78 |
dev-java/sun-jaf:0 |
| 79 |
@@ -100,11 +100,11 @@ CDEPEND="~dev-java/netbeans-harness-${PV} |
| 80 |
dev-java/ws-commons-util:0 |
| 81 |
dev-java/xerces:2 |
| 82 |
dev-vcs/subversion:0[java]" |
| 83 |
-# dev-java/lucene:3.5 we do not have slot 3.5 yet |
| 84 |
-# dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours |
| 85 |
# app-text/jing:0 our version is probably too old |
| 86 |
+# dev-java/commons-io fails with following error: |
| 87 |
+# 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 |
| 88 |
# dev-java/ini4j:0 our version is too old |
| 89 |
-# java-virtuals/jaf:0 could use this instead of sun-jaf but it returns empty classpath |
| 90 |
+# dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours |
| 91 |
# dev-java/trilead-ssh2:0 in overlay |
| 92 |
DEPEND="virtual/jdk:1.6 |
| 93 |
app-arch/unzip |
| 94 |
@@ -137,8 +137,6 @@ src_unpack() { |
| 95 |
ln -s "${DISTDIR}"/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar libs.antlr3.runtime/external/antlr-runtime-3.3.jar || die |
| 96 |
ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die |
| 97 |
ln -s "${DISTDIR}"/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar libs.commons_net/external/commons-net-3.0.1.jar || die |
| 98 |
- # system commons-io fails with following error: |
| 99 |
- # 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 |
| 100 |
ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar ||die |
| 101 |
ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die |
| 102 |
ln -s "${DISTDIR}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die |
| 103 |
@@ -158,11 +156,9 @@ src_unpack() { |
| 104 |
ln -s "${DISTDIR}"/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die |
| 105 |
ln -s "${DISTDIR}"/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die |
| 106 |
ln -s "${DISTDIR}"/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar html.validation/external/jing.jar || die |
| 107 |
- ln -s "${DISTDIR}"/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar html.validation/external/js.jar || die |
| 108 |
ln -s "${DISTDIR}"/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip javascript.editing/external/js-domstubs.zip || die |
| 109 |
ln -s "${DISTDIR}"/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip javascript.editing/external/jsstubs.zip || die |
| 110 |
ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.destroy/external/libpam4j-1.1.jar || die |
| 111 |
- ln -s "${DISTDIR}"/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar libs.lucene/external/lucene-core-3.5.0.jar || die |
| 112 |
ln -s "${DISTDIR}"/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar html.validation/external/non-schema.jar || die |
| 113 |
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 |
| 114 |
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 |
| 115 |
@@ -247,20 +243,15 @@ src_prepare() { |
| 116 |
java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar |
| 117 |
java-pkg_jar-from --into extexecution.destroy/external commons-io-1 commons-io.jar commons-io-1.4.jar |
| 118 |
java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_0.jar |
| 119 |
- # java-pkg_jar-from --into html.validation/external jing jing.jar jing.jar |
| 120 |
java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar |
| 121 |
+ java-pkg_jar-from --into html.validation/external rhino-1.6 js.jar js.jar |
| 122 |
java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar |
| 123 |
- # java-pkg_jar-from --into libs.antlr3.runtime/external antlr-3 antlr3.jar antlr-runtime-3.1.3.jar |
| 124 |
- # java-pkg_jar-from --into libs.commons_net/external commons-net commons-net.jar commons-net-1.4.1.jar |
| 125 |
java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.8.jar |
| 126 |
- # java-pkg_jar-from --into libs.ini4j/external ini4j ini4j.jar ini4j-0.5.1.jar |
| 127 |
- # java-pkg_jar-from --into libs.jaxb/external jaxb-2 jaxb-impl.jar jaxb-impl.jar |
| 128 |
java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar |
| 129 |
- # java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar |
| 130 |
+ java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar |
| 131 |
java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar |
| 132 |
java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar |
| 133 |
java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.7.2.jar |
| 134 |
- # java-pkg_jar-from --into libs.svnClientAdapter.svnkit/external trilead-ssh2 trilead-ssh2.jar trilead.jar |
| 135 |
java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar |
| 136 |
java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar |
| 137 |
java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar |
| 138 |
@@ -269,7 +260,6 @@ src_prepare() { |
| 139 |
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 |
| 140 |
java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar |
| 141 |
java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar |
| 142 |
- # java-pkg_jar-from --into xml.jaxb.api/external jaxb-2 jaxb-api.jar jaxb-api.jar |
| 143 |
java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_api.jar |
| 144 |
|
| 145 |
java-pkg-2_src_prepare |
| 146 |
@@ -320,65 +310,29 @@ src_install() { |
| 147 |
|
| 148 |
local instdir=${INSTALL_DIR}/modules/ext |
| 149 |
pushd "${D}"/${instdir} >/dev/null || die |
| 150 |
- # rm antlr-runtime-3.1.3.jar && dosym /usr/share/antlr-3/lib/antlr3.jar ${instdir}/antlr-runtime-3.1.3.jar || die |
| 151 |
- # bytelist-0.1.jar |
| 152 |
- # rm commons-net-1.4.1.jar && dosym /usr/share/commons-net/lib/commons-net.jar ${instdir}/commons-net-1.4.1.jar || die |
| 153 |
- # ddl.jar |
| 154 |
rm freemarker-2.3.8.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.8.jar || die |
| 155 |
- # html5-datatypes.jar |
| 156 |
- # html5-parser.jar |
| 157 |
rm icu4j-4_0.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_0.jar || die |
| 158 |
- # [[ -f ini4j-0.5.1.jar ]] && java-pkg_jar-from ini4j ini4j.jar ${instdir}/ini4j-0.5.1.jar || die |
| 159 |
- # io-xml-util.jar |
| 160 |
- # iri.jar |
| 161 |
- # isorelax20041111.jar |
| 162 |
- # [[ -f jing.jar ]] && java-pkg_jar-from jing jing.jar ${instdir}/jing.jar || die |
| 163 |
- # js.jar |
| 164 |
+ rm js.jar && dosym /usr/share/rhino-1.6/lib/js.jar ${instdir}/js.jar || die |
| 165 |
rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die |
| 166 |
- # libpam4j-1.1.jar |
| 167 |
rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die |
| 168 |
- # 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 |
| 169 |
+ 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 |
| 170 |
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 |
| 171 |
- # non-schema.jar |
| 172 |
- # org.eclipse.mylyn.bugzilla.core_3.3.1.jar |
| 173 |
- # org.eclipse.mylyn.commons.core_3.3.1.jar |
| 174 |
- # org.eclipse.mylyn.commons.net_3.3.0.jar |
| 175 |
- # org.eclipse.mylyn.tasks.core_3.3.1.jar |
| 176 |
- # org-netbeans-tax.jar |
| 177 |
rm postgresql-9.1-901.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.1-901.jdbc4.jar || die |
| 178 |
- # processtreekiller-1.0.1.jar |
| 179 |
- # resolver-1.2.jar |
| 180 |
rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die |
| 181 |
rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die |
| 182 |
rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die |
| 183 |
rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die |
| 184 |
- # sqljet-1.0.3.jar |
| 185 |
- # svnClientAdapter-javahl-1.6.13.jar |
| 186 |
- # svnClientAdapter-main-1.6.13.jar |
| 187 |
- # svnClientAdapter-svnkit-1.6.13.jar |
| 188 |
rm svnjavahl-1.7.2.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl-1.7.2.jar || die |
| 189 |
- # svnkit-javahl.jar |
| 190 |
- # svnkit-1.3.4.jar |
| 191 |
- # swingx-0.9.5.jar |
| 192 |
- # [[ -f trilead.jar ]] && java-pkg_jar-from trilead-ssh2 trilead-ssh2.jar ${instdir}/trilead.jar || die |
| 193 |
- # ValidationAPI.jar |
| 194 |
- # validator.jar |
| 195 |
- # webserver.jar |
| 196 |
- # winp-1.14-patched.jar |
| 197 |
rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die |
| 198 |
popd >/dev/null || die |
| 199 |
|
| 200 |
local instdir=${INSTALL_DIR}/modules/ext/jaxb |
| 201 |
pushd "${D}"/${instdir} >/dev/null || die |
| 202 |
rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die |
| 203 |
- # [[ -f jaxb-impl.jar ]] && java-pkg_jar-from jaxb-2 jaxb-impl.jar ${instdir}/jaxb-impl.jar || die |
| 204 |
- # jaxb-xjc.jar |
| 205 |
- # jaxb1-impl.jar |
| 206 |
popd >/dev/null || die |
| 207 |
|
| 208 |
local instdir=${INSTALL_DIR}/modules/ext/jaxb/api |
| 209 |
pushd "${D}"/${instdir} >/dev/null || die |
| 210 |
- # [[ -f jaxb-api.jar ]] && java-pkg_jar-from jaxb-2 jaxb-api.jar ${instdir}/jaxb-api.jar || die |
| 211 |
rm jsr173_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_api.jar || die |
| 212 |
popd >/dev/null || die |
| 213 |
|
| 214 |
|
| 215 |
diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20120530.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20120530-r1.ebuild |
| 216 |
similarity index 88% |
| 217 |
rename from dev-java/netbeans-ide/netbeans-ide-9999_p20120530.ebuild |
| 218 |
rename to dev-java/netbeans-ide/netbeans-ide-9999_p20120530-r1.ebuild |
| 219 |
index edea0e7..26341a5 100644 |
| 220 |
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20120530.ebuild |
| 221 |
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20120530-r1.ebuild |
| 222 |
@@ -34,11 +34,9 @@ SRC_URI="${SOURCE_URL} |
| 223 |
http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar |
| 224 |
http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar |
| 225 |
http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar |
| 226 |
- http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar |
| 227 |
http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip |
| 228 |
http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip |
| 229 |
http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar |
| 230 |
- http://hg.netbeans.org/binaries/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar |
| 231 |
http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar |
| 232 |
http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar |
| 233 |
http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar |
| 234 |
@@ -93,6 +91,8 @@ CDEPEND="~dev-java/netbeans-harness-${PV} |
| 235 |
dev-java/jsr173:0 |
| 236 |
dev-java/jvyamlb:0 |
| 237 |
dev-java/log4j:0 |
| 238 |
+ dev-java/lucene:3.5 |
| 239 |
+ dev-java/rhino:1.6 |
| 240 |
dev-java/saxon:9 |
| 241 |
dev-java/smack:2.2 |
| 242 |
dev-java/sun-jaf:0 |
| 243 |
@@ -100,11 +100,11 @@ CDEPEND="~dev-java/netbeans-harness-${PV} |
| 244 |
dev-java/ws-commons-util:0 |
| 245 |
dev-java/xerces:2 |
| 246 |
dev-vcs/subversion:0[java]" |
| 247 |
-# dev-java/lucene:3.5 we do not have slot 3.5 yet |
| 248 |
-# dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours |
| 249 |
# app-text/jing:0 our version is probably too old |
| 250 |
+# dev-java/commons-io fails with following error: |
| 251 |
+# 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 |
| 252 |
# dev-java/ini4j:0 our version is too old |
| 253 |
-# java-virtuals/jaf:0 could use this instead of sun-jaf but it returns empty classpath |
| 254 |
+# dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours |
| 255 |
# dev-java/trilead-ssh2:0 in overlay |
| 256 |
DEPEND="virtual/jdk:1.6 |
| 257 |
app-arch/unzip |
| 258 |
@@ -137,8 +137,6 @@ src_unpack() { |
| 259 |
ln -s "${DISTDIR}"/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar libs.antlr3.runtime/external/antlr-runtime-3.3.jar || die |
| 260 |
ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die |
| 261 |
ln -s "${DISTDIR}"/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar libs.commons_net/external/commons-net-3.0.1.jar || die |
| 262 |
- # system commons-io fails with following error: |
| 263 |
- # 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 |
| 264 |
ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar ||die |
| 265 |
ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die |
| 266 |
ln -s "${DISTDIR}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die |
| 267 |
@@ -158,11 +156,9 @@ src_unpack() { |
| 268 |
ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die |
| 269 |
ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die |
| 270 |
ln -s "${DISTDIR}"/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar html.validation/external/jing.jar || die |
| 271 |
- ln -s "${DISTDIR}"/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar html.validation/external/js.jar || die |
| 272 |
ln -s "${DISTDIR}"/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip javascript.editing/external/js-domstubs.zip || die |
| 273 |
ln -s "${DISTDIR}"/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip javascript.editing/external/jsstubs.zip || die |
| 274 |
ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.destroy/external/libpam4j-1.1.jar || die |
| 275 |
- ln -s "${DISTDIR}"/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar libs.lucene/external/lucene-core-3.5.0.jar || die |
| 276 |
ln -s "${DISTDIR}"/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar html.validation/external/non-schema.jar || die |
| 277 |
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 |
| 278 |
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 |
| 279 |
@@ -247,20 +243,15 @@ src_prepare() { |
| 280 |
java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar |
| 281 |
java-pkg_jar-from --into extexecution.destroy/external commons-io-1 commons-io.jar commons-io-1.4.jar |
| 282 |
java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_0.jar |
| 283 |
- # java-pkg_jar-from --into html.validation/external jing jing.jar jing.jar |
| 284 |
java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar |
| 285 |
+ java-pkg_jar-from --into html.validation/external rhino-1.6 js.jar js.jar |
| 286 |
java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar |
| 287 |
- # java-pkg_jar-from --into libs.antlr3.runtime/external antlr-3 antlr3.jar antlr-runtime-3.1.3.jar |
| 288 |
- # java-pkg_jar-from --into libs.commons_net/external commons-net commons-net.jar commons-net-1.4.1.jar |
| 289 |
java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.8.jar |
| 290 |
- # java-pkg_jar-from --into libs.ini4j/external ini4j ini4j.jar ini4j-0.5.1.jar |
| 291 |
- # java-pkg_jar-from --into libs.jaxb/external jaxb-2 jaxb-impl.jar jaxb-impl.jar |
| 292 |
java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar |
| 293 |
- # java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar |
| 294 |
+ java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar |
| 295 |
java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar |
| 296 |
java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar |
| 297 |
java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.7.2.jar |
| 298 |
- # java-pkg_jar-from --into libs.svnClientAdapter.svnkit/external trilead-ssh2 trilead-ssh2.jar trilead.jar |
| 299 |
java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar |
| 300 |
java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar |
| 301 |
java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar |
| 302 |
@@ -269,7 +260,6 @@ src_prepare() { |
| 303 |
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 |
| 304 |
java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar |
| 305 |
java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar |
| 306 |
- # java-pkg_jar-from --into xml.jaxb.api/external jaxb-2 jaxb-api.jar jaxb-api.jar |
| 307 |
java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar |
| 308 |
|
| 309 |
java-pkg-2_src_prepare |
| 310 |
@@ -320,65 +310,29 @@ src_install() { |
| 311 |
|
| 312 |
local instdir=${INSTALL_DIR}/modules/ext |
| 313 |
pushd "${D}"/${instdir} >/dev/null || die |
| 314 |
- # rm antlr-runtime-3.1.3.jar && dosym /usr/share/antlr-3/lib/antlr3.jar ${instdir}/antlr-runtime-3.1.3.jar || die |
| 315 |
- # bytelist-0.1.jar |
| 316 |
- # rm commons-net-1.4.1.jar && dosym /usr/share/commons-net/lib/commons-net.jar ${instdir}/commons-net-1.4.1.jar || die |
| 317 |
- # ddl.jar |
| 318 |
rm freemarker-2.3.8.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.8.jar || die |
| 319 |
- # html5-datatypes.jar |
| 320 |
- # html5-parser.jar |
| 321 |
rm icu4j-4_0.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_0.jar || die |
| 322 |
- # [[ -f ini4j-0.5.1.jar ]] && java-pkg_jar-from ini4j ini4j.jar ${instdir}/ini4j-0.5.1.jar || die |
| 323 |
- # io-xml-util.jar |
| 324 |
- # iri.jar |
| 325 |
- # isorelax20041111.jar |
| 326 |
- # [[ -f jing.jar ]] && java-pkg_jar-from jing jing.jar ${instdir}/jing.jar || die |
| 327 |
- # js.jar |
| 328 |
+ rm js.jar && dosym /usr/share/rhino-1.6/lib/js.jar ${instdir}/js.jar || die |
| 329 |
rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die |
| 330 |
- # libpam4j-1.1.jar |
| 331 |
rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die |
| 332 |
- # 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 |
| 333 |
+ 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 |
| 334 |
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 |
| 335 |
- # non-schema.jar |
| 336 |
- # org.eclipse.mylyn.bugzilla.core_3.3.1.jar |
| 337 |
- # org.eclipse.mylyn.commons.core_3.3.1.jar |
| 338 |
- # org.eclipse.mylyn.commons.net_3.3.0.jar |
| 339 |
- # org.eclipse.mylyn.tasks.core_3.3.1.jar |
| 340 |
- # org-netbeans-tax.jar |
| 341 |
rm postgresql-9.1-901.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.1-901.jdbc4.jar || die |
| 342 |
- # processtreekiller-1.0.1.jar |
| 343 |
- # resolver-1.2.jar |
| 344 |
rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die |
| 345 |
rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die |
| 346 |
rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die |
| 347 |
rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die |
| 348 |
- # sqljet-1.0.3.jar |
| 349 |
- # svnClientAdapter-javahl-1.6.13.jar |
| 350 |
- # svnClientAdapter-main-1.6.13.jar |
| 351 |
- # svnClientAdapter-svnkit-1.6.13.jar |
| 352 |
rm svnjavahl-1.7.2.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl-1.7.2.jar || die |
| 353 |
- # svnkit-javahl.jar |
| 354 |
- # svnkit-1.3.4.jar |
| 355 |
- # swingx-0.9.5.jar |
| 356 |
- # [[ -f trilead.jar ]] && java-pkg_jar-from trilead-ssh2 trilead-ssh2.jar ${instdir}/trilead.jar || die |
| 357 |
- # ValidationAPI.jar |
| 358 |
- # validator.jar |
| 359 |
- # webserver.jar |
| 360 |
- # winp-1.14-patched.jar |
| 361 |
rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die |
| 362 |
popd >/dev/null || die |
| 363 |
|
| 364 |
local instdir=${INSTALL_DIR}/modules/ext/jaxb |
| 365 |
pushd "${D}"/${instdir} >/dev/null || die |
| 366 |
rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die |
| 367 |
- # [[ -f jaxb-impl.jar ]] && java-pkg_jar-from jaxb-2 jaxb-impl.jar ${instdir}/jaxb-impl.jar || die |
| 368 |
- # jaxb-xjc.jar |
| 369 |
- # jaxb1-impl.jar |
| 370 |
popd >/dev/null || die |
| 371 |
|
| 372 |
local instdir=${INSTALL_DIR}/modules/ext/jaxb/api |
| 373 |
pushd "${D}"/${instdir} >/dev/null || die |
| 374 |
- # [[ -f jaxb-api.jar ]] && java-pkg_jar-from jaxb-2 jaxb-api.jar ${instdir}/jaxb-api.jar || die |
| 375 |
rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die |
| 376 |
popd >/dev/null || die |
Archives