1 |
commit: a3efe764b4364a5679f145490ae51f8842eec426 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 19 19:42:51 2015 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 6 23:06:02 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3efe764 |
7 |
|
8 |
dev-java/netbeans-enterprise: Allow the new split antlr-2 |
9 |
|
10 |
Not restricting to just the new version because fordfrog wants to |
11 |
stabilize soon. |
12 |
|
13 |
Package-Manager: portage-2.2.26 |
14 |
|
15 |
....ebuild => netbeans-enterprise-8.0.2-r1.ebuild} | 45 +++++++--------------- |
16 |
....1.ebuild => netbeans-enterprise-8.1-r1.ebuild} | 2 +- |
17 |
2 files changed, 15 insertions(+), 32 deletions(-) |
18 |
|
19 |
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild |
20 |
similarity index 89% |
21 |
copy from dev-java/netbeans-enterprise/netbeans-enterprise-8.1.ebuild |
22 |
copy to dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild |
23 |
index ff199a1..a6b5a34 100644 |
24 |
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-8.1.ebuild |
25 |
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild |
26 |
@@ -7,14 +7,15 @@ inherit eutils java-pkg-2 java-ant-2 |
27 |
|
28 |
DESCRIPTION="Netbeans Enterprise cluster" |
29 |
HOMEPAGE="http://netbeans.org/" |
30 |
-SLOT="8.1" |
31 |
-SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip" |
32 |
+SLOT="8.0" |
33 |
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip" |
34 |
SRC_URI="${SOURCE_URL} |
35 |
- http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 |
36 |
+ https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 |
37 |
http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar |
38 |
http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar |
39 |
http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar |
40 |
http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar |
41 |
+ http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar |
42 |
http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar |
43 |
http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar |
44 |
http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar |
45 |
@@ -59,7 +60,7 @@ CDEPEND="~dev-java/netbeans-ide-${PV} |
46 |
dev-java/commons-fileupload:0 |
47 |
dev-java/commons-logging:0 |
48 |
dev-java/glassfish-deployment-api:1.2" |
49 |
-DEPEND=">=virtual/jdk-1.7 |
50 |
+DEPEND="virtual/jdk:1.7 |
51 |
app-arch/unzip |
52 |
${CDEPEND} |
53 |
dev-java/javahelp:0 |
54 |
@@ -68,26 +69,21 @@ DEPEND=">=virtual/jdk-1.7 |
55 |
dev-java/tomcat-servlet-api:2.3" |
56 |
RDEPEND=">=virtual/jdk-1.7 |
57 |
${CDEPEND} |
58 |
- dev-java/antlr:0[java] |
59 |
+ dev-java/antlr:0[java(+)] |
60 |
dev-java/bsf:2.3 |
61 |
- dev-java/cglib:3 |
62 |
dev-java/commons-beanutils:1.7 |
63 |
dev-java/commons-collections:0 |
64 |
dev-java/commons-digester:0 |
65 |
dev-java/commons-io:1 |
66 |
dev-java/commons-validator:0 |
67 |
- dev-java/glassfish-persistence:0 |
68 |
- dev-java/guava:14 |
69 |
- dev-java/jakarta-oro:2.0 |
70 |
- dev-java/osgi-core-api:0 |
71 |
- dev-java/validation-api:1.0" |
72 |
+ dev-java/jakarta-oro:2.0" |
73 |
# dev-java/commons-chain:1.1 in overlay |
74 |
|
75 |
INSTALL_DIR="/usr/share/${PN}-${SLOT}" |
76 |
|
77 |
EANT_BUILD_XML="nbbuild/build.xml" |
78 |
EANT_BUILD_TARGET="rebuild-cluster" |
79 |
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true" |
80 |
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true" |
81 |
EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7" |
82 |
JAVA_PKG_BSFIX="off" |
83 |
|
84 |
@@ -97,13 +93,14 @@ src_unpack() { |
85 |
einfo "Deleting bundled jars..." |
86 |
find -name "*.jar" -type f -delete |
87 |
|
88 |
- unpack netbeans-8.1-build.xml.patch.bz2 |
89 |
+ unpack netbeans-8.0.2-build.xml.patch.bz2 |
90 |
|
91 |
pushd "${S}" >/dev/null || die |
92 |
ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die |
93 |
ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die |
94 |
ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die |
95 |
ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die |
96 |
+ ln -s "${DISTDIR}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.jar || die |
97 |
ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die |
98 |
ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die |
99 |
ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die |
100 |
@@ -138,11 +135,11 @@ src_prepare() { |
101 |
einfo "Deleting bundled class files..." |
102 |
find -name "*.class" -type f | xargs rm -vf |
103 |
|
104 |
- epatch netbeans-8.1-build.xml.patch |
105 |
+ epatch netbeans-8.0.2-build.xml.patch |
106 |
|
107 |
# Support for custom patches |
108 |
- if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then |
109 |
- local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f` |
110 |
+ if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then |
111 |
+ local files=`find "${NETBEANS80_PATCHES_DIR}" -type f` |
112 |
|
113 |
if [ -n "${files}" ] ; then |
114 |
einfo "Applying custom patches:" |
115 |
@@ -160,7 +157,7 @@ src_prepare() { |
116 |
java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar |
117 |
java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar |
118 |
java-pkg_jar-from --build-only --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar |
119 |
- java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar |
120 |
+ java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar |
121 |
java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar |
122 |
|
123 |
einfo "Linking in other clusters..." |
124 |
@@ -227,20 +224,6 @@ src_install() { |
125 |
rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die |
126 |
popd >/dev/null || die |
127 |
|
128 |
- local instdir=${INSTALL_DIR}/modules/ext/javaee7-endorsed |
129 |
- pushd "${D}"/${instdir} >/dev/null || die |
130 |
- rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die |
131 |
- popd >/dev/null || die |
132 |
- |
133 |
- local instdir=${INSTALL_DIR}/modules/ext/jersey2/ext |
134 |
- pushd "${D}"/${instdir} >/dev/null || die |
135 |
- rm cglib-2.2.0-b21.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.0-b21.jar || die |
136 |
- rm guava-14.0.1.jar && dosym /usr/share/guava-14/lib/guava.jar ${instdir}/guava-14.0.1.jar || die |
137 |
- rm org.osgi.core-4.2.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/org.osgi.core-4.2.0.jar || die |
138 |
- rm persistence-api-1.0.jar && dosym /usr/share/glassfish-persistence/lib/glassfish-persistence.jar ${instdir}/persistence-api-1.0.jar || die |
139 |
- rm validation-api-1.1.0.Final.jar && dosym /usr/share/validation-api-1.0/lib/validation-api.jar ${instdir}/validation-api-1.1.0.Final.jar || die |
140 |
- popd >/dev/null || die |
141 |
- |
142 |
local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2 |
143 |
pushd "${D}"/${instdir} >/dev/null || die |
144 |
rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die |
145 |
|
146 |
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.1-r1.ebuild |
147 |
similarity index 99% |
148 |
rename from dev-java/netbeans-enterprise/netbeans-enterprise-8.1.ebuild |
149 |
rename to dev-java/netbeans-enterprise/netbeans-enterprise-8.1-r1.ebuild |
150 |
index ff199a1..c5d9d28 100644 |
151 |
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-8.1.ebuild |
152 |
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.1-r1.ebuild |
153 |
@@ -68,7 +68,7 @@ DEPEND=">=virtual/jdk-1.7 |
154 |
dev-java/tomcat-servlet-api:2.3" |
155 |
RDEPEND=">=virtual/jdk-1.7 |
156 |
${CDEPEND} |
157 |
- dev-java/antlr:0[java] |
158 |
+ dev-java/antlr:0[java(+)] |
159 |
dev-java/bsf:2.3 |
160 |
dev-java/cglib:3 |
161 |
dev-java/commons-beanutils:1.7 |