Fix dev-java/xerces dependency so that it doesn't match multiple slots.

Package-Manager: portage-2.1.3.19

4 files changed, 25 insertions, 21 deletions

diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog
index 4305cf24d93a..206a8c22e9ec 100644
--- a/media-tv/tvbrowser/ChangeLog
+++ b/media-tv/tvbrowser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/tvbrowser
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.18 2007/07/30 12:52:29 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.19 2007/11/15 01:03:01 betelgeuse Exp $
+
+  15 Nov 2007; Petteri Räty <betelgeuse@gentoo.org> tvbrowser-2.5.2.ebuild,
+  tvbrowser-2.5.3.ebuild:
+  Fix dev-java/xerces dependency so that it doesn't match multiple slots.
 
 *tvbrowser-2.5.3 (30 Jul 2007)
 
diff --git a/media-tv/tvbrowser/Manifest b/media-tv/tvbrowser/Manifest
index 02ed208f9f2d..1006e4b0793c 100644
--- a/media-tv/tvbrowser/Manifest
+++ b/media-tv/tvbrowser/Manifest
@@ -59,22 +59,22 @@ EBUILD tvbrowser-2.5-r1.ebuild 3421 RMD160 9411fa2676567629334590c66023c7128ca23
 MD5 e56d4971dc1464750d00ef955b55454d tvbrowser-2.5-r1.ebuild 3421
 RMD160 9411fa2676567629334590c66023c7128ca23a1a tvbrowser-2.5-r1.ebuild 3421
 SHA256 49fc758c9a07a4f2bad48ebd011b9c2c93cc8e70b08e70bcae7a36f96a2e897d tvbrowser-2.5-r1.ebuild 3421
-EBUILD tvbrowser-2.5.2.ebuild 3616 RMD160 c6e39625daf6301b48641cdf5615ca14a572b2d4 SHA1 b4897d3859e68ec928a4e4403446db33b97a08fd SHA256 6c9966014e659dd21ad3edbcc5a2e3e786cef7012a8ba63673c743af8aeddd54
-MD5 69c5f709a979c9558a564e1d416d68df tvbrowser-2.5.2.ebuild 3616
-RMD160 c6e39625daf6301b48641cdf5615ca14a572b2d4 tvbrowser-2.5.2.ebuild 3616
-SHA256 6c9966014e659dd21ad3edbcc5a2e3e786cef7012a8ba63673c743af8aeddd54 tvbrowser-2.5.2.ebuild 3616
-EBUILD tvbrowser-2.5.3.ebuild 3611 RMD160 4571391f757aec23adb62b2e4e4ee1e34e837588 SHA1 2459998bd011babf6f084d9803a2059e2ff5d81c SHA256 ca5112fe6dc6114b73d420c63a1caf1bb2fb0804615cc7d0383c2c30ac70586a
-MD5 2b187bb03ff409a8362c266d3c89408a tvbrowser-2.5.3.ebuild 3611
-RMD160 4571391f757aec23adb62b2e4e4ee1e34e837588 tvbrowser-2.5.3.ebuild 3611
-SHA256 ca5112fe6dc6114b73d420c63a1caf1bb2fb0804615cc7d0383c2c30ac70586a tvbrowser-2.5.3.ebuild 3611
+EBUILD tvbrowser-2.5.2.ebuild 3615 RMD160 72918a1aaa316b814de58f284ee217ac8e2a1a0a SHA1 5e0e7f265411f4b825a15d20d2083b6cd2305347 SHA256 35eed0f2294c424996e19298dacd28c17be866cac72046f896d69d132293d7a9
+MD5 7766cb5e936897e4bb7edad0b3f501e1 tvbrowser-2.5.2.ebuild 3615
+RMD160 72918a1aaa316b814de58f284ee217ac8e2a1a0a tvbrowser-2.5.2.ebuild 3615
+SHA256 35eed0f2294c424996e19298dacd28c17be866cac72046f896d69d132293d7a9 tvbrowser-2.5.2.ebuild 3615
+EBUILD tvbrowser-2.5.3.ebuild 3615 RMD160 c8f8215e51f941792a8b759f74ac33ff78559c37 SHA1 5182f91c04c0f57805c3d3666d844d50b916a4e7 SHA256 4fc59a3cd16c720a842b0b16fee994debe936ddd277b0b1b2972643cc0ff8258
+MD5 a3aca21216cb30af82b9651aedc589ae tvbrowser-2.5.3.ebuild 3615
+RMD160 c8f8215e51f941792a8b759f74ac33ff78559c37 tvbrowser-2.5.3.ebuild 3615
+SHA256 4fc59a3cd16c720a842b0b16fee994debe936ddd277b0b1b2972643cc0ff8258 tvbrowser-2.5.3.ebuild 3615
 EBUILD tvbrowser-2.5.ebuild 3231 RMD160 f0ca8c0af12b97e90f55edbf2559cf14158c86f9 SHA1 f6a8fdd0e5e16786a551121c736de67a0091cf8c SHA256 e2493121d4de0385ae5c874f83b38d66dfdd30747706224623b72c4e8f561488
 MD5 a7caf6b67bedef605f61e79d63d4512f tvbrowser-2.5.ebuild 3231
 RMD160 f0ca8c0af12b97e90f55edbf2559cf14158c86f9 tvbrowser-2.5.ebuild 3231
 SHA256 e2493121d4de0385ae5c874f83b38d66dfdd30747706224623b72c4e8f561488 tvbrowser-2.5.ebuild 3231
-MISC ChangeLog 3729 RMD160 238cf09c2a37f6e84ffaea2e9a10dcd126dbe4c5 SHA1 8d234f48d42ada1b202f6586b8da1a5ef6893823 SHA256 23a140e8deee67b201de7072468a60366d43f415addb946777f3c6e23b2904e7
-MD5 de3e3c664fe2ce608e3f04ee549a541b ChangeLog 3729
-RMD160 238cf09c2a37f6e84ffaea2e9a10dcd126dbe4c5 ChangeLog 3729
-SHA256 23a140e8deee67b201de7072468a60366d43f415addb946777f3c6e23b2904e7 ChangeLog 3729
+MISC ChangeLog 3913 RMD160 0003a1823e30e0bf1c7cfd5e4c3333819669cd34 SHA1 2fe6385729a60d4e99d8ca71a7fac655f6a5f3b4 SHA256 779eefe813be99682813c65c04e5d26f52ba3b4c51d186e637b677d04c65ce08
+MD5 fcb4b09d747fc5eb26a6f6cfc9b43eb7 ChangeLog 3913
+RMD160 0003a1823e30e0bf1c7cfd5e4c3333819669cd34 ChangeLog 3913
+SHA256 779eefe813be99682813c65c04e5d26f52ba3b4c51d186e637b677d04c65ce08 ChangeLog 3913
 MISC metadata.xml 437 RMD160 fa0a4e1d3225b61ff69426a3b7994353474eb3b6 SHA1 9c88f63415dc76c616ed7c09706939b07c311225 SHA256 d249b340ae05ef3fce3fcf4e4352c69b566fe16f6cd80f34b28a17a4ba068259
 MD5 ab9a5a08dc409da5c9928d07cbea5725 metadata.xml 437
 RMD160 fa0a4e1d3225b61ff69426a3b7994353474eb3b6 metadata.xml 437
@@ -98,9 +98,9 @@ MD5 8cd3ff362e2fc971d115fec308df8a24 files/digest-tvbrowser-2.5.3 485
 RMD160 a40de90005a1d2695a6f87a8fe42c22129931fed files/digest-tvbrowser-2.5.3 485
 SHA256 a565524bfc27d1bc64ee3b8170e390762b3db0f81edd69e4ea310c5ba1b4d96f files/digest-tvbrowser-2.5.3 485
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGrd8st2vP6XvVdOcRAnqUAKChXmwdurpTYIm4MggbXe4aEWyfTgCfZVr6
-20yW2eOwChoaW3Yi7X/lgKU=
-=LYKk
+iD8DBQFHO5rCcxLzpIGCsLQRAnkKAJ9r13KfR/pK8CV345HQoMeDvHiT5QCgg+Ge
+2yacq9j5HEZqwZwn45lNaeA=
+=FpVm
 -----END PGP SIGNATURE-----
diff --git a/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild b/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild
index 904fb70b1880..a01972d2413c 100644
--- a/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-2.5.2.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/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild,v 1.5 2007/07/13 05:03:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild,v 1.6 2007/11/15 01:03:01 betelgeuse Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -36,7 +36,7 @@ RDEPEND="
 	>=dev-java/skinlf-6.7
 	dev-java/l2fprod-common
 	>=dev-java/poi-2.5.1
-	>=dev-java/xerces-2.6.2"
+	>=dev-java/xerces-2.8"
 
 DEPEND=">=virtual/jdk-1.5
 	${RDEPEND}
diff --git a/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild b/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild
index eb57a52617ec..72794cf3a22c 100644
--- a/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-2.5.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/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild,v 1.1 2007/07/30 12:52:29 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild,v 1.2 2007/11/15 01:03:01 betelgeuse Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -36,7 +36,7 @@ RDEPEND="
 	>=dev-java/skinlf-6.7
 	dev-java/l2fprod-common
 	>=dev-java/poi-2.5.1
-	>=dev-java/xerces-2.6.2"
+	>=dev-java/xerces-2.8"
 
 DEPEND=">=virtual/jdk-1.5
 	${RDEPEND}