Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/hibernate/, dev-java/hibernate/files/
Date: Wed, 07 Oct 2015 20:24:20
Message-Id: 1444249338.4cec0b746c556a2d392f873482c7108a84eca40b.monsieurp@gentoo
1 commit: 4cec0b746c556a2d392f873482c7108a84eca40b
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 7 14:20:24 2015 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 7 20:22:18 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cec0b74
7
8 dev-java/hibernate: SLOT bump: ehcache 0 -> 1.2.
9
10 Package-Manager: portage-2.2.20.1
11 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
12
13 .../files/hibernate-3.1.3-EhCache.java.patch | 22 +++++++
14 dev-java/hibernate/hibernate-3.1.3-r5.ebuild | 76 ++++++++++++++++++++++
15 2 files changed, 98 insertions(+)
16
17 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
18 new file mode 100644
19 index 0000000..16d0a05
20 --- /dev/null
21 +++ b/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch
22 @@ -0,0 +1,22 @@
23 +--- src/org/hibernate/cache/EhCache.java.orig 2015-10-07 14:06:39.968486000 +0000
24 ++++ src/org/hibernate/cache/EhCache.java 2015-10-07 14:06:49.900486000 +0000
25 +@@ -192,9 +192,9 @@
26 + catch (IllegalStateException e) {
27 + throw new CacheException(e);
28 + }
29 +- catch (IOException e) {
30 +- throw new CacheException(e);
31 +- }
32 ++ // catch (IOException e) {
33 ++ // throw new CacheException(e);
34 ++ // }
35 + }
36 +
37 + /**
38 +@@ -289,4 +289,4 @@
39 + return "EHCache(" + getRegionName() + ')';
40 + }
41 +
42 +-}
43 +\ No newline at end of file
44 ++}
45
46 diff --git a/dev-java/hibernate/hibernate-3.1.3-r5.ebuild b/dev-java/hibernate/hibernate-3.1.3-r5.ebuild
47 new file mode 100644
48 index 0000000..e1c5e94
49 --- /dev/null
50 +++ b/dev-java/hibernate/hibernate-3.1.3-r5.ebuild
51 @@ -0,0 +1,76 @@
52 +# Copyright 1999-2015 Gentoo Foundation
53 +# Distributed under the terms of the GNU General Public License v2
54 +# $Id$
55 +
56 +EAPI="5"
57 +
58 +WANT_ANT_TASKS="ant-antlr ant-swing ant-junit"
59 +JAVA_PKG_IUSE="doc source"
60 +JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
61 +
62 +inherit java-pkg-2 java-ant-2
63 +
64 +MY_PV="3.1"
65 +DESCRIPTION="A powerful, ultra-high performance object / relational persistence and query service for Java"
66 +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
67 +HOMEPAGE="http://www.hibernate.org"
68 +LICENSE="LGPL-2"
69 +IUSE=""
70 +SLOT="3.1"
71 +KEYWORDS="~amd64 ~x86"
72 +
73 +CDEPENDEND="
74 + >=dev-java/antlr-2.7.7:0[java]
75 + dev-java/c3p0:0
76 + dev-java/cglib:3
77 + dev-java/commons-collections:0
78 + dev-java/commons-logging:0
79 + dev-java/dom4j:1
80 + dev-java/ehcache:1.2
81 + dev-java/oscache:0
82 + dev-java/proxool:0
83 + dev-java/swarmcache:1.0
84 + java-virtuals/transaction-api:0
85 + dev-java/sun-jacc-api:0
86 + dev-java/ant-core:0
87 + dev-java/asm:2.2"
88 +RDEPEND=">=virtual/jre-1.6
89 + ${CDEPENDEND}"
90 +DEPEND=">=virtual/jdk-1.6
91 + ${CDEPENDEND}"
92 +
93 +S="${WORKDIR}/${PN}-${MY_PV}"
94 +
95 +JAVA_ANT_ENCODING="ISO-8859-1"
96 +
97 +PATCHES=(
98 + "${FILESDIR}"/"${P}-EhCache.java.patch"
99 +)
100 +
101 +java_prepare() {
102 + epatch "${PATCHES[@]}"
103 +
104 + java-ant_rewrite-bootclasspath 1.5
105 +
106 + # this depends on jboss
107 + rm src/org/hibernate/cache/JndiBoundTreeCacheProvider.java \
108 + src/org/hibernate/cache/TreeCache.java \
109 + src/org/hibernate/cache/TreeCacheProvider.java
110 +
111 + rm -v *.jar lib/*.jar || die
112 +}
113 +
114 +JAVA_ANT_REWRITE_CLASSPATH="true"
115 +EANT_GENTOO_CLASSPATH="
116 +c3p0,commons-collections,commons-logging,cglib-3,transaction-api
117 +dom4j-1,ehcache-1.2,oscache,proxool,swarmcache-1.0
118 +sun-jacc-api,antlr,ant-core,asm-2.2
119 +"
120 +EANT_EXTRA_ARGS="-Dnosplash -Ddist.dir=dist"
121 +
122 +src_install() {
123 + java-pkg_dojar hibernate3.jar
124 + dodoc changelog.txt readme.txt
125 + use doc && java-pkg_dohtml -r doc/api doc/other doc/reference
126 + use source && java-pkg_dosrc src/*
127 +}