summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-01-08 22:13:19 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-01-08 22:13:19 +0000
commit417050fa084c7d38c5622b5fd2f43c3d183f1240 (patch)
treea4aaddeb6768e767d402d5c26dac69716217b770 /dev-java/log4j
parentadded to ~ppc, bug #116831 (diff)
downloadgentoo-2-417050fa084c7d38c5622b5fd2f43c3d183f1240.tar.gz
gentoo-2-417050fa084c7d38c5622b5fd2f43c3d183f1240.tar.bz2
gentoo-2-417050fa084c7d38c5622b5fd2f43c3d183f1240.zip
Disabled jikes support due to bug #108819.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'dev-java/log4j')
-rw-r--r--dev-java/log4j/ChangeLog7
-rw-r--r--dev-java/log4j/Manifest12
-rw-r--r--dev-java/log4j/log4j-1.2.12.ebuild9
3 files changed, 10 insertions, 18 deletions
diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index c657576da3ac..290b3d0d50a0 100644
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,6 +1,9 @@
# 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.37 2005/12/06 00:07:44 betelgeuse Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.38 2006/01/08 22:13:19 nichoj Exp $
+
+ 08 Jan 2006; Joshua Nichols <nichoj@gentoo.org> log4j-1.2.12.ebuild:
+ Disabled jikes support due to bug #108819.
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
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index 23b6beb0e88a..af4992121119 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,18 +1,8 @@
------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 845f16a50b50b0ee06b9c39a8560f6cf log4j-1.2.12.ebuild 2046
+MD5 547adc30c0ff03a8c3569643e653a0ce log4j-1.2.12.ebuild 1991
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 a77c77ded5b4..cff252926f37 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
+# Copyright 1999-2006 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.3 2005/12/06 00:07:44 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.12.ebuild,v 1.4 2006/01/08 22:13:19 nichoj Exp $
inherit java-pkg
@@ -10,7 +10,8 @@ HOMEPAGE="http://logging.apache.org/log4j/"
LICENSE="Apache-1.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc javamail jikes jms jmx source"
+# jikes support disabled: bug #108819
+IUSE="doc javamail jms jmx source"
RDEPEND=">=virtual/jre-1.4
javamail? ( dev-java/sun-javamail-bin dev-java/sun-jaf-bin )
@@ -27,7 +28,6 @@ RDEPEND=">=virtual/jre-1.4
DEPEND=">=virtual/jdk-1.4
>=dev-java/ant-core-1.6.5
- jikes? ( dev-java/jikes )
source? ( app-arch/zip )
${RDEPEND}"
@@ -41,7 +41,6 @@ src_unpack() {
src_compile() {
local antflags="jar"
- use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
use javamail && antflags="${antflags} -Djavamail.jar=$(java-pkg_getjar sun-javamail-bin mail.jar) -Dactivation.jar=$(java-pkg_getjar sun-jaf-bin activation.jar)"
use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)"
#use jms && antflags="${antflags} -Djms.jar=$(java-pkg_getjar openjms jms.jar)"