From 0082a27acf84942929d2db78d81612aa66f54750 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Thu, 30 Nov 2006 15:12:19 +0000 Subject: [PATCH] Fix xerces-2 dep to ensure it pulls ebuild of the right slot. Package-Manager: portage-2.1.2_rc2-r3 --- app-text/trang/ChangeLog | 6 +++- app-text/trang/Manifest | 42 ++++++++++--------------- app-text/trang/trang-20030619-r1.ebuild | 4 +-- app-text/trang/trang-20030619-r2.ebuild | 4 +-- app-text/trang/trang-20030619-r3.ebuild | 4 +-- 5 files changed, 27 insertions(+), 33 deletions(-) diff --git a/app-text/trang/ChangeLog b/app-text/trang/ChangeLog index 667a57613707..2d9a4ba6f604 100644 --- a/app-text/trang/ChangeLog +++ b/app-text/trang/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/trang # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/trang/ChangeLog,v 1.14 2006/11/25 18:52:55 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/trang/ChangeLog,v 1.15 2006/11/30 15:12:19 caster Exp $ + + 30 Nov 2006; Vlastimil Babka trang-20030619-r1.ebuild, + trang-20030619-r2.ebuild, trang-20030619-r3.ebuild: + Fix xerces-2 dep to ensure it pulls ebuild of the right slot. *trang-20030619-r3 (25 Nov 2006) diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest index cade5a1c679c..2db8bee9e719 100644 --- a/app-text/trang/Manifest +++ b/app-text/trang/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX build-r1.xml 2738 RMD160 17984a75f5862230f27f703ba263e9c4054d1385 SHA1 70a9001c1edee7d169efcd49bbd7e2fdd90a8be7 SHA256 8f1fbacb800d091f0118746b6e42b60868845eca4b1eb059b38ef0ceab090cb8 MD5 78b764efefb6f915dfa315945234516d files/build-r1.xml 2738 RMD160 17984a75f5862230f27f703ba263e9c4054d1385 files/build-r1.xml 2738 @@ -10,22 +7,22 @@ MD5 4067ed3d01d556519f8f66f469e56374 files/build.xml 669 RMD160 2d209cc9cf0b1e280a96e76d4fa4a4a3e3085077 files/build.xml 669 SHA256 618c79a8178de6713c50d289471550db4bd2500fba66de5090ad10763eaeaaf9 files/build.xml 669 DIST trang-20030619.zip 941382 RMD160 f7dea9e4aae3e753fad2faae1304d865e30a5f6e SHA1 ed1c371f11c7e3c329baab6fa2997549f03458d0 SHA256 049ede1c5524fdc2958b47fe49bcf11620e36c4c6ede08f9df530eae12243343 -EBUILD trang-20030619-r1.ebuild 1245 RMD160 34216c1b22dab45ad3cb0c064ca0b5073d2b5cb9 SHA1 4acb766d8d1144597e5725fbf8b1df1f115e1e88 SHA256 980804d3186bb31c1525e4e276b38538dd5f6c40dc74b69109d16ec193c0c169 -MD5 53188da24a49a93d10bedb460966fb9d trang-20030619-r1.ebuild 1245 -RMD160 34216c1b22dab45ad3cb0c064ca0b5073d2b5cb9 trang-20030619-r1.ebuild 1245 -SHA256 980804d3186bb31c1525e4e276b38538dd5f6c40dc74b69109d16ec193c0c169 trang-20030619-r1.ebuild 1245 -EBUILD trang-20030619-r2.ebuild 1032 RMD160 5f033b470bb2a99444e2f2e3e803bc94b7e61836 SHA1 0564773803a200e886c19dbf6014d03a60ba0d95 SHA256 fe341f44fcbd4420cc1f5bbd4f1ae935dcc636271cdc63264dfe85afd55ab449 -MD5 ea74d6ebf1e9a7be630d9939d6c59ffd trang-20030619-r2.ebuild 1032 -RMD160 5f033b470bb2a99444e2f2e3e803bc94b7e61836 trang-20030619-r2.ebuild 1032 -SHA256 fe341f44fcbd4420cc1f5bbd4f1ae935dcc636271cdc63264dfe85afd55ab449 trang-20030619-r2.ebuild 1032 -EBUILD trang-20030619-r3.ebuild 1431 RMD160 d1bf49c076ca328060a8b1423190ce043e8cffb4 SHA1 bacd97347a1b891eb4616534bd1f1d9801f750a5 SHA256 a44ca238dc7fa4fc7d6bb8e928006d1350445e237b355070cfd81dd95e76ff4f -MD5 0d8c51b8584d9aefce6bfb7c824bcb7d trang-20030619-r3.ebuild 1431 -RMD160 d1bf49c076ca328060a8b1423190ce043e8cffb4 trang-20030619-r3.ebuild 1431 -SHA256 a44ca238dc7fa4fc7d6bb8e928006d1350445e237b355070cfd81dd95e76ff4f trang-20030619-r3.ebuild 1431 -MISC ChangeLog 2317 RMD160 8e791e805a2cb36f17d97ae14a3dcc5b81da6ba0 SHA1 0c13649b7cd54f9cbc83a55bbf1b1244125fc588 SHA256 66d25c09d19f6d319102afb19bdca679f1b0d6a714b7ba701ff28ee40ed5fd45 -MD5 3a11ed023459e1ec06f9257d7d9b8d89 ChangeLog 2317 -RMD160 8e791e805a2cb36f17d97ae14a3dcc5b81da6ba0 ChangeLog 2317 -SHA256 66d25c09d19f6d319102afb19bdca679f1b0d6a714b7ba701ff28ee40ed5fd45 ChangeLog 2317 +EBUILD trang-20030619-r1.ebuild 1250 RMD160 16be2ea4434651b92d9733a09e4fad5ecaa16b90 SHA1 ed6d7e776224d7d302b3d40962ec24bb055282ce SHA256 806cbdf1bd73bc29cee822ee54bdf28fef3fffdb758e91b421fdc8453c9eb038 +MD5 33847e381e949d3fdc55eef7c21657ec trang-20030619-r1.ebuild 1250 +RMD160 16be2ea4434651b92d9733a09e4fad5ecaa16b90 trang-20030619-r1.ebuild 1250 +SHA256 806cbdf1bd73bc29cee822ee54bdf28fef3fffdb758e91b421fdc8453c9eb038 trang-20030619-r1.ebuild 1250 +EBUILD trang-20030619-r2.ebuild 1037 RMD160 d1d7e1b020114ed181386d8fee6eef7cd3238781 SHA1 00b43d95163cf6f9b0a3500cd252d8b5abbef86d SHA256 f89b6d61ae3c0138ec9d0c84d8909bf89a966683c3ac21221d382f0a052113a4 +MD5 950cd4dfab3ac565178f60ba9f02661a trang-20030619-r2.ebuild 1037 +RMD160 d1d7e1b020114ed181386d8fee6eef7cd3238781 trang-20030619-r2.ebuild 1037 +SHA256 f89b6d61ae3c0138ec9d0c84d8909bf89a966683c3ac21221d382f0a052113a4 trang-20030619-r2.ebuild 1037 +EBUILD trang-20030619-r3.ebuild 1431 RMD160 50cef22666e36b4b93e130251d8ad5e304df2456 SHA1 b1fecba3358b34add82caf7a569b0cf3d381f719 SHA256 21665d83a4904b281e6006bf5b93bcf34397380a25fa58e3bd4a0d92ee65fbf8 +MD5 d069e1fa3f79f3a86673ffad722abdac trang-20030619-r3.ebuild 1431 +RMD160 50cef22666e36b4b93e130251d8ad5e304df2456 trang-20030619-r3.ebuild 1431 +SHA256 21665d83a4904b281e6006bf5b93bcf34397380a25fa58e3bd4a0d92ee65fbf8 trang-20030619-r3.ebuild 1431 +MISC ChangeLog 2509 RMD160 160736adf3c93237097d73f74cb3bdee7672059f SHA1 1dd90f1534f39363bb2a100e3d5735c007381cbe SHA256 80741a1d7995331e37654bce36416016d8891a9364ae4613e786f7ec338ccae6 +MD5 90537a00629b974c0ce6540f91468c18 ChangeLog 2509 +RMD160 160736adf3c93237097d73f74cb3bdee7672059f ChangeLog 2509 +SHA256 80741a1d7995331e37654bce36416016d8891a9364ae4613e786f7ec338ccae6 ChangeLog 2509 MISC metadata.xml 176 RMD160 7b9811f5e25a1acb5d5bb2d9112f4b7165ecd50d SHA1 e7dded9a52a425251f7aa7127a79289fc776cbcd SHA256 54961b0f82bee2e683d1a4fdd717a964a254afad757cf4f55415b5ffd72d1424 MD5 79a5dd1b805e5bca495aec6d6a73826b metadata.xml 176 RMD160 7b9811f5e25a1acb5d5bb2d9112f4b7165ecd50d metadata.xml 176 @@ -39,10 +36,3 @@ SHA256 49fa5bd04111bce566eb43802219fb046f3a5a6aff99b2dc12978b0f9e567af1 files/di MD5 58ed1e8e5816bfaf5eee7abb48a9b49e files/digest-trang-20030619-r3 235 RMD160 c9bdda85f07ed48251b14468f01d5f73c6a4f234 files/digest-trang-20030619-r3 235 SHA256 49fa5bd04111bce566eb43802219fb046f3a5a6aff99b2dc12978b0f9e567af1 files/digest-trang-20030619-r3 235 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFaJEdcxLzpIGCsLQRAsn7AJ44YjgTTLQkGZGQzZ4Puzy+pqoROACfUpqh -eljVaE5A+gzuGPsrtC6+dwk= -=pGYy ------END PGP SIGNATURE----- diff --git a/app-text/trang/trang-20030619-r1.ebuild b/app-text/trang/trang-20030619-r1.ebuild index 14b5be1f290f..aad29d5b760a 100644 --- a/app-text/trang/trang-20030619-r1.ebuild +++ b/app-text/trang/trang-20030619-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619-r1.ebuild,v 1.7 2006/11/24 18:56:29 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619-r1.ebuild,v 1.8 2006/11/30 15:12:19 caster Exp $ inherit java-pkg @@ -13,7 +13,7 @@ KEYWORDS="x86 amd64" IUSE="jikes" RDEPEND=">=virtual/jre-1.4 =dev-java/xerces-1.3* - =dev-java/xerces-2*" + >=dev-java/xerces-2.7.1" DEPEND=">=virtual/jdk-1.4 ${RDEPEND} diff --git a/app-text/trang/trang-20030619-r2.ebuild b/app-text/trang/trang-20030619-r2.ebuild index 2af455e52936..57bc613610f4 100644 --- a/app-text/trang/trang-20030619-r2.ebuild +++ b/app-text/trang/trang-20030619-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619-r2.ebuild,v 1.1 2006/11/24 18:56:30 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619-r2.ebuild,v 1.2 2006/11/30 15:12:19 caster Exp $ inherit java-pkg-2 java-ant-2 @@ -13,7 +13,7 @@ KEYWORDS="~x86 ~amd64" IUSE="" RDEPEND=">=virtual/jre-1.4 =dev-java/xerces-1.3* - =dev-java/xerces-2*" + >=dev-java/xerces-2.7.1" DEPEND=">=virtual/jdk-1.4 ${RDEPEND} diff --git a/app-text/trang/trang-20030619-r3.ebuild b/app-text/trang/trang-20030619-r3.ebuild index c60b218b5346..0f0a59e38e9a 100644 --- a/app-text/trang/trang-20030619-r3.ebuild +++ b/app-text/trang/trang-20030619-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619-r3.ebuild,v 1.1 2006/11/25 18:52:55 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619-r3.ebuild,v 1.2 2006/11/30 15:12:19 caster Exp $ inherit java-pkg-2 java-ant-2 @@ -14,7 +14,7 @@ IUSE="doc source" COMMON_DEP=" =dev-java/xerces-1.3* - =dev-java/xerces-2*" + >=dev-java/xerces-2.7.1" RDEPEND=">=virtual/jre-1.4 ${COMMON_DEP}" -- 2.26.2