Add guava:14 dependency. Change virtual-jdk to version 1.6.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64

3 files changed, 13 insertions, 7 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/Manifest b/dev-java/maven-bin/Manifest
index f9916f7052be..a169262e2afa 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -16,6 +16,6 @@ EBUILD maven-bin-3.0.4-r1.ebuild 1424 SHA256 0d3cac6c344403c89dc4fe0ba35bdbcd05e
 EBUILD maven-bin-3.1.0-r1.ebuild 2219 SHA256 4cbf5b002d03fd46c02bcee21227e4732b3e05b831ded402286f614e2e97fb18 SHA512 353a06be39408b501ca09c30ca2541efdefc9ef5a8a26c2d0e22c88949fa53d1deca0c08ca2a92e16ebcb50bb69d1d884afe908712c91197ba445b6e81a527fb WHIRLPOOL c9d74ce3c8eae617cbd90dfbc4ce4058f2456c1052f965b00ec084c1d8e2499e0ad370f12f1fb76ae2abdff8dabbf09969e703f74b52439dd9e17c1ab0c4eedc
 EBUILD maven-bin-3.1.0.ebuild 1801 SHA256 c992e05b5ae7103b8e63cb4545fc4426327d13c0ff34f84819ede5c55d20447e SHA512 60e18b6c90f8b44959ccf2822de67e7cf490c0713040090b1b9795de54963dd5cb0ee1cb36d78a056f1849f2ce72bb938f78f8d6f2efb2a6420c8c2d4f42b915 WHIRLPOOL 3c7adfb63cbafbaba88ae4aa68c219f7ce4106cd7740e93249d8ff22e4f5f6f77b171f3d471efd10f8faf04a6b3cb8998def7f9630876d95677bc04ac3465314
 EBUILD maven-bin-3.1.1.ebuild 2421 SHA256 e70a66f16142fc2d533f91273ac81a3f13c060d4c54056bbdb52b4647c8cf0d8 SHA512 75e54c33b974ad9b32178d0eb8da81a5f2d611f7fdc9373fadc99ffee8c2808c437fdd491202f273badfdab34e424516d0941ade7bb5b88201a72b4c0e55f7d7 WHIRLPOOL 80b763b4df82d2c981d6677d7b7caca122266080dabfa61e53898f465e15c56a1ad1db380971dbbd9249203742dca90607485ebd87e8149b4c1f0110ce945124
-EBUILD maven-bin-3.2.3.ebuild 2427 SHA256 852b3f707a5e35cfeea6f8aeed45a462d400e79c761cc8db7d4db8757701c769 SHA512 3f116363e226740e3422be33ea4d9fa73402c97b6598fc548cf98abc83d12dbee62eb2ad3b35e9ffc74da4a41b0d140444e62c8682d9c43a4ec64bfbda0c0be8 WHIRLPOOL 63d887605bb0ec0debabe91e658c13a7ac3462838aab9e41d40e971bf05aa16d577586e3cbbc369f56b5053dd4abfee90781c65450ca57f5b5e0df0edf1e38fc
-MISC ChangeLog 16736 SHA256 4f52eb132b5be732c09e7cc78c4a2b30682322c2d627436e67d0c3f198440836 SHA512 5bdfe9fb1292f5fa51971aa0d4e195867f885397340eaf22128d531885773b9dfa9b6e2fa1646bf5879ec7c92fbd411b0e585445ac204f4fe9cc0e2f54a99a10 WHIRLPOOL 1ccc8f49320cd60851550a26115b2132d873389db0cd1adaaaf33c52f0f3e5f9134060876182611991b9744206d5768eb9250388b4b969f1d15dae876ca30615
+EBUILD maven-bin-3.2.3.ebuild 2484 SHA256 2f5f2e9560456fa4fd1e150dd17efbe252dc18f240b3c119a89d11e5a437dc6f SHA512 62da8531280b357919c7e6c52ceaca75f8422283a30bbd1b4ae0746992b7f1c358062c59c4b2327a5ed4b504ca8115e31239040b005f8b9679827aa6ed647ff2 WHIRLPOOL 33675994515df54efa41d01570a9fb5f417a6331446eea65025eb15728335c613f1bf1aa6e52c7d5221bdc2be3c52d37d77e7e47b108cbe22954e802a0235318
+MISC ChangeLog 16877 SHA256 1d51435073ab18f4f2d88a8f6e8c6a9440385dbef404544d5806b3f38f5cc0a0 SHA512 13e128fe47ccb3b209f4f3fd9e3b4328c9d9b6e12ce03337fdcafed9d01aca3fe900c36eac14513c6e7f946f40e1edd29365b712d216965792263be22da066df WHIRLPOOL c8a548165215c77db31cbc7426961c2ee343a72bcf978dbcc2132f48877ade788e585039b982d97febc45fa708a9897760029dd50f2b0806192a159e1e7e3215
 MISC metadata.xml 532 SHA256 737cab248d8870cc15bf2526d49b4e1a92ad53078f466210337075c1c57e138f SHA512 e71f154a1baa3eafe6f6fcaff059f59f62f1e5dde4610431b49ee91dfbdf046bfc2ac8b05ab740662911869e62327de6b6e7394cb6dc6f652021aa53f99d1b68 WHIRLPOOL 97d324d82f92bb3cf5bcd3cb55842bca1d2b2c87a8a76e2787b30e0b1de990ea3ab1d9ff5d953a69fc36ca1dd6c2be3073e166dd1fdbbc9e184bcdd4d33737c3
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