Use EAPI=1 to match only slot 0 of junit.

Package-Manager: portage-2.1.4

4 files changed, 39 insertions, 25 deletions

diff --git a/dev-java/ant-tasks/Manifest b/dev-java/ant-tasks/Manifest
index b7e85fcd5559..b2b191d0a62a 100644
--- a/dev-java/ant-tasks/Manifest
+++ b/dev-java/ant-tasks/Manifest
@@ -1,8 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST apache-ant-1.6.5-src.tar.bz2 6283500 RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 SHA1 08e838c506ee580f5d220401a974c757ea80365d SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59
-EBUILD ant-tasks-1.6.5-r4.ebuild 3423 RMD160 6a80b2086f1fdfbf484724303468c9ad4ffb9861 SHA1 75af0436249274568320c957dc1182e6e7d13015 SHA256 072f5fec48c8406670d7ce485b2b439cb07cebe86f1bc70290bb3b120294dd13
-MD5 4d39e613bb40e1c280158c5cc1bf8698 ant-tasks-1.6.5-r4.ebuild 3423
-RMD160 6a80b2086f1fdfbf484724303468c9ad4ffb9861 ant-tasks-1.6.5-r4.ebuild 3423
-SHA256 072f5fec48c8406670d7ce485b2b439cb07cebe86f1bc70290bb3b120294dd13 ant-tasks-1.6.5-r4.ebuild 3423
+EBUILD ant-tasks-1.6.5-r4.ebuild 3432 RMD160 f1cc44de605f3175f1ea84cc5a79c4f0c3675404 SHA1 9f6d517ee9db4bfea0d38e40a145ab318282132a SHA256 28033fdd909e6bbe8b69d575e273e27dd367ef06875248e2dcf6036569997d82
+MD5 a17d26c48d19b8f54b1e3b1c1a379baa ant-tasks-1.6.5-r4.ebuild 3432
+RMD160 f1cc44de605f3175f1ea84cc5a79c4f0c3675404 ant-tasks-1.6.5-r4.ebuild 3432
+SHA256 28033fdd909e6bbe8b69d575e273e27dd367ef06875248e2dcf6036569997d82 ant-tasks-1.6.5-r4.ebuild 3432
 EBUILD ant-tasks-1.7.0-r2.ebuild 3991 RMD160 96a0788097853338512aaf72587dff198dcee671 SHA1 e50e27475dc2b1bb03ba115c527dfaba593053aa SHA256 80f837cca99db720b4a31cc1487bf2221e522e715531ead00f3f022c4ca7f68c
 MD5 d8ff724701aa04119fdaf4892a200236 ant-tasks-1.7.0-r2.ebuild 3991
 RMD160 96a0788097853338512aaf72587dff198dcee671 ant-tasks-1.7.0-r2.ebuild 3991
@@ -15,10 +18,10 @@ EBUILD ant-tasks-1.7.0-r4.ebuild 3373 RMD160 023116db66e1aa133da7f5d03d8211071b4
 MD5 d40ca7f57dbc303efab28c028b12bc0d ant-tasks-1.7.0-r4.ebuild 3373
 RMD160 023116db66e1aa133da7f5d03d8211071b428df0 ant-tasks-1.7.0-r4.ebuild 3373
 SHA256 9f2f0fbf9e05cd9abd43fa2b006911c1b92243529b434f92a713107fe2219fc2 ant-tasks-1.7.0-r4.ebuild 3373
-MISC ChangeLog 16820 RMD160 4f59c5017be134e5de002bfc5b3b8f1b37dc0bba SHA1 533588a5461e20f963a5f7d8e7afe422f00e960f SHA256 686fadc4092132f88bfd3360a628692f32dfb127747e4c03116da11bb3e3211e
-MD5 fa7ee46488a292f757ce742f14bf2e91 ChangeLog 16820
-RMD160 4f59c5017be134e5de002bfc5b3b8f1b37dc0bba ChangeLog 16820
-SHA256 686fadc4092132f88bfd3360a628692f32dfb127747e4c03116da11bb3e3211e ChangeLog 16820
+MISC ChangeLog 16962 RMD160 fce0ab29a5c5cd7792d391873f495685e8eaac91 SHA1 3caf3eec9f7b30617539aef83713c4fcc1276e1b SHA256 7445cc21042cf7383f3d602c561991ba1e4443a363da6c12b7ded139baf92071
+MD5 1835a85abc25a1ebe836bcb8119fb000 ChangeLog 16962
+RMD160 fce0ab29a5c5cd7792d391873f495685e8eaac91 ChangeLog 16962
+SHA256 7445cc21042cf7383f3d602c561991ba1e4443a363da6c12b7ded139baf92071 ChangeLog 16962
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -35,3 +38,10 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-tasks-1.7.0-r4 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ant-tasks-1.7.0-r4 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ant-tasks-1.7.0-r4 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHk9eccxLzpIGCsLQRAiiWAKCX6nm80Da5QDrHVTm+5cBITsTQHACfXDMC
+lAUWXBxmqtkMfG+8lGVD9PU=
+=Idh2
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jtds/ChangeLog b/dev-java/jtds/ChangeLog
index a9751d28688e..30d5234751f1 100644
--- a/dev-java/jtds/ChangeLog
+++ b/dev-java/jtds/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jtds
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.18 2007/07/16 00:00:18 betelgeuse Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.19 2008/01/20 23:19:48 betelgeuse Exp $
+
+  20 Jan 2008; Petteri Räty <betelgeuse@gentoo.org> jtds-1.2-r2.ebuild:
+  Use EAPI=1 to match only slot 0 of junit.
 
   15 Jul 2007; Petteri Räty <betelgeuse@gentoo.org> -jtds-0.9.1.ebuild,
   -jtds-1.0.3.ebuild:
diff --git a/dev-java/jtds/Manifest b/dev-java/jtds/Manifest
index 2cb6ec7a6a72..85138bc843f3 100644
--- a/dev-java/jtds/Manifest
+++ b/dev-java/jtds/Manifest
@@ -18,14 +18,14 @@ MD5 f3a1bea2ce8720ca91b3e2d813631ca9 files/buildxml-gentoo.patch 2919
 RMD160 09e8138ccf2b60bd797afbf11fa77f50c7e1cead files/buildxml-gentoo.patch 2919
 SHA256 ad850b2cc62eaf90163af5285044e359fda7baac582fca744135290d0a0c1b79 files/buildxml-gentoo.patch 2919
 DIST jtds-1.2-src.zip 3489215 RMD160 b7f79995090201af570239b5105d5ced030174f3 SHA1 3ed957b7f39f15f705e5f2940d4819521951b79f SHA256 60020866fec76fc246db5eaafc894a2348ac2d910139da8e9be91d23362d9b4e
-EBUILD jtds-1.2-r2.ebuild 1272 RMD160 f6b9c93f742a942360c78b18eeb96a0591b5f361 SHA1 97cb0a5b88adb0ee316cb4f9a50f6f205816d186 SHA256 85a035309e068d45985994bc23f481fa2fb3d40ce0b0bf4aea9641175490a5a8
-MD5 be5f2555aab0352410b9a47d82cae348 jtds-1.2-r2.ebuild 1272
-RMD160 f6b9c93f742a942360c78b18eeb96a0591b5f361 jtds-1.2-r2.ebuild 1272
-SHA256 85a035309e068d45985994bc23f481fa2fb3d40ce0b0bf4aea9641175490a5a8 jtds-1.2-r2.ebuild 1272
-MISC ChangeLog 2828 RMD160 966f7ad15b4fcbd2fcc4ac24ec70a486e4a99775 SHA1 989541fcdeb1b101e6930384ae1ce52404302206 SHA256 a899ebb8a07fca4333c136810478326be77cce6504156300835445a154f3cc2b
-MD5 e934542a08535b44ac43533ce67d6828 ChangeLog 2828
-RMD160 966f7ad15b4fcbd2fcc4ac24ec70a486e4a99775 ChangeLog 2828
-SHA256 a899ebb8a07fca4333c136810478326be77cce6504156300835445a154f3cc2b ChangeLog 2828
+EBUILD jtds-1.2-r2.ebuild 1279 RMD160 17069527ae25a6068e90f313f4c23da76b4cf19d SHA1 85d621eff3f10d3109164d48c6678ec36e4b8ed6 SHA256 f83282c0cd0e3d5522493341624c27e49d8fda3f71ada1f16281a8b31f5b14fb
+MD5 92199ce33a605b80f0a3346587dc22c7 jtds-1.2-r2.ebuild 1279
+RMD160 17069527ae25a6068e90f313f4c23da76b4cf19d jtds-1.2-r2.ebuild 1279
+SHA256 f83282c0cd0e3d5522493341624c27e49d8fda3f71ada1f16281a8b31f5b14fb jtds-1.2-r2.ebuild 1279
+MISC ChangeLog 2946 RMD160 5bfe1d6dc54452771dad22ae8e1f2bbd75ad01d6 SHA1 c0a41a04187c0953f2591e136bcdc751843ffb15 SHA256 15f0d2bf7eedb0c65f4ddf4968bc812d27a27589a3724cbda4db5452ac4e5f7c
+MD5 df4e7b6d50cbc0af0f094c9b6781c3e2 ChangeLog 2946
+RMD160 5bfe1d6dc54452771dad22ae8e1f2bbd75ad01d6 ChangeLog 2946
+SHA256 15f0d2bf7eedb0c65f4ddf4968bc812d27a27589a3724cbda4db5452ac4e5f7c ChangeLog 2946
 MISC metadata.xml 728 RMD160 394d832af5454401e1f5e382465b1e05d2367e98 SHA1 ba2c17315d21d6afe07a1739b8e180cd84db7a3a SHA256 3e7b67c3c3850d9f00d6c036ae8f77d1346462bbb479f4fb82a732976220a3a7
 MD5 18b4e0bc9665a646af0bec4688bad602 metadata.xml 728
 RMD160 394d832af5454401e1f5e382465b1e05d2367e98 metadata.xml 728
@@ -34,9 +34,9 @@ MD5 65195690fbb916cdb0855d4386d78a67 files/digest-jtds-1.2-r2 232
 RMD160 87453400508e3fcef8eefd6c7caa12303a03ee91 files/digest-jtds-1.2-r2 232
 SHA256 cdbec460ca437522dad0326270f0f5ed226518c75318147d4886e276d3a8a4eb files/digest-jtds-1.2-r2 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGmrUQcxLzpIGCsLQRAmeFAJ0fdLQhr2HdVpidlMUGltQ7POhbhgCgncwk
-IeYdUaDoqTUKvCkCEKfWnS0=
-=elBC
+iD8DBQFHk9cbcxLzpIGCsLQRAogzAJwPxLM6cmQT7Jpmvh/R7rnWD8kM9gCdHmKN
+suW+2Ir7YG34FvLafDnu2J0=
+=dxcx
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jtds/jtds-1.2-r2.ebuild b/dev-java/jtds/jtds-1.2-r2.ebuild
index 2e099a80e1dd..248853394443 100644
--- a/dev-java/jtds/jtds-1.2-r2.ebuild
+++ b/dev-java/jtds/jtds-1.2-r2.ebuild
@@ -1,8 +1,9 @@
-# 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/dev-java/jtds/jtds-1.2-r2.ebuild,v 1.6 2007/07/15 13:49:59 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-1.2-r2.ebuild,v 1.7 2008/01/20 23:19:48 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source"
+EAPI=1
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -14,7 +15,7 @@ SLOT="1.2"
 KEYWORDS="amd64 ppc ~ppc64 x86"
 COMMON_DEPEND="
 	=dev-java/jcifs-1*
-	>=dev-java/junit-3.8"
+	dev-java/junit:0"
 # does not like javax.sql in >=1.6
 DEPEND="
 	|| (