Version bump and restrict tests. see #219668.

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

4 files changed, 101 insertions, 6 deletions

diff --git a/dev-java/velocity/ChangeLog b/dev-java/velocity/ChangeLog
index 93773a583070..b78c9d5fdc4f 100644
--- a/dev-java/velocity/ChangeLog
+++ b/dev-java/velocity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/velocity
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.41 2008/05/02 20:01:03 opfer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.42 2010/03/17 09:32:53 ali_bush Exp $
+
+*velocity-1.6.3 (16 Mar 2010)
+
+  16 Mar 2010; Alistair Bush <ali_bush@gentoo.org> velocity-1.5-r1.ebuild,
+  +velocity-1.6.3.ebuild:
+  Version bump and restrict tests. see #219668.
 
   02 May 2008; Christian Faulhammer <opfer@gentoo.org>
   velocity-1.5-r1.ebuild:
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 959745322890..22f52f65f2dc 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,6 +1,8 @@
 AUX velocity-1.4-versioned_jar.patch 2237 RMD160 2d79615b45f51d94b19967de0ae263b0fe65dd10 SHA1 c982f779d73d33bfb89c997dd908ff8327813ea5 SHA256 18fd6dad922d571a63e2a5fe2f036455ab4aea3a0c7224eba84ac8c6576baa09
 DIST velocity-1.5.tar.gz 4548966 RMD160 f9c5df89e786cb7672072d59ce2b4e02f703fdeb SHA1 9d3d0e41a69cb244597f3c886780a227980d5260 SHA256 26138ab6a2ff430f08c3410ad1a760034e48ae823a4dd15b26eed087f49fa8eb
-EBUILD velocity-1.5-r1.ebuild 1918 RMD160 e59e11b362db7189e6b4aee9d8e13fe5325e439f SHA1 52a41f87615a87b3b46513baf09184a1319c403a SHA256 63ae8db3869bb3a2d0f60db76ddc1e29d93e6d2ca314cde7591cc9a1335fac9d
+DIST velocity-1.6.3.tar.gz 5773231 RMD160 5f5f3a67e6bfa5ce6f2f97604f5fa6aabfe75deb SHA1 9ad441577dbf0a8b828a5759c4e98d0ebeeea748 SHA256 63b42ecd8b03a3dabb6a0cc7086844dc0af1066847fb442824b4e0e0fb622e1e
+EBUILD velocity-1.5-r1.ebuild 1969 RMD160 b5b67e396bfac660764def2ba05ff3a99c5ea22d SHA1 18ef0f080487236b0703975e0f7eff9f2e6fbc1d SHA256 84c536c3f3f1938a4c8bcabf41cb7212808dc1d1012ac889aa3ef159aa3e4066
 EBUILD velocity-1.5.ebuild 1830 RMD160 5c87d18f616a50cbdd2dd1672940404383f5651d SHA1 46a806be2c85a42330efa51e89eaa62c5ca698d4 SHA256 5d76f6dacb4efef4c85470b08c700f26ae94df5dc10c531ca159e239af092113
-MISC ChangeLog 5471 RMD160 9f4e6548f3ab134d813b40e31e9ec8830744d5b9 SHA1 656cb00e85bdc43d3ceafa1e995f0d792ae9024e SHA256 189e35f368ee5b5749bd4e3923e963ecc4867e3bcbd4828392ec131dfb5d49b7
+EBUILD velocity-1.6.3.ebuild 2094 RMD160 753fa189c29e47936c88ba044a51a015a5f234a4 SHA1 6dc10fcf65d8bfec7b044422da0e9e0f01770d3e SHA256 760dd3895b50d6aaff026649386a78f36160a3f836f230d7b6403c1eb7903b97
+MISC ChangeLog 5655 RMD160 3afa3183ab45ba17924d639c3d524cb4b4fef7db SHA1 5c33cfac0088c38ae5b4f427635195f77f304724 SHA256 d1b701cefc396d888e8b79b0a6d0b2b22ad88ecf0344fe246785131933e8bfbb
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/velocity/velocity-1.5-r1.ebuild b/dev-java/velocity/velocity-1.5-r1.ebuild
index eda6a4139ea6..ca8e135b49eb 100644
--- a/dev-java/velocity/velocity-1.5-r1.ebuild
+++ b/dev-java/velocity/velocity-1.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.5-r1.ebuild,v 1.3 2008/05/02 20:01:03 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.5-r1.ebuild,v 1.4 2010/03/17 09:32:53 ali_bush Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="examples doc source test"
@@ -58,6 +58,9 @@ src_compile () {
 	eant jar -Dskip-download=true #prebuilt javadocs
 }
 
+#One test fails see #219668 :(
+RESTRICT="test"
+
 src_test() {
 	mkdir -p bin/test-lib || die
 	cd bin/test-lib || die
diff --git a/dev-java/velocity/velocity-1.6.3.ebuild b/dev-java/velocity/velocity-1.6.3.ebuild
new file mode 100644
index 000000000000..3fc24686c0da
--- /dev/null
+++ b/dev-java/velocity/velocity-1.6.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.6.3.ebuild,v 1.1 2010/03/17 09:32:53 ali_bush Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="examples doc source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A Java-based template engine for easy creation/rendering of documents that format and present data."
+HOMEPAGE="http://velocity.apache.org"
+SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+CDEPEND="
+	dev-java/commons-lang:2.1
+	dev-java/commons-collections:0
+	dev-java/commons-logging:0
+	dev-java/jdom:1.0
+	dev-java/log4j:0
+	dev-java/avalon-logkit:2.0
+	dev-java/jakarta-oro:2.0
+	java-virtuals/servlet-api:2.3
+	dev-java/werken-xpath:0
+	dev-java/ant-core:0"
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit:0
+		dev-java/ant-antlr:0
+		dev-db/hsqldb:0
+	)
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v *.jar lib/test/*.jar lib/*.jar || die
+
+	mkdir -p bin/lib
+	cd bin/lib || die
+
+	java-pkg_jar-from commons-lang-2.1
+	java-pkg_jar-from commons-logging commons-logging-api.jar \
+		commons-logging.jar
+	java-pkg_jar-from --virtual servlet-api-2.3
+	java-pkg_jar-from jdom-1.0,log4j,avalon-logkit-2.0
+	java-pkg_jar-from ant-core,commons-collections
+	java-pkg_jar-from werken-xpath,jakarta-oro-2.0
+}
+
+src_compile () {
+	cd "${S}/build"
+	eant jar -Dskip-download=true #prebuilt javadocs
+}
+
+#One test fails. see #219668
+RESTRICT="test"
+
+src_test() {
+	mkdir -p bin/test-lib || die
+	cd bin/test-lib || die
+	java-pkg_jar-from junit,hsqldb
+	java-pkg_jar-from --virtual servlet-api-2.3
+	cd "${S}/build"
+	ANT_TASKS="ant-junit ant-antlr" eant test -Dskip-download=true
+}
+
+src_install () {
+	java-pkg_newjar bin/*.jar
+
+	dodoc NOTICE README.txt || die
+	# has other stuff besides api too
+	use doc && java-pkg_dohtml -r docs/*
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/java/*
+}