diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2005-12-06 00:07:44 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2005-12-06 00:07:44 +0000 |
| commit | eab26c63c8a38d2e2662afa6d8a24854e40f79cc (patch) | |
| tree | 91e6b72820eb7b576e1cbe47b128c45d8b1c17cc /dev-java/log4j | |
| parent | chgrp root isn't portable, bug #112514 (diff) | |
| download | gentoo-2-eab26c63c8a38d2e2662afa6d8a24854e40f79cc.tar.gz gentoo-2-eab26c63c8a38d2e2662afa6d8a24854e40f79cc.tar.bz2 gentoo-2-eab26c63c8a38d2e2662afa6d8a24854e40f79cc.zip | |
Adjusted ant-core dependency because this version does not compile using ant-core-1.6.2* at the moment.
(Portage version: 2.0.53)
Diffstat (limited to 'dev-java/log4j')
| -rw-r--r-- | dev-java/log4j/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/log4j/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/log4j/log4j-1.2.12.ebuild | 9 |
3 files changed, 14 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..8d2116496a81 100644 --- a/dev-java/log4j/Manifest +++ b/dev-java/log4j/Manifest @@ -1,8 +1,8 @@ -MD5 624b2ed36c30b79389026e8afeafd725 ChangeLog 4373 +MD5 db9b2e46e993714e75ecf1a9cd239616 ChangeLog 4556 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 f5aa9670e95f7ad9c62198e5cbb987b2 log4j-1.2.12.ebuild 2040 MD5 9c63997323bb4971620df8065b8bc388 log4j-1.2.9.ebuild 1737 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 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}" |