Revision bump, because package.env could possible change. A first step to fix up dependencies for bug #472850, cuts 2 or more optional dependencies; after which we need to deal with bug #477436 as well as unbundle more dependencies where possible. Thanks to wojtek for reporting and researching the situation.

Package-Manager: portage-2.1.13.5/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 97 insertions, 9 deletions

diff --git a/dev-java/maven-bin/ChangeLog b/dev-java/maven-bin/ChangeLog
index c8be8a3fbc57..f27b4ddc6b5b 100644
--- a/dev-java/maven-bin/ChangeLog
+++ b/dev-java/maven-bin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.83 2013/07/19 23:58:10 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.84 2013/08/10 11:15:09 tomwij Exp $
+
+*maven-bin-3.1.0-r1 (10 Aug 2013)
+
+  10 Aug 2013; Tom Wijsman <TomWij@gentoo.org> +maven-bin-3.1.0-r1.ebuild:
+  Revision bump, because package.env could possible change. A first step to fix
+  up dependencies for bug #472850, cuts 2 or more optional dependencies; after
+  which we need to deal with bug #477436 as well as unbundle more dependencies
+  where possible. Thanks to wojtek for reporting and researching the situation.
 
 *maven-bin-3.1.0 (19 Jul 2013)
 
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 62d151914b38..097865d61cd3 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -14,17 +14,18 @@ EBUILD maven-bin-2.0.11.ebuild 1212 SHA256 a412f1c83c4fe06ee2bcf0c0ea3b3562f81f1
 EBUILD maven-bin-2.2.1-r2.ebuild 1347 SHA256 8c9ead085dccec00107993361926c89e46d82d5076cd55cc69fa55258e8d1f71 SHA512 5d8e9f12a3e8735061ea767382b44ff95a130825e1bbd390ec532a7aea47712b1a42a69f8fdd288029882620bb11210c525cf5fca642135dae8806e70a8fc1d9 WHIRLPOOL e6d705613e88ccf1cd87377e86972aa5c74045a71b8c0550acac28416bcb36a59774d4227dbbbc3896ec06b0709e40f4420b058529ef03dd7562cc1b5dea81f8
 EBUILD maven-bin-2.2.1.ebuild 1213 SHA256 539b9d7e06b5720045efdcae66b10e5724d4aa21c7427d85fc7020e5cef5baa2 SHA512 1ba760c68a0084d80ccc92fe4f40a4ff9309dd063006fc464647a0c523ffc3e3e7442cac6a00548273895d20de447fd4376c283f3524fee3aec1118d09cad5f5 WHIRLPOOL 8b52e00b64ec7e990e4fa739451f5a3ea0f0ddea08a81862695997f89f0a2740453120da6872bab3c79f85e76e07a2683d983f08c863a5289f2a14699985cd73
 EBUILD maven-bin-3.0.4-r1.ebuild 1424 SHA256 0d3cac6c344403c89dc4fe0ba35bdbcd05ea3b82ae7c5a7a5e2f79d5399c1b8c SHA512 76e04157fd320893d4d3739c57dd7666d377ad59b3adbc987f31ddaf2a285a79ec10f75a52d310fe5af96a7d3b325da55892caf15784610fce8a496f0eab130b WHIRLPOOL ce14fce8575a8027fa2829bb49d2a2727ac87ac753ac0915c8aad245aea3208b7b536a9e1ab1944c6c71336b794a1a68196a359d1e633c71b2cd357e1703c068
+EBUILD maven-bin-3.1.0-r1.ebuild 2147 SHA256 184ce5e917a90996a1a6167fd80d36f9f60b4ff94b193f69bc7d9a456a788ee5 SHA512 4dd1bc4eed285ef6d8b162e18bc079e734c5a984088e6c57f916e8c8b3ac96152b6d490738d17f669b8635974cb3d2b3f4cfafe09d22921292407d718edcc093 WHIRLPOOL b39fd752997cb245b63ed1635280d6fcfddbbcf4f3be2bafed9bc6f660a4035525bb893f8e84344ada8db4000c687530ba8ad59c5cc709f4ab07c3755330d2c6
 EBUILD maven-bin-3.1.0.ebuild 1801 SHA256 c992e05b5ae7103b8e63cb4545fc4426327d13c0ff34f84819ede5c55d20447e SHA512 60e18b6c90f8b44959ccf2822de67e7cf490c0713040090b1b9795de54963dd5cb0ee1cb36d78a056f1849f2ce72bb938f78f8d6f2efb2a6420c8c2d4f42b915 WHIRLPOOL 3c7adfb63cbafbaba88ae4aa68c219f7ce4106cd7740e93249d8ff22e4f5f6f77b171f3d471efd10f8faf04a6b3cb8998def7f9630876d95677bc04ac3465314
-MISC ChangeLog 15600 SHA256 3eb09c02fed909cc03fde2bbec58248b36b9e0e2edbb81f011dc4bbfce7f4353 SHA512 4f8491483a362535e5fc871e18a43b457f3ba2800e899d871345699200f554a875ca7df849a35f2eff8d0a8cf419816a21780a4cddbfac3ed8baf674cef2c893 WHIRLPOOL d24f8b80b4f4e44a76e930e5d2fafc10997a6f1dbefe3c451d92028285799c856af042ed967e1ebcf5825cb8a3acf1ff8a6e1845bc38fdbe90949669a97f396e
+MISC ChangeLog 16029 SHA256 c7f9fbee2461c63b9760f74b8a15d86a51691796e6416e99707103b9c48eea40 SHA512 e258e5e06592747d52b9ff2379937554b17b7b9e4d9dc11306b46e30eb9432b03de98add4e608e1ab659a4a9e4addf5749570f9e187b229f6f7dd85174e1d944 WHIRLPOOL ce91550feccd6b158484f22ff7ec900f223baa9799867d020287496333058f9d36c43bebab063bb278cfe0f817fdf97f21228cae31d75c1b0c1cd2ece426a876
 MISC metadata.xml 532 SHA256 737cab248d8870cc15bf2526d49b4e1a92ad53078f466210337075c1c57e138f SHA512 e71f154a1baa3eafe6f6fcaff059f59f62f1e5dde4610431b49ee91dfbdf046bfc2ac8b05ab740662911869e62327de6b6e7394cb6dc6f652021aa53f99d1b68 WHIRLPOOL 97d324d82f92bb3cf5bcd3cb55842bca1d2b2c87a8a76e2787b30e0b1de990ea3ab1d9ff5d953a69fc36ca1dd6c2be3073e166dd1fdbbc9e184bcdd4d33737c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR6dHKAAoJEJWyH81tNOV9FagH/j3v4Rfca6/5v7oObR4Nh5WI
-fBI4T2sq8YMC+dNGM2N8QOz6m4BCiw7tKexlK2//9Y82u4ST3tglBBBV9gK4IHLx
-R2TN6WLQZTWPNLL6PrcqclrEv8NAP4/aoR3lDtBZ4EutnZef5Yqo3doKO3HiTQbw
-Vp/6yIfzl6OZu8knbB11RxxANjrtSalE+5O/ILRdB32mzGSJEZSk0yn5zrjgpr5r
-X4zXh6t97OK8QYCk1m9wWG2Vhb4UiCQdhTWgOLy+Lvr+UpPzzcZB337Goy/8BtTa
-lU9YJPIV0h1qfqwflj2iM3CDOw0BIlmvFRpYDhDD/V0gPa6wmvEoTPbiCru+JRc=
-=IHPE
+iQEcBAEBCAAGBQJSBh/jAAoJEJWyH81tNOV9ys4H/R5aGoKFUeCAlzzVp3zt6dXB
+WtT4+55IZbVnOtubPUv8ls3UZzIKMVdpLgiFDOn47Fv5Pvbe5oZsDrBm4WKdj7qL
+4bNBXqcV2o6cGnoocCPZUzU+HqNPnUsVCeDZdVHgJqdDWO1Vss5w/8tfG8D4kl+2
+n3Nfyzv967a/Sw4x76Qg9NTuTBVp0zGWl25gYm7ijhXLDtj9IOjRkqdjXPKWTKaD
+0aC+ovqWbodHG+8IX0wxmbbvSHz04fR/v2HvWyHQXa+3spIXGh5cAHY5k7ZAd8ER
+jhyD9xCZl2sb+S4w8KqIZCtXKGh2hvL8JWFa4mQSzhZt04poS+1/ZeSMBnXLbM8=
+=pPK8
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..a394f2dacdc0
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild
@@ -0,0 +1,79 @@
+# 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 $
+
+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.1"
+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/avalon-framework:4.1
+	dev-java/commons-io:1
+	dev-java/juel:0
+	dev-java/osgi-core-api:0
+	java-virtuals/servlet-api:2.4"
+
+RDEPEND=">=virtual/jdk-1.5
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+	rm -v "${S}"/bin/*.bat || die
+
+	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
+	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
+}
+
+# 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.txt 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
+}