diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-08-14 15:25:11 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-08-14 15:25:11 +0000 |
| commit | fe734612ad4f6c4b00f07ddf37246762b83e6c54 (patch) | |
| tree | a10ba4320c3bbe68cf15c51b32025237cd864616 /dev-java | |
| parent | Fix e-mail address. (diff) | |
| download | gentoo-2-fe734612ad4f6c4b00f07ddf37246762b83e6c54.tar.gz gentoo-2-fe734612ad4f6c4b00f07ddf37246762b83e6c54.tar.bz2 gentoo-2-fe734612ad4f6c4b00f07ddf37246762b83e6c54.zip | |
Move commons-logging under a has_version check just like the other two choices. Fixes bug #480700, reported by spyder on IRC as well as Maciej Piechotka on the bug.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/maven-bin/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/dev-java/maven-bin/ChangeLog b/dev-java/maven-bin/ChangeLog index f27b4ddc6b5b..62745ed4dfb0 100644 --- a/dev-java/maven-bin/ChangeLog +++ b/dev-java/maven-bin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/maven-bin # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.84 2013/08/10 11:15:09 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.85 2013/08/14 15:25:11 tomwij Exp $ + + 14 Aug 2013; Tom Wijsman <TomWij@gentoo.org> maven-bin-3.1.0-r1.ebuild: + Move commons-logging under a has_version check just like the other two + choices. Fixes bug #480700, reported by spyder on IRC as well as Maciej + Piechotka on the bug. *maven-bin-3.1.0-r1 (10 Aug 2013) diff --git a/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild b/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild index a394f2dacdc0..1a7079a14d56 100644 --- a/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild +++ b/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild,v 1.1 2013/08/10 11:15:09 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild,v 1.2 2013/08/14 15:25:11 tomwij Exp $ EAPI="5" @@ -46,7 +46,8 @@ java_prepare() { chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die # Register jars. - java-pkg_getjars avalon-framework-4.1,commons-io-1,commons-logging,juel,osgi-core-api,servlet-api-2.4 > /dev/null + java-pkg_getjars avalon-framework-4.1,commons-io-1,juel,osgi-core-api,servlet-api-2.4 > /dev/null + has_version dev-java/commons-logging:0 && java-pkg_getjars commons-logging > /dev/null has_version dev-java/avalon-logkit:2.0 && java-pkg_getjars avalon-logkit-2.0 > /dev/null has_version dev-java/log4j:0 && java-pkg_getjars log4j > /dev/null } |