dep fixes

(Portage version: 2.0.51.22-r1)

4 files changed, 7 insertions, 47 deletions

diff --git a/dev-java/hibernate/files/digest-hibernate-2.1.7 b/dev-java/hibernate/files/digest-hibernate-2.1.7
deleted file mode 100644
index b88777c69dba..000000000000
--- a/dev-java/hibernate/files/digest-hibernate-2.1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e148d82500a8d9f319cd68846bddeb41 hibernate-2.1.7c.tar.gz 16440891
diff --git a/dev-java/hibernate/hibernate-2.1.7.ebuild b/dev-java/hibernate/hibernate-2.1.7.ebuild
deleted file mode 100644
index b487be2ca4ae..000000000000
--- a/dev-java/hibernate/hibernate-2.1.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.5 2005/07/09 22:26:45 swegener 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/${P}c.tar.gz"
-HOMEPAGE="http://www.hibernate.org"
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~amd64"
-DEPEND=">=virtual/jdk-1.3
-		>=dev-java/ant-1.5
-		>=dev-java/log4j-1.2.7
-		dev-java/dom4j
-		dev-java/c3p0
-		dev-java/oscache
-		dev-java/odmg
-		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
-	java-pkg_dojar lib/ehcache*.jar lib/swarmcache*.jar lib/proxool*.jar
-	java-pkg_dojar lib/concurrent*.jar lib/connector*.jar
-	dodoc *.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.8.ebuild b/dev-java/hibernate/hibernate-2.1.8.ebuild
index fd3cbcb746fe..c0857e9b47c1 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.4 2005/07/09 22:26:45 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.8.ebuild,v 1.5 2005/07/18 14:13:32 axxo Exp $
 
 inherit java-pkg
 
@@ -10,8 +10,7 @@ HOMEPAGE="http://hibernate.bluemars.net"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="~x86 ~amd64"
-RDEPEND="
-		>=virtual/jre-1.4
+RDEPEND=">=virtual/jre-1.4
 
 		=dev-java/cglib-2*
 		dev-java/commons-collections
@@ -47,8 +46,8 @@ RDEPEND="
 		)
 
 		"
-DEPEND="${RDEPEND}
-		>=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.4
+		${RDEPEND}
 		>=dev-java/ant-core-1.5
 		junit? (
 			dev-java/ant
diff --git a/dev-java/hibernate/hibernate-3.0_rc1.ebuild b/dev-java/hibernate/hibernate-3.0_rc1.ebuild
index 8ec9607c2e08..307dfaa8dfec 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.5 2005/07/10 03:30:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.0_rc1.ebuild,v 1.6 2005/07/18 14:13:32 axxo Exp $
 
 inherit java-pkg
 
@@ -46,8 +46,8 @@ RDEPEND="
 		)
 
 		"
-DEPEND="${RDEPEND}
-		>=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.4
+		${RDEPEND}
 		>=dev-java/ant-core-1.5
 		junit? (
 			dev-java/ant