Migrate to modular ant.

Package-Manager: portage-2.1.3.16

3 files changed, 28 insertions, 14 deletions

diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index 973907534156..7e4d538a73c8 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.35 2007/08/02 02:56:22 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.36 2007/11/02 10:40:55 betelgeuse Exp $
+
+  02 Nov 2007; Petteri Räty <betelgeuse@gentoo.org>
+  hibernate-3.0.5-r2.ebuild:
+  Migrate to modular ant.
 
   02 Aug 2007; Joshua Nichols <nichoj@gentoo.org> metadata.xml:
   Removed myself from metadata.xml.
diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest
index 36ed90fbbc6f..57c681654115 100644
--- a/dev-java/hibernate/Manifest
+++ b/dev-java/hibernate/Manifest
@@ -1,21 +1,24 @@
+-----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-3.0.5.tar.gz 16097031 RMD160 720e9f16b8caea3245a9b82075a1d0957e790d5a SHA1 49897f3c4cccf0fe9fbe7903a509a0ccc996958b SHA256 6971edbbb7bda9e0d2b96a0a652c9040ccde9f17dfae0fe72cc017c3b29196fa
 DIST hibernate-3.1.3.tar.gz 18529984 RMD160 3c7a2a74d4c9f35d4250f0f0ef1fd478c7fd1828 SHA1 b27169ede61e154cf5641b5a960f9074108d55a1 SHA256 e34feddabd7e1a432f11c670d08338720beb6c1dc5bb62952612f05260944c49
-EBUILD hibernate-3.0.5-r2.ebuild 2575 RMD160 5569dd2e617b1b18a736295fc243b40b4b0b631b SHA1 e29eb6ef59c0b206c06ede6b08ef3d8a20ecbc7b SHA256 e0d1c3df7b575e13c1d280fc1e3cc3ae01884e48468b7baf3e7a808e9e68a10a
-MD5 331ac3e8d95d1f9ff8b6042e3815078b hibernate-3.0.5-r2.ebuild 2575
-RMD160 5569dd2e617b1b18a736295fc243b40b4b0b631b hibernate-3.0.5-r2.ebuild 2575
-SHA256 e0d1c3df7b575e13c1d280fc1e3cc3ae01884e48468b7baf3e7a808e9e68a10a hibernate-3.0.5-r2.ebuild 2575
+EBUILD hibernate-3.0.5-r2.ebuild 2592 RMD160 c916cd95d0bb33a35f0a5bdfbc346790ede577eb SHA1 f9aa7964175924d9aa1a6c737f76a3b8ec17a0a1 SHA256 346c210a311bf01c11c2cb748a1aeaac2ac1facc33ab488a544369cc0bc46102
+MD5 8ae5dd0b581c168575d431816caf55a3 hibernate-3.0.5-r2.ebuild 2592
+RMD160 c916cd95d0bb33a35f0a5bdfbc346790ede577eb hibernate-3.0.5-r2.ebuild 2592
+SHA256 346c210a311bf01c11c2cb748a1aeaac2ac1facc33ab488a544369cc0bc46102 hibernate-3.0.5-r2.ebuild 2592
 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 5291 RMD160 435be99b961c40e29cfeddcf535d909f8923571f SHA1 c646b65948fa01e5ab32e3db5034b8957d264cd9 SHA256 1ebca8757eaf3e8414291d181951a00b6290d0b2e84d50bc6abd8af6c5a9d6cd
-MD5 d4cb9b6fb1f18175a0d4fdbed6dfb09a ChangeLog 5291
-RMD160 435be99b961c40e29cfeddcf535d909f8923571f ChangeLog 5291
-SHA256 1ebca8757eaf3e8414291d181951a00b6290d0b2e84d50bc6abd8af6c5a9d6cd ChangeLog 5291
+MISC ChangeLog 5404 RMD160 5fd6f85de577419a38003f3f9a0e1ba6b6e5bda1 SHA1 d90fa88453c1284243f2c93f3f98661f0b715d9c SHA256 3edfb733e65ff2917e25d09e0687409a85e579abfe84e1ce519aae6533e9bdb5
+MD5 08230182b8d10c47e244da849998c901 ChangeLog 5404
+RMD160 5fd6f85de577419a38003f3f9a0e1ba6b6e5bda1 ChangeLog 5404
+SHA256 3edfb733e65ff2917e25d09e0687409a85e579abfe84e1ce519aae6533e9bdb5 ChangeLog 5404
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -26,3 +29,10 @@ SHA256 5363d16fc4c6d845b851b96aa754ccd23e81227edfeb7815cf7149715d1ccf4e files/di
 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.7 (GNU/Linux)
+
+iD8DBQFHKv7JcxLzpIGCsLQRAuYiAKCYISxNaRjjn2jf9eKFOjF1bPYPvgCcDzwU
+nMTM2iQA86ZWh6oWv0wRAW4=
+=6pZ3
+-----END PGP SIGNATURE-----
diff --git a/dev-java/hibernate/hibernate-3.0.5-r2.ebuild b/dev-java/hibernate/hibernate-3.0.5-r2.ebuild
index 9c1296599ec2..f1cc110539fe 100644
--- a/dev-java/hibernate/hibernate-3.0.5-r2.ebuild
+++ b/dev-java/hibernate/hibernate-3.0.5-r2.ebuild
@@ -1,6 +1,8 @@
 # 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.5 2007/05/25 15:34:11 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.0.5-r2.ebuild,v 1.6 2007/11/02 10:40:55 betelgeuse Exp $
+
+WANT_ANT_TASKS="ant-antlr ant-swing ant-junit"
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -44,7 +46,6 @@ COMMON_DEPEND="
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEPEND}"
 DEPEND=">=virtual/jdk-1.4
-		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*"
@@ -84,9 +85,8 @@ src_unpack() {
 #	fi
 
 }
-src_compile() {
-	eant jar -Ddist.dir=dist $(use_doc)
-}
+
+EANT_EXTRA_ARGS="-Ddist.dir=dist"
 
 src_install() {
 	java-pkg_dojar dist/hibernate3.jar