Correct asm-2 dep which could have pulled different slot.

Package-Manager: portage-2.1.2-r3

diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 52b9137dd0c878a37e3ac540f5df7f5aefc90306..3f796310796a4b121304314d835b62ac6643e908 100644 (file)
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -6,19 +6,10 @@ AUX asm-2.2.3-commons.patch 737 RMD160 6e7b9bc8ec6335b0bf48be3ea6356fca89e78e93
 MD5 6f416c3eb6f071182aa1820a03a6d929 files/asm-2.2.3-commons.patch 737
 RMD160 6e7b9bc8ec6335b0bf48be3ea6356fca89e78e93 files/asm-2.2.3-commons.patch 737
 SHA256 63df67584f36fcbac29102c7fe78df99c94efda087885eeacf9f2aaf6a1dd9c0 files/asm-2.2.3-commons.patch 737
-DIST ASM_1.4.1_src.zip 845832 RMD160 567a04434bf0b5750084f3ac00270f49c3ab6385 SHA1 dd514470eeab30cdeeca19938eed571a957028d3 SHA256 233e99f292870eb1b946bbb3351120596e399bb30866150ce23c2654dfe0874d
 DIST asm-1.4.3.tar.gz 135980 RMD160 3808cddc689e8f800802ae83d042a4ecc07f8fca SHA1 ca949c9350da047f28cc99e6973aeb6bcc17beb9 SHA256 45970ef619fb39d30c48379ef362b2e2738586382df1d8090519736219c22a01
 DIST asm-1.5.2.tar.gz 149059 RMD160 57538d7710396bbaa099e8539ffe62cff8c56001 SHA1 c0e949d03ff26c1facfdb070ac1e74f812480300 SHA256 2ee53206ea5d582bc9fa0acd5c417dbf37b3418891c6d418edc491e0be819b4a
 DIST asm-2.0.tar.gz 258426 RMD160 3727b7fa9f848dd9f60edd457981b46df06a016a SHA1 b031b618d37ab6f0a87e83a8023471157047ffee SHA256 8c0b305819f123aa3333efb66acbeb8f5deb8cef5419c1d940310c7fbe7c194e
 DIST asm-2.2.3.tar.gz 287535 RMD160 9cdda5f5e03217c18f884f0515af713b202a2e5e SHA1 886b306b057bd16073a2c2a80052e96e5ee44b6b SHA256 56c5ce25bff92c3641b6435e28eee71718bc4eb62d4964faa9da6bb9d1002344
-EBUILD asm-1.4.1-r1.ebuild 1045 RMD160 061851ac5181317beb24bce47baaaef7f2a3d1f6 SHA1 fc4ba9061dbc7aa3f3f69fad56375d46d84bb4f3 SHA256 031ff769e417b6b929fef72de2ee4cf56acb2e16835908217ab301343fb66040
-MD5 10098a937fe9dccb68fb9968b5b92433 asm-1.4.1-r1.ebuild 1045
-RMD160 061851ac5181317beb24bce47baaaef7f2a3d1f6 asm-1.4.1-r1.ebuild 1045
-SHA256 031ff769e417b6b929fef72de2ee4cf56acb2e16835908217ab301343fb66040 asm-1.4.1-r1.ebuild 1045
-EBUILD asm-1.4.1.ebuild 1040 RMD160 1e28be564215932a7e2abb889b7a76d75f9c1784 SHA1 1bb090cf4c7b456a6c2294f3c1626525a10df58c SHA256 ef7d5e7f410ab74febb62a096cdaa5f9e8f7ed7b017d72159dca1fbbf67e3227
-MD5 e1d5f6fe10dbffc76bc489ecfc20969e asm-1.4.1.ebuild 1040
-RMD160 1e28be564215932a7e2abb889b7a76d75f9c1784 asm-1.4.1.ebuild 1040
-SHA256 ef7d5e7f410ab74febb62a096cdaa5f9e8f7ed7b017d72159dca1fbbf67e3227 asm-1.4.1.ebuild 1040
 EBUILD asm-1.4.3-r2.ebuild 998 RMD160 a60c2a659014c717456137fddee4e2ea73bad19e SHA1 0ac232c9c609f2c95a0faff613863b9ef25f68f4 SHA256 29c01c0fda27768f6756ef320918e7f0078f3e35fdda1f6968ddfea26f3a6f9e
 MD5 bc0ce4fa6bbaca432c598548863aa08f asm-1.4.3-r2.ebuild 998
 RMD160 a60c2a659014c717456137fddee4e2ea73bad19e asm-1.4.3-r2.ebuild 998
@@ -47,24 +38,14 @@ EBUILD asm-2.2.3-r1.ebuild 1240 RMD160 d4fe60f772a4eab7684c5f7b4291b38fb2354661
 MD5 81307d222696d5cfb6812d690fb35268 asm-2.2.3-r1.ebuild 1240
 RMD160 d4fe60f772a4eab7684c5f7b4291b38fb2354661 asm-2.2.3-r1.ebuild 1240
 SHA256 4b5502d57a1b486c161b05742547c15a35b86680328ba9dc8db06eb6d3f46705 asm-2.2.3-r1.ebuild 1240
-EBUILD asm-2.2.3.ebuild 1083 RMD160 50b66d504113858d6cc461aba21a23b40deca04d SHA1 1749845a03a1b11817cd445ed3ce5242252063fc SHA256 56f3a917ebaa7209aa30754beaf62a57ad55532e5fe4e02a099ba2757f9b9636
-MD5 c349fbadc43934e9639a603b23f48eb4 asm-2.2.3.ebuild 1083
-RMD160 50b66d504113858d6cc461aba21a23b40deca04d asm-2.2.3.ebuild 1083
-SHA256 56f3a917ebaa7209aa30754beaf62a57ad55532e5fe4e02a099ba2757f9b9636 asm-2.2.3.ebuild 1083
-MISC ChangeLog 3507 RMD160 fb35b32e3f40316db65033ef34235e3889001f89 SHA1 891969d56077afe5631ea8c1a89ba4850e2ef747 SHA256 3e1326d6e4ad2e59f7c28763f9a766a8dea4a0e49afb69c2321c6c2c3693c9c5
-MD5 8814f626c3cbe29b79fb3dfea213bdfa ChangeLog 3507
-RMD160 fb35b32e3f40316db65033ef34235e3889001f89 ChangeLog 3507
-SHA256 3e1326d6e4ad2e59f7c28763f9a766a8dea4a0e49afb69c2321c6c2c3693c9c5 ChangeLog 3507
+MISC ChangeLog 3649 RMD160 a6b326caab1f59c40342aa1d0264e19cd73cee2c SHA1 8dfa72f6ccc77d0dfd967a96fc34bb5dfa59bc73 SHA256 8503aaf37c9b519513021ca0d25950d148c707c6385b726d4bb6bdaebf3f3b2f
+MD5 be5b803d6a984f66ec2aaab68a9b3d47 ChangeLog 3649
+RMD160 a6b326caab1f59c40342aa1d0264e19cd73cee2c ChangeLog 3649
+SHA256 8503aaf37c9b519513021ca0d25950d148c707c6385b726d4bb6bdaebf3f3b2f ChangeLog 3649
 MISC metadata.xml 887 RMD160 ffc019291737f6ac4c82f7531484fc69cac80c19 SHA1 055d458f584cc7079ea89d63fe10cfd5ff2e83a8 SHA256 f8618d0e80406ef0ec2e4c287c0f09b0dcced9688dec3fd7dafa8601bba10527
 MD5 4dc1e10b1b2b46929ef7bcca0c634374 metadata.xml 887
 RMD160 ffc019291737f6ac4c82f7531484fc69cac80c19 metadata.xml 887
 SHA256 f8618d0e80406ef0ec2e4c287c0f09b0dcced9688dec3fd7dafa8601bba10527 metadata.xml 887
-MD5 590aea446bd66cbe299ff800ea9d976f files/digest-asm-1.4.1 232
-RMD160 9d6d9a54351d390c8e0babbd7d9510eb5a2adcf0 files/digest-asm-1.4.1 232
-SHA256 e71b4aa8d0fc1c016e3b63d3f2a43a3e6569934fe39fd7aefd0e17e4aeed277d files/digest-asm-1.4.1 232
-MD5 590aea446bd66cbe299ff800ea9d976f files/digest-asm-1.4.1-r1 232
-RMD160 9d6d9a54351d390c8e0babbd7d9510eb5a2adcf0 files/digest-asm-1.4.1-r1 232
-SHA256 e71b4aa8d0fc1c016e3b63d3f2a43a3e6569934fe39fd7aefd0e17e4aeed277d files/digest-asm-1.4.1-r1 232
 MD5 a890641a5bfd0eb7f43a7a1edbcaf26b files/digest-asm-1.4.3-r2 229
 RMD160 d0c30b46301d4206b8b5aee3435642f2489e82d9 files/digest-asm-1.4.3-r2 229
 SHA256 eddbc944073de0b8b855dc6c2ce4649d15590a53dc238c72973d628884c0fdff files/digest-asm-1.4.3-r2 229
@@ -83,9 +64,6 @@ SHA256 da540bafc7e4567e0ad909b68f780ec25e8e921c11dfd39a671d635a6c65f4cb files/di
 MD5 f347615bd20604c91cfd41e6e99efd7f files/digest-asm-2.0-r1 223
 RMD160 ab0be5508c5faf7604605f2ad1c8a0da8f62182c files/digest-asm-2.0-r1 223
 SHA256 da540bafc7e4567e0ad909b68f780ec25e8e921c11dfd39a671d635a6c65f4cb files/digest-asm-2.0-r1 223
-MD5 36453ccf5a5c9ca804be2cfbfeb1fb15 files/digest-asm-2.2.3 229
-RMD160 9069a7ec894544c82e2cafca18d7ea1e2624f590 files/digest-asm-2.2.3 229
-SHA256 6b7909a53ce31c07d41b68d7575eb7c2585309d12d5d6674f7f07915e1f60071 files/digest-asm-2.2.3 229
 MD5 36453ccf5a5c9ca804be2cfbfeb1fb15 files/digest-asm-2.2.3-r1 229
 RMD160 9069a7ec894544c82e2cafca18d7ea1e2624f590 files/digest-asm-2.2.3-r1 229
 SHA256 6b7909a53ce31c07d41b68d7575eb7c2585309d12d5d6674f7f07915e1f60071 files/digest-asm-2.2.3-r1 229

diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index 68bdf29461c44a746ebeb2e99249030d4fa8d320..62bc7aad8f9622066a6bab061b636f144786fae2 100644 (file)
--- 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.27 2007/01/12 12:53:38 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.28 2007/01/24 17:48:47 caster Exp $
+
+  24 Jan 2007; Vlastimil Babka <caster@gentoo.org>
+  hibernate-3.0.5-r2.ebuild, hibernate-3.1.3.ebuild:
+  Correct asm-2 dep which could have pulled different slot.
 
   12 Jan 2007; Vlastimil Babka <caster@gentoo.org>
   hibernate-3.0.5-r2.ebuild:

diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest
index 41290278a36891a141b0077a5716cb735dc93e57..a735c08adac118ea19195866fe214aba5b616c05 100644 (file)
--- a/dev-java/hibernate/Manifest
+++ b/dev-java/hibernate/Manifest
@@ -10,22 +10,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 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.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 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 4256 RMD160 4c4fb1deb96cff6040fcf9f2d9fe5c83ef2eda04 SHA1 7ec664be0983489f95d0fb79c94f7ab013fcda56 SHA256 c74a6bd4ee8cf7e44f1152836d1cc4753d5850de53ef05faae225999ad84d173
-MD5 66595381b928a403c000c6fde8b798c3 ChangeLog 4256
-RMD160 4c4fb1deb96cff6040fcf9f2d9fe5c83ef2eda04 ChangeLog 4256
-SHA256 c74a6bd4ee8cf7e44f1152836d1cc4753d5850de53ef05faae225999ad84d173 ChangeLog 4256
+EBUILD hibernate-3.1.3.ebuild 2055 RMD160 33fbde8bc9f36aa7e94893199257eca478a2a363 SHA1 48b6d298e48da2f376ef1c71907c63a3a2d36c75 SHA256 21edc15e43419cf26e2503e826caf65035c07810d52b58c7edd74902bcbfd9bb
+MD5 b526060afea4b58a63ac3e2b2b99afb5 hibernate-3.1.3.ebuild 2055
+RMD160 33fbde8bc9f36aa7e94893199257eca478a2a363 hibernate-3.1.3.ebuild 2055
+SHA256 21edc15e43419cf26e2503e826caf65035c07810d52b58c7edd74902bcbfd9bb hibernate-3.1.3.ebuild 2055
+MISC ChangeLog 4421 RMD160 44f5d6367c2892b6033dbd8d87ddee7284fa17fa SHA1 287c8aa7519eb278238fe58f08389879d9da0c0c SHA256 772a5909db9917cbf25f19c9f2eebe1ca2954a1aa44e63f74bffccd288ff697c
+MD5 e3c24c2773a52d4957bf90d5252356fa ChangeLog 4421
+RMD160 44f5d6367c2892b6033dbd8d87ddee7284fa17fa ChangeLog 4421
+SHA256 772a5909db9917cbf25f19c9f2eebe1ca2954a1aa44e63f74bffccd288ff697c ChangeLog 4421
 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a
 MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252
 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252

diff --git a/dev-java/hibernate/hibernate-3.0.5-r2.ebuild b/dev-java/hibernate/hibernate-3.0.5-r2.ebuild
index e54065f30da168b05e03edb1443d3d9e25017a98..ce1c6f789a37d8b5882a6ad6a0b614b68712db49 100644 (file)
--- 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.3 2007/01/12 12:53:38 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.0.5-r2.ebuild,v 1.4 2007/01/24 17:48:47 caster Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -16,7 +16,7 @@ SLOT="3"
 KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
-       =dev-java/asm-2*
+       =dev-java/asm-2.0*
        dev-java/c3p0
        =dev-java/cglib-2.1*
        dev-java/commons-collections

diff --git a/dev-java/hibernate/hibernate-3.1.3.ebuild b/dev-java/hibernate/hibernate-3.1.3.ebuild
index 92a7ced33a71f0d950084ca687ebc61350c45939..72459210722effee80901bfd8e847fb65d1e78ad 100644 (file)
--- 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.2 2007/01/11 19:13:59 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.1.3.ebuild,v 1.3 2007/01/24 17:48:47 caster Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -15,7 +15,7 @@ KEYWORDS="~x86 ~amd64"
 
 COMMON_DEPEND="
        dev-java/antlr
-       =dev-java/asm-2*
+       =dev-java/asm-2.0*
        dev-java/c3p0
        =dev-java/cglib-2.1*
        dev-java/commons-collections