summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2005-09-17 22:06:23 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2005-09-17 22:06:23 +0000
commit01da6396e2a33072576008b66f084bc642c451a1 (patch)
treeeb65cf7deaed190f79c9cf0f65bb68636c4c3791 /dev-java/avalon-logkit
parentVersion bump. Fixes bug #105318. Thanks to Josh Nichols <nichoj@alum.rpi.edu>... (diff)
downloadgentoo-2-01da6396e2a33072576008b66f084bc642c451a1.tar.gz
gentoo-2-01da6396e2a33072576008b66f084bc642c451a1.tar.bz2
gentoo-2-01da6396e2a33072576008b66f084bc642c451a1.zip
Changed dependencies because gnu-javamail is now slotted.
(Portage version: 2.0.52-r1)
Diffstat (limited to 'dev-java/avalon-logkit')
-rw-r--r--dev-java/avalon-logkit/ChangeLog6
-rw-r--r--dev-java/avalon-logkit/Manifest14
-rw-r--r--dev-java/avalon-logkit/avalon-logkit-1.2.ebuild6
-rw-r--r--dev-java/avalon-logkit/avalon-logkit-2.0.ebuild6
4 files changed, 13 insertions, 19 deletions
diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 44a42086e1ec..4cd736a53e40 100644
--- 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 a5bcfbf78e39..21a6b43657df 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 fa3c40e917272ac2c405256df1bc8146 ChangeLog 1997
-MD5 e2ade95b9c15def580385b094ab37970 avalon-logkit-1.2.ebuild 1844
+MD5 b499ecbef46a9b8c13c251a68ada9b70 avalon-logkit-1.2.ebuild 1852
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 9583b92ff1f93b02abefaa7fcbcb4734 avalon-logkit-2.0.ebuild 2349
+MD5 882be047c48b65533cc70f3b7dcbda75 avalon-logkit-2.0.ebuild 2357
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.1 (GNU/Linux)
-
-iD8DBQFC3Up8/rLF9B432nYRAh1RAJsFyOrGpAgqYHBKVrrrfzdnBmVYwwCfUy64
-a5LXBdopyceC5k4i/MN10gg=
-=yT6O
------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 ec16b2571de6..c9d1647b4354 100644
--- 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 4303bc3fa05f..fd0a323737d8 100644
--- 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