Change ant-core dep to full ant, because antlr task is needed. Remove jdbc2 jar-from also from 3.0.5.

Package-Manager: portage-2.1.2_rc4-r8

4 files changed, 23 insertions, 26 deletions

diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index f479b7157749..68bdf29461c4 100644
--- a/dev-java/hibernate/ChangeLog
+++ b/dev-java/hibernate/ChangeLog
@@ -1,6 +1,11 @@
 # 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.26 2007/01/11 19:13:59 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.27 2007/01/12 12:53:38 caster Exp $
+
+  12 Jan 2007; Vlastimil Babka <caster@gentoo.org>
+  hibernate-3.0.5-r2.ebuild:
+  Change ant-core dep to full ant, because antlr task is needed. Remove jdbc2
+  jar-from also from 3.0.5.
 
   12 Jan 2007; Petteri Räty <betelgeuse@gentoo.org> hibernate-3.1.3.ebuild:
   Remove java-pkg_jar-from call for jdbc2-stdext as it is not needed to
diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest
index bdb1a9c84413..41290278a368 100644
--- a/dev-java/hibernate/Manifest
+++ b/dev-java/hibernate/Manifest
@@ -1,22 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX hibernate-3.0.5-nosplash.patch 3891 RMD160 2cd9fec46f848a4350c85e9a863dda16e2b00610 SHA1 1907032dae49f01abc1d077a70653b084a81b02e SHA256 a2b16438ff87cd59c22c4ede3b288a1ab9c1d90f061e9b4279e19a0fef3f8e64
 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-2.1.8.tar.gz 17348255 RMD160 cdc7c9723c30c048de2f27472c40902721a2a236 SHA1 bf432e3798370938b54a476e20ab96cdd9215f55 SHA256 5f81e81bc5d8b5727bd8419119c4a8094cd59c8035bdb17ac5b0e823e4f0afef
 DIST hibernate-3.0.5.tar.gz 16097031 RMD160 720e9f16b8caea3245a9b82075a1d0957e790d5a SHA1 49897f3c4cccf0fe9fbe7903a509a0ccc996958b SHA256 6971edbbb7bda9e0d2b96a0a652c9040ccde9f17dfae0fe72cc017c3b29196fa
-DIST hibernate-3.0rc1.tar.gz 14125433
+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-2.1.8.ebuild 3631 RMD160 99ec77485327f0accd09a87cadb02095582c1870 SHA1 d2a956ca1993fd2d1b5e66b7b71434f94b800065 SHA256 7131d8105623d5d7c346c804ac07bea8dae53185ceaf6a0d861010d4342440bb
 MD5 3b4b85e4f98e74c162e6782e0286d78d hibernate-2.1.8.ebuild 3631
 RMD160 99ec77485327f0accd09a87cadb02095582c1870 hibernate-2.1.8.ebuild 3631
 SHA256 7131d8105623d5d7c346c804ac07bea8dae53185ceaf6a0d861010d4342440bb hibernate-2.1.8.ebuild 3631
-EBUILD hibernate-3.0.5-r2.ebuild 2552 RMD160 c56df612a5f89773469dc6e739719a3cf8b9ee68 SHA1 ea25c8ba4eef5538c8e916dcba6aabce0de2ea17 SHA256 9af59174c852d0d0bfbfa67522a2b54af84121fc3d8d99dac455c15b569394ad
-MD5 bef46773a13c6d724e6b1e167c10add5 hibernate-3.0.5-r2.ebuild 2552
-RMD160 c56df612a5f89773469dc6e739719a3cf8b9ee68 hibernate-3.0.5-r2.ebuild 2552
-SHA256 9af59174c852d0d0bfbfa67522a2b54af84121fc3d8d99dac455c15b569394ad hibernate-3.0.5-r2.ebuild 2552
+EBUILD hibernate-3.0.5-r2.ebuild 2524 RMD160 27506d0d3cea5f209f2cabbf783afa0a212c9a87 SHA1 7f7d449708d6fb0333796d95ae32eb83845b03e6 SHA256 f3e4d6e85868542a90e93427a299298aface237d4d05bbec4f76b1231412e0f9
+MD5 2d6f3338d91be62dd7bc88df1eae7a3a hibernate-3.0.5-r2.ebuild 2524
+RMD160 27506d0d3cea5f209f2cabbf783afa0a212c9a87 hibernate-3.0.5-r2.ebuild 2524
+SHA256 f3e4d6e85868542a90e93427a299298aface237d4d05bbec4f76b1231412e0f9 hibernate-3.0.5-r2.ebuild 2524
 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
@@ -25,10 +22,10 @@ EBUILD hibernate-3.1.3.ebuild 2057 RMD160 e8df75571bf28bbbbd2abc8c19eb9a18873209
 MD5 a77731bc47cd9dfd4afab91673e929a8 hibernate-3.1.3.ebuild 2057
 RMD160 e8df75571bf28bbbbd2abc8c19eb9a1887320988 hibernate-3.1.3.ebuild 2057
 SHA256 08e38f3f80356a86fbf32b930d424e5995c2e8db07869845c471ef864ee4215d hibernate-3.1.3.ebuild 2057
-MISC ChangeLog 4073 RMD160 ba436ffb1de5b9cc9f97e37e4b324aff471e59ad SHA1 ed2be456301f48a74cf25ca838271f65caee9f35 SHA256 ad09ce96ccf3ae2d1daa10d1770cdb4437769342bc19800299c3ca932e52702e
-MD5 c3b0139760f96d39bf6c409acfdf0cbd ChangeLog 4073
-RMD160 ba436ffb1de5b9cc9f97e37e4b324aff471e59ad ChangeLog 4073
-SHA256 ad09ce96ccf3ae2d1daa10d1770cdb4437769342bc19800299c3ca932e52702e ChangeLog 4073
+MISC ChangeLog 4256 RMD160 4c4fb1deb96cff6040fcf9f2d9fe5c83ef2eda04 SHA1 7ec664be0983489f95d0fb79c94f7ab013fcda56 SHA256 c74a6bd4ee8cf7e44f1152836d1cc4753d5850de53ef05faae225999ad84d173
+MD5 66595381b928a403c000c6fde8b798c3 ChangeLog 4256
+RMD160 4c4fb1deb96cff6040fcf9f2d9fe5c83ef2eda04 ChangeLog 4256
+SHA256 c74a6bd4ee8cf7e44f1152836d1cc4753d5850de53ef05faae225999ad84d173 ChangeLog 4256
 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a
 MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252
 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252
@@ -39,16 +36,9 @@ SHA256 abbfd31c7eaed4e7dbc435ff429cb4cd47e6e5578924316665eec158e3518a1b files/di
 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 e5aa0a8633b0ef9e280d35213fd5254f files/digest-hibernate-3.0_rc1 70
-RMD160 5617879b00ec5f66dfce111b6ecbdd2026c83d6b files/digest-hibernate-3.0_rc1 70
-SHA256 befe3aab460b7819524f51d055687ebe0bdde47c7bee55a3b8d9a97919ce28b5 files/digest-hibernate-3.0_rc1 70
+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 v1.4.6 (GNU/Linux)
-
-iD8DBQFFpuDocxLzpIGCsLQRAqCvAJ4vtatW+smyJl359qrww2UVgnHCHwCgjew4
-RzgqO1VPvbXppo/XF6F5V+8=
-=t6pM
------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
index ca85cfe0c4fb..43214be5ac44 100644
--- a/dev-java/hibernate/files/digest-hibernate-3.0_rc1
+++ b/dev-java/hibernate/files/digest-hibernate-3.0_rc1
@@ -1 +1,3 @@
 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.5-r2.ebuild b/dev-java/hibernate/hibernate-3.0.5-r2.ebuild
index f008a6df472b..e54065f30da1 100644
--- a/dev-java/hibernate/hibernate-3.0.5-r2.ebuild
+++ b/dev-java/hibernate/hibernate-3.0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.0.5-r2.ebuild,v 1.2 2007/01/11 19:13:59 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.0.5-r2.ebuild,v 1.3 2007/01/12 12:53:38 caster Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -42,7 +42,7 @@ COMMON_DEPEND="
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEPEND}"
 DEPEND=">=virtual/jdk-1.4
-		>=dev-java/ant-core-1.5
+		dev-java/ant
 		${COMMON_DEPEND}"
 # TODO fix for Java 1.6... has problems due to JDBC4
 JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4* =virtual/jdk-1.5*"
@@ -66,7 +66,7 @@ src_unpack() {
 	rm *.jar
 
 	local JAR_PACKAGES="ant-core antlr asm-2 c3p0 commons-collections
-		commons-logging dom4j-1 ehcache jaxen-1.1 jdbc2-stdext jta
+		commons-logging dom4j-1 ehcache jaxen-1.1 jta
 		log4j oscache proxool swarmcache-1.0 sun-jacc-api xerces-2"
 	for PACKAGE in ${JAR_PACKAGES}; do
 		java-pkg_jar-from ${PACKAGE}