Version bump.

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

3 files changed, 105 insertions, 6 deletions

diff --git a/dev-java/mojarra/ChangeLog b/dev-java/mojarra/ChangeLog
index e23bf0789bea..68da1ab69c95 100644
--- a/dev-java/mojarra/ChangeLog
+++ b/dev-java/mojarra/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2010/02/23 22:47:47 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/ChangeLog,v 1.3 2010/08/19 15:03:06 nelchael Exp $
+
+*mojarra-1.2.15 (19 Aug 2010)
+
+  19 Aug 2010; Krzysztof Pawlik <nelchael@gentoo.org>
+  +mojarra-1.2.15.ebuild:
+  Version bump.
 
   23 Feb 2010; Krzysiek Pawlik <nelchael@gentoo.org> mojarra-1.2.14.ebuild:
   Improve ebuild to build also reference implementation.
diff --git a/dev-java/mojarra/Manifest b/dev-java/mojarra/Manifest
index 353404c26c7d..271cec0f508b 100644
--- a/dev-java/mojarra/Manifest
+++ b/dev-java/mojarra/Manifest
@@ -3,13 +3,20 @@ Hash: SHA1
 
 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
+DIST mojarra-1.2_15-b01-FCS-patch.bz2 4369 RMD160 1bd52ebd3c3dc4390b7107458b5fb94e3f136eca SHA1 55647ac19fedf4a2a802431786fa3939cece8fd9 SHA256 c8495b51225201bf23033a01bb853abf1cc0a40214aa6a68c7dd1c30812e6cd1
+DIST mojarra-1.2_15-b01-FCS-source.zip 5091287 RMD160 587843df7d177903f264e913b5d637a9591ea9bd SHA1 ac8af7a7ff191a72604ce20eb95e5005e3be6073 SHA256 8678db1e93a2f605b696ae3a04e145bc14dd46409301ae230dc6ee4477ccb343
 EBUILD mojarra-1.2.14.ebuild 2396 RMD160 9b4546526f2d9b58e802be0fed31e71fb1e9303c SHA1 5300dbf329ef86101e892f4185ee264a2ad2ba27 SHA256 2438fd1c966d17c1f6092f5f7548a83efffd89c2507aa39f4cd9b4827c94f4fd
-MISC ChangeLog 485 RMD160 a7ec87ee02da56a4df554eb16499c3e7aefcdd0f SHA1 5f709c2b7352f717f37c88fbbf2097db6b6bb234 SHA256 d7ee5d6b7dadf57c069f7d1a85ddb3929e45ff23a0c65618d1f6b1c226b948c8
+EBUILD mojarra-1.2.15.ebuild 2396 RMD160 e5d3d4cc96a19f9dc4f472780229af99160083e5 SHA1 da9f834533f175a52c489f5d5f7407f7f7e134d2 SHA256 bb5377af33fc477657dfc0d4e5551827928a6a993a7e69c0c1287a19ab3eaf72
+MISC ChangeLog 613 RMD160 6480470a46cab1b22e9c072a423b787d286d70d9 SHA1 9b0e24aa04dfec0bcd00f79439fb344cddbf9481 SHA256 a0ebc7f8ead4bc62f144d81b07dccac78f8446f5d14daf59e1a40bf4877777de
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkuEWx4ACgkQgo/w9rxVVVFjiwCfapcwGXTYp4OO81miuuUylNZ/
-VzQAoJ9wdx/r/41/GiLwTRf8PwD5s4pL
-=58fU
+iQEcBAEBAgAGBQJMbUewAAoJEBZyv1r2qA5GEIoIAJO/GfdMpMiGnerTrKRTgAi2
+IMqH1kO76kMY/RBHsFCSRN2bM+TzF0l34J61n9UjuvG2LZPqbUUPAJFDhLbYTivb
+Rx82bmQ7WVI38sze8W5RAFXALqeLsYA0jsXJ6Fw9PFuVZZAMnFgoxx1gMvO/85kk
+q9two7V/UDEeHy1Z6X0AUNkomasPaY6WrEw3jRtIE5dQAx7qeEUTmXPL/6O6Kwdj
+eSelD8ZMzG6c+wzomeLbPKxCEhOSy9yPL3JTTAcyj9cZg/MpY+0EWKUd7rPQWOmY
+3rGZB2qzBx5lKHRFonZXpy2H9XKaXCH7ZhPKUlTv1tyxBbE5xMyky7DsfqN6emo=
+=tmLM
 -----END PGP SIGNATURE-----
diff --git a/dev-java/mojarra/mojarra-1.2.15.ebuild b/dev-java/mojarra/mojarra-1.2.15.ebuild
new file mode 100644
index 000000000000..e18b733e6f47
--- /dev/null
+++ b/dev-java/mojarra/mojarra-1.2.15.ebuild
@@ -0,0 +1,86 @@
+# 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.15.ebuild,v 1.1 2010/08/19 15:03:06 nelchael Exp $
+
+EAPI=3
+
+WANT_ANT_TASKS="ant-trax"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV="$(get_version_component_range 1-2)_$(get_version_component_range 3)-b01-FCS"
+
+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}-patch.bz2"
+
+LICENSE="CDDL"
+SLOT="1.2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+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}-sources"
+
+src_prepare() {
+	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 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"
+	java-pkg_dojar "${S}/jsf-ri/build/lib/jsf-impl.jar"
+	use source && java-pkg_dosrc "${S}"/jsf-api/src/* "${S}"/jsf-ri/src/*
+}