Remove java-pkg_jar-from call for jdbc2-stdext as it is not needed to compile hibernate and not dependent upon. Fixes bug #161582.

Package-Manager: portage-2.1.2_rc4-r7

4 files changed, 34 insertions, 20 deletions

diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index 77fb9b97a90e..f479b7157749 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.25 2007/01/11 13:17:04 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.26 2007/01/11 19:13:59 betelgeuse Exp $
+
+  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
+  compile hibernate and not dependent upon. Fixes bug #161582.
 
   11 Jan 2007; Joshua Nichols <nichoj@gentoo.org> metadata.xml:
   Added self as maintainer.
diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest
index 2167e1244ad0..bdb1a9c84413 100644
--- a/dev-java/hibernate/Manifest
+++ b/dev-java/hibernate/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -10,22 +13,22 @@ EBUILD hibernate-2.1.8.ebuild 3631 RMD160 99ec77485327f0accd09a87cadb02095582c18
 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 2550 RMD160 985c1277c4236263c0115903b1e240f288b33bbe SHA1 1018757431a37ced8b6bd5c0d57942c9b3bcbcf8 SHA256 e08fbbae6dea41209c8a933c116a9ae7289bb8c3b3101d71a1111a22db1778f1
-MD5 0cc57b665ca8ee2456db4a69efc877f6 hibernate-3.0.5-r2.ebuild 2550
-RMD160 985c1277c4236263c0115903b1e240f288b33bbe hibernate-3.0.5-r2.ebuild 2550
-SHA256 e08fbbae6dea41209c8a933c116a9ae7289bb8c3b3101d71a1111a22db1778f1 hibernate-3.0.5-r2.ebuild 2550
+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_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 2074 RMD160 76e3772116c267c0db7fdbd01b7a5ccef5b894c1 SHA1 d5d700d2ab14b902ab3cf3d75f81829bb7b2c0c0 SHA256 503caf98adf602ff8dbd03ab5f1d775551470dee289c320e61e1d31ae95c7c64
-MD5 1fbc88350f73cbf7629ec5048598b77c hibernate-3.1.3.ebuild 2074
-RMD160 76e3772116c267c0db7fdbd01b7a5ccef5b894c1 hibernate-3.1.3.ebuild 2074
-SHA256 503caf98adf602ff8dbd03ab5f1d775551470dee289c320e61e1d31ae95c7c64 hibernate-3.1.3.ebuild 2074
-MISC ChangeLog 3856 RMD160 ce915a14b9e24e6f368ef2e640e44f35813a900b SHA1 33cd5d79664db0f54e5dd2ac06c85a4bc2057249 SHA256 e8c10c39c3174ad86de1d0b39614a775efb6f99ae02b5767074bfc5153f3e197
-MD5 3a0e7a23cb556edb22188a6e99097a10 ChangeLog 3856
-RMD160 ce915a14b9e24e6f368ef2e640e44f35813a900b ChangeLog 3856
-SHA256 e8c10c39c3174ad86de1d0b39614a775efb6f99ae02b5767074bfc5153f3e197 ChangeLog 3856
+EBUILD hibernate-3.1.3.ebuild 2057 RMD160 e8df75571bf28bbbbd2abc8c19eb9a1887320988 SHA1 32a2ee597d4de38ea19e0e4b0c0166783a4c1e91 SHA256 08e38f3f80356a86fbf32b930d424e5995c2e8db07869845c471ef864ee4215d
+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 metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a
 MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252
 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252
@@ -42,3 +45,10 @@ SHA256 befe3aab460b7819524f51d055687ebe0bdde47c7bee55a3b8d9a97919ce28b5 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 v1.4.6 (GNU/Linux)
+
+iD8DBQFFpuDocxLzpIGCsLQRAqCvAJ4vtatW+smyJl359qrww2UVgnHCHwCgjew4
+RzgqO1VPvbXppo/XF6F5V+8=
+=t6pM
+-----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 c283a01690f4..f008a6df472b 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.1 2007/01/11 04:49:52 nichoj Exp $
+# $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 $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -61,11 +61,11 @@ src_unpack() {
 			src/org/hibernate/cache/TreeCache.java \
 			src/org/hibernate/cache/TreeCacheProvider.java
 #	fi
-	
+
 	cd lib
 	rm *.jar
 
-	local JAR_PACKAGES="ant-core antlr asm-2 c3p0 commons-collections 
+	local JAR_PACKAGES="ant-core antlr asm-2 c3p0 commons-collections
 		commons-logging dom4j-1 ehcache jaxen-1.1 jdbc2-stdext jta
 		log4j oscache proxool swarmcache-1.0 sun-jacc-api xerces-2"
 	for PACKAGE in ${JAR_PACKAGES}; do
diff --git a/dev-java/hibernate/hibernate-3.1.3.ebuild b/dev-java/hibernate/hibernate-3.1.3.ebuild
index aa1fd4800c00..92a7ced33a71 100644
--- a/dev-java/hibernate/hibernate-3.1.3.ebuild
+++ b/dev-java/hibernate/hibernate-3.1.3.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.1.3.ebuild,v 1.1 2007/01/11 00:24:31 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.1.3.ebuild,v 1.2 2007/01/11 19:13:59 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -31,7 +31,6 @@ COMMON_DEPEND="
 	dev-java/sun-jacc-api
 	dev-java/jgroups
 	>=dev-java/xerces-2.7"
-#	dev-java/jdbc2-stdext
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEPEND}"
 # FIXME doesn't like  Java 1.6's JDBC API
@@ -53,11 +52,12 @@ src_unpack() {
 		src/org/hibernate/cache/TreeCache.java \
 		src/org/hibernate/cache/TreeCacheProvider.java
 
+	rm -v *.jar
 	cd lib
-	rm *.jar
+	rm -v *.jar
 
 	local JAR_PACKAGES="asm-2 c3p0 commons-collections
-		commons-logging dom4j-1 ehcache jaxen-1.1 jdbc2-stdext
+		commons-logging dom4j-1 ehcache jaxen-1.1
 		log4j oscache proxool swarmcache-1.0 xerces-2 jgroups"
 	for PACKAGE in ${JAR_PACKAGES}; do
 		java-pkg_jar-from ${PACKAGE}