diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2005-08-20 11:59:53 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2005-08-20 11:59:53 +0000 |
| commit | 6ca309ea38f7e08bbb8001644afce058cd4bec5b (patch) | |
| tree | aff38373afe52c2885f69b47f937647e0b6dcb3c | |
| parent | initial commit. (diff) | |
| download | historical-6ca309ea38f7e08bbb8001644afce058cd4bec5b.tar.gz historical-6ca309ea38f7e08bbb8001644afce058cd4bec5b.tar.bz2 historical-6ca309ea38f7e08bbb8001644afce058cd4bec5b.zip | |
Reverted the behaviour of the jms use flag to the old one until a fix to the circular dependency that openjms from source brings can be solved. Fixes bug #103112 too.
Package-Manager: portage-2.0.51.22-r2
| -rw-r--r-- | dev-java/log4j/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/log4j/Manifest | 10 | ||||
| -rw-r--r-- | dev-java/log4j/log4j-1.2.11.ebuild | 8 |
3 files changed, 17 insertions, 8 deletions
diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog index fa156a094fec..f644dd692575 100644 --- a/dev-java/log4j/ChangeLog +++ b/dev-java/log4j/ChangeLog @@ -1,6 +1,11 @@ # 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.32 2005/08/19 20:22:54 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.33 2005/08/20 11:59:53 betelgeuse Exp $ + + 20 Aug 2005; Petteri Räty <betelgeuse@gentoo.org> log4j-1.2.11.ebuild: + Reverted the behaviour of the jms use flag to the old one until a fix to the + circular dependency that openjms from source brings can be solved. Fixes + bug #103112 too. *log4j-1.2.11 (19 Aug 2005) diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest index c391e2db9e1c..31cc819b57f0 100644 --- a/dev-java/log4j/Manifest +++ b/dev-java/log4j/Manifest @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 eb267fb725658a1444793d7e58673b4f ChangeLog 3753 +MD5 d8ec4b1d68cedc3b613772a44ba3ebc2 ChangeLog 4002 MD5 8e947ece0ccb5698c9d1bae8dfcfc6e8 log4j-1.2.9.ebuild 1635 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 -MD5 5e6d09fc69c440d98f311a0e8062e544 log4j-1.2.11.ebuild 1645 +MD5 429d1aa64a490d6ed97645256aa927e1 log4j-1.2.11.ebuild 1791 MD5 d55e5a6d5e0b3b7044122df1b3c55830 files/digest-log4j-1.2.9 72 MD5 c7a6fa71142e97d11735ceccc088752b files/digest-log4j-1.2.11 73 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDBj+6QiJ/wx066S4RAsXMAJ0dz+Bo11qsgKBBfUypXbeDxoKnywCfXCTk -PsEl55QctleSW3o0Pk5pIMw= -=oBWn +iD8DBQFDBxtPQiJ/wx066S4RAiDOAJ9LvKaYQR8e1hB2Bghf6ApxWAd+jACginpO +LAmZ7oyGbQBD9Q470k8wPPw= +=JhR4 -----END PGP SIGNATURE----- diff --git a/dev-java/log4j/log4j-1.2.11.ebuild b/dev-java/log4j/log4j-1.2.11.ebuild index c73207e74a22..a1285e3c310e 100644 --- a/dev-java/log4j/log4j-1.2.11.ebuild +++ b/dev-java/log4j/log4j-1.2.11.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.11.ebuild,v 1.1 2005/08/19 20:22:54 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.11.ebuild,v 1.2 2005/08/20 11:59:53 betelgeuse Exp $ inherit java-pkg @@ -15,7 +15,11 @@ IUSE="doc javamail jikes jms jmx source" RDEPEND=">=virtual/jre-1.4 javamail? ( dev-java/sun-javamail-bin dev-java/sun-jaf-bin ) jmx? ( dev-java/jmx ) - jms? || ( =dev-java/openjms-0.7.6* =dev-java/openjms-bin-0.7.6* )" + jms? ( =dev-java/openjms-bin-0.7.6 )" + +# 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* ))" DEPEND=">=virtual/jdk-1.4 dev-java/ant-core jikes? ( dev-java/jikes ) |