[gentoo-commits] repo/gentoo:master commit in: dev-java/hibernate/, dev-java/hibernate/files/

2015-10-26 Thread James Le Cuirot
commit: ada875a8b40dd3785a154b1d00dc3e2e5bb57ff2
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Oct 26 23:23:20 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Oct 26 23:30:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada875a8

dev-java/hibernate: Remove obsolete package

Hibernate is alive upstream but we have no immediate plans to bump
it. It has also been modularized so we would now call it
hibernate-core anyway.

 dev-java/hibernate/Manifest|  1 -
 .../files/hibernate-3.1.3-EhCache.java.patch   | 22 ---
 dev-java/hibernate/hibernate-3.1.3-r5.ebuild   | 76 --
 dev-java/hibernate/metadata.xml|  8 ---
 4 files changed, 107 deletions(-)

diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest
deleted file mode 100644
index e0725a4..000
--- a/dev-java/hibernate/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hibernate-3.1.3.tar.gz 18529984 SHA256 
e34feddabd7e1a432f11c670d08338720beb6c1dc5bb62952612f05260944c49 SHA512 
5a5acf5abc82bbc38313148dc73cea981f69c68fb6b3023f1c6261a392853b5bd4a9852991011891e8b678ff0c35aea9554ebdd17e0da1b8fdf816ffcaca4dea
 WHIRLPOOL 
0c2c6d5f0d5c04e9cb5e10f9eb22dbb796133791a57b8c4c18e780aa8eb637fd5fe2fa793da4885fdfe8902f7676bcce8e740219afc5176be4284bb575c99497

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
deleted file mode 100644
index 16d0a05..000
--- a/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 src/org/hibernate/cache/EhCache.java.orig  2015-10-07 14:06:39.968486000 
+
-+++ src/org/hibernate/cache/EhCache.java   2015-10-07 14:06:49.900486000 
+
-@@ -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
deleted file mode 100644
index 151b353..000
--- a/dev-java/hibernate/hibernate-3.1.3-r5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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/*
-}

diff --git a/dev-java/hibernate/metadata.xml b/dev-java/hibernate/metadata.xml
deleted file mode 100644
index 5d17a7d..000
--- a/dev-java/hibernate/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   java
-   
-   hibernate
-   
-



[gentoo-commits] repo/gentoo:master commit in: dev-java/hibernate/, dev-java/hibernate/files/

2015-10-07 Thread Patrice Clement
commit: 4cec0b746c556a2d392f873482c7108a84eca40b
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Oct  7 14:20:24 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Oct  7 20:22:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cec0b74

dev-java/hibernate: SLOT bump: ehcache 0 -> 1.2.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement  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(+)

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 000..16d0a05
--- /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 
+
 src/org/hibernate/cache/EhCache.java   2015-10-07 14:06:49.900486000 
+
+@@ -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 000..e1c5e94
--- /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/*
+}