summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2010-12-12 13:50:47 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2010-12-12 13:50:47 +0000
commitc9164aa1fc2d5e65a835930d5f6c83c84110c4dd (patch)
treee82ff3880b898030a6f711e7edb64b007a094501 /dev-java/mojarra
parentAdd images and config file for 1600x900 (bug #342421). (diff)
downloadhistorical-c9164aa1fc2d5e65a835930d5f6c83c84110c4dd.tar.gz
historical-c9164aa1fc2d5e65a835930d5f6c83c84110c4dd.tar.bz2
historical-c9164aa1fc2d5e65a835930d5f6c83c84110c4dd.zip
Move some dependencies to DEPEND only, remove them from run-time dependency list, see bug #344355.
Package-Manager: portage-2.1.9.25/cvs/Linux x86_64
Diffstat (limited to 'dev-java/mojarra')
-rw-r--r--dev-java/mojarra/ChangeLog9
-rw-r--r--dev-java/mojarra/Manifest13
-rw-r--r--dev-java/mojarra/mojarra-1.2.15-r2.ebuild85
3 files changed, 102 insertions, 5 deletions
diff --git a/dev-java/mojarra/ChangeLog b/dev-java/mojarra/ChangeLog
index cb50a8e6c602..db930181be76 100644
--- a/dev-java/mojarra/ChangeLog
+++ b/dev-java/mojarra/ChangeLog
@@ -1,6 +1,13 @@
# 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.6 2010/11/06 09:40:58 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/ChangeLog,v 1.7 2010/12/12 13:50:46 nelchael Exp $
+
+*mojarra-1.2.15-r2 (12 Dec 2010)
+
+ 12 Dec 2010; Krzysztof Pawlik <nelchael@gentoo.org>
+ +mojarra-1.2.15-r2.ebuild:
+ Move some dependencies to DEPEND only, remove them from run-time dependency
+ list, see bug #344355.
*mojarra-1.2.15-r1 (06 Nov 2010)
diff --git a/dev-java/mojarra/Manifest b/dev-java/mojarra/Manifest
index 99f684842377..32af3630194a 100644
--- a/dev-java/mojarra/Manifest
+++ b/dev-java/mojarra/Manifest
@@ -4,13 +4,18 @@ Hash: SHA1
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.15-r1.ebuild 2392 RMD160 e6368ef872253a0d676a1f0119cbe2a019c2da7f SHA1 88242c898f7550af3beb46c7667d086873a90490 SHA256 22b64ff24e2575e40c085ca351bcd76e47471c9f32d77fcbb368fe273889a5b2
+EBUILD mojarra-1.2.15-r2.ebuild 2442 RMD160 eee98e1cce0960f4fd8ebf454e4331f04501ab63 SHA1 18cf044b6437b4acb7eae40669a23eb70989642a SHA256 fea2e1600d100f244ede5b833cf62758027bc42c32ecec63f163049f9efead34
EBUILD mojarra-1.2.15.ebuild 2396 RMD160 8751cd224d2a271501fd5fb01cc9d892a226da45 SHA1 4148a7d5de35d354607fd85c589a945b19b9bcac SHA256 a78ede1e16f347b80a623925014e02bab3268dc7eeedaf21e14d7944f66d7a8d
-MISC ChangeLog 1026 RMD160 cf5c3ca6a7230d19becd82cb753e5481cbb8ea55 SHA1 80fff19e8d6cd2a92557ce7c678f633735717a91 SHA256 9201c5063058fb060976a195538fd78bfa6081320251b6d4ff673d931f9bb828
+MISC ChangeLog 1245 RMD160 1457da37c015d740de68a3b57ed4c33bc80de966 SHA1 2dd98ad6756c9f490263a266929360fe5e1ea3cb SHA256 914e7602e276b311d22b7d00eac8d038d37e44e11d4577197a0070d1076dbd85
MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkzVI0wACgkQcxLzpIGCsLQUqQCcDLFeTsFWhdcLBBNAaoHYZwkD
-SzYAn0dP/gckUQ1gL9OmKIHanQDLcTOs
-=dSdg
+iQEcBAEBAgAGBQJNBNM9AAoJEBZyv1r2qA5GL8QH/AwILe7mpXozuD07RvhF7UJ+
+/AHQL6N8bTJA4r+QrJKtP81XVbSiQtouUJvt/gD6IcHVDIADbL8hWYQ3k+c46Pis
+lhdwELVxvZ+L23Kf8mbgqQkNVuP5zmyszuIuvu9TB0Dje40sEHxSsKPcBnyVOyH0
+CdKZ0yvPeliJbA8nTldxmHhXK1ix91OI0ftnUPA7nzt6H/gVR5nPTIa7mikLsBSG
+OL4oEJxlKzmtXbnfklXn/ueTyZLGxiL0Y8F1+rJtrwKaELQgKzP02vq/xuyCdzJP
+LzW34gbJMhGGeqhomKkDvPG97mSF+swEZuJljs6YAKDk1hWHYSyFAOl9XCo4cqY=
+=huE7
-----END PGP SIGNATURE-----
diff --git a/dev-java/mojarra/mojarra-1.2.15-r2.ebuild b/dev-java/mojarra/mojarra-1.2.15-r2.ebuild
new file mode 100644
index 000000000000..9b9813dc63fa
--- /dev/null
+++ b/dev-java/mojarra/mojarra-1.2.15-r2.ebuild
@@ -0,0 +1,85 @@
+# 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-r2.ebuild,v 1.1 2010/12/12 13:50:47 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/151669/${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/glassfish-servlet-api:2.5
+ dev-java/groovy:0
+ dev-java/jakarta-jstl:0
+ 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/commons-beanutils:1.7
+ dev-java/commons-collections:0
+ dev-java/commons-digester:0
+ dev-java/commons-logging:0
+ ${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 --build-only commons-beanutils-1.7
+ java-pkg_jarfrom --build-only commons-collections
+ java-pkg_jarfrom --build-only commons-digester
+ java-pkg_jarfrom --build-only 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/*
+}