[gentoo-commits] gentoo-x86 commit in dev-java/mojarra: ChangeLog mojarra-1.2.15-r1.ebuild

[Petteri Raty (betelgeuse)]

betelgeuse    10/11/06 09:40:58

  Modified:             ChangeLog
  Added:                mojarra-1.2.15-r1.ebuild
  Log:
  Use newer 1.7 slot of commons-beanutils.
  
  (Portage version: 2.2.0_alpha2/cvs/Linux i686)

Revision  Changes    Path
1.6                  dev-java/mojarra/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/mojarra/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/mojarra/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/mojarra/ChangeLog?r1=1.5&r2=1.6

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/mojarra/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog	19 Aug 2010 19:18:19 -0000	1.5
+++ ChangeLog	6 Nov 2010 09:40:58 -0000	1.6
@@ -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.5 2010/08/19 19:18:19 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/ChangeLog,v 1.6 2010/11/06 09:40:58 betelgeuse Exp $
+
+*mojarra-1.2.15-r1 (06 Nov 2010)
+
+  06 Nov 2010; Petteri Räty <betelgeuse@g.o>
+  +mojarra-1.2.15-r1.ebuild:
+  Use newer 1.7 slot of commons-beanutils.
 
   19 Aug 2010; Krzysztof Pawlik <nelchael@g.o> mojarra-1.2.15.ebuild:
   Fix SRC_URI for 1.2.15, bug #333479.



1.1                  dev-java/mojarra/mojarra-1.2.15-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/mojarra/mojarra-1.2.15-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/mojarra/mojarra-1.2.15-r1.ebuild?rev=1.1&content-type=text/plain

Index: mojarra-1.2.15-r1.ebuild
===================================================================
# 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-r1.ebuild,v 1.1 2010/11/06 09:40:58 betelgeuse 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/commons-beanutils:1.7
	dev-java/commons-collections:0
	dev-java/commons-digester:0
	dev-java/commons-logging:0
	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
	${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.7
	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/*
}