Restore 2.3.10

Package-Manager: portage-2.1.4

5 files changed, 150 insertions, 8 deletions

diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog
index b99a7d33facd..bf2c1164d8f9 100644
--- a/dev-java/freemarker/ChangeLog
+++ b/dev-java/freemarker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/freemarker
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.16 2008/01/15 08:42:43 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.17 2008/01/21 11:06:50 nelchael Exp $
+
+  21 Jan 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/freemarker-2.3.10-gentoo.patch, +freemarker-2.3.10.ebuild:
+  Restore 2.3.10
 
 *freemarker-2.3.11 (15 Jan 2008)
 
diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
index 1b5ce3338134..1f8a710fa045 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.11-gentoo.patch 2061 RMD160 af095f67d5d546b902467c2ec4839a09317acf22 SHA1 b4a53b02bc6d5e275bf662d55f9c1851c2de7aa5 SHA256 4a54b85f8465f5476b25bac7ea355ba39f3eebcbf3c8ebe72c8b5d3d4ea7b581
 MD5 5cf0e671b8a99f025bd9586f01d496b7 files/freemarker-2.3.11-gentoo.patch 2061
 RMD160 af095f67d5d546b902467c2ec4839a09317acf22 files/freemarker-2.3.11-gentoo.patch 2061
 SHA256 4a54b85f8465f5476b25bac7ea355ba39f3eebcbf3c8ebe72c8b5d3d4ea7b581 files/freemarker-2.3.11-gentoo.patch 2061
+DIST freemarker-2.3.10.tar.gz 2029438 RMD160 edce21fb3df653596ff7f62d97fa3a5f16c02829 SHA1 b903d4a8a7530c72f468fe76ee9f66b37a3f6d8c SHA256 bf97f4121188b0772811f9f57a66fea9577e7d30688401302c5e673fb5b2875e
 DIST freemarker-2.3.11.tar.gz 2105172 RMD160 c565e65f9cbd70395c583cb08fd371b83550fe04 SHA1 cd16921baf37b296aa26998baaaa86e3aff5c932 SHA256 37c8442042e114fbaa74d48feed8f5790ed6986acdba15f26f999dd9c10b6d78
+EBUILD freemarker-2.3.10.ebuild 1471 RMD160 f193f8ffe2bc2fdbb9f08fefcedbaa231c275cb4 SHA1 9ddc2ab24e2fcfdc03645922213fb616010538bd SHA256 b2a681fac94bb9c1293310862ea3ecc082b9aad3115c72446fcc540e6c569b53
+MD5 27f821708ab744ce00b752ccb093dbe2 freemarker-2.3.10.ebuild 1471
+RMD160 f193f8ffe2bc2fdbb9f08fefcedbaa231c275cb4 freemarker-2.3.10.ebuild 1471
+SHA256 b2a681fac94bb9c1293310862ea3ecc082b9aad3115c72446fcc540e6c569b53 freemarker-2.3.10.ebuild 1471
 EBUILD freemarker-2.3.11.ebuild 1471 RMD160 6c557d912ae16a250727bf25f6e938f4640f82cf SHA1 e3ba87b66871de5923de95b4c22573191b2b401d SHA256 056003f7ac2d88ecb1b4d67d6e8c4d62a4467147b76ed25b64ed251c4a9a0491
 MD5 9757398851afbdb394315246c13f180d freemarker-2.3.11.ebuild 1471
 RMD160 6c557d912ae16a250727bf25f6e938f4640f82cf freemarker-2.3.11.ebuild 1471
 SHA256 056003f7ac2d88ecb1b4d67d6e8c4d62a4467147b76ed25b64ed251c4a9a0491 freemarker-2.3.11.ebuild 1471
-MISC ChangeLog 2498 RMD160 82a1645e47dba447ff44e881c0102257c15cfa69 SHA1 ad84fc0708fbfc56909257021f279fec6619a52a SHA256 d89b17b8f7effad89baa1de5784498e0c1258877a6c06e2a9b1c40e2b9b37fd9
-MD5 fd29d6dc7f64a17e89025b145fa9e73f ChangeLog 2498
-RMD160 82a1645e47dba447ff44e881c0102257c15cfa69 ChangeLog 2498
-SHA256 d89b17b8f7effad89baa1de5784498e0c1258877a6c06e2a9b1c40e2b9b37fd9 ChangeLog 2498
+MISC ChangeLog 2637 RMD160 7c8f6caed16bf1afe014ae63ba370f88599eb28a SHA1 238cc53c31b616b240ed33c7877a7bdeec2dded8 SHA256 5037e12006b19765c127a151ffad031e1b09d9857d7dedf35becd74888fe81a1
+MD5 53811ddadbef72ac9d49120fd0429660 ChangeLog 2637
+RMD160 7c8f6caed16bf1afe014ae63ba370f88599eb28a ChangeLog 2637
+SHA256 5037e12006b19765c127a151ffad031e1b09d9857d7dedf35becd74888fe81a1 ChangeLog 2637
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
 MD5 9f455923f62e1ecb14ebb7f29636850a metadata.xml 159
 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f metadata.xml 159
 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb metadata.xml 159
+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 672cb7b6ba48f57a5cd821820d0c3aa7 files/digest-freemarker-2.3.11 256
 RMD160 941d6c0e87479f81afe5fd9ef60659ef258b1a09 files/digest-freemarker-2.3.11 256
 SHA256 cdc35ccc2cf5859ea01b0aaf9dbcb9fade9abd669612af1d92eb82c7c535574a files/digest-freemarker-2.3.11 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHjHIIgo/w9rxVVVERAmi3AKCWP0omAVEaVXGwjEN7S1pJW9Et1gCeNkJU
-LiazjJdDD14cm8bQS02yaK4=
-=ULnB
+iD8DBQFHlHzQgo/w9rxVVVERAmxdAJ4tJ1G1fcFADtPHlYb6zfevseMWsgCgplEK
+qDsSlquncXc/6r52PhBpupM=
+=lI+L
 -----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..32f4858731b7
--- /dev/null
+++ b/dev-java/freemarker/freemarker-2.3.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 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.4 2008/01/21 11:06:50 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 ~x86-fbsd"
+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/*
+
+}