Version bump.

Package-Manager: portage-2.1.2.6

5 files changed, 152 insertions, 8 deletions

diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog
index d6024e24cf13..0a15c1dc7c35 100644
--- a/dev-java/freemarker/ChangeLog
+++ b/dev-java/freemarker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/freemarker
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.11 2007/04/28 15:01:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.12 2007/05/06 10:12:18 nelchael Exp $
+
+*freemarker-2.3.10 (06 May 2007)
+
+  06 May 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/freemarker-2.3.10-gentoo.patch, +freemarker-2.3.10.ebuild:
+  Version bump.
 
   28 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   -files/freemarker-2.3.8-gentoo.patch, -freemarker-2.3.8.ebuild,
diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
index 3a67eae58499..68c7c2cb05e9 100644
--- a/dev-java/freemarker/Manifest
+++ b/dev-java/freemarker/Manifest
@@ -1,30 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX freemarker-2.3.10-gentoo.patch 1934 RMD160 63b558825d19eb9492a728a478caf96ed522ae15 SHA1 8af8ad60fbee21c4655070da25aa74fa39f0476c SHA256 9ae7310dae12b6a12389459683e886c16ddd6f5610a353dfc92d96f0b1693266
+MD5 2e103af3df6ab5591f332a255b435f3f files/freemarker-2.3.10-gentoo.patch 1934
+RMD160 63b558825d19eb9492a728a478caf96ed522ae15 files/freemarker-2.3.10-gentoo.patch 1934
+SHA256 9ae7310dae12b6a12389459683e886c16ddd6f5610a353dfc92d96f0b1693266 files/freemarker-2.3.10-gentoo.patch 1934
 AUX freemarker-2.3.9-gentoo.patch 2477 RMD160 67e7cf681ee8ee999e0b2a5625f682d185839722 SHA1 c7a411218394a07a9d3f1bac7f7b133cfbc005fa SHA256 b567c5d975a820af31b8b5cc13e17529fee05cd8178fd38125de681ac9a42744
 MD5 03ec18b10011301b5dc0c52a6b420de0 files/freemarker-2.3.9-gentoo.patch 2477
 RMD160 67e7cf681ee8ee999e0b2a5625f682d185839722 files/freemarker-2.3.9-gentoo.patch 2477
 SHA256 b567c5d975a820af31b8b5cc13e17529fee05cd8178fd38125de681ac9a42744 files/freemarker-2.3.9-gentoo.patch 2477
+DIST freemarker-2.3.10.tar.gz 2029438 RMD160 edce21fb3df653596ff7f62d97fa3a5f16c02829 SHA1 b903d4a8a7530c72f468fe76ee9f66b37a3f6d8c SHA256 bf97f4121188b0772811f9f57a66fea9577e7d30688401302c5e673fb5b2875e
 DIST freemarker-2.3.9.tar.gz 2016244 RMD160 b12965adcf7d33e887b7a0367caa94a01a2c5bb7 SHA1 38c8c1db197ea0db3da61a3df80cb96c76b3d138 SHA256 f9b462312bfbf22058e5d43683754a0a87294e5dff9bc1696b6ee48b0dafeefa
+EBUILD freemarker-2.3.10.ebuild 1461 RMD160 0f805b72f822ab28c33ef0a76911cb3da7996655 SHA1 42d02ee62baf6a3217be04aefd50ffe851045eaf SHA256 59a9c45c2a3a2b6cbbf30bd1d488a483f5d571bb689abd531e1ecc834a55fece
+MD5 2143ca653a50ff11f6e5673069d44f63 freemarker-2.3.10.ebuild 1461
+RMD160 0f805b72f822ab28c33ef0a76911cb3da7996655 freemarker-2.3.10.ebuild 1461
+SHA256 59a9c45c2a3a2b6cbbf30bd1d488a483f5d571bb689abd531e1ecc834a55fece freemarker-2.3.10.ebuild 1461
 EBUILD freemarker-2.3.9.ebuild 1460 RMD160 defabd40f6c8dd8d24a0679c2fe34cebd6cb4786 SHA1 d9d09508875776af83c3bf3bb0357c5651aae77b SHA256 ce0833ab55e19c7fd5851a3486b30e8b3e28d3bb4691ff1a10865aaf6ebda392
 MD5 6564987cea38c18d7eb13b55d0539136 freemarker-2.3.9.ebuild 1460
 RMD160 defabd40f6c8dd8d24a0679c2fe34cebd6cb4786 freemarker-2.3.9.ebuild 1460
 SHA256 ce0833ab55e19c7fd5851a3486b30e8b3e28d3bb4691ff1a10865aaf6ebda392 freemarker-2.3.9.ebuild 1460
-MISC ChangeLog 1732 RMD160 a41371f453575fc92f4c7f176b4bdf1b55709313 SHA1 596d27d1197be1cff00dff3b3116f581b3c6d22f SHA256 a87ecd50b259b1f1d15f3331373eb740f3095b36959115348f17a378fffa16e5
-MD5 826eea02f37d247e099f612dedf7c2d1 ChangeLog 1732
-RMD160 a41371f453575fc92f4c7f176b4bdf1b55709313 ChangeLog 1732
-SHA256 a87ecd50b259b1f1d15f3331373eb740f3095b36959115348f17a378fffa16e5 ChangeLog 1732
+MISC ChangeLog 1904 RMD160 26a46f7c6e78bbfdf06fe9cca77eeacb4839eb43 SHA1 a9c11e631dea9c5a5cc437a046819362d728e044 SHA256 047035004503cb1298516cab5bc80b3fb9e3c3ebffdf86a4a98ca82993fe1313
+MD5 ba3d2d5ecb574bdda2626a26616df9ce ChangeLog 1904
+RMD160 26a46f7c6e78bbfdf06fe9cca77eeacb4839eb43 ChangeLog 1904
+SHA256 047035004503cb1298516cab5bc80b3fb9e3c3ebffdf86a4a98ca82993fe1313 ChangeLog 1904
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884 metadata.xml 229
+MD5 4de632c1c96b78d427c457f50a2e7143 files/digest-freemarker-2.3.10 256
+RMD160 e8a81f6f3a5c7cd1c6a59aac26c408660ca74a48 files/digest-freemarker-2.3.10 256
+SHA256 facb1f4a4b5dbcc00da18b72400e817ba7ccc4fba8b916d291a34141ac89df9c files/digest-freemarker-2.3.10 256
 MD5 44334ec3c158e1618813fb32f501080e files/digest-freemarker-2.3.9 253
 RMD160 e8d086f81140a9e26606fda2f4acd03bf31e8dab files/digest-freemarker-2.3.9 253
 SHA256 f419df8f4a06374d4a560a2f967e48d2a81b5ec10dc60666731067406e96c950 files/digest-freemarker-2.3.9 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGM2H+go/w9rxVVVERAgllAJ4titzVzRtyXIEulBd0Wjd6xxzhzACguTeo
-ui4cAyGcDtdufQ0jJq32r4Y=
-=XK6w
+iD8DBQFGPapFgo/w9rxVVVERAo4aAKCpaerXPTmP1uvjcomTL8YPML3S/wCgnjxz
+X6TG47mZSZgObLCPlH3bg2E=
+=DXW6
 -----END PGP SIGNATURE-----
diff --git a/dev-java/freemarker/files/digest-freemarker-2.3.10 b/dev-java/freemarker/files/digest-freemarker-2.3.10
new file mode 100644
index 000000000000..b70e565de039
--- /dev/null
+++ b/dev-java/freemarker/files/digest-freemarker-2.3.10
@@ -0,0 +1,3 @@
+MD5 0fbf40be3cbf5b1ff5852aab3cc8392c freemarker-2.3.10.tar.gz 2029438
+RMD160 edce21fb3df653596ff7f62d97fa3a5f16c02829 freemarker-2.3.10.tar.gz 2029438
+SHA256 bf97f4121188b0772811f9f57a66fea9577e7d30688401302c5e673fb5b2875e freemarker-2.3.10.tar.gz 2029438
diff --git a/dev-java/freemarker/files/freemarker-2.3.10-gentoo.patch b/dev-java/freemarker/files/freemarker-2.3.10-gentoo.patch
new file mode 100644
index 000000000000..2282b04de165
--- /dev/null
+++ b/dev-java/freemarker/files/freemarker-2.3.10-gentoo.patch
@@ -0,0 +1,54 @@
+diff -Nru freemarker-2.3.10.vanilla/build.xml freemarker-2.3.10/build.xml
+--- freemarker-2.3.10.vanilla/build.xml	2007-05-06 11:46:06.000000000 +0200
++++ freemarker-2.3.10/build.xml	2007-05-06 11:48:55.000000000 +0200
+@@ -55,16 +55,19 @@
+         <pathelement path="${lib.log4j}"/>

+         <pathelement path="${lib.rhino}"/>

+         <pathelement path="${java.class.path}"/>

++        <fileset dir="lib" includes="*.jar"/>

+     </path>

+     

+     <path id="compile.classpath">

+         <path refid="compile.nojsp.classpath"/>

+         <pathelement path="${lib.servlet23}"/>

++        <fileset dir="lib" includes="*.jar"/>

+     </path>

+ 

+     <path id="compile.jsp2.classpath">

+         <path refid="compile.nojsp.classpath"/>

+         <pathelement path="${lib.servlet24}"/>

++        <fileset dir="lib" includes="*.jar"/>

+     </path>

+ 

+     <path id="compile.classpath.testcases">

+@@ -72,6 +75,7 @@
+         <pathelement path="${lib.jython}"/>

+         <pathelement path="${lib.jdom}"/>

+         <pathelement path="${lib.servlet23}"/>

++        <fileset dir="lib" includes="*.jar"/>

+     </path>

+ 

+     <path id="compile.classpath.javadoc">

+@@ -89,12 +93,14 @@
+         <pathelement path="${src.dir}"/>

+         <pathelement path="${build.javacc.dir}"/>

+         <pathelement path="${java.class.path}"/>

++        <fileset dir="lib" includes="*.jar"/>

+     </path>

+ 

+     <path id="compile.classpath.examples">

+         <pathelement path="${lib.servlet23}"/>

+         <pathelement path="${lib.dir}/freemarker.jar"/>

+         <pathelement path="${lib.struts}"/>

++        <fileset dir="lib" includes="*.jar"/>

+     </path>

+     

+     <path id="full.classpath">

+@@ -110,6 +116,7 @@
+         <pathelement path="${lib.logkit}"/>

+         <pathelement path="${lib.log4j}"/>

+         <pathelement path="${java.class.path}"/>

++        <fileset dir="lib" includes="*.jar"/>

+     </path>

+     

+     

diff --git a/dev-java/freemarker/freemarker-2.3.10.ebuild b/dev-java/freemarker/freemarker-2.3.10.ebuild
new file mode 100644
index 000000000000..cd393d0ee2f4
--- /dev/null
+++ b/dev-java/freemarker/freemarker-2.3.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.10.ebuild,v 1.1 2007/05/06 10:12:18 nelchael Exp $
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION=" FreeMarker is a template engine; a generic tool to generate text output based on templates."
+HOMEPAGE="http://freemarker.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="freemarker"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEP="dev-java/javacc
+	dev-java/jython
+	=dev-java/servletapi-2.3*
+	=dev-java/jaxen-1.1*"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	cd "${S}/lib/"
+	rm -f *.jar
+
+	rm -f "${S}/src/freemarker/testcase/servlets/WEB-INF/taglib2.jar"
+	rm -f "${S}/src/freemarker/testcase/servlets/WEB-INF/lib/taglib-foo.jar"
+
+}
+
+src_compile() {
+
+	# BIG FAT WARNING:
+	# clean target removes lib/ directory!!
+	eant clean
+
+	mkdir lib/
+	cd lib/
+	java-pkg_jar-from servletapi-2.3
+	java-pkg_jar-from jaxen-1.1
+	java-pkg_jar-from jython
+
+	cd "${S}"
+	eant jar $(use_doc) -Djavacc.home=/usr/share/javacc/lib
+
+}
+
+src_install() {
+
+	java-pkg_dojar lib/${PN}.jar
+	dodoc README.txt || die
+
+	use doc && java-pkg_dojavadoc build/api
+	use source && java-pkg_dosrc src/*
+
+}