From 4cec0b746c556a2d392f873482c7108a84eca40b Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Wed, 7 Oct 2015 14:20:24 +0000
Subject: [PATCH] dev-java/hibernate: SLOT bump: ehcache 0 -> 1.2.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 .../files/hibernate-3.1.3-EhCache.java.patch  | 22 ++++++
 dev-java/hibernate/hibernate-3.1.3-r5.ebuild  | 76 +++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch
 create mode 100644 dev-java/hibernate/hibernate-3.1.3-r5.ebuild

diff --git a/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch b/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch
new file mode 100644
index 000000000000..16d0a05a7709
--- /dev/null
+++ b/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch
@@ -0,0 +1,22 @@
+--- src/org/hibernate/cache/EhCache.java.orig	2015-10-07 14:06:39.968486000 +0000
++++ src/org/hibernate/cache/EhCache.java	2015-10-07 14:06:49.900486000 +0000
+@@ -192,9 +192,9 @@
+         catch (IllegalStateException e) {
+             throw new CacheException(e);
+         } 
+-        catch (IOException e) {
+-            throw new CacheException(e);
+-        }
++        // catch (IOException e) {
++        //     throw new CacheException(e);
++        // }
+     }
+ 
+     /**
+@@ -289,4 +289,4 @@
+ 		return "EHCache(" + getRegionName() + ')';
+ 	}
+ 
+-}
+\ No newline at end of file
++}
diff --git a/dev-java/hibernate/hibernate-3.1.3-r5.ebuild b/dev-java/hibernate/hibernate-3.1.3-r5.ebuild
new file mode 100644
index 000000000000..e1c5e94a0a05
--- /dev/null
+++ b/dev-java/hibernate/hibernate-3.1.3-r5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+WANT_ANT_TASKS="ant-antlr ant-swing ant-junit"
+JAVA_PKG_IUSE="doc source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV="3.1"
+DESCRIPTION="A powerful, ultra-high performance object / relational persistence and query service for Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.hibernate.org"
+LICENSE="LGPL-2"
+IUSE=""
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86"
+
+CDEPENDEND="
+	>=dev-java/antlr-2.7.7:0[java]
+	dev-java/c3p0:0
+	dev-java/cglib:3
+	dev-java/commons-collections:0
+	dev-java/commons-logging:0
+	dev-java/dom4j:1
+	dev-java/ehcache:1.2
+	dev-java/oscache:0
+	dev-java/proxool:0
+	dev-java/swarmcache:1.0
+	java-virtuals/transaction-api:0
+	dev-java/sun-jacc-api:0
+	dev-java/ant-core:0
+	dev-java/asm:2.2"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPENDEND}"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPENDEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-EhCache.java.patch"
+)
+
+java_prepare() {
+	epatch "${PATCHES[@]}"
+
+	java-ant_rewrite-bootclasspath 1.5
+
+	# this depends on jboss
+	rm src/org/hibernate/cache/JndiBoundTreeCacheProvider.java \
+		src/org/hibernate/cache/TreeCache.java \
+		src/org/hibernate/cache/TreeCacheProvider.java
+
+	rm -v *.jar lib/*.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+c3p0,commons-collections,commons-logging,cglib-3,transaction-api
+dom4j-1,ehcache-1.2,oscache,proxool,swarmcache-1.0
+sun-jacc-api,antlr,ant-core,asm-2.2
+"
+EANT_EXTRA_ARGS="-Dnosplash -Ddist.dir=dist"
+
+src_install() {
+	java-pkg_dojar hibernate3.jar
+	dodoc changelog.txt readme.txt
+	use doc && java-pkg_dohtml -r doc/api doc/other doc/reference
+	use source && java-pkg_dosrc src/*
+}
-- 
2.26.2