Improve ebuild to build also reference implementation.

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

3 files changed, 45 insertions, 24 deletions

diff --git a/dev-java/mojarra/ChangeLog b/dev-java/mojarra/ChangeLog
index 51374e4327c4..e23bf0789bea 100644
--- a/dev-java/mojarra/ChangeLog
+++ b/dev-java/mojarra/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/mojarra
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/ChangeLog,v 1.1 2010/02/23 22:01:02 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/ChangeLog,v 1.2 2010/02/23 22:47:47 nelchael Exp $
+
+  23 Feb 2010; Krzysiek Pawlik <nelchael@gentoo.org> mojarra-1.2.14.ebuild:
+  Improve ebuild to build also reference implementation.
 
 *mojarra-1.2.14 (23 Feb 2010)
 
diff --git a/dev-java/mojarra/Manifest b/dev-java/mojarra/Manifest
index f8c1bdd8b373..353404c26c7d 100644
--- a/dev-java/mojarra/Manifest
+++ b/dev-java/mojarra/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST mojarra-1.2_14-gentoo.patch.bz2 4198 RMD160 77caa80b027ef5237954c42e435d2bbc3153b4af SHA1 26eb3b88ebea000644e86d53200b3f8853eb9566 SHA256 741937c1eb847d7c6564a9bd4b22d70b7776344d4ab42b340d45f1386b1431e6
+DIST mojarra-1.2_14-patch.bz2 4476 RMD160 bd4924fa7b4e9386ecb6df75ecd631bbbd19b218 SHA1 9a084ceea0edd95b581794a8547036e11b4bed81 SHA256 a041946408aa86f251a5f279c2e3d8d89764bbc6c9fd4d4a1e105c1c4bef9911
 DIST mojarra-1.2_14-source.zip 4994203 RMD160 580d59e0cd26f5b8d7db33bb99622cc1eda963ea SHA1 b5285bd2584d4731f7c5f010b371975b4bc10956 SHA256 aa9a4c1892c0ff9511d44d99924dd4ac7a8304f84091f09a1cf0b9e8a9b73077
-EBUILD mojarra-1.2.14.ebuild 1846 RMD160 15d3770e8490ea12fdfc77c5d80b40aa0d0c4465 SHA1 2e27e853492a6352506cd98c7d1c96524707e5c6 SHA256 25f380a62160e69146f928b39d9cf6b67a031c1949454ee0d979f2a2f8ffe26f
-MISC ChangeLog 351 RMD160 16851257fef5d41f5ac60efaef615cc300418c7a SHA1 dc0fdc64e69631c0f1b2bcc9b209efa830fa9486 SHA256 c1b6428d35053a821085a26021f254e8986b650e3fde960e983f381055d2f12f
+EBUILD mojarra-1.2.14.ebuild 2396 RMD160 9b4546526f2d9b58e802be0fed31e71fb1e9303c SHA1 5300dbf329ef86101e892f4185ee264a2ad2ba27 SHA256 2438fd1c966d17c1f6092f5f7548a83efffd89c2507aa39f4cd9b4827c94f4fd
+MISC ChangeLog 485 RMD160 a7ec87ee02da56a4df554eb16499c3e7aefcdd0f SHA1 5f709c2b7352f717f37c88fbbf2097db6b6bb234 SHA256 d7ee5d6b7dadf57c069f7d1a85ddb3929e45ff23a0c65618d1f6b1c226b948c8
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuEUCQACgkQgo/w9rxVVVEzgACgtm6qYN2l6TU3hWExszPCpRBt
-YC8An006kqJlZGIGuSInBG/J3nmRLW1w
-=6JrK
+iEYEARECAAYFAkuEWx4ACgkQgo/w9rxVVVFjiwCfapcwGXTYp4OO81miuuUylNZ/
+VzQAoJ9wdx/r/41/GiLwTRf8PwD5s4pL
+=58fU
 -----END PGP SIGNATURE-----
diff --git a/dev-java/mojarra/mojarra-1.2.14.ebuild b/dev-java/mojarra/mojarra-1.2.14.ebuild
index 132ea83d98e8..686a4a5420b5 100644
--- a/dev-java/mojarra/mojarra-1.2.14.ebuild
+++ b/dev-java/mojarra/mojarra-1.2.14.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/mojarra-1.2.14.ebuild,v 1.1 2010/02/23 22:01:02 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/mojarra-1.2.14.ebuild,v 1.2 2010/02/23 22:47:47 nelchael Exp $
 
 EAPI=3
 
+WANT_ANT_TASKS="ant-trax"
 JAVA_PKG_IUSE="source"
 
 inherit eutils java-pkg-2 java-ant-2
@@ -13,7 +14,7 @@ MY_PV="$(get_version_component_range 1-2)_$(get_version_component_range 3)"
 DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces API"
 HOMEPAGE="https://javaserverfaces.dev.java.net/"
 SRC_URI="https://javaserverfaces.dev.java.net/files/documents/1866/146227/${PN}-${MY_PV}-source.zip
-	mirror://gentoo/${PN}-${MY_PV}-gentoo.patch.bz2"
+	mirror://gentoo/${PN}-${MY_PV}-patch.bz2"
 
 LICENSE="CDDL"
 SLOT="1.2"
@@ -21,48 +22,65 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	dev-java/ant-contrib
+COMMON_DEP="
 	dev-java/commons-beanutils:1.6
 	dev-java/commons-collections
 	dev-java/commons-digester
 	dev-java/commons-logging
 	dev-java/glassfish-servlet-api:2.5
+	dev-java/groovy
 	dev-java/jakarta-jstl
+	dev-java/portletapi:1
+	"
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	dev-java/ant-contrib
+	dev-java/ant-trax
 	${COMMON_DEP}"
 
 S="${WORKDIR}/${PN}-${MY_PV}-b01-FCS-sources"
 
 src_prepare() {
-	epatch "${DISTDIR}/${PN}-${MY_PV}-gentoo.patch.bz2"
+	epatch "${DISTDIR}/${PN}-${MY_PV}-patch.bz2"
 
 	mkdir -p "${S}/dependencies/jars" || die
 
+	# Should we remove those files? I don't see a reason to pull in three
+	# different web app server for this package.
+	rm -f \
+		"${S}/jsf-ri/src/com/sun/faces/vendor/GlassFishInjectionProvider.java" \
+		"${S}/jsf-ri/src/com/sun/faces/vendor/Jetty6InjectionProvider.java" \
+		"${S}/jsf-ri/src/com/sun/faces/vendor/Tomcat6InjectionProvider.java"
+
 	find -name '*.jar' -exec rm -f {} \;
 
 	cd "${S}/common/lib/"
 	java-pkg_jarfrom --build-only ant-contrib
 
 	cd "${S}/dependencies/jars"
-	java-pkg_jarfrom --build-only commons-digester
-	java-pkg_jarfrom --build-only commons-logging
-	java-pkg_jarfrom --build-only commons-collections
-	java-pkg_jarfrom --build-only commons-beanutils-1.6
-	java-pkg_jarfrom --build-only glassfish-servlet-api-2.5
-	java-pkg_jarfrom --build-only jakarta-jstl
+	java-pkg_jarfrom commons-beanutils-1.6
+	java-pkg_jarfrom commons-collections
+	java-pkg_jarfrom commons-digester
+	java-pkg_jarfrom commons-logging
+	java-pkg_jarfrom glassfish-servlet-api-2.5
+	java-pkg_jarfrom groovy
+	java-pkg_jarfrom jakarta-jstl
+	java-pkg_jarfrom portletapi-1
 }
 
 src_compile() {
 	cd "${S}/jsf-api"
 	eant -Djsf.build.home="${S}" -Dcontainer.name=glassfish jars
+
+	cd "${S}/jsf-ri"
+	eant -Djsf.build.home="${S}" -Dcontainer.name=glassfish jars
 }
 
 src_install() {
 	java-pkg_dojar "${S}/jsf-api/build/lib/jsf-api.jar"
-	use source && java-pkg_dosrc "${S}"/jsf-api/src/*
+	java-pkg_dojar "${S}/jsf-ri/build/lib/jsf-impl.jar"
+	use source && java-pkg_dosrc "${S}"/jsf-api/src/* "${S}"/jsf-ri/src/*
 }