Restore 2.3.10-r1 as 2.3.11 is package.masked.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-tuxonice-r5 x86_64)

2 files changed, 81 insertions, 1 deletions

diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog
index 0cf6a3acbebf..cdad93107f09 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.19 2008/04/05 00:40:25 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.20 2008/06/20 21:51:13 nelchael Exp $
+
+  20 Jun 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  +freemarker-2.3.10-r1.ebuild:
+  Restore 2.3.10-r1 as 2.3.11 is package.masked.
 
   05 Apr 2008; Petteri Räty <betelgeuse@gentoo.org>
   -freemarker-2.3.10.ebuild, -freemarker-2.3.10-r1.ebuild:
diff --git a/dev-java/freemarker/freemarker-2.3.10-r1.ebuild b/dev-java/freemarker/freemarker-2.3.10-r1.ebuild
new file mode 100644
index 000000000000..4bb4816d8bfa
--- /dev/null
+++ b/dev-java/freemarker/freemarker-2.3.10-r1.ebuild
@@ -0,0 +1,76 @@
+# 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-r1.ebuild,v 1.3 2008/06/20 21:51:13 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-2.2.1
+	=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"
+	#If you remove this patch, remove the postinst function.
+	epatch "${FILESDIR}/${PN}-jython-2.2.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/*
+}
+
+pkg_postinst() {
+	elog "This version of freemarker has been patched to allow use with"
+	elog ">=dev-java/jython-2.2.1.  This patch breaks compatibility with"
+	elog "the upstream supported jython-2.1.  Please be aware of this before"
+	elog "using and file bugs at https://bugs.gentoo.org, not upstream."
+}