diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2014-11-27 22:52:34 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2014-11-27 22:52:34 +0000 |
| commit | 2549349b00de3f63f2343e6d12535b532c427123 (patch) | |
| tree | 5d8353b4c44b0be5f5901e3cc94dbe74242f2e8c /dev-java/maven-bin | |
| parent | Version bump. (diff) | |
| download | gentoo-2-2549349b00de3f63f2343e6d12535b532c427123.tar.gz gentoo-2-2549349b00de3f63f2343e6d12535b532c427123.tar.bz2 gentoo-2-2549349b00de3f63f2343e6d12535b532c427123.zip | |
Add guava:14 dependency. Change virtual-jdk to version 1.6.
(Portage version: 2.2.8-r2/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-java/maven-bin')
| -rw-r--r-- | dev-java/maven-bin/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/maven-bin/maven-bin-3.2.3.ebuild | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/dev-java/maven-bin/ChangeLog b/dev-java/maven-bin/ChangeLog index 2f63b25edb9f..a75237c7ecac 100644 --- a/dev-java/maven-bin/ChangeLog +++ b/dev-java/maven-bin/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/maven-bin # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.89 2014/11/26 20:19:50 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.90 2014/11/27 22:52:34 monsieurp Exp $ + + 27 Nov 2014; Patrice Clement <monsieurp@gentoo.org> maven-bin-3.2.3.ebuild: + Add guava:14 dependency. Change virtual-jdk to version 1.6. *maven-bin-3.2.3 (26 Nov 2014) diff --git a/dev-java/maven-bin/maven-bin-3.2.3.ebuild b/dev-java/maven-bin/maven-bin-3.2.3.ebuild index 3321054daa87..b243db311104 100644 --- a/dev-java/maven-bin/maven-bin-3.2.3.ebuild +++ b/dev-java/maven-bin/maven-bin-3.2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.2.3.ebuild,v 1.1 2014/11/26 20:19:50 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.2.3.ebuild,v 1.2 2014/11/27 22:52:34 monsieurp Exp $ EAPI="5" @@ -30,6 +30,7 @@ DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven ) dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 + dev-java/guava:14 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 @@ -38,7 +39,7 @@ DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven ) java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4" -RDEPEND=">=virtual/jdk-1.5 +RDEPEND=">=virtual/jdk-1.6 ${DEPEND}" S="${WORKDIR}/${MY_P}" @@ -47,13 +48,15 @@ MAVEN=${PN}-${SLOT} MAVEN_SHARE="/usr/share/${MAVEN}" java_prepare() { - rm -fv bin/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die + rm -fv \ + bin/*.bat \ + lib/{aopalliance,commons-cli,commons-io,guava,jsoup,javax.inject,jsr250}-*.jar || die chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die # Symlink jars. cd lib || die - java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4 + java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,guava-14,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4 has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0 has_version dev-java/log4j:0 && java-pkg_jar-from log4j |