Removed some older files, and fixed 2.1.8

(Portage version: 2.0.51.19)

8 files changed, 64 insertions, 104 deletions

diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index c121ee5e402f..8f6efe60df81 100644
--- a/dev-java/hibernate/ChangeLog
+++ b/dev-java/hibernate/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/hibernate
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.16 2005/03/11 16:20:09 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.17 2005/03/17 01:07:13 st_lim Exp $
+
+  17 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> -hibernate-2.1.4.ebuild,
+  -hibernate-2.1.6.ebuild, hibernate-2.1.7.ebuild, hibernate-2.1.8.ebuild,
+  hibernate-3.0_rc1.ebuild:
+  Fixed 2.1.8 and retired 2.1.4 and 2.1.6
+
+  16 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> :
+  Fixed hibernate-2.1.8
 
 *hibernate-2.1.8 (11 Mar 2005)
 
diff --git a/dev-java/hibernate/files/digest-hibernate-2.1.4 b/dev-java/hibernate/files/digest-hibernate-2.1.4
deleted file mode 100644
index c260c719a343..000000000000
--- a/dev-java/hibernate/files/digest-hibernate-2.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 108203914ee86c3672171f79cc3f73e2 hibernate-2.1.4.tar.gz 13839542
diff --git a/dev-java/hibernate/files/digest-hibernate-2.1.6 b/dev-java/hibernate/files/digest-hibernate-2.1.6
deleted file mode 100644
index 063a8c9513bd..000000000000
--- a/dev-java/hibernate/files/digest-hibernate-2.1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 857b99b916215f446e20c355391c53eb hibernate-2.1.6.tar.gz 15121768
diff --git a/dev-java/hibernate/hibernate-2.1.4.ebuild b/dev-java/hibernate/hibernate-2.1.4.ebuild
deleted file mode 100644
index 3e150267b9d0..000000000000
--- a/dev-java/hibernate/hibernate-2.1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.4.ebuild,v 1.8 2004/10/22 10:59:48 absinthe Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Hibernate is a powerful, ultra-high performance object / relational persistence and query service for Java."
-SRC_URI="mirror://sourceforge/hibernate/${PN}-${PV}.tar.gz"
-HOMEPAGE="http://hibernate.bluemars.net"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~amd64"
-DEPEND=">=virtual/jdk-1.3
-		>=dev-java/ant-1.5
-		>=dev-java/log4j-1.2.7
-		dev-java/dom4j
-		dev-java/commons-logging"
-IUSE="doc"
-
-S=${WORKDIR}/${PN}-${PV:0:3}
-
-src_compile() {
-	sed -e '/<splash/D' -i ${S}/build.xml
-	ant jar
-}
-
-src_install() {
-	java-pkg_dojar ${WORKDIR}/hibernate/hibernate2.jar lib/cglib*.jar lib/jcs*.jar lib/odmg*.jar lib/c3p0*.jar
-	java-pkg_dojar lib/ehcache*.jar lib/swarmcache*.jar lib/oscache*.jar lib/proxool*.jar
-	java-pkg_dojar lib/concurrent*.jar lib/connector*.jar
-	dodoc *.txt lib/c3p0*.txt
-	insinto /usr/share/doc/${P}/sample
-	doins src/*.xml src/*.properties src/*.ccf src/META-INF/ra.xml
-	use doc && java-pkg_dohtml -r doc/*
-}
diff --git a/dev-java/hibernate/hibernate-2.1.6.ebuild b/dev-java/hibernate/hibernate-2.1.6.ebuild
deleted file mode 100644
index 12d6270ab02f..000000000000
--- a/dev-java/hibernate/hibernate-2.1.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.6.ebuild,v 1.3 2004/10/22 10:59:48 absinthe Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Hibernate is a powerful, ultra-high performance object / relational persistence and query service for Java."
-SRC_URI="mirror://sourceforge/hibernate/${PN}-${PV}.tar.gz"
-HOMEPAGE="http://hibernate.bluemars.net"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-DEPEND=">=virtual/jdk-1.3
-		>=dev-java/ant-1.5
-		>=dev-java/log4j-1.2.7
-		dev-java/dom4j
-		dev-java/commons-logging"
-IUSE="doc"
-
-S=${WORKDIR}/${PN}-${PV:0:3}
-
-src_compile() {
-	sed -e '/<splash/D' -i ${S}/build.xml
-	ant jar
-}
-
-src_install() {
-	java-pkg_dojar ${WORKDIR}/hibernate/hibernate2.jar lib/cglib*.jar lib/jcs*.jar lib/odmg*.jar lib/c3p0*.jar
-	java-pkg_dojar lib/ehcache*.jar lib/swarmcache*.jar lib/oscache*.jar lib/proxool*.jar
-	java-pkg_dojar lib/concurrent*.jar lib/connector*.jar
-	dodoc *.txt lib/c3p0*.txt
-	insinto /usr/share/doc/${P}/sample
-	doins src/*.xml src/*.properties src/*.ccf src/META-INF/ra.xml
-	use doc && java-pkg_dohtml -r doc/*
-}
diff --git a/dev-java/hibernate/hibernate-2.1.7.ebuild b/dev-java/hibernate/hibernate-2.1.7.ebuild
index 24be379839a9..ba0ddd1a5e3e 100644
--- a/dev-java/hibernate/hibernate-2.1.7.ebuild
+++ b/dev-java/hibernate/hibernate-2.1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.7.ebuild,v 1.2 2004/12/27 14:27:39 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.7.ebuild,v 1.3 2005/03/17 01:07:13 st_lim Exp $
 
 inherit java-pkg
 
@@ -8,7 +8,7 @@ DESCRIPTION="Hibernate is a powerful, ultra-high performance object / relational
 SRC_URI="mirror://sourceforge/hibernate/${PN}-${PV}c.tar.gz"
 HOMEPAGE="http://hibernate.bluemars.net"
 LICENSE="LGPL-2"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~x86 ~amd64"
 DEPEND=">=virtual/jdk-1.3
 		>=dev-java/ant-1.5
diff --git a/dev-java/hibernate/hibernate-2.1.8.ebuild b/dev-java/hibernate/hibernate-2.1.8.ebuild
index e2fdf1287ab5..9f1ab0eb2451 100644
--- a/dev-java/hibernate/hibernate-2.1.8.ebuild
+++ b/dev-java/hibernate/hibernate-2.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.8.ebuild,v 1.1 2005/03/11 16:20:09 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.8.ebuild,v 1.2 2005/03/17 01:07:13 st_lim Exp $
 
 inherit java-pkg
 
@@ -8,7 +8,7 @@ DESCRIPTION="Hibernate is a powerful, ultra-high performance object / relational
 SRC_URI="mirror://sourceforge/hibernate/${PN}-${PV}.tar.gz"
 HOMEPAGE="http://hibernate.bluemars.net"
 LICENSE="LGPL-2"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~x86 ~amd64"
 RDEPEND="
 		>=virtual/jre-1.4
@@ -16,6 +16,7 @@ RDEPEND="
 		=dev-java/cglib-2*
 		dev-java/commons-collections
 		dev-java/commons-logging
+		dev-java/concurrent-util
 		=dev-java/dom4j-1*
 		dev-java/ehcache
 		dev-java/odmg
@@ -28,15 +29,21 @@ RDEPEND="
 			dev-java/commons-pool
 			dev-java/commons-dbcp
 		)
+		jboss? (
+			>=www-servers/jboss-3.2.5
+			dev-java/jmx
+		)
+		jcs? (
+			dev-java/jcs-bin
+		)
 		proxool? (
 			dev-java/proxool
 		)
 		oscache? (
 			dev-java/oscache
 		)
-		jboss? (
-			>=www-servers/jboss-3.2.5
-			dev-java/jmx
+		swarmcache? (
+			dev-java/swarmcache
 		)
 
 		"
@@ -48,19 +55,22 @@ DEPEND="${RDEPEND}
 			dev-java/junit
 			dev-db/hsqldb
 		)"
-IUSE="doc jikes jboss oscache proxool dbcp c3p0 junit"
+IUSE="c3p0 dbcp doc jikes jboss jcs junit proxool oscache swarmcache"
 
 S=${WORKDIR}/${PN}-${PV:0:3}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	mv lib old-lib
+	mkdir lib
 	cd lib
+	mv ../old-lib/connector.jar .
 
-	rm *.jar
 	java-pkg_jar-from cglib-2
 	java-pkg_jar-from commons-collections
 	java-pkg_jar-from commons-logging
+	java-pkg_jar-from concurrent-util
 	java-pkg_jar-from dom4j-1
 	java-pkg_jar-from ehcache
 	java-pkg_jar-from jta
@@ -70,7 +80,7 @@ src_unpack() {
 	if use c3p0 ; then
 		java-pkg_jar-from c3p0
 	else
-		find ../src -name "C3P0*" -exec rm {} \;
+		find ${S}/src -name "C3P0*" -exec rm {} \;
 	fi
 
 	# DBCP support
@@ -78,21 +88,7 @@ src_unpack() {
 		java-pkg_jar-from commons-dbcp
 		java-pkg_jar-from commons-pool
 	else
-		find ../src -name "DBCP*" -exec rm {} \;
-	fi
-
-	# Proxool support
-	if use proxool ; then
-		java-pkg_jar-from proxool
-	else
-		find ../src -name "Proxool*" -exec rm {} \;
-	fi
-
-	# OSCache support
-	if use oscache ; then
-		java-pkg_jar-from oscache
-	else
-		find ${S}/src -name "OSCache*" -exec rm {} \;
+		find ${S}/src -name "DBCP*" -exec rm {} \;
 	fi
 
 	# JBoss caching support
@@ -111,15 +107,42 @@ src_unpack() {
 		find ${S}/src -name "Tree*" -exec rm {} \;
 	fi
 
+	# JCS support
+	# JCS is deprecated, so don't compile it
+	if use jcs ; then
+		java-pkg_jar-from jcs-bin
+	else
+		find ${S}/src -name "JCS*" -exec rm {} \;
+	fi
+
+	# JUnit support
 	if use junit ; then
 		java-pkg_jar-from junit
 		java-pkg_jar-from hsqldb
 	fi
 
-	cd ..
+	# Proxool support
+	if use proxool ; then
+		java-pkg_jar-from proxool
+	else
+		find ${S}/src -name "Proxool*" -exec rm {} \;
+	fi
 
-	# JCS is deprecated, so don't compile it
-	find src -name "JCS*" -exec rm {} \;
+	# OSCache support
+	if use oscache ; then
+		java-pkg_jar-from oscache
+	else
+		find ${S}/src -name "OSCache*" -exec rm {} \;
+	fi
+
+	# SwarmCache support
+	if use swarmcache ; then
+		java-pkg_jar-from swarmcache
+	else
+		find ${S}/src -name "SwarmCache*" -exec rm {} \;
+	fi
+
+	cd ..
 
 	sed -r -i \
 		-e '/<splash/d' \
@@ -142,6 +165,7 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar dist/hibernate2.jar
+	java-pkg_dojar lib/connector.jar
 	dodoc *.txt
 	use doc && java-pkg_dohtml -r dist/doc/*
 	insinto /usr/share/doc/${P}/sample
diff --git a/dev-java/hibernate/hibernate-3.0_rc1.ebuild b/dev-java/hibernate/hibernate-3.0_rc1.ebuild
index b9f28110d003..536e5cff232b 100644
--- a/dev-java/hibernate/hibernate-3.0_rc1.ebuild
+++ b/dev-java/hibernate/hibernate-3.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.0_rc1.ebuild,v 1.1 2005/03/11 16:20:09 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.0_rc1.ebuild,v 1.2 2005/03/17 01:07:13 st_lim Exp $
 
 inherit java-pkg
 
@@ -9,7 +9,7 @@ MY_PV=${PV/_/}
 SRC_URI="mirror://sourceforge/hibernate/${PN}-${MY_PV}.tar.gz"
 HOMEPAGE="http://hibernate.bluemars.net"
 LICENSE="LGPL-2"
-SLOT="0"
+SLOT="3"
 KEYWORDS="~x86 ~amd64"
 RDEPEND="
 		>=virtual/jre-1.4