No longer used bundled jars (bug #63275).

(Portage version: 2.0.53_rc7)

5 files changed, 128 insertions, 14 deletions

diff --git a/dev-java/velocity/ChangeLog b/dev-java/velocity/ChangeLog
index 5209fa8e19c1..25bfe0d10e77 100644
--- a/dev-java/velocity/ChangeLog
+++ b/dev-java/velocity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/velocity
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.17 2005/05/18 12:11:59 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.18 2005/12/09 01:50:03 nichoj Exp $
+
+*velocity-1.4-r3 (09 Dec 2005)
+
+  09 Dec 2005; Joshua Nichols <nichoj@gentoo.org>
+  +files/velocity-1.4-versioned_jar.patch, +velocity-1.4-r3.ebuild:
+  No longer used bundled jars (bug #63275).
 
 *velocity-1.4-r2 (18 May 2005)
 
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 2e4ba991959a..3a906f5dd39a 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5a3f2fb72b2d9e485817bb1fbeae03f1 velocity-1.4-r2.ebuild 1408
-MD5 63f4771f7a97fe6d62557744cc622c66 velocity-1.4-r1.ebuild 1371
 MD5 ce29cb44c25a7dafa441a5f3bf79bb3a ChangeLog 2450
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 ebc2b845ee1e201a404b4eceb168952a files/digest-velocity-1.4-r1 65
 MD5 ebc2b845ee1e201a404b4eceb168952a files/digest-velocity-1.4-r2 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC16Fg/rLF9B432nYRAkd6AKC2k5aJ3+Ognxu78Gm2mygg99ta0ACfVEPp
-7mkOD1mDaxs7Cwh5VEmEqJ0=
-=lfuM
------END PGP SIGNATURE-----
+MD5 ebc2b845ee1e201a404b4eceb168952a files/digest-velocity-1.4-r3 65
+MD5 1b739fb0994afdb5b18dc46f157211f7 files/velocity-1.4-versioned_jar.patch 2237
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 63f4771f7a97fe6d62557744cc622c66 velocity-1.4-r1.ebuild 1371
+MD5 5a3f2fb72b2d9e485817bb1fbeae03f1 velocity-1.4-r2.ebuild 1408
+MD5 2f704a14f4c5d1dfb87c8644fd2322ac velocity-1.4-r3.ebuild 1689
diff --git a/dev-java/velocity/files/digest-velocity-1.4-r3 b/dev-java/velocity/files/digest-velocity-1.4-r3
new file mode 100644
index 000000000000..ccc2e9c9c5dd
--- /dev/null
+++ b/dev-java/velocity/files/digest-velocity-1.4-r3
@@ -0,0 +1 @@
+MD5 f280fee7ddb5eac5b354f6dea39a2f51 velocity-1.4.tar.gz 4566056
diff --git a/dev-java/velocity/files/velocity-1.4-versioned_jar.patch b/dev-java/velocity/files/velocity-1.4-versioned_jar.patch
new file mode 100644
index 000000000000..5b445594058c
--- /dev/null
+++ b/dev-java/velocity/files/velocity-1.4-versioned_jar.patch
@@ -0,0 +1,48 @@
+diff -ru velocity-1.4/build/build.xml velocity-1.4-gentoo/build/build.xml
+--- velocity-1.4/build/build.xml	2004-04-14 08:26:40.000000000 -0400
++++ velocity-1.4-gentoo/build/build.xml	2005-07-14 21:33:37.000000000 -0400
+@@ -287,7 +287,7 @@
+   <!-- =================================================================== -->

+   <target name="jar" depends="compile">

+          

+-    <jar jarfile="${build.dir}/${project}-${version}.jar">

++    <jar jarfile="${build.dir}/${project}.jar">

+ 

+       <fileset dir="${build.dest}">

+         <exclude name="**/package.html"/>

+@@ -324,7 +324,7 @@
+   <!-- =================================================================== -->

+   <target name="jar-J2EE" depends="compile-J2EE" if="J2EE.present">

+         

+-    <jar jarfile="${build.dir}/${project}-J2EE-${version}.jar"

++    <jar jarfile="${build.dir}/${project}-J2EE.jar"

+       basedir="${build.dest}"

+       excludes="**/package.html"

+     />

+@@ -336,7 +336,7 @@
+   <!-- =================================================================== -->

+   <target name="jar-core" depends="compile">

+         

+-    <jar compress="true" jarfile="${build.dir}/${project}-core-${version}.jar">

++    <jar compress="true" jarfile="${build.dir}/${project}-core.jar">

+       <fileset dir="${build.dest}">

+         <exclude name="**/package.html"/>

+         <exclude name="org/apache/oro/**"/>

+@@ -356,7 +356,7 @@
+   <!-- =================================================================== -->

+   <target name="jar-util" depends="compile">

+         

+-    <jar jarfile="${build.dir}/${project}-util-${version}.jar">

++    <jar jarfile="${build.dir}/${project}-util.jar">

+       <fileset dir="${build.dest}">

+         <exclude name="**/package.html"/>

+         <include name="org/apache/velocity/anakia/**"/>

+@@ -373,7 +373,7 @@
+   <!-- =================================================================== -->

+   <target name="jar-servlet" depends="compile">

+         

+-    <jar jarfile="${build.dir}/${project}-servlet-${version}.jar">

++    <jar jarfile="${build.dir}/${project}-servlet.jar">

+       <fileset dir="${build.dest}">

+         <exclude name="**/package.html"/>

+         <include name="org/apache/velocity/servlet/**"/>

diff --git a/dev-java/velocity/velocity-1.4-r3.ebuild b/dev-java/velocity/velocity-1.4-r3.ebuild
new file mode 100644
index 000000000000..5c0a7d749b45
--- /dev/null
+++ b/dev-java/velocity/velocity-1.4-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.4-r3.ebuild,v 1.1 2005/12/09 01:50:04 nichoj Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="A Java-based template engine that allows easy creation/rendering of documents that format and present data."
+HOMEPAGE="http://jakarta.apache.org/velocity/"
+SRC_URI="mirror://apache/jakarta/${PN}/binaries/${P}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc jikes source"
+
+DEPEND=">=virtual/jdk-1.3.1
+	dev-java/ant-core
+	dev-java/antlr
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jdk-1.3.1
+	dev-java/bcel
+	dev-java/commons-collections
+	=dev-java/jdom-1.0_beta9*
+	dev-java/log4j
+	=dev-java/avalon-logkit-1.2*
+	=dev-java/jakarta-oro-2.0*
+	=dev-java/servletapi-2.2*
+	dev-java/werken-xpath"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-versioned_jar.patch
+
+	cd ${S}/build/lib
+	rm *.jar
+	java-pkg_jar-from antlr
+	java-pkg_jar-from bcel
+	java-pkg_jar-from commons-collections
+	java-pkg_jar-from jakarta-oro-2.0
+	java-pkg_jar-from jdom-1.0_beta9
+	java-pkg_jar-from log4j
+	java-pkg_jar-from avalon-logkit-1.2
+	java-pkg_jar-from servletapi-2.2
+	java-pkg_jar-from werken-xpath
+}
+
+src_compile () {
+	cd ${S}/build
+	local antflags="jar jar-core jar-util jar-servlet"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use doc && antflags="${antflags} javadocs"
+
+	ant ${antflags} || die "Ant failed"
+}
+
+
+src_install () {
+	java-pkg_dojar bin/*.jar
+
+	dodoc NOTICE README.txt
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/java/*
+}