1 |
nelchael 10/02/23 22:47:48 |
2 |
|
3 |
Modified: ChangeLog mojarra-1.2.14.ebuild |
4 |
Log: |
5 |
Improve ebuild to build also reference implementation. |
6 |
(Portage version: 2.1.7.17/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 dev-java/mojarra/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/mojarra/ChangeLog?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/mojarra/ChangeLog?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/mojarra/ChangeLog?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/mojarra/ChangeLog,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- ChangeLog 23 Feb 2010 22:01:02 -0000 1.1 |
22 |
+++ ChangeLog 23 Feb 2010 22:47:47 -0000 1.2 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for dev-java/mojarra |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/ChangeLog,v 1.1 2010/02/23 22:01:02 nelchael Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/ChangeLog,v 1.2 2010/02/23 22:47:47 nelchael Exp $ |
28 |
+ |
29 |
+ 23 Feb 2010; Krzysiek Pawlik <nelchael@g.o> mojarra-1.2.14.ebuild: |
30 |
+ Improve ebuild to build also reference implementation. |
31 |
|
32 |
*mojarra-1.2.14 (23 Feb 2010) |
33 |
|
34 |
|
35 |
|
36 |
|
37 |
1.2 dev-java/mojarra/mojarra-1.2.14.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/mojarra/mojarra-1.2.14.ebuild?rev=1.2&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/mojarra/mojarra-1.2.14.ebuild?rev=1.2&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/mojarra/mojarra-1.2.14.ebuild?r1=1.1&r2=1.2 |
42 |
|
43 |
Index: mojarra-1.2.14.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/mojarra/mojarra-1.2.14.ebuild,v |
46 |
retrieving revision 1.1 |
47 |
retrieving revision 1.2 |
48 |
diff -u -r1.1 -r1.2 |
49 |
--- mojarra-1.2.14.ebuild 23 Feb 2010 22:01:02 -0000 1.1 |
50 |
+++ mojarra-1.2.14.ebuild 23 Feb 2010 22:47:47 -0000 1.2 |
51 |
@@ -1,9 +1,10 @@ |
52 |
# Copyright 1999-2010 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/mojarra-1.2.14.ebuild,v 1.1 2010/02/23 22:01:02 nelchael Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/mojarra-1.2.14.ebuild,v 1.2 2010/02/23 22:47:47 nelchael Exp $ |
56 |
|
57 |
EAPI=3 |
58 |
|
59 |
+WANT_ANT_TASKS="ant-trax" |
60 |
JAVA_PKG_IUSE="source" |
61 |
|
62 |
inherit eutils java-pkg-2 java-ant-2 |
63 |
@@ -13,7 +14,7 @@ |
64 |
DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces API" |
65 |
HOMEPAGE="https://javaserverfaces.dev.java.net/" |
66 |
SRC_URI="https://javaserverfaces.dev.java.net/files/documents/1866/146227/${PN}-${MY_PV}-source.zip |
67 |
- mirror://gentoo/${PN}-${MY_PV}-gentoo.patch.bz2" |
68 |
+ mirror://gentoo/${PN}-${MY_PV}-patch.bz2" |
69 |
|
70 |
LICENSE="CDDL" |
71 |
SLOT="1.2" |
72 |
@@ -21,48 +22,65 @@ |
73 |
|
74 |
IUSE="" |
75 |
|
76 |
-COMMON_DEP="" |
77 |
- |
78 |
-RDEPEND=">=virtual/jre-1.6 |
79 |
- ${COMMON_DEP}" |
80 |
-DEPEND=">=virtual/jdk-1.6 |
81 |
- app-arch/unzip |
82 |
- dev-java/ant-contrib |
83 |
+COMMON_DEP=" |
84 |
dev-java/commons-beanutils:1.6 |
85 |
dev-java/commons-collections |
86 |
dev-java/commons-digester |
87 |
dev-java/commons-logging |
88 |
dev-java/glassfish-servlet-api:2.5 |
89 |
+ dev-java/groovy |
90 |
dev-java/jakarta-jstl |
91 |
+ dev-java/portletapi:1 |
92 |
+ " |
93 |
+ |
94 |
+RDEPEND=">=virtual/jre-1.6 |
95 |
+ ${COMMON_DEP}" |
96 |
+DEPEND=">=virtual/jdk-1.6 |
97 |
+ app-arch/unzip |
98 |
+ dev-java/ant-contrib |
99 |
+ dev-java/ant-trax |
100 |
${COMMON_DEP}" |
101 |
|
102 |
S="${WORKDIR}/${PN}-${MY_PV}-b01-FCS-sources" |
103 |
|
104 |
src_prepare() { |
105 |
- epatch "${DISTDIR}/${PN}-${MY_PV}-gentoo.patch.bz2" |
106 |
+ epatch "${DISTDIR}/${PN}-${MY_PV}-patch.bz2" |
107 |
|
108 |
mkdir -p "${S}/dependencies/jars" || die |
109 |
|
110 |
+ # Should we remove those files? I don't see a reason to pull in three |
111 |
+ # different web app server for this package. |
112 |
+ rm -f \ |
113 |
+ "${S}/jsf-ri/src/com/sun/faces/vendor/GlassFishInjectionProvider.java" \ |
114 |
+ "${S}/jsf-ri/src/com/sun/faces/vendor/Jetty6InjectionProvider.java" \ |
115 |
+ "${S}/jsf-ri/src/com/sun/faces/vendor/Tomcat6InjectionProvider.java" |
116 |
+ |
117 |
find -name '*.jar' -exec rm -f {} \; |
118 |
|
119 |
cd "${S}/common/lib/" |
120 |
java-pkg_jarfrom --build-only ant-contrib |
121 |
|
122 |
cd "${S}/dependencies/jars" |
123 |
- java-pkg_jarfrom --build-only commons-digester |
124 |
- java-pkg_jarfrom --build-only commons-logging |
125 |
- java-pkg_jarfrom --build-only commons-collections |
126 |
- java-pkg_jarfrom --build-only commons-beanutils-1.6 |
127 |
- java-pkg_jarfrom --build-only glassfish-servlet-api-2.5 |
128 |
- java-pkg_jarfrom --build-only jakarta-jstl |
129 |
+ java-pkg_jarfrom commons-beanutils-1.6 |
130 |
+ java-pkg_jarfrom commons-collections |
131 |
+ java-pkg_jarfrom commons-digester |
132 |
+ java-pkg_jarfrom commons-logging |
133 |
+ java-pkg_jarfrom glassfish-servlet-api-2.5 |
134 |
+ java-pkg_jarfrom groovy |
135 |
+ java-pkg_jarfrom jakarta-jstl |
136 |
+ java-pkg_jarfrom portletapi-1 |
137 |
} |
138 |
|
139 |
src_compile() { |
140 |
cd "${S}/jsf-api" |
141 |
eant -Djsf.build.home="${S}" -Dcontainer.name=glassfish jars |
142 |
+ |
143 |
+ cd "${S}/jsf-ri" |
144 |
+ eant -Djsf.build.home="${S}" -Dcontainer.name=glassfish jars |
145 |
} |
146 |
|
147 |
src_install() { |
148 |
java-pkg_dojar "${S}/jsf-api/build/lib/jsf-api.jar" |
149 |
- use source && java-pkg_dosrc "${S}"/jsf-api/src/* |
150 |
+ java-pkg_dojar "${S}/jsf-ri/build/lib/jsf-impl.jar" |
151 |
+ use source && java-pkg_dosrc "${S}"/jsf-api/src/* "${S}"/jsf-ri/src/* |
152 |
} |