Changed dependencies because gnu-javamail is now slotted.

Package-Manager: portage-2.0.52-r1

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 44a42086e1ecf8ac108e0f02305cb14c4f9a9515..4cd736a53e40d51c256cfed1f00ce01024c568d8 100644 (file)
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/avalon-logkit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.19 2005/07/09 15:59:10 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.20 2005/09/17 22:06:23 betelgeuse Exp $
+
+  17 Sep 2005; Petteri Räty <betelgeuse@gentoo.org>
+  avalon-logkit-1.2.ebuild, avalon-logkit-2.0.ebuild:
+  Changed dependencies because gnu-javamail is now slotted.
 
   09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> avalon-logkit-1.2.ebuild,
   avalon-logkit-2.0.ebuild:

diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index b08c55b3ae1da8fa41bc8de7d8c9920891c0a6eb..fd2e20698eab50fc7d0b999a703af78ebccbc6f6 100644 (file)
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 a8297d068fd4e9fe18785046d54d344b ChangeLog 2171
 MD5 b630c19a1abc4347806baee38ccc4eed avalon-logkit-1.2.ebuild 1858
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
@@ -5,3 +8,10 @@ MD5 31e1835181258863a7e7d3ad04caf370 avalon-logkit-2.0.ebuild 2359
 MD5 1d4fb92234d539c16377690ccc278dbb files/2.0-build.xml 1931
 MD5 59f31286545f93f7dfa4a5e40cfb19a4 files/digest-avalon-logkit-1.2 66
 MD5 f5ee024795ce428b5418141110096d4d files/digest-avalon-logkit-2.0 78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLJNyQiJ/wx066S4RAgPJAJ9xGoroU5de3GvEv4STacOH0vetmwCbBI2P
+qzWzZRx5S+HdsKRzET6CniQ=
+=vS5h
+-----END PGP SIGNATURE-----

diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild
index ec16b2571de6d9b5f3d6a9999e74b98603adbd26..c9d1647b4354ee75ed98718a439517f67d908ec5 100644 (file)
--- a/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild,v 1.22 2005/07/19 18:45:53 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild,v 1.23 2005/09/17 22:06:23 betelgeuse Exp $
 
 inherit java-pkg
 
@@ -12,7 +12,7 @@ RDEPEND=">=virtual/jre-1.3
                dev-java/sun-jaf-bin
                || (
                        dev-java/sun-javamail-bin
-                       dev-java/gnu-javamail
+                       =dev-java/gnu-javamail-1.0*
                )
        )
        jms? ( || (
@@ -44,7 +44,7 @@ src_unpack() {
                java-pkg_jar-from sun-jaf-bin
 
                if has_version dev-java/gnu-javamail; then
-                       java-pkg_jar-from gnu-javamail
+                       java-pkg_jar-from gnu-javamail-1
                elif has_version dev-java/sun-javamail-bin; then
                        java-pkg_jar-from sun-javamail-bin
                fi

diff --git a/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild
index 4303bc3fa05f892f36ab2a387c8ee8b1e3c8b386..fd0a323737d82b13fd3101c6bb0ebe78c8897e98 100644 (file)
--- a/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild,v 1.13 2005/07/13 14:05:58 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild,v 1.14 2005/09/17 22:06:23 betelgeuse Exp $
 
 inherit java-pkg
 
@@ -19,7 +19,7 @@ RDEPEND=">=virtual/jre-1.4
                        )
                )
                javamail? ( || (
-                               dev-java/gnu-javamail
+                               =dev-java/gnu-javamail-1.0*
                                dev-java/sun-javamail-bin
                        )
                )
@@ -44,7 +44,7 @@ src_unpack() {
        local javamail=""
        if use javamail; then
                if has_version dev-java/gnu-javamail; then
-                       javamail="gnu-javamail"
+                       javamail="gnu-javamail-1"
                elif has_version dev-java/sun-javamail-bin; then
                        javamail="sun-javamail-bin"
                fi