Fixing compile with -jmx

Package-Manager: portage-2.0.53_rc7

diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index 0143abebec61cf2ae2559b446047803695d25d9d..a6d841e03ded712631f22826d6b2f6b3a27bdbdf 100644 (file)
--- 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.35 2005/10/15 11:41:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.36 2005/11/18 06:46:21 compnerd Exp $
+
+  18 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org> log4j-1.2.9.ebuild:
+  Fixing compile without JMX
 
   15 Oct 2005; Thomas Matthijs <axxo@gentoo.org> log4j-1.2.9.ebuild,
   log4j-1.2.11.ebuild, log4j-1.2.12.ebuild:

diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index eb82950ef61137e2316583cbfe8a480f7cb7c417..4c0755b500d9df40c8e76142cb024f749e929bf9 100644 (file)
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 29747ec5db6bce22db7f0171a6d643db ChangeLog 4263
+MD5 624b2ed36c30b79389026e8afeafd725 ChangeLog 4373
 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 c8928993256543fbbb002091f7c0cc95 log4j-1.2.9.ebuild 1647
+MD5 9c63997323bb4971620df8065b8bc388 log4j-1.2.9.ebuild 1737
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDUOsP/rLF9B432nYRAmubAJ4zdX6u50UFoprV6pvduIALeAAwlgCcCvW5
-gnwl3k/haBIPNeK74eNjkxw=
-=kfhF
------END PGP SIGNATURE-----

diff --git a/dev-java/log4j/log4j-1.2.9.ebuild b/dev-java/log4j/log4j-1.2.9.ebuild
index 3d9b7b32f37ec1019ce74c319f510bd87c41fc13..44893a88a462d32f99b26b600789c19cae26f3d9 100644 (file)
--- a/dev-java/log4j/log4j-1.2.9.ebuild
+++ b/dev-java/log4j/log4j-1.2.9.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.9.ebuild,v 1.13 2005/10/15 11:41:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.9.ebuild,v 1.14 2005/11/18 06:46:21 compnerd Exp $
 
 inherit java-pkg
 
@@ -29,6 +29,9 @@ src_unpack() {
        unpack ${A}
        cd ${S}
        rm -rf dist/
+
+       # Fix for failure without JMX
+       use jmx || rm -rf ${S}/src/java/org/apache/log4j/jmx
 }
 
 src_compile() {