Require >=jdk-1.5 for javacc-5.0. #315557

javacc is build-only dep.
EAPI bump and cleanup.

Package-Manager: portage-2.1.11.13/cvs/Linux x86_64

3 files changed, 93 insertions, 3 deletions

diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog
index 462cce12cf65..0d135b9c5ce8 100644
--- a/dev-java/freemarker/ChangeLog
+++ b/dev-java/freemarker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/freemarker
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.27 2009/12/29 07:43:23 josejx Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.28 2012/09/27 13:38:27 sera Exp $
+
+*freemarker-2.3.13-r1 (27 Sep 2012)
+
+  27 Sep 2012; Ralph Sennhauser <sera@gentoo.org> +freemarker-2.3.13-r1.ebuild:
+  Require >=jdk-1.5 for javacc-5.0. #315557
+  javacc is build-only dep.
+  EAPI bump and cleanup.
 
   29 Dec 2009; Joseph Jezak <josejx@gentoo.org> freemarker-2.3.13.ebuild:
   Marked ppc stable for bug #284326.
diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
index 3fabc35cae9f..0bcaa3d0069d 100644
--- a/dev-java/freemarker/Manifest
+++ b/dev-java/freemarker/Manifest
@@ -1,7 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX freemarker-2.3.10-gentoo.patch 1934 SHA256 9ae7310dae12b6a12389459683e886c16ddd6f5610a353dfc92d96f0b1693266 SHA512 33c7bb10a2ca076ce147b648d84178a6eb0de6f58bd6fff9791d2b2675dc90da15cbf3cef5a812a8c6ee69e51c94fa2ae91824eb6b69d378e0e5e89a91bd7085 WHIRLPOOL 03d32311c9aa4b4ce609058c98fb5feb6dce8c72e6f32cbde6e5eca197a2f5e7a8770678c84896ac4a180aa1a612ca9556fe3fdff3800a939ea4fddbd58c1ccf
 AUX freemarker-2.3.13-gentoo.patch 5228 SHA256 6bb4a5f0aa7696bbd1fb3666ec21605a90c0946c0fb131480282aab0d6cc97ad SHA512 857762085428fc094522d03a39b57a2fc74c1f7d57afe260383d04caeceea9fc30a5ab45d3a1039a30d8b18597c6b0500a0b998bbacfe746bdfb0902e96c8fbd WHIRLPOOL 91d5c51b2ee1c7883763d97520d7027aa76c77cfe11b12d5ee56723a58bfbe7e17d5dfbb22936688997e5e49b2e57c0675db7a93de43c87184c295347ce7832b
 AUX freemarker-jython-2.2.patch 1132 SHA256 f46b6f48c25b170561a1bbc3d95d37294362b0f60810ad8264ab4678461958fa SHA512 69525562e483e672a44f8de543f2c692b0d04c6f4ac1a1e7d9f35a4debf1d3d9b95125caae43ac54392eb18a184aa44bd9fb1a3da3a3d136b0dcee6916d9b6d1 WHIRLPOOL 736d3bbbb0d41de0c89d843c0e454a231a8696d5a6a5f92e6ea636b5b6f2997b01f28a3f37e37448640cd79001f23a45ade2d3bfd4b362ee7d4ed2bb09f21e66
 DIST freemarker-2.3.13.tar.gz 2136791 SHA256 00b43c28bc5b141e53ad9e56c472f40774b5638f96fc29f3d7cfa97048830eb5 SHA512 9216bc97e74779617ec91916842185472c3cfd4c5625168ddd2f4404237767df44c62d8308af8bed0ab10d72c8835c97daab7fbc1efa80c3e01c861dd334ec3b WHIRLPOOL f46ae311feb122e7ce52d2f4b518216c72135e5e6491d02cbef177fd76b798e7b7fa883a22067225e5a4de2163066696fb34f21708a5d821daf0d82c1460d9cc
+EBUILD freemarker-2.3.13-r1.ebuild 1714 SHA256 f86c0e8b11ec4cc4efa716cf77c2ee6384ba06d34cc209330992673f693d0980 SHA512 7d4ce7fdbaaa82dba5a1ec2658f85c52d5e4c3c557ab8212654331736021b42acb8e171b507b7c48beee92456fe2d07374b49b160a2610a979e346a4ee5f5cb6 WHIRLPOOL e04509b852d47da88a389397341945a08931137f587a36e55a8cdd76d015ea2eb584fd3f7b14abd99462e0d69f06a24785d4fc4e93a60f5e20505cea48fb41a6
 EBUILD freemarker-2.3.13.ebuild 1828 SHA256 a4231b6cdfd351415625ed9a0d5f24f1735d392f68e2aab39984aa29cf1d5f3a SHA512 5fbdc2ed9a356573239c3a902d0112b73a6149e326b64abd5b659640876405eb0fc768ad11d1430cc33bc202276ace3d42ac6ea257821078fa5ee69ad22ebfc2 WHIRLPOOL 83dbbfbca1ca4fb12edecc20f1e27fc7b1ab320d05e9ddbf9d0db3c36832c878596c08fc23e0f41322eb6d6976415656c65650833b58c79b61f2f6631f921860
-MISC ChangeLog 4114 SHA256 d030cd6dea498fd32b8b940e6bef8627ddc218a72cbe1a5ca6e0f392b4f631cb SHA512 febdaa08ecb6a1355c8b38dd2c99c31b8a6aeb7f3e834294effa3e8d96dbf9aea47b1b749ada10611d10909cd5ce50a1ae282579edf2722d4bbe2ea74f7ba728 WHIRLPOOL f7710a6ff335ce3af220d8ecdc3a506bbb82ec8e533b3818c5773fbc37a2eb2e7856cf8e6ff918c5d588f0de2b0da625035828481192de9ff2afab626c2d7bae
+MISC ChangeLog 4327 SHA256 feac86bf6cb12b39626f21efa6080992f828475e84f0d21239767cd2c1aad07e SHA512 e172ae6f97ef6a502818ac7763f0214105e2c2ab544b759aeb9a259768edd2e56bc3f4376192ff7a134ac3953243ca2fee53c0a67ca212081c0c47430cbe15b0 WHIRLPOOL ae30cef8d7e7c43eb72730c2a9714ef01b8ad2303b9be313f50f67b4547b3127544c75b6f910e202cd3e2f3334e61f01bbc049e940c51e4406cdf21142c59f00
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQZFboAAoJEIUJ+svaV163BAIIALB5ep0N2K6qe1o07F05V9Yo
+21MvaS2+qHYv1n28HJElazwo+b/ErTC3BCDCl0Fo0bElR2v3vyp04DRl3VYIdtrr
+2oJFbNRSrhrudAhD3tYnHqbMnfhBmyfcPkCG7+y+v4nU858CiqPmNo8qjC7M00hs
+gUgFQ1U5d/fjEU8D5FtjSAOXStYIBpY8yZGgO9F2T9NwvSTWczIbIbdxRyJxdeII
+CGJ4GePKLPuj7PUpBAUaD2vkTJ+NL0glZzIRk+Dgm8QPxDjWc7/CSwTS9BVfTJPl
+79BTBSmfWm2XoweQy1Rd2DKQ58ix9EZL6XacrlP8LN9w1B+EbJ1Fckj0pU0GauY=
+=JdAe
+-----END PGP SIGNATURE-----
diff --git a/dev-java/freemarker/freemarker-2.3.13-r1.ebuild b/dev-java/freemarker/freemarker-2.3.13-r1.ebuild
new file mode 100644
index 000000000000..5f8e82b0cebc
--- /dev/null
+++ b/dev-java/freemarker/freemarker-2.3.13-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.13-r1.ebuild,v 1.1 2012/09/27 13:38:27 sera Exp $
+
+EAPI="4"
+
+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/jython-2.2:0
+	java-virtuals/servlet-api:2.3
+	java-virtuals/servlet-api:2.4
+	java-virtuals/servlet-api:2.5
+	dev-java/jaxen:1.1
+	dev-java/juel:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	dev-java/javacc:0"
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	# for ecj-3.5
+	java-ant_rewrite-bootclasspath auto
+}
+
+src_compile() {
+	# BIG FAT WARNING:
+	# clean target removes lib/ directory!!
+	eant clean
+
+	mkdir -p lib/jsp-{1.2,2.0,2.1} || die
+	pushd lib >/dev/null || die
+	java-pkg_jar-from --virtual --into jsp-1.2 servlet-api-2.3
+	java-pkg_jar-from --virtual --into jsp-2.0 servlet-api-2.4
+	java-pkg_jar-from --virtual --into jsp-2.1 servlet-api-2.5
+	java-pkg_jar-from jaxen-1.1
+	java-pkg_jar-from jython
+	java-pkg_jar-from --build-only javacc
+	java-pkg_jar-from juel
+	popd >/dev/null
+
+	eant jar $(use_doc) -Djavacc.home=/usr/share/javacc/lib
+}
+
+src_install() {
+	java-pkg_dojar lib/${PN}.jar
+	dodoc README.txt
+
+	use doc && java-pkg_dojavadoc build/api
+	use source && java-pkg_dosrc src/*
+}