Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/
Date: Wed, 06 Jun 2012 09:50:48
Message-Id: 1338976222.6705e905706d021d7d1521c47c4f86c3fbbaf5c9.fordfrog@gentoo
1 commit: 6705e905706d021d7d1521c47c4f86c3fbbaf5c9
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 6 09:50:22 2012 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 6 09:50:22 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=6705e905
7
8 dev-java/netbeans-ide: unbundled iso-relax
9
10 ---
11 dev-java/netbeans-ide/ChangeLog | 4 ++++
12 dev-java/netbeans-ide/Manifest | 6 +++---
13 ...a-r1.ebuild => netbeans-ide-7.2_beta-r2.ebuild} | 5 +++--
14 ...build => netbeans-ide-9999_p20120604-r1.ebuild} | 5 +++--
15 4 files changed, 13 insertions(+), 7 deletions(-)
16
17 diff --git a/dev-java/netbeans-ide/ChangeLog b/dev-java/netbeans-ide/ChangeLog
18 index 47cc19a..af96f52 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 + 06 Jun 2012; Miroslav Šulc <fordfrog@g.o>
26 + -netbeans-ide-7.2_beta-r1.ebuild, -netbeans-ide-9999_p20120604.ebuild:
27 + unbundled iso-relax
28 +
29 *netbeans-ide-9999_p20120604 (04 Jun 2012)
30
31 04 Jun 2012; Miroslav Šulc <fordfrog@g.o>
32
33 diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
34 index fae8b7f..57f0146 100644
35 --- a/dev-java/netbeans-ide/Manifest
36 +++ b/dev-java/netbeans-ide/Manifest
37 @@ -89,8 +89,8 @@ DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc0
38 DIST netbeans-trunk-nightly-201206040001-src.zip 174879472 RMD160 0cfb8c96eb6aae8c4f4f2acb2c8b412800da7b80 SHA1 bde5d830e085fddcc09651f71d518d8fa9a0b663 SHA256 21bd083e28f2c006feb05648c2c9260e6f1b09634105e22e249b13534249e784
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-r1.ebuild 24424 RMD160 c2b048c1cc14cddd882d4bc0a5a3ab87f4e7e687 SHA1 4a84d8ba96716708c8ba712e038fa9f7d20788f8 SHA256 a447660c5d3a65a3c4a2b5c679106ab3dd7b8e747f3dca18d794365405ec4b7c
42 +EBUILD netbeans-ide-7.2_beta-r2.ebuild 24422 RMD160 8e647dacf2e31b39bc06d3b2add0534546720acc SHA1 8219ef16ecaf12116c888568e1c9c17bb090a0ca SHA256 93caa404d77315d3dbf27223158c0c5230594af120bd5a7f4e1d2ea50edce647
43 EBUILD netbeans-ide-9999_p20120530-r1.ebuild 24478 RMD160 b42fcd26bb3d57a44f77639b3c134d810df7c409 SHA1 6bd0fc4e3190f9eb67a56a51c39ca581c7670f4b SHA256 40c8b1e9de9e961c162737c511e13a8db18ae485c44760606c457ce4c8291742
44 -EBUILD netbeans-ide-9999_p20120604.ebuild 24478 RMD160 d02b80b6a89a46b486ad2e43a9f5ab4d610c0e98 SHA1 f0fb36a2d1a5a75b001001f4fdea217445980a62 SHA256 0ac4c576f58075addafcd3bad3e9c7ea01cdc25a87c72fa710b94abc6e305d8c
45 -MISC ChangeLog 35015 RMD160 1f4edf6ebd61f8f795daccab7f445b8f1769a69f SHA1 6d12831c8d17901e49c0ee39282c27afc68116b7 SHA256 94e1a4f81ae02d4e6625eec3a4e7521db4472d5d436d21ce1cea806653f74fc6
46 +EBUILD netbeans-ide-9999_p20120604-r1.ebuild 24476 RMD160 b7b293e76b81ee24ae840695d1ff6b3d1ad78235 SHA1 fd8adb0ab7210e7e20e14460fd907df80842cd39 SHA256 3f334afb4c26c410b4bc196aa83f0694b502762ed4bc293b3362b05e9fbb51d6
47 +MISC ChangeLog 35163 RMD160 071307c7e30ff32b56f9e871e8718585ba9cc4ee SHA1 cf4c4e8bb345a90cef0c87354acc57fe356a372e SHA256 72c4e5862b5880e3a7542dc02a5c79b26c48648e31d6501e2c4a936b4275fca6
48 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
49
50 diff --git a/dev-java/netbeans-ide/netbeans-ide-7.2_beta-r1.ebuild b/dev-java/netbeans-ide/netbeans-ide-7.2_beta-r2.ebuild
51 similarity index 99%
52 rename from dev-java/netbeans-ide/netbeans-ide-7.2_beta-r1.ebuild
53 rename to dev-java/netbeans-ide/netbeans-ide-7.2_beta-r2.ebuild
54 index cf1997e..4c8b247 100644
55 --- a/dev-java/netbeans-ide/netbeans-ide-7.2_beta-r1.ebuild
56 +++ b/dev-java/netbeans-ide/netbeans-ide-7.2_beta-r2.ebuild
57 @@ -26,7 +26,6 @@ SRC_URI="${SOURCE_URL}
58 http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
59 http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
60 http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
61 - http://hg.netbeans.org/binaries/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar
62 http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
63 http://hg.netbeans.org/binaries/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar
64 http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
65 @@ -86,6 +85,7 @@ CDEPEND="~dev-java/netbeans-harness-${PV}
66 dev-java/commons-logging:0
67 dev-java/freemarker:2.3
68 dev-java/icu4j:4.4
69 + dev-java/iso-relax:0
70 dev-java/jdbc-mysql:0
71 dev-java/jdbc-postgresql:0
72 dev-java/jsr173:0
73 @@ -148,7 +148,6 @@ src_unpack() {
74 ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
75 ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
76 ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
77 - ln -s "${DISTDIR}"/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar html.validation/external/isorelax20041111.jar || die
78 ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
79 ln -s "${DISTDIR}"/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
80 ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
81 @@ -243,6 +242,7 @@ src_prepare() {
82 java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
83 java-pkg_jar-from --into extexecution.destroy/external commons-io-1 commons-io.jar commons-io-1.4.jar
84 java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_0.jar
85 + java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax20041111.jar
86 java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
87 java-pkg_jar-from --into html.validation/external rhino-1.6 js.jar js.jar
88 java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
89 @@ -312,6 +312,7 @@ src_install() {
90 pushd "${D}"/${instdir} >/dev/null || die
91 rm freemarker-2.3.8.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.8.jar || die
92 rm icu4j-4_0.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_0.jar || die
93 + rm isorelax20041111.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax20041111.jar || die
94 rm js.jar && dosym /usr/share/rhino-1.6/lib/js.jar ${instdir}/js.jar || die
95 rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
96 rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
97
98 diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20120604.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20120604-r1.ebuild
99 similarity index 99%
100 rename from dev-java/netbeans-ide/netbeans-ide-9999_p20120604.ebuild
101 rename to dev-java/netbeans-ide/netbeans-ide-9999_p20120604-r1.ebuild
102 index a1498ff..62a42a7 100644
103 --- a/dev-java/netbeans-ide/netbeans-ide-9999_p20120604.ebuild
104 +++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20120604-r1.ebuild
105 @@ -26,7 +26,6 @@ SRC_URI="${SOURCE_URL}
106 http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
107 http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
108 http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
109 - http://hg.netbeans.org/binaries/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar
110 http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
111 http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
112 http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
113 @@ -86,6 +85,7 @@ CDEPEND="~dev-java/netbeans-harness-${PV}
114 dev-java/commons-logging:0
115 dev-java/freemarker:2.3
116 dev-java/icu4j:4.4
117 + dev-java/iso-relax:0
118 dev-java/jdbc-mysql:0
119 dev-java/jdbc-postgresql:0
120 dev-java/jsr173:0
121 @@ -148,7 +148,6 @@ src_unpack() {
122 ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
123 ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
124 ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
125 - ln -s "${DISTDIR}"/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar html.validation/external/isorelax20041111.jar || die
126 ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
127 ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
128 ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
129 @@ -243,6 +242,7 @@ src_prepare() {
130 java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
131 java-pkg_jar-from --into extexecution.destroy/external commons-io-1 commons-io.jar commons-io-1.4.jar
132 java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_0.jar
133 + java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax20041111.jar
134 java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
135 java-pkg_jar-from --into html.validation/external rhino-1.6 js.jar js.jar
136 java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
137 @@ -312,6 +312,7 @@ src_install() {
138 pushd "${D}"/${instdir} >/dev/null || die
139 rm freemarker-2.3.8.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.8.jar || die
140 rm icu4j-4_0.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_0.jar || die
141 + rm isorelax20041111.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax20041111.jar || die
142 rm js.jar && dosym /usr/share/rhino-1.6/lib/js.jar ${instdir}/js.jar || die
143 rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
144 rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die