Version bump.

(Portage version: 2.1.1_pre3-r4)
 (Signed Manifest commit)

4 files changed, 19 insertions, 88 deletions

diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
index cf6ff51bae9f..1e72f1e401fe 100644
--- a/dev-java/freemarker/Manifest
+++ b/dev-java/freemarker/Manifest
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX freemarker-2.3.6-gentoo.patch 969 RMD160 b2c3fdaffedddb8d49fa2489c8bdc50c31131adf SHA1 73a66cd36c018216c634e895c051e2e1b263e0f5 SHA256 18fc56480b35b3ab0841d772f2d99217cb7563b9913ca569a35e0be59457f30b
-MD5 3dca30f16ab39ce16f1bb2c93c586f34 files/freemarker-2.3.6-gentoo.patch 969
-RMD160 b2c3fdaffedddb8d49fa2489c8bdc50c31131adf files/freemarker-2.3.6-gentoo.patch 969
-SHA256 18fc56480b35b3ab0841d772f2d99217cb7563b9913ca569a35e0be59457f30b files/freemarker-2.3.6-gentoo.patch 969
-DIST freemarker-2.3.6.tar.gz 1986196 RMD160 0916693e765c08c3db2522822f754f70ff980b94 SHA1 eacf2cd92dbff44eba26429bb546d491f9f4ba0d SHA256 a2055455d0909a929bd6284af8e939ebe7bfad43c51ea2df4da6f8f89e8819a1
-EBUILD freemarker-2.3.6.ebuild 1206 RMD160 6668b4b37084730b8b8e9f4f877c327c62422ce9 SHA1 5a64fee3421ff707fd6f5a868d63657ba217bfef SHA256 3f9b15cc6abc49fcd71b2f7779b1d3791b0ecd214b8afb3849cc98d1953baeb4
-MD5 db8c6bc127d2e410ff27dedac96c032a freemarker-2.3.6.ebuild 1206
-RMD160 6668b4b37084730b8b8e9f4f877c327c62422ce9 freemarker-2.3.6.ebuild 1206
-SHA256 3f9b15cc6abc49fcd71b2f7779b1d3791b0ecd214b8afb3849cc98d1953baeb4 freemarker-2.3.6.ebuild 1206
-MISC ChangeLog 621 RMD160 cdc3e5c90c7364453c2989300a76e37d121f0db9 SHA1 f261329de0d5ac02cd03739330ab396d8fd8666a SHA256 204cc79f66dc09ed1ad1302b4ab8409efb2d336c562f5e27fad986cd7a97ff7c
-MD5 b6376541135b2555a834aee4dc790507 ChangeLog 621
-RMD160 cdc3e5c90c7364453c2989300a76e37d121f0db9 ChangeLog 621
-SHA256 204cc79f66dc09ed1ad1302b4ab8409efb2d336c562f5e27fad986cd7a97ff7c ChangeLog 621
+AUX freemarker-2.3.8-gentoo.patch 789 RMD160 d19c3be69848b6b2e4f12d89862d03441a776ccf SHA1 a84b0a09f24f7563f9769518b62e285bf65a34ff SHA256 ca7d30c3c09ed163472e5e4af7a5d0498a0871e3982d22f69f21776425381961
+MD5 dbeddba11d9598366718929d24c16384 files/freemarker-2.3.8-gentoo.patch 789
+RMD160 d19c3be69848b6b2e4f12d89862d03441a776ccf files/freemarker-2.3.8-gentoo.patch 789
+SHA256 ca7d30c3c09ed163472e5e4af7a5d0498a0871e3982d22f69f21776425381961 files/freemarker-2.3.8-gentoo.patch 789
+DIST freemarker-2.3.8.tar.gz 2012911 RMD160 9638b9296fd1369d3c20dab6b4445c901a4c26a9 SHA1 59a40b3da9d38d64774a95708e7a980808ded0f6 SHA256 cf0507fbe4901946e1842c1b63ac95e4b8ed59c0ea27b4398e207428f07633bf
+EBUILD freemarker-2.3.8.ebuild 1217 RMD160 aed31736e363e31dcb5a4a72eac26e468b07af2e SHA1 82d53eff08576c4bc8b846ddea5ff76a0635011e SHA256 a36ba614d94e3875a919743325e9291d851c1242af4e3082620df63c4df62638
+MD5 ed286aaa48593517a022e390f0e147e3 freemarker-2.3.8.ebuild 1217
+RMD160 aed31736e363e31dcb5a4a72eac26e468b07af2e freemarker-2.3.8.ebuild 1217
+SHA256 a36ba614d94e3875a919743325e9291d851c1242af4e3082620df63c4df62638 freemarker-2.3.8.ebuild 1217
+MISC ChangeLog 858 RMD160 d2240f469198e5f2bb1e3b6a193f3a52d1f1fe66 SHA1 de1134decbe3340b8a55167d882a57346623033d SHA256 dc115d4eef3166a282f6d60ad0deb7cc68585b20c2bdded7c1a7ab8c1772cceb
+MD5 95ec28b4da7c60365709a774a03e7486 ChangeLog 858
+RMD160 d2240f469198e5f2bb1e3b6a193f3a52d1f1fe66 ChangeLog 858
+SHA256 dc115d4eef3166a282f6d60ad0deb7cc68585b20c2bdded7c1a7ab8c1772cceb ChangeLog 858
 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 5994d68fed2b2597f2366554afaf8c94 files/digest-freemarker-2.3.6 253
-RMD160 a907521e5da87bde219354fd1ef3969aaa7d8695 files/digest-freemarker-2.3.6 253
-SHA256 cf6727d1b1a6ece297efe38e3da543ee1daa14e230f1b408170aed6600f9eaf2 files/digest-freemarker-2.3.6 253
+MD5 77299b15ef833c9e165b092ba4deddf3 files/digest-freemarker-2.3.8 253
+RMD160 463b4563edf3c38ebfcdf66cab52db346d68c0b6 files/digest-freemarker-2.3.8 253
+SHA256 71b172470989ef1a126d008c229fce0eace3477c8c0b67a91d2b427db6e4d993 files/digest-freemarker-2.3.8 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEt6QFgo/w9rxVVVERAlAsAKC/eLWebamrRyD6UxtevcTnt8E7fwCfQfkk
-8jgvNkGSZ/qOUfnqaeYJ+XM=
-=jZv2
+iD8DBQFExhhlgo/w9rxVVVERAu8UAJwJ+E0AjQAqT3PIzPzA7eSxNOHDXwCeOViv
+LF0IVPH/UkoMdb+DtgmrtFI=
+=PNVg
 -----END PGP SIGNATURE-----
diff --git a/dev-java/freemarker/files/digest-freemarker-2.3.6 b/dev-java/freemarker/files/digest-freemarker-2.3.6
deleted file mode 100644
index 119d2b3cff62..000000000000
--- a/dev-java/freemarker/files/digest-freemarker-2.3.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 86b65f283d5c57322cdd794f306a08d3 freemarker-2.3.6.tar.gz 1986196
-RMD160 0916693e765c08c3db2522822f754f70ff980b94 freemarker-2.3.6.tar.gz 1986196
-SHA256 a2055455d0909a929bd6284af8e939ebe7bfad43c51ea2df4da6f8f89e8819a1 freemarker-2.3.6.tar.gz 1986196
diff --git a/dev-java/freemarker/files/freemarker-2.3.6-gentoo.patch b/dev-java/freemarker/files/freemarker-2.3.6-gentoo.patch
deleted file mode 100644
index 4270d49100b5..000000000000
--- a/dev-java/freemarker/files/freemarker-2.3.6-gentoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nru freemarker-2.3.6.vanilla/src/freemarker/ext/rhino/RhinoFunctionModel.java freemarker-2.3.6/src/freemarker/ext/rhino/RhinoFunctionModel.java
---- freemarker-2.3.6.vanilla/src/freemarker/ext/rhino/RhinoFunctionModel.java	2006-05-13 11:30:05.000000000 +0200
-+++ freemarker-2.3.6/src/freemarker/ext/rhino/RhinoFunctionModel.java	2006-05-13 11:31:16.000000000 +0200
-@@ -37,7 +37,11 @@
-         for (int i = 0; i < args.length; i++) {

-             args[i] = wrapper.unwrap((TemplateModel)args[i], Scriptable.class);

-         }

--        return wrapper.wrap(((Function)getScriptable()).call(cx, 

--                ScriptableObject.getTopLevelScope(fnThis), fnThis, args));

-+        try {

-+            return wrapper.wrap(((Function)getScriptable()).call(cx, 

-+                    ScriptableObject.getTopLevelScope(fnThis), fnThis, args));

-+        } catch (Exception e) {

-+            throw new TemplateModelException(e.getMessage());

-+        }

-     }

- }

diff --git a/dev-java/freemarker/freemarker-2.3.6.ebuild b/dev-java/freemarker/freemarker-2.3.6.ebuild
deleted file mode 100644
index cb11fa3ba366..000000000000
--- a/dev-java/freemarker/freemarker-2.3.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.6.ebuild,v 1.3 2006/07/14 14:02:36 nelchael Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION=" FreeMarker is a template engine; a generic tool to generate text output (anything from HTML to autogenerated source code) based on templates."
-HOMEPAGE="http://freemarker.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="freemarker"
-SLOT="2.3"
-KEYWORDS="~amd64 ~x86"
-IUSE="source doc"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.4
-	=dev-java/servletapi-2.3*
-	=dev-java/jaxen-1.1*
-	dev-java/javacc"
-
-GETJARS_ARG="servletapi-2.3,jaxen-1.1"
-
-src_unpack() {
-
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-}
-
-src_compile() {
-
-	local antflags="jar -Djavacc.home=/usr/share/javacc/lib -lib $(java-pkg_getjars ${GETJARS_ARG})"
-	use doc && antflags="${antflags} javadoc"
-
-	eant clean ${antflags} || die "Compilation failed"
-
-}
-
-src_install() {
-
-	java-pkg_dojar lib/${PN}.jar
-	dodoc README.txt
-
-	use doc && java-pkg_dohtml -r build/api
-	use source && java-pkg_dosrc src
-
-}