Switched to java-virtuals/servlet-api, EAPI=1 slots, and shrank description

Package-Manager: portage-2.1.4.1

3 files changed, 87 insertions, 3 deletions

diff --git a/dev-java/velocity/ChangeLog b/dev-java/velocity/ChangeLog
index 55ab939189dd..c5dcb11198f3 100644
--- a/dev-java/velocity/ChangeLog
+++ b/dev-java/velocity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/velocity
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.38 2007/08/26 14:22:12 betelgeuse Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.39 2008/03/22 21:45:15 wltjr Exp $
+
+*velocity-1.5-r1 (22 Mar 2008)
+
+  22 Mar 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  +velocity-1.5-r1.ebuild:
+  Switched to java-virtuals/servlet-api, EAPI=1 slots, and shrank description
 
   26 Aug 2007; Petteri Räty <betelgeuse@gentoo.org> velocity-1.5.ebuild:
   Relax commons-lang dependency to match 2.3
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 3008e0fd2594..3852612a2d95 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,5 +1,6 @@
 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 1886 RMD160 11460d754e5bc0522fb1460269fe8fe3c79c5cbb SHA1 d14b2d8fb3fad75797ed4e396055f0bec00f4ed9 SHA256 1f9423f56b59b40a687e901b58ff60540b80753f96b09eef74dce6e8c42d1ead
 EBUILD velocity-1.5.ebuild 1830 RMD160 5c87d18f616a50cbdd2dd1672940404383f5651d SHA1 46a806be2c85a42330efa51e89eaa62c5ca698d4 SHA256 5d76f6dacb4efef4c85470b08c700f26ae94df5dc10c531ca159e239af092113
-MISC ChangeLog 5087 RMD160 aa03f96b59abede21fd78878f3dbed329eb4d409 SHA1 855a9d3e45aa54303973a0936db46140beedf266 SHA256 8f3c566b63ba7ce25a9d3cfd1b052cdc44ec6e2a95ade6f39751354c7a91beb6
+MISC ChangeLog 5277 RMD160 2a84180499734ca943f9008a15a32836a8dfd3f5 SHA1 bcc09aa6d6d2616a7549afb24dac82d22ca025fd SHA256 231efcd9406b264b8054118ea0b4a0b831e68cfe87c9ef539838ff908e248285
 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
new file mode 100644
index 000000000000..4efc7842f30a
--- /dev/null
+++ b/dev-java/velocity/velocity-1.5-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 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.1 2008/03/22 21:45:15 wltjr Exp $
+
+EAPI=1
+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=""
+
+CDEPEND="
+	dev-java/commons-lang:2.1
+	dev-java/commons-collections
+	dev-java/jdom:1.0
+	dev-java/log4j
+	dev-java/avalon-logkit:2.0
+	dev-java/jakarta-oro:2.0
+	java-virtuals/servlet-api:2.3
+	dev-java/werken-xpath
+	dev-java/ant-core"
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit
+		dev-java/ant-antlr
+		dev-db/hsqldb
+	)
+	${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 --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
+}
+
+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/*
+}