summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2005-12-06 00:07:44 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2005-12-06 00:07:44 +0000
commit56ff0e40145027f216fbd70cce1d7fddbbd3831a (patch)
tree4517c9f27d2f4434f4c22139164dc8a1d5a2bb86 /dev-java/log4j
parentchgrp root isn't portable, bug #112514 (diff)
downloadhistorical-56ff0e40145027f216fbd70cce1d7fddbbd3831a.tar.gz
historical-56ff0e40145027f216fbd70cce1d7fddbbd3831a.tar.bz2
historical-56ff0e40145027f216fbd70cce1d7fddbbd3831a.zip
Adjusted ant-core dependency because this version does not compile using ant-core-1.6.2* at the moment.
Package-Manager: portage-2.0.53
Diffstat (limited to 'dev-java/log4j')
-rw-r--r--dev-java/log4j/ChangeLog6
-rw-r--r--dev-java/log4j/Manifest14
-rw-r--r--dev-java/log4j/log4j-1.2.12.ebuild9
3 files changed, 24 insertions, 5 deletions
diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index a6d841e03ded..c657576da3ac 100644
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/log4j
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.36 2005/11/18 06:46:21 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.37 2005/12/06 00:07:44 betelgeuse Exp $
+
+ 06 Dec 2005; Petteri Räty <betelgeuse@gentoo.org> log4j-1.2.12.ebuild:
+ Adjusted ant-core dependency because this version does not compile using
+ ant-core-1.6.2* at the moment.
18 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org> log4j-1.2.9.ebuild:
Fixing compile without JMX
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index 4c0755b500d9..23b6beb0e88a 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,8 +1,18 @@
-MD5 624b2ed36c30b79389026e8afeafd725 ChangeLog 4373
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bc9268b61e68b66e5560cc8cb3ab4f7d ChangeLog 4558
MD5 c7a6fa71142e97d11735ceccc088752b files/digest-log4j-1.2.11 73
MD5 d30ee0a14e3537d3f518067d60130a47 files/digest-log4j-1.2.12 73
MD5 d55e5a6d5e0b3b7044122df1b3c55830 files/digest-log4j-1.2.9 72
MD5 66f688f3902333537517ca8743b019b6 log4j-1.2.11.ebuild 1797
-MD5 042f6d1d8c7bc4dbec37abb16a58f4ab log4j-1.2.12.ebuild 1797
+MD5 845f16a50b50b0ee06b9c39a8560f6cf log4j-1.2.12.ebuild 2046
MD5 9c63997323bb4971620df8065b8bc388 log4j-1.2.9.ebuild 1737
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDlNZfQiJ/wx066S4RAhLqAJ9+elQkIBKG/KOpQ8i4iRhujh3EqgCfTj1J
+91w5FQpuU/DVG3/e0U9hxmI=
+=BSv0
+-----END PGP SIGNATURE-----
diff --git a/dev-java/log4j/log4j-1.2.12.ebuild b/dev-java/log4j/log4j-1.2.12.ebuild
index 32b27f6739f8..a77c77ded5b4 100644
--- a/dev-java/log4j/log4j-1.2.12.ebuild
+++ b/dev-java/log4j/log4j-1.2.12.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/log4j/log4j-1.2.12.ebuild,v 1.2 2005/10/15 11:41:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.12.ebuild,v 1.3 2005/12/06 00:07:44 betelgeuse Exp $
inherit java-pkg
@@ -20,8 +20,13 @@ RDEPEND=">=virtual/jre-1.4
# We should get log4j working with openjms but at the moment that would bring
# a circular dependency.
# jms? ( || (=dev-java/openjms-0.7.6* =dev-java/openjms-bin-0.7.6* ))"
+
+# Needs the a newer ant-core because otherwise source 1.1 and target 1.1 fails
+# on at least blackdown-jdk-1.4.2.02. The other way to go around this is to
+# explicitly set the javac.source and javac.target properties in the ebuild.
+
DEPEND=">=virtual/jdk-1.4
- dev-java/ant-core
+ >=dev-java/ant-core-1.6.5
jikes? ( dev-java/jikes )
source? ( app-arch/zip )
${RDEPEND}"