apply patch from #75430

diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog
index 317876e72d35c81d4e93e6378b335fd44ae71bc7..daf247e7394e48649efcc97e00be87de57c1fd98 100644 (file)
--- a/dev-java/commons-logging/ChangeLog
+++ b/dev-java/commons-logging/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-logging
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.24 2004/12/18 09:07:02 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.25 2004/12/23 19:10:06 axxo Exp $
+
+  23 Dec 2004; Thomas Matthijs <axxo@gentoo.org>
+  commons-logging-1.0.4.ebuild:
+  apply patch from #75430
 
   18 Dec 2004; Markus Rothe <corsair@gentoo.org> commons-logging-1.0.4.ebuild:
   added ~ppc64 to KEYWORDS

diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index a92d7a33f91b8bde34393d82899e93728c705198..2074a64d037201f40e89af34a8ce186c8a1c5f9a 100644 (file)
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,4 +1,14 @@
-MD5 15881ba3f8e8074f76cda8c6e32b71e3 ChangeLog 3479
-MD5 5f4101aeb155512f6b955861cfdc124c commons-logging-1.0.4.ebuild 1505
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 40b049d194991de248636d7dffbb82b1 commons-logging-1.0.4.ebuild 1531
+MD5 ef7c4139ff6963436ec5957300848c8d ChangeLog 3584
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 1e62b8a1770a8f7d817420e0c0d5f651 files/digest-commons-logging-1.0.4 77
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFByxgZ/rLF9B432nYRAh7+AJ9GcsbspvY+hwyCnjzmsSbbolVacwCeNf5q
+Bym5J2ihvjTUSzI3K8n25yQ=
+=WvQO
+-----END PGP SIGNATURE-----

diff --git a/dev-java/commons-logging/commons-logging-1.0.4.ebuild b/dev-java/commons-logging/commons-logging-1.0.4.ebuild
index 1a55fcee0eb2437fdd7b4fb6c4b40b7b92e1a08a..0f388c39ea7c6c176709ccca9f9638f3a26807b5 100644 (file)
--- a/dev-java/commons-logging/commons-logging-1.0.4.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.0.4.ebuild,v 1.10 2004/12/18 09:07:02 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.0.4.ebuild,v 1.11 2004/12/23 19:10:06 axxo Exp $
 
 inherit java-pkg
 
@@ -24,9 +24,12 @@ S="${WORKDIR}/${P}-src/"
 src_unpack() {
        unpack ${A}
        cd ${S}
-       echo "log4j.jar=`java-config -p log4j`" > build.properties
-       echo "logkit.jar=`java-config -p avalon-logkit-bin`" >> build.properties
-       echo "junit.jar=`java-config -p junit`" >> build.properties
+       echo "log4j.jar=$(java-config -p log4j)" > build.properties
+       echo "logkit.jar=$(java-config -p avalon-logkit-bin)" >> build.properties
+
+       if use junit; then
+               echo "junit.jar=$(java-config -p junit)" >> build.properties
+       fi
 }
 
 src_compile() {