diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2008-01-12 15:13:04 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2008-01-12 15:13:04 +0000 |
| commit | f702b7784c2aca03465c884fcc4bdd0f902a09dc (patch) | |
| tree | d4afb6f386104b2c50b50b3eb20fd4163cc63ebb /dev-java/commons-logging | |
| parent | Make ANT_TASKS="none" the new default, bug #203750. (diff) | |
| download | gentoo-2-f702b7784c2aca03465c884fcc4bdd0f902a09dc.tar.gz gentoo-2-f702b7784c2aca03465c884fcc4bdd0f902a09dc.tar.bz2 gentoo-2-f702b7784c2aca03465c884fcc4bdd0f902a09dc.zip | |
Fix emerging with USE=servletapi, bug #205453.
(Portage version: 2.1.4_rc14)
Diffstat (limited to 'dev-java/commons-logging')
| -rw-r--r-- | dev-java/commons-logging/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/commons-logging/commons-logging-1.1-r3.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog index 9075813d5bd2..0f182f22e433 100644 --- a/dev-java/commons-logging/ChangeLog +++ b/dev-java/commons-logging/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/commons-logging # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.54 2008/01/11 08:12:29 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.55 2008/01/12 15:13:04 caster Exp $ + + 12 Jan 2008; Vlastimil Babka <caster@gentoo.org> + commons-logging-1.1-r3.ebuild: + Fix emerging with USE=servletapi, bug #205453. *commons-logging-1.1-r3 (11 Jan 2008) diff --git a/dev-java/commons-logging/commons-logging-1.1-r3.ebuild b/dev-java/commons-logging/commons-logging-1.1-r3.ebuild index 52c1999f3168..9352e60e4c44 100644 --- a/dev-java/commons-logging/commons-logging-1.1-r3.ebuild +++ b/dev-java/commons-logging/commons-logging-1.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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.1-r3.ebuild,v 1.1 2008/01/11 08:12:29 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r3.ebuild,v 1.2 2008/01/12 15:13:04 caster Exp $ inherit java-pkg-2 java-ant-2 @@ -16,7 +16,7 @@ IUSE="avalon-logkit log4j servletapi avalon-framework doc source" RDEPEND=">=virtual/jre-1.3 avalon-logkit? ( =dev-java/avalon-logkit-1.2* ) log4j? ( =dev-java/log4j-1.2* ) - servletapi? ( =java-virtuals/servlet-api-2.3* ) + servletapi? ( ~java-virtuals/servlet-api-2.3 ) avalon-framework? ( =dev-java/avalon-framework-4.2* )" # ATTENTION: Add this when log4j-1.3 is out # =dev-java/log4j-1.3* @@ -41,7 +41,7 @@ src_unpack() { # ATTENTION: Add this when log4j-1.3 is out (check the SLOT) #echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties - use servletapi && echo "servletapi.jar=$(java-pkg_getjars --virtual servlet-api-2.3)" >> build.properties + use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-2.3 servlet.jar)" >> build.properties use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties java-pkg_filter-compiler jikes ecj-3.2 } |