Fix bug 534358: version bump to 3.2.5 courtesy of Thanh Ha.

Package-Manager: portage-2.2.14/cvs/Linux x86_64

3 files changed, 98 insertions, 3 deletions

diff --git a/dev-java/maven-bin/ChangeLog b/dev-java/maven-bin/ChangeLog
index a75237c7ecac..4ad69f2fb7da 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.90 2014/11/27 22:52:34 monsieurp Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.91 2015/01/19 20:42:58 monsieurp Exp $
+
+*maven-bin-3.2.5 (19 Jan 2015)
+
+  19 Jan 2015; Patrice Clement <monsieurp@gentoo.org> +maven-bin-3.2.5.ebuild:
+  Fix bug 534358: version bump to 3.2.5 courtesy of Thanh Ha.
 
   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.
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index a169262e2afa..416c708b50d0 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -5,6 +5,7 @@ DIST apache-maven-3.0.4-bin.tar.gz 4873043 SHA256 d35a876034c08cb7e20ea2fbcf168b
 DIST apache-maven-3.1.0-bin.tar.gz 5439122 SHA256 59088c62c14b996d597bbd55e720866b0e13e36daed8a46a81c01058ee74bd54 SHA512 8c6b13c680de2f9cddb1dffd15ae44a8866a29e56c92ccd905fba1a656d2cab26c40b10c4168ffe11dd3bd4e5161c6d9ea01f450e7c89aba532b2a20f9fd2b07 WHIRLPOOL 9b80b5e5d49a27784bd9760dd326677809fd5bcc8872bc2ee356bde92a6523d6cf1ad0ddcfc3aff96b07fb315af5f3c04b2278f5fd11964c76f179329dca8c8e
 DIST apache-maven-3.1.1-bin.tar.gz 5494427 SHA256 077ed466455991d5abb4748a1d022e2d2a54dc4d557c723ecbacdc857c61d51b SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1 WHIRLPOOL 60aa84a2f6441deb005c41e00b4dbc790f8679d5387ffd6602d8008206718655784822816c9a9898cb9b09c75bb3b3d824c71150e4ac747bd0eb1dabe2bacdcd
 DIST apache-maven-3.2.3-bin.tar.gz 6956162 SHA256 bf3f04aadee3a67158aebdfb0b4cb022063329d459d10fd6b4b02223e10aa8ed SHA512 9c211b17a8109939a776a4ad0e833ce9b301941eb0cfd4e8978634589ea48227cb979b5819c4b151184cff46bb44139c09477e904daa00ac769b0c756859f6f0 WHIRLPOOL 6a254dc8beb6d1d42299dd563da1eaeccff11bbfd18a122cb015ee28e55f59ae0b4e512a48b697fa09004edd8bae7dbef32bce24dbc9f5913b7cdd311a6ec6b3
+DIST apache-maven-3.2.5-bin.tar.gz 7956528 SHA256 8c190264bdf591ff9f1268dc0ad940a2726f9e958e367716a09b8aaa7e74a755 SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5 WHIRLPOOL 79feb96c42dfd2235b0513ce50cf3d684224dcbccb290d2d80565648a6b30af8961b2e3d02d38818ca5c89386c5a25f2a8025e696279a339844535c2d2733f96
 DIST maven-1.1.tar.gz 7625074 SHA256 6913083d2db1d32ee5e18db7280be0f8ce36224aba3595690e85054f2ad5e731 SHA512 d08e6f4f7568caec718e82d1106ab01a63855061b5ff65134cdb25ba0a4eee875472bceaccffc1425bd0e57918f69f4e48ad2dd0098f2995ba55ad61c64424a0 WHIRLPOOL 2137afc57306d840d04a38a09f5b40d946d10f8216ebff4a3a0a385f475316266339f4b8d07b461a2004d487c6b74a68fc2db5f38cb831ed0947259f1cd08d48
 EBUILD maven-bin-1.1-r1.ebuild 987 SHA256 6924f1c13682cf67663cf528f4add2bf86ed7ea961f4a1e9d73f72794b03818a SHA512 d6e6f2f3b985538ec21f7ee98e8a2b3e6c3e235c220a297578b6145163978a947ce4df9a36938c06da2067cee8030520e839ace01cecefb130389ac55458c5f1 WHIRLPOOL e19f5560de9cb5f2fd1cc24c4e0d7ce31b00c1338e53ba2f04ac103d1ca0589b2330fd3366d63f69373291ea9b851abf8f33558525d3bf91a98793039ff64831
 EBUILD maven-bin-1.1-r3.ebuild 1090 SHA256 a2d2156c44b57db6b2a12158da35aa98e2d9d6f8e50d31eb041863b795496fd2 SHA512 bfde0905f0fba2b1834164d9dd144d000e8b2656355022a70a1f0468095f9cc0543507175d5e3c4485cbd75e3a1dbe49c656352115615188e16cd00eb09fe80f WHIRLPOOL 71c4542ced2982886140faf950429c4c5811accd5ed97cbd03bbdf9eba20ca267567f84bf1dfc847ee8845d034fc09ff1c6b8c1e3501e9a606dd29477b8ce87f
@@ -17,5 +18,6 @@ EBUILD maven-bin-3.1.0-r1.ebuild 2219 SHA256 4cbf5b002d03fd46c02bcee21227e4732b3
 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 2484 SHA256 2f5f2e9560456fa4fd1e150dd17efbe252dc18f240b3c119a89d11e5a437dc6f SHA512 62da8531280b357919c7e6c52ceaca75f8422283a30bbd1b4ae0746992b7f1c358062c59c4b2327a5ed4b504ca8115e31239040b005f8b9679827aa6ed647ff2 WHIRLPOOL 33675994515df54efa41d01570a9fb5f417a6331446eea65025eb15728335c613f1bf1aa6e52c7d5221bdc2be3c52d37d77e7e47b108cbe22954e802a0235318
-MISC ChangeLog 16877 SHA256 1d51435073ab18f4f2d88a8f6e8c6a9440385dbef404544d5806b3f38f5cc0a0 SHA512 13e128fe47ccb3b209f4f3fd9e3b4328c9d9b6e12ce03337fdcafed9d01aca3fe900c36eac14513c6e7f946f40e1edd29365b712d216965792263be22da066df WHIRLPOOL c8a548165215c77db31cbc7426961c2ee343a72bcf978dbcc2132f48877ade788e585039b982d97febc45fa708a9897760029dd50f2b0806192a159e1e7e3215
+EBUILD maven-bin-3.2.5.ebuild 2431 SHA256 915e5cc7082c07f6addde1f797dea0432ca963f15090b3f1ffaa008e113522e0 SHA512 87dc547201c1e45fcfdc13c1c97461a60d39880167109728a9d84f68deaa194804764817293b433466986eed8b8485ab1aeb352749a46c92e5a44a1f9acd69be WHIRLPOOL cc2cfd1bad852a08dc04cca642a8350170ea4d009590c7b4b10ae5d5839547a1a9adeeb8642c78c0c390da65b94b80856091e4478d7a3f3a2f739efcc20951ba
+MISC ChangeLog 17051 SHA256 37f2af3398013bffceef99f28ba66729ad56dece5bd9a85af28eb67d12ef2d1d SHA512 42461647c56403d01453661fe575684c24cf5e5649a74b6511d4bcda2af9452812e32d2c493030ffee500021a508cb8d116f9e472c67d28879a8c78a027c759b WHIRLPOOL ff5d573d736344383dc43b0da22674c566c5433e3dfbb653de4a736a74e07ffac66f0f9ec2e59a48a2c51a1ac1ea97d27c0e6701529312dfae30a13c323bcb93
 MISC metadata.xml 532 SHA256 737cab248d8870cc15bf2526d49b4e1a92ad53078f466210337075c1c57e138f SHA512 e71f154a1baa3eafe6f6fcaff059f59f62f1e5dde4610431b49ee91dfbdf046bfc2ac8b05ab740662911869e62327de6b6e7394cb6dc6f652021aa53f99d1b68 WHIRLPOOL 97d324d82f92bb3cf5bcd3cb55842bca1d2b2c87a8a76e2787b30e0b1de990ea3ab1d9ff5d953a69fc36ca1dd6c2be3073e166dd1fdbbc9e184bcdd4d33737c3
diff --git a/dev-java/maven-bin/maven-bin-3.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
new file mode 100644
index 000000000000..92d79f2bb027
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 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.5.ebuild,v 1.1 2015/01/19 20:42:58 monsieurp Exp $
+
+EAPI="5"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="~amd64 ~x86"
+
+# TODO: Needs further resolution:
+#
+# - https://bugs.gentoo.org/show_bug.cgi?id=472850
+# - https://bugs.gentoo.org/show_bug.cgi?id=477436
+#
+DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )
+|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
+dev-java/aopalliance:1
+dev-java/avalon-framework:4.1
+dev-java/commons-cli:1
+dev-java/commons-io:1
+dev-java/javax-inject:0
+dev-java/jsoup:0
+dev-java/jsr250:0
+dev-java/juel:0
+dev-java/osgi-core-api:0
+java-virtuals/interceptor-api:0
+java-virtuals/servlet-api:2.4"
+
+RDEPEND=">=virtual/jdk-1.6
+>=virtual/jre-1.6
+${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+	rm -v bin/*.bat lib/{aopalliance,commons-cli,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
+	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
+}
+
+# TODO: We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}