Version bump to 3.1.0. Fixes bug #472850, reported by Joerg Schaible. Also fixes up some missing dependencies, remaining dependencies are listed in bug #477436.

(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

2 files changed, 81 insertions, 2 deletions

diff --git a/dev-java/maven-bin/ChangeLog b/dev-java/maven-bin/ChangeLog
index 91563232b5e9..c8be8a3fbc57 100644
--- a/dev-java/maven-bin/ChangeLog
+++ b/dev-java/maven-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/maven-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.82 2012/12/22 15:39:57 ago Exp $
+# 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 $
+
+*maven-bin-3.1.0 (19 Jul 2013)
+
+  19 Jul 2013; Tom Wijsman <TomWij@gentoo.org> +maven-bin-3.1.0.ebuild:
+  Version bump to 3.1.0. Fixes bug #472850, reported by Joerg Schaible. Also
+  fixes up some missing dependencies, remaining dependencies are listed in bug
+  #477436.
 
   22 Dec 2012; Agostino Sarubbo <ago@gentoo.org> maven-bin-1.1-r1.ebuild,
   maven-bin-1.1-r3.ebuild, maven-bin-2.0.11-r2.ebuild, maven-bin-2.0.11.ebuild,
diff --git a/dev-java/maven-bin/maven-bin-3.1.0.ebuild b/dev-java/maven-bin/maven-bin-3.1.0.ebuild
new file mode 100644
index 000000000000..4e98e25cd5b1
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.1.0.ebuild
@@ -0,0 +1,72 @@
+# 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.ebuild,v 1.1 2013/07/19 23:58:10 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"
+
+DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )
+	dev-java/avalon-framework:4.1
+	dev-java/avalon-logkit:2.0
+	dev-java/commons-io:1
+	dev-java/juel:0
+	dev-java/log4j: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
+
+	java-pkg_getjars avalon-framework-4.1,avalon-logkit-2.0,commons-io-1,juel,log4j,osgi-core-api,servlet-api-2.4 > /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
+}