version bump wrt #279348

4 files changed, 195 insertions, 0 deletions

diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
new file mode 100644
index 0000000..fa6750e
--- /dev/null
+++ b/dev-java/freemarker/Manifest
@@ -0,0 +1,4 @@
+AUX freemarker-2.3.19-gentoo.patch 4498 SHA256 8115b7614c31817022d26d37400014bc7fe42faa98ff0a5895bdc835944d9aaa SHA512 9325a385a523595ad20baa7ac2a3f1e0725d8482ad8d343a61e0e452d546cb0955004426f5d76df7ec842831da52cfb1917a46c2033c2a08d493483930dbf998 WHIRLPOOL 598d57471f0cb65d88593908ce3ac400db97bd95d83ba55aa7eeee5c6f8d3468b8fb9f2186eea03b045e394481c1be12bc123c219e2d0894a25d171bc253d577
+DIST freemarker-2.3.19.tar.gz 2705412 SHA256 d61fb022d06c40a512b59006d21da1f1d11a6b1a4a6267c43f092af0641c4abd SHA512 02df537508f34da620d93ae50ee3c1faa6b78164320669011c787485bb42266054962c97b689a10a68f3f7b08a3952c2efb82ac14683b5c9202de73ff14c7fea WHIRLPOOL 04d54bb8636634a2d463f56c01a6516a30d0fabd926a3d0951c3b3e8f8ad788b1f1beb21e2402800fb5627d2b278a0944ed1f4fd809b0d0ddb679fc051f44dc0
+EBUILD freemarker-2.3.19.ebuild 1921 SHA256 ac3e5bfa6361487946d27425770f68d7ba96803f87bfbfa93d5eaf57b6c62751 SHA512 245613543ab6677d734728a93cb4c908a633c724c103d6cbf62cd249a7f5b4f2686da288c66bb680b9e3b38630c09fb613a1ea9156c54a463a809cde56462818 WHIRLPOOL 8839d5770a9e8f51f88b53ece699878b754c6cfbfb6bc1415a0022d1c3a188719459777a1d6187f280689d4fee3b9bef3cf132bad0649d5f4b896dfc48c54052
+MISC metadata.xml 205 SHA256 2ff0740a5424b0e10c7888541a248d1bd363a60911b0921b4cfe5c36590498ce SHA512 e7c77c724739d0af43cc338ded09dcbeee2a710eb0e49f1e656dc4c891bee85bfd6935bf70a191a1c5823f473643e676d64970416e5f1820ea466681016757c5 WHIRLPOOL 5b7f0c2a5243244fa06b072c8f0d9f53e7b6f45c7e1b74a0d945bdcc28b7137fddfd58e85b0d3e721e80963916ceae0d4cca59f48114ba26c47b24a91d6abb27
diff --git a/dev-java/freemarker/files/freemarker-2.3.19-gentoo.patch b/dev-java/freemarker/files/freemarker-2.3.19-gentoo.patch
new file mode 100644
index 0000000..ec98343
--- /dev/null
+++ b/dev-java/freemarker/files/freemarker-2.3.19-gentoo.patch
@@ -0,0 +1,113 @@
+diff -Nru /tmp/freemarker-2.3.19.orig/build.xml ./build.xml
+--- /tmp/freemarker-2.3.19.orig/build.xml	2012-03-01 02:56:24.000000000 +0200
++++ ./build.xml	2012-09-29 21:45:17.876005850 +0300
+@@ -54,13 +54,14 @@
+     <property name="lib.dom4j" location="lib/dom4j.jar"/>
+     <property name="lib.struts" location="lib/struts.jar"/>
+     <property name="lib.rhino" location="lib/js.jar"/>
+-    <property name="lib.servlet" location="lib/servlet.jar"/>
+-    <property name="lib.jsp12" location="lib/jsp-api-1.2.jar"/>
+-    <property name="lib.jsp20" location="lib/jsp-api-2.0.jar"/>
+-    <property name="lib.jsp21" location="lib/jsp-api-2.1.jar"/>
++    <property name="lib.servlet" location="lib/jsp-2.0/servlet-api.jar"/>
++    <property name="lib.jsp12" location="lib/jsp-2.0/jsp-api.jar"/>
++    <property name="lib.jsp20" location="lib/jsp-2.0/jsp-api.jar"/>
++    <property name="lib.jsp21" location="lib/jsp-2.1/jsp-api.jar"/>
++    <property name="lib.el" location="lib/jsp-2.1/el-api.jar"/>
+     
+     <property name="lib.jython20" location="lib/jython-2.0.jar"/>
+-    <property name="lib.jython22" location="lib/jython-2.2.1.jar"/>
++    <property name="lib.jython22" location="lib/jython.jar"/>
+     <property name="lib.jython25" location="lib/jython-2.5.jar"/>
+     <!-- If not overridden, use default -->
+     <property name="boot.class.path" value="${sun.boot.class.path}"/>
+@@ -86,11 +87,12 @@
+     <path id="compile.classpath">
+         <path refid="compile.nomultiversion.classpath"/>
+         <pathelement path="${lib.jsp21}"/>
++	<pathelement path="${lib.el}"/>
+     </path>
+ 
+     <path id="compile.jsp1.classpath">
+         <path refid="compile.nomultiversion.classpath"/>
+-        <pathelement path="${lib.jsp12}"/>
++        <fileset dir="lib/jsp-2.1" includes="*.jar"/>
+     </path>
+ 
+     <path id="compile.jsp2.classpath">
+@@ -561,8 +563,7 @@
+         <antcall target="compile-commons-logging"/>
+         <antcall target="compile-jdk14"/>
+         <antcall target="compile-jdk15"/>
+-        <antcall target="compile-jsp1"/>
+-        <antcall target="compile-jsp2"/>
++	<antcall target="compile-jsp2"/>
+         <antcall target="compile-jython20"/>
+         <antcall target="compile-jython22"/>
+         <antcall target="compile-jython25"/>
+diff -Nru /tmp/freemarker-2.3.19.orig/src/freemarker/ext/beans/BeansWrapper.java ./src/freemarker/ext/beans/BeansWrapper.java
+--- /tmp/freemarker-2.3.19.orig/src/freemarker/ext/beans/BeansWrapper.java	2012-03-01 02:56:25.000000000 +0200
++++ ./src/freemarker/ext/beans/BeansWrapper.java	2012-09-29 21:43:29.368369974 +0300
+@@ -232,7 +232,7 @@
+      */
+     public BeansWrapper() {
+         if(javaRebelAvailable) {
+-            JavaRebelIntegration.registerWrapper(this);
++            //JavaRebelIntegration.registerWrapper(this);
+         }
+     }
+     
+@@ -1672,13 +1672,7 @@
+ 
+     
+     private static boolean isJavaRebelAvailable() {
+-        try {
+-            JavaRebelIntegration.testAvailability();
+-            return true;
+-        }
+-        catch(NoClassDefFoundError e) {
+-            return false;
+-        }
++	return false;
+     }
+     
+     /**
+diff -Nru /tmp/freemarker-2.3.19.orig/src/freemarker/log/SLF4JLoggerFactory.java ./src/freemarker/log/SLF4JLoggerFactory.java
+--- /tmp/freemarker-2.3.19.orig/src/freemarker/log/SLF4JLoggerFactory.java	2012-03-01 02:56:25.000000000 +0200
++++ ./src/freemarker/log/SLF4JLoggerFactory.java	2012-09-29 21:43:29.369369962 +0300
+@@ -86,7 +86,7 @@
+ 

+ 		public void debug(String message, Throwable t) {

+ 			logger.log(null, ADAPTER_FQCN,

+-					LocationAwareLogger.DEBUG_INT, message, null, t);

++					LocationAwareLogger.DEBUG_INT, message, t);

+ 		}

+ 

+ 		public void info(String message) {

+@@ -95,7 +95,7 @@
+ 

+ 		public void info(String message, Throwable t) {

+ 			logger.log(null, ADAPTER_FQCN,

+-					LocationAwareLogger.INFO_INT, message, null, t);

++					LocationAwareLogger.INFO_INT, message, t);

+ 		}

+ 

+ 		public void warn(String message) {

+@@ -104,7 +104,7 @@
+ 

+ 		public void warn(String message, Throwable t) {

+ 			logger.log(null, ADAPTER_FQCN,

+-					LocationAwareLogger.WARN_INT, message, null, t);

++					LocationAwareLogger.WARN_INT, message, t);

+ 		}

+ 

+ 		public void error(String message) {

+@@ -113,7 +113,7 @@
+ 

+ 		public void error(String message, Throwable t) {

+ 			logger.log(null, ADAPTER_FQCN,

+-					LocationAwareLogger.ERROR_INT, message, null, t);

++					LocationAwareLogger.ERROR_INT, message, t);

+ 		}

+ 

+ 		public boolean isDebugEnabled() {

diff --git a/dev-java/freemarker/freemarker-2.3.19.ebuild b/dev-java/freemarker/freemarker-2.3.19.ebuild
new file mode 100644
index 0000000..f2f241d
--- /dev/null
+++ b/dev-java/freemarker/freemarker-2.3.19.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+#can be optionalized juel, jaxen, javacc, jdom,dom4j, rhino, logkit
+#servlet-api-3.0 can't be used alone as freemarker doesn't overrides JspFactory.getJspApplicationContext()
+#which appeared at jsp 2.1 specifiction.
+
+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 ~x86"
+IUSE="python"
+
+COMMON_DEP="
+	dev-java/commons-logging:0
+	java-virtuals/servlet-api:2.4
+	java-virtuals/servlet-api:3.0
+	dev-java/slf4j-api:0
+	dev-java/jaxen:1.1
+	python? ( dev-java/jython:2.5 )"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+JAVA_PKG_FORCE_COMPILER="javac"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_EXTRA_ARGS="-Dall.libs.present=true -Djaxen.available=true"
+EANT_GENTOO_CLASSPATH="commons-logging,jaxen-1.1"
+EANT_BUILD_TARGET="jar"
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+	find -name '*.class' -exec rm -v {} + || die
+
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	#uses non-free java-rebel libarary
+	rm -f "${S}/src/freemarker/ext/beans/JavaRebelIntegration.java"
+
+	mkdir -p lib/jsp-{2.0,2.1}
+
+	cd lib/
+	java-pkg_jar-from --virtual --into jsp-2.0 servlet-api-2.4
+	java-pkg_jar-from --virtual --into jsp-2.1 servlet-api-3.0
+	java-pkg_jar-from slf4j-api
+}
+
+src_compile() {
+	use python && EANT_GENTOO_CLASSPATH+=",jython-2.5" && EANT_EXTRA_ARGS+=" -Djython25.available=true"
+	java-pkg-2_src_compile
+}
+
+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/*
+}
diff --git a/dev-java/freemarker/metadata.xml b/dev-java/freemarker/metadata.xml
new file mode 100644
index 0000000..80859ae
--- /dev/null
+++ b/dev-java/freemarker/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		 <email>the.dmol@gmail.com</email>
+	</maintainer>
+</pkgmetadata>