Restrict junit dependency.

Package-Manager: portage-2.1.4_rc14

7 files changed, 45 insertions, 50 deletions

diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog
index 2ebfe92ccba8..307cfda9274a 100644
--- a/media-tv/tvbrowser/ChangeLog
+++ b/media-tv/tvbrowser/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/tvbrowser
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.22 2008/01/04 20:09:14 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.23 2008/01/10 22:42:11 caster Exp $
+
+  10 Jan 2008; Vlastimil Babka <caster@gentoo.org> tvbrowser-2.2.1.ebuild,
+  tvbrowser-2.5.ebuild, tvbrowser-2.5-r1.ebuild, tvbrowser-2.5.2.ebuild,
+  tvbrowser-2.5.3.ebuild:
+  Restrict junit dependency.
 
   04 Jan 2008; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
   Assigned package to vdr-project.
diff --git a/media-tv/tvbrowser/Manifest b/media-tv/tvbrowser/Manifest
index 41c8bb0a10be..6944f75a1f21 100644
--- a/media-tv/tvbrowser/Manifest
+++ b/media-tv/tvbrowser/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tvbrowser-2.1-makefiles.patch 3385 RMD160 dc09af2ddba09eb90657c9b61eead3e40002cd00 SHA1 836ca66cc7bd1fdd7fac5c71ba68e60b495b3d52 SHA256 e33caa5f099590fa3c0da2ccbff7189a442f12404775ee19b26319747c7613ed
 MD5 2a50d11a23b770a3d4b7b34bbaca2c36 files/tvbrowser-2.1-makefiles.patch 3385
 RMD160 dc09af2ddba09eb90657c9b61eead3e40002cd00 files/tvbrowser-2.1-makefiles.patch 3385
@@ -46,30 +43,30 @@ DIST tvbrowser-2.2.1-src.zip 8138920 RMD160 e0080a207026ea0d3037e97032fe0451bb97
 DIST tvbrowser-2.5-src.zip 8865427 RMD160 2f47f2a9d56f9fac26dae77f6f34dac06bd17b7d SHA1 a8a3444cfc40f67e16beccfb491121d98f4e0cc1 SHA256 f2f60303a5600dd3bcd94dc681f469f9e0e6e408581db4eccc2bad3cbdbb3c7a
 DIST tvbrowser-2.5.2-src.zip 9237691 RMD160 6b0b219535606897bfc8b15858e3cc8eb153fe4a SHA1 569052af3744938c1ae432ec04dcdc7c85e9f99a SHA256 7355ed9887fc3ea833c9f8296a513eb864605f85646fbb4bb9a83be128c24d8e
 DIST tvbrowser-2.5.3-src.zip 9290454 RMD160 9138e33dd1fbe887353a8ac5eecd7e9cb7b1fd0f SHA1 979d9dc437e28aff5eb5853b7637e244871d2eee SHA256 e3dbabedb9e16b73f11828f5b5654034055638387be7f1b89db1b8b00d7bcea8
-EBUILD tvbrowser-2.2.1.ebuild 2917 RMD160 b8ee28df0c3d7bc9e7704c6d55d5fbe5dc552737 SHA1 6007a3ba0c12839a6a5f051528e5b52fe03ac248 SHA256 434ded422acb85e4205cb6deef29cc8f1d6e5cd90d7cfea5c6ab754e6a02a6f3
-MD5 292dc6ccfaedfbf0c51031e2b55e072d tvbrowser-2.2.1.ebuild 2917
-RMD160 b8ee28df0c3d7bc9e7704c6d55d5fbe5dc552737 tvbrowser-2.2.1.ebuild 2917
-SHA256 434ded422acb85e4205cb6deef29cc8f1d6e5cd90d7cfea5c6ab754e6a02a6f3 tvbrowser-2.2.1.ebuild 2917
-EBUILD tvbrowser-2.5-r1.ebuild 3452 RMD160 de5dd85a879bf3c0f51ca4e6e6e3f5b5df0c7c04 SHA1 b6bdeb874b9c6eb875ad2617fe54b956e8eea38b SHA256 c0af84e0dae7813b9aa21d8f592e6cba5b18e924a3c2dfa7dcc7e0fde15069cb
-MD5 7866f4b0f09911b9b9d586fe12331a23 tvbrowser-2.5-r1.ebuild 3452
-RMD160 de5dd85a879bf3c0f51ca4e6e6e3f5b5df0c7c04 tvbrowser-2.5-r1.ebuild 3452
-SHA256 c0af84e0dae7813b9aa21d8f592e6cba5b18e924a3c2dfa7dcc7e0fde15069cb tvbrowser-2.5-r1.ebuild 3452
-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 3260 RMD160 044d541b9b1a72bbd8f72c58cfd919eecd2878eb SHA1 5ca765383f3fc3e74705f572b5840ed559b8f452 SHA256 4c5b150f802ff1255f47c69e38200305dfd4785dbf58c12781f5e284db48069d
-MD5 3bbda864fe37a8d95f0f0f51ae5d06a5 tvbrowser-2.5.ebuild 3260
-RMD160 044d541b9b1a72bbd8f72c58cfd919eecd2878eb tvbrowser-2.5.ebuild 3260
-SHA256 4c5b150f802ff1255f47c69e38200305dfd4785dbf58c12781f5e284db48069d tvbrowser-2.5.ebuild 3260
-MISC ChangeLog 4283 RMD160 501d1818e8424f79ee8281c5e0ae2539c79470dd SHA1 e096d2302354a010f767b9b73c895e3e8ea26cc6 SHA256 e0eaf9bbd97038eebdeaede8f6ee04bbc60b44809f8b3387e4b9a866dbccfd52
-MD5 53cabd62da4cc76b3d612af008fa8bd6 ChangeLog 4283
-RMD160 501d1818e8424f79ee8281c5e0ae2539c79470dd ChangeLog 4283
-SHA256 e0eaf9bbd97038eebdeaede8f6ee04bbc60b44809f8b3387e4b9a866dbccfd52 ChangeLog 4283
+EBUILD tvbrowser-2.2.1.ebuild 2925 RMD160 7335673b8776c2da16f43a6cb63d3205a791c6be SHA1 75048a7b42047ab7a95de89ea39dc836f050008f SHA256 39da410283914d49d3c81088e9a38e28e73c04850cd66844c76bfc33c1da8bb7
+MD5 8f1ba51d78c3d639095eab697e5b7031 tvbrowser-2.2.1.ebuild 2925
+RMD160 7335673b8776c2da16f43a6cb63d3205a791c6be tvbrowser-2.2.1.ebuild 2925
+SHA256 39da410283914d49d3c81088e9a38e28e73c04850cd66844c76bfc33c1da8bb7 tvbrowser-2.2.1.ebuild 2925
+EBUILD tvbrowser-2.5-r1.ebuild 3460 RMD160 ab9495a8d17f68b59ef0e787acd651ce68d6e6ae SHA1 d6e440b581356ecd5a9080b61c523fbfa588bee0 SHA256 781b1ab3907174c4d312b3a0ef2b05c38640572b19b9578b0ba81cceccf97e8c
+MD5 01414bd88a8604ba4a8f86fbbcca2ba0 tvbrowser-2.5-r1.ebuild 3460
+RMD160 ab9495a8d17f68b59ef0e787acd651ce68d6e6ae tvbrowser-2.5-r1.ebuild 3460
+SHA256 781b1ab3907174c4d312b3a0ef2b05c38640572b19b9578b0ba81cceccf97e8c tvbrowser-2.5-r1.ebuild 3460
+EBUILD tvbrowser-2.5.2.ebuild 3617 RMD160 1b54ae078366e05a6f261c6f4d3c5d07bb64d9ca SHA1 65bf13e5ebb26d3299a5ff1c03fdbd974e5d01d8 SHA256 f87826b39cbf29579d0f2e4ca2081571896c669e2d1e583ab56cbe1dbce447fb
+MD5 e7ba14a140282cad44454f0864e58fff tvbrowser-2.5.2.ebuild 3617
+RMD160 1b54ae078366e05a6f261c6f4d3c5d07bb64d9ca tvbrowser-2.5.2.ebuild 3617
+SHA256 f87826b39cbf29579d0f2e4ca2081571896c669e2d1e583ab56cbe1dbce447fb tvbrowser-2.5.2.ebuild 3617
+EBUILD tvbrowser-2.5.3.ebuild 3617 RMD160 9f663a633f0782eac1a55b6490173b93a4bde1c2 SHA1 a6856e8bb2f201bcf85fcd7f7186e8512efa09f9 SHA256 37d27bc00bfa58e31fb15c3e169fbd63df729973b059680bd52d81745bb859a7
+MD5 fceed9c1879651ac3ebafb3120c4f19a tvbrowser-2.5.3.ebuild 3617
+RMD160 9f663a633f0782eac1a55b6490173b93a4bde1c2 tvbrowser-2.5.3.ebuild 3617
+SHA256 37d27bc00bfa58e31fb15c3e169fbd63df729973b059680bd52d81745bb859a7 tvbrowser-2.5.3.ebuild 3617
+EBUILD tvbrowser-2.5.ebuild 3268 RMD160 c405a535f0ac5a36a14b9db6d721429fd933ba77 SHA1 bd8b8a4a3787f387b80d8dec2a8fddccd417b0c3 SHA256 9d33738359b58738e6dff90a8bb33b1c64a27a86b08e2b4fd67de88b4bd3aef8
+MD5 3cf4e26ca6fb9f0cbbcac811cd3ddfa9 tvbrowser-2.5.ebuild 3268
+RMD160 c405a535f0ac5a36a14b9db6d721429fd933ba77 tvbrowser-2.5.ebuild 3268
+SHA256 9d33738359b58738e6dff90a8bb33b1c64a27a86b08e2b4fd67de88b4bd3aef8 tvbrowser-2.5.ebuild 3268
+MISC ChangeLog 4489 RMD160 968fee9077b2142942b2bc347ba25799363c9145 SHA1 f869514bf40166e03c7a1d77ca550e43466d8293 SHA256 ad24944ef36f13e1ee91c45468a0ab35bed888653e5a63a132e7c566bf5bfa3a
+MD5 68cf7fd53fa95d56391c2f0f5afb1335 ChangeLog 4489
+RMD160 968fee9077b2142942b2bc347ba25799363c9145 ChangeLog 4489
+SHA256 ad24944ef36f13e1ee91c45468a0ab35bed888653e5a63a132e7c566bf5bfa3a ChangeLog 4489
 MISC metadata.xml 435 RMD160 e02ae4bcc65e90d97467292bf900c480adb735ae SHA1 9fd5825432abec1a5007e927793b70ad63ac889d SHA256 16652e21166757002251540278cedeb8592f7395b2d011741dd61d4b00391e38
 MD5 a2a90aa093038bde52c5e8229ca16373 metadata.xml 435
 RMD160 e02ae4bcc65e90d97467292bf900c480adb735ae metadata.xml 435
@@ -89,10 +86,3 @@ SHA256 9077f1ef73f1d1d33ce47076a7b20c0931242be1e69101dfbd1ed13f3e3d9cb9 files/di
 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.8 (GNU/Linux)
-
-iEYEARECAAYFAkd+knMACgkQt2vP6XvVdOePjwCg5FksppH2Dy4zWW4zmKFjB4u3
-DZ0AoMLfKlhUy/1EbZWJp+sShe3g3KNb
-=tzdy
------END PGP SIGNATURE-----
diff --git a/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild b/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild
index 38426c335695..0a948e37b804 100644
--- a/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild,v 1.8 2007/11/27 10:53:54 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild,v 1.9 2008/01/10 22:42:11 caster Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -24,7 +24,7 @@ RDEPEND="x11-libs/libXt
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	>=virtual/jre-1.4
-	dev-java/junit
+	=dev-java/junit-3.8*
 	dev-java/commons-net
 	>=dev-java/jgoodies-forms-1.0.7
 	>=dev-java/jgoodies-looks-2.0
diff --git a/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild b/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild
index 00e666855b57..a0f5ca4bb0d8 100644
--- a/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild,v 1.3 2007/11/27 10:53:54 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild,v 1.4 2008/01/10 22:42:11 caster Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -26,7 +26,7 @@ RDEPEND="x11-libs/libXt
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	>=virtual/jre-1.5
-	dev-java/junit
+	=dev-java/junit-3.8*
 	dev-java/commons-net
 	>=dev-java/jgoodies-forms-1.0.7
 	>=dev-java/jgoodies-looks-2.0
diff --git a/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild b/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild
index a01972d2413c..7d42c5ba64b6 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
+# Copyright 1999-2008 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.6 2007/11/15 01:03:01 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild,v 1.7 2008/01/10 22:42:11 caster Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -28,7 +28,7 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXau
 	x11-libs/libXdmcp
-	dev-java/junit
+	=dev-java/junit-3.8*
 	dev-java/commons-net
 	>=dev-java/jgoodies-forms-1.0.7
 	>=dev-java/jgoodies-looks-2.0
diff --git a/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild b/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild
index 72794cf3a22c..4a4e51cfa80a 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
+# Copyright 1999-2008 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.2 2007/11/15 01:03:01 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild,v 1.3 2008/01/10 22:42:11 caster Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -28,7 +28,7 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXau
 	x11-libs/libXdmcp
-	dev-java/junit
+	=dev-java/junit-3.8*
 	dev-java/commons-net
 	>=dev-java/jgoodies-forms-1.0.7
 	>=dev-java/jgoodies-looks-2.0
diff --git a/media-tv/tvbrowser/tvbrowser-2.5.ebuild b/media-tv/tvbrowser/tvbrowser-2.5.ebuild
index 819da778ea71..259d4b9f30c6 100644
--- a/media-tv/tvbrowser/tvbrowser-2.5.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5.ebuild,v 1.4 2007/11/27 10:53:54 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5.ebuild,v 1.5 2008/01/10 22:42:11 caster Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -26,7 +26,7 @@ RDEPEND="x11-libs/libXt
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	>=virtual/jre-1.5
-	dev-java/junit
+	=dev-java/junit-3.8*
 	dev-java/commons-net
 	>=dev-java/jgoodies-forms-1.0.7
 	>=dev-java/jgoodies-looks-2.0