Remove old version depending on dev-java/jcs-bin.

Package-Manager: portage-2.1.2.4

4 files changed, 12 insertions, 183 deletions

diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index bffcad2ce68d..c7d05f06ac26 100644
--- a/dev-java/hibernate/ChangeLog
+++ b/dev-java/hibernate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/hibernate
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.32 2007/04/25 20:10:38 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.33 2007/04/26 08:39:49 nelchael Exp $
+
+  26 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  -hibernate-3.0_rc1.ebuild:
+  Remove old version depending on dev-java/jcs-bin.
 
   25 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org> hibernate-3.1.3.ebuild:
   Disable splash, QA fixes.
diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest
index 241362c1425e..cfffa2a2110e 100644
--- a/dev-java/hibernate/Manifest
+++ b/dev-java/hibernate/Manifest
@@ -6,24 +6,19 @@ MD5 4918d75410af20764bb71a72a1546dd2 files/hibernate-3.0.5-nosplash.patch 3891
 RMD160 2cd9fec46f848a4350c85e9a863dda16e2b00610 files/hibernate-3.0.5-nosplash.patch 3891
 SHA256 a2b16438ff87cd59c22c4ede3b288a1ab9c1d90f061e9b4279e19a0fef3f8e64 files/hibernate-3.0.5-nosplash.patch 3891
 DIST hibernate-3.0.5.tar.gz 16097031 RMD160 720e9f16b8caea3245a9b82075a1d0957e790d5a SHA1 49897f3c4cccf0fe9fbe7903a509a0ccc996958b SHA256 6971edbbb7bda9e0d2b96a0a652c9040ccde9f17dfae0fe72cc017c3b29196fa
-DIST hibernate-3.0rc1.tar.gz 14125433 RMD160 253411824bba3917158561bb52aa17dcc65773b0 SHA1 ce3bf7600e158b6ec53b66f052aa1b6c630a8c02 SHA256 9795a08468b278aa2c271f4ea115018957a27ef6589048259a45db375e7b08d0
 DIST hibernate-3.1.3.tar.gz 18529984 RMD160 3c7a2a74d4c9f35d4250f0f0ef1fd478c7fd1828 SHA1 b27169ede61e154cf5641b5a960f9074108d55a1 SHA256 e34feddabd7e1a432f11c670d08338720beb6c1dc5bb62952612f05260944c49
 EBUILD hibernate-3.0.5-r2.ebuild 2526 RMD160 3aaf50374e9c4868d0c0d73f59d75cc8d43fa7f9 SHA1 591f62c8a5456fae9274eb153dbddc6054ffd6c5 SHA256 fc4f5938f5a72e625a81e1ed31a3a88ad6e00644a018e76c4979705ef05153e8
 MD5 31e3176789631248a66ea4cb1fcc0e3f hibernate-3.0.5-r2.ebuild 2526
 RMD160 3aaf50374e9c4868d0c0d73f59d75cc8d43fa7f9 hibernate-3.0.5-r2.ebuild 2526
 SHA256 fc4f5938f5a72e625a81e1ed31a3a88ad6e00644a018e76c4979705ef05153e8 hibernate-3.0.5-r2.ebuild 2526
-EBUILD hibernate-3.0_rc1.ebuild 3633 RMD160 5150951576c359dba4db40ac616f4c1afbcae4cc SHA1 6cb6776726641ad90d7cf4d070020da78d02ebfc SHA256 9d9c8a104ad736cf6f0b4e9cbe998c92da7687fbe017589ba7fd9001cd4216c7
-MD5 894d0d8af99b6e9fa02d31a04b43e9f0 hibernate-3.0_rc1.ebuild 3633
-RMD160 5150951576c359dba4db40ac616f4c1afbcae4cc hibernate-3.0_rc1.ebuild 3633
-SHA256 9d9c8a104ad736cf6f0b4e9cbe998c92da7687fbe017589ba7fd9001cd4216c7 hibernate-3.0_rc1.ebuild 3633
 EBUILD hibernate-3.1.3.ebuild 2063 RMD160 9d7c368d7f020d6dfbf93ca2f50fb9a65ee2bb2a SHA1 0840bef07aa4bcca05d525ca50bca370ff03b833 SHA256 a82b869b63a96a795e5d6cc1f86a591acac1ebaccefe060e408ce75cf099e983
 MD5 06ce0629a40ceb4506ab796663a853b4 hibernate-3.1.3.ebuild 2063
 RMD160 9d7c368d7f020d6dfbf93ca2f50fb9a65ee2bb2a hibernate-3.1.3.ebuild 2063
 SHA256 a82b869b63a96a795e5d6cc1f86a591acac1ebaccefe060e408ce75cf099e983 hibernate-3.1.3.ebuild 2063
-MISC ChangeLog 4948 RMD160 9fcdef67f3450e90cb2591b2e3c42f27c2124106 SHA1 a8c869e79d4866597fe379a646c1d74247a2f2fa SHA256 28ed1d5db22cee83fc419135053b0480bfaa80a14c7e664cd622ccfbfda12166
-MD5 b95cce398f0aaf1d5dabd38179ada26b ChangeLog 4948
-RMD160 9fcdef67f3450e90cb2591b2e3c42f27c2124106 ChangeLog 4948
-SHA256 28ed1d5db22cee83fc419135053b0480bfaa80a14c7e664cd622ccfbfda12166 ChangeLog 4948
+MISC ChangeLog 5083 RMD160 53dae1eb753b6edbffc0cc21aa9403dccf3bef8a SHA1 76d9940f83aa174b8fdb1b84ab34ee8b2f5d70dc SHA256 79cf7cfacc6cf6e84a86a32b143dcf427937b2b0515be548839c5aecec3d1628
+MD5 c7d070d38aadb71fe86c5d1281791d51 ChangeLog 5083
+RMD160 53dae1eb753b6edbffc0cc21aa9403dccf3bef8a ChangeLog 5083
+SHA256 79cf7cfacc6cf6e84a86a32b143dcf427937b2b0515be548839c5aecec3d1628 ChangeLog 5083
 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a
 MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252
 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252
@@ -31,16 +26,13 @@ SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a metadata
 MD5 16ce2da72a4386e32086daf4f3d94235 files/digest-hibernate-3.0.5-r2 253
 RMD160 0b48a732450333486940adb64e28e334ef1a14a1 files/digest-hibernate-3.0.5-r2 253
 SHA256 5363d16fc4c6d845b851b96aa754ccd23e81227edfeb7815cf7149715d1ccf4e files/digest-hibernate-3.0.5-r2 253
-MD5 b9baec9af9aa451f5d11218e7e9975ce files/digest-hibernate-3.0_rc1 256
-RMD160 9d03ca45d45340269684488dc12b2c7358a156df files/digest-hibernate-3.0_rc1 256
-SHA256 2a32c940016bb7b2a2a73c9952fd00f1f1cb8495d99ee76fd804b79c5b0a9297 files/digest-hibernate-3.0_rc1 256
 MD5 753926dba7f5a09e6ca3c58b2b7f4373 files/digest-hibernate-3.1.3 253
 RMD160 1317eda97e8e2b4afd2b838ca922f08c1636f041 files/digest-hibernate-3.1.3 253
 SHA256 c3c603703e9e3ab8263a26796fbc3f3612e5d1f36a047648c920f0a756e45d33 files/digest-hibernate-3.1.3 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGL7X4go/w9rxVVVERAlI7AKCEbBLHS8hLOzKk8FVvLgVG/GGQWQCgv9Fv
-RtDv7qL6TwXmU4x2MlYKjUU=
-=XXgt
+iD8DBQFGMGWIgo/w9rxVVVERAmhfAJ9gTFmX16zhswoWfs70QPzw/M/8bACfadOE
+OMk5104ivcRggAchIKjxzGk=
+=bDn5
 -----END PGP SIGNATURE-----
diff --git a/dev-java/hibernate/files/digest-hibernate-3.0_rc1 b/dev-java/hibernate/files/digest-hibernate-3.0_rc1
deleted file mode 100644
index 43214be5ac44..000000000000
--- a/dev-java/hibernate/files/digest-hibernate-3.0_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d04967ca6f85607ebb6a3f15527a77b6 hibernate-3.0rc1.tar.gz 14125433
-RMD160 253411824bba3917158561bb52aa17dcc65773b0 hibernate-3.0rc1.tar.gz 14125433
-SHA256 9795a08468b278aa2c271f4ea115018957a27ef6589048259a45db375e7b08d0 hibernate-3.0rc1.tar.gz 14125433
diff --git a/dev-java/hibernate/hibernate-3.0_rc1.ebuild b/dev-java/hibernate/hibernate-3.0_rc1.ebuild
deleted file mode 100644
index e81cddd78021..000000000000
--- a/dev-java/hibernate/hibernate-3.0_rc1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2006 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.10 2006/05/04 17:28:49 nichoj Exp $
-
-inherit java-pkg
-
-MY_PV=${PV/_rc/rc}
-DESCRIPTION="Hibernate is a powerful, ultra-high performance object / relational persistence and query service for Java."
-SRC_URI="mirror://sourceforge/hibernate/${PN}-${MY_PV}.tar.gz"
-HOMEPAGE="http://www.hibernate.org"
-LICENSE="LGPL-2"
-SLOT="3"
-KEYWORDS="~x86 ~amd64"
-RDEPEND="
-		>=virtual/jre-1.4
-
-		=dev-java/cglib-2.0*
-		dev-java/commons-collections
-		dev-java/commons-logging
-		dev-java/concurrent-util
-		>=dev-java/dom4j-1.5
-		dev-java/ehcache
-		dev-java/jta
-		dev-java/odmg
-		dev-java/proxool
-
-		dev-java/c3p0
-
-		dbcp? (
-			dev-java/commons-pool
-			dev-java/commons-dbcp
-		)
-		jboss? (
-			>=www-servers/jboss-3.2.5
-			dev-java/sun-jmx
-		)
-		jcs? (
-			dev-java/jcs-bin
-		)
-			dev-java/oscache
-		swarmcache? (
-			dev-java/swarmcache
-		)
-
-		"
-DEPEND=">=virtual/jdk-1.4
-		${RDEPEND}
-		>=dev-java/ant-1.5
-		junit? (
-			dev-db/hsqldb
-		)"
-IUSE="c3p0 dbcp doc jboss jcs jikes junit 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 .
-	mv ../old-lib/jacc-1_0-fr.jar jacc.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
-	java-pkg_jar-from odmg
-	java-pkg_jar-from proxool
-
-	# c3p0 support
-	#if use c3p0 ; then
-		java-pkg_jar-from c3p0
-	#else
-	#	find ${S}/src -name "C3P0*" -exec rm {} \;
-	#fi
-
-	# DBCP support
-	if use dbcp ; then
-		java-pkg_jar-from commons-dbcp
-		java-pkg_jar-from commons-pool
-	else
-		find ${S}/src -name "DBCP*" -exec rm {} \;
-	fi
-
-	# JBoss caching support
-	if use jboss ; then
-		JBOSSHOME=`java-config -p jboss | sed -e "s/\/client.*$//g"`
-		ln -sf ${JBOSSHOME}/server/all/lib/jboss-cache.jar
-		ln -sf ${JBOSSHOME}/lib/jboss-system.jar
-		java-pkg_jar-from sun-jmx
-		if ! [ -r jboss-cache.jar ] ; then
-			eerror "The JBoss JARs are not readable.  Most likely, the "
-			eerror "/var/lib/jboss directory is not traverseable  by the "
-			eerror "portage user."
-			die "See above message."
-		fi
-	else
-		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-1.0
-	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
-
-
-	# 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-1.0
-	else
-		find ${S}/src -name "SwarmCache*" -exec rm {} \;
-	fi
-
-	cd ..
-
-	sed -r -i \
-		-e '/<splash/d' \
-		-e 's/..\/\$\{name\}/dist/g' \
-			build.xml
-	sed -r -i \
-		-e "s/JCSCache/EhCache/g" \
-			test/org/hibernate/test/CacheTest.java
-}
-
-src_compile() {
-	use jikes && ! use jboss && export ANT_OPTS="-Dbuild.compiler=jikes"
-	targets="jar"
-	if use junit ; then
-		targets="${targets} junitreport"
-	fi
-	use doc && targets="${targets} javadoc"
-	ant -q ${targets} || die "Build failed."
-}
-
-src_install() {
-	java-pkg_dojar dist/hibernate3.jar
-	java-pkg_dojar lib/connector.jar
-	java-pkg_dojar lib/jacc.jar
-	dodoc *.txt
-	use doc && java-pkg_dohtml -r dist/doc/*
-	insinto /usr/share/doc/${P}/sample
-	doins etc/*.xml etc/*.properties etc/*.ccf src/META-INF/ra.xml
-}