[gentoo-commits] gentoo-x86 commit in dev-java/commons-jelly: commons-jelly-1.0-r6.ebuild ChangeLog commons-jelly-1.0-r4.ebuild

[gentoo-commits] gentoo-x86 commit in dev-java/commons-jelly: commons-jelly-1.0-r6.ebuild ChangeLog commons-jelly-1.0-r4.ebuild

[Patrice Clement (monsieurp)]

monsieurp    15/06/08 13:09:39

  Modified:             ChangeLog
  Added:                commons-jelly-1.0-r6.ebuild
  Removed:              commons-jelly-1.0-r4.ebuild
  Log:
  Update jakarta-jstl dependency. Remove old. Fix bug 551032.
  
  Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

Revision  Changes    Path
1.20                 dev-java/commons-jelly/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog	16 Aug 2014 10:03:00 -0000	1.19
+++ ChangeLog	8 Jun 2015 13:09:39 -0000	1.20
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-jelly
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.19 2014/08/16 10:03:00 johu Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.20 2015/06/08 13:09:39 monsieurp Exp $
+
+*commons-jelly-1.0-r6 (08 Jun 2015)
+
+  08 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  +commons-jelly-1.0-r6.ebuild, -commons-jelly-1.0-r4.ebuild:
+  Update jakarta-jstl dependency. Remove old. Fix bug 551032.
 
   16 Aug 2014; Johannes Huber <johu@gentoo.org> commons-jelly-1.0-r5.ebuild:
   amd64 stable, bug #518928



1.1                  dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild?rev=1.1&content-type=text/plain

Index: commons-jelly-1.0-r6.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild,v 1.1 2015/06/08 13:09:39 monsieurp Exp $

EAPI=4

JAVA_PKG_IUSE="doc source test"

inherit java-pkg-2 java-ant-2 eutils

MY_P="${P}-src"
DESCRIPTION="A Java and XML based scripting and processing engine"
HOMEPAGE="http://commons.apache.org/jelly/"
SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"

LICENSE="Apache-2.0"
SLOT="1"
KEYWORDS="~amd64 ~x86"
IUSE=""

COMMON_DEP="
	dev-java/commons-beanutils:1.7
	dev-java/commons-cli:1
	dev-java/commons-collections:0
	dev-java/commons-discovery:0
	dev-java/commons-jexl:1.0
	dev-java/commons-lang:0
	dev-java/commons-logging:0
	dev-java/dom4j:1
	dev-java/tomcat-jstl-spec:1.2.5
	dev-java/jaxen:1.1
	dev-java/junit:0
	java-virtuals/servlet-api:2.5"
RDEPEND="${COMMON_DEP}
	>=virtual/jre-1.4"
DEPEND="${COMMON_DEP}
	>=virtual/jdk-1.4
	test? ( dev-java/ant-junit:0 )"

S=${WORKDIR}/${MY_P}

java_prepare() {
	# disables dependency fetching, and remove tests as a dependency of jar
	epatch "${FILESDIR}/${P}-gentoo.patch"
}

JAVA_ANT_REWRITE_CLASSPATH="yes"

EANT_EXTRA_ARGS="-Dlibdir=."
EANT_GENTOO_CLASSPATH="
	commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
	commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec-1.2.5
	jaxen-1.1,junit,servlet-api-2.5"

src_test() {
	java-pkg-2_src_test
}

src_install() {
	java-pkg_newjar target/${P}.jar ${PN}.jar

	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die

	use doc && java-pkg_dojavadoc dist/docs/api
	use source && java-pkg_dosrc src/java/*
}