New version and eselect support.

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

4 files changed, 102 insertions, 3 deletions

diff --git a/dev-java/maven-bin/ChangeLog b/dev-java/maven-bin/ChangeLog
index 37e29fa8688f..bdd8d4d71f52 100644
--- a/dev-java/maven-bin/ChangeLog
+++ b/dev-java/maven-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/maven-bin
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.56 2009/04/27 00:03:10 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.57 2009/05/12 19:33:02 ali_bush Exp $
+
+*maven-bin-2.1.0 (12 May 2009)
+*maven-bin-2.0.10-r1 (12 May 2009)
+
+  12 May 2009; Alistair Bush <ali_bush@gentoo.org>
+  +maven-bin-2.0.10-r1.ebuild, +maven-bin-2.1.0.ebuild:
+  Add support for eselect-maven. Required as mvn have made possible
+  incompatiable changes to 2.1.
 
   27 Apr 2009; Brent Baude <ranger@gentoo.org> maven-bin-2.0.10.ebuild:
   Marking maven-bin-2.0.10 ppc for bug 265108
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 6d60fcdbcc31..21c3febd4c81 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -2,10 +2,13 @@ AUX maven 5108 RMD160 324047be03ff25943367b52092e5cb88c5580cff SHA1 f7e1469e6a9a
 DIST apache-maven-2.0.10-bin.tar.bz2 2104924 RMD160 e2b292fc981298a8a3fc5d08caf390e3f484026b SHA1 d70a18bc119f60954fcf514312fe048d70996c7e SHA256 a3f62f0f3766a0b8279d650dcc47486bed54d9d0459c96d5caa60359e1f15721
 DIST apache-maven-2.0.8-bin.tar.bz2 1360480 RMD160 dc490a17da6b0639762122554df66fbd48e4b2ad SHA1 7e9cc2778246103f09d9930c263e57b73d60f44c SHA256 5169a5de37d96a300e7a0b9141a678edd2bc3e49586f342401b31f4e2fde5af1
 DIST apache-maven-2.0.9-bin.tar.bz2 2018028 RMD160 5687ddb796c17533e42c08ef5ac53a3fa4fa26c2 SHA1 1890a33aac8f23c2a97f4858a1eb0edc13b898e9 SHA256 65b5b30b03606ae0651269f663bffc660e5227a8df85f9cf48b7058e38b2e6a9
+DIST apache-maven-2.1.0-bin.tar.bz2 2903842 RMD160 fde285896606d8a380ad07656a6401f6d66b4f6b SHA1 7b18c2968b3c4e0c32aceb3203b776572c161fd3 SHA256 2accbe9358765973ce68f4cc11a9bc8de0358e72164647ac4c2041a83e0cde1b
 DIST maven-1.1.tar.gz 7625074 RMD160 82ef869218ac42d9132fc74316f0e8a5edcf9431 SHA1 d9174675f0e846a225278949869fa2d979fa7f3b SHA256 6913083d2db1d32ee5e18db7280be0f8ce36224aba3595690e85054f2ad5e731
 EBUILD maven-bin-1.1.ebuild 933 RMD160 7aa07ac949296267824e2b97de36bc154208f3b8 SHA1 10d0eb40df023f9f31be38997175c2a5bb896125 SHA256 054db0a8d1f6f70de954543b7c8ef070ed34d47edd4b3d848274dfebe54aa74b
+EBUILD maven-bin-2.0.10-r1.ebuild 1060 RMD160 53249b02e6ad271849e70ddd635d6d27737f66e8 SHA1 7073a27dbb69b6b5e6d1c189f473b8cf335732fd SHA256 300dd85be83447eef7eb7554f6c3704ea995c8203a19558e74f321774c107847
 EBUILD maven-bin-2.0.10.ebuild 1024 RMD160 7b8518567ccbfdaf02aef7b7584c53ccb6978932 SHA1 5a9a2d53d4f079dac99ed32479b2de86ff87cdef SHA256 f098e7e9d89172982fa19d299231d148e1686a32830ad25c178de9fae7e4292f
 EBUILD maven-bin-2.0.8.ebuild 1023 RMD160 6a39033fb69aee73b228ff2074a8f69fb22a91c0 SHA1 056f6a6f9c51168507dfa21216bccbd688a88a1d SHA256 23d27e448c6136c193a53013aac13e1f5cc1a909f38a4ef2d6e1a9b31d1734a2
 EBUILD maven-bin-2.0.9.ebuild 1023 RMD160 27e16dfb903239ee9275b4315325cdaadb0c68ff SHA1 a1ec8ab661878bf8b523482975c41591b3fd5b9c SHA256 33ea6853513ad4b128d4083bef7c8f4dfe85611fd64fc6e5f344f9b76081a8c2
-MISC ChangeLog 9582 RMD160 236fed99b0811ae86bc648ac6d35835a8bc90120 SHA1 f1e3093a7b74aa6959f3c2ef10dc47f4876586bd SHA256 ad5ef0d4bf9ca22fd864e809a57d33c3aa66251d5bd9569b92f50de7a40b4883
+EBUILD maven-bin-2.1.0.ebuild 1056 RMD160 7d959eb35fc1371ab3b7fd9787c4b3e609bd7dd0 SHA1 d9b9e61bcf43f54014732ab8cd3b853de05e5421 SHA256 7576684a123ec96b86b444fd92db2697ffe62b2321791f6658cba5852876317a
+MISC ChangeLog 9859 RMD160 3779b32081aee32ad282d880a3c806806d438a43 SHA1 b339a45aba66ac352f039da582282b4a07a90ce6 SHA256 8b39e0a77b04b4e82bab33647da4d8b9835ca7ee3fc772f0a3cbb71945ad32d2
 MISC metadata.xml 532 RMD160 23fa79fc26d775ecf394078ea2b437c13fcb1c1c SHA1 9788d76408e6137cfac15b1cbe453f1f29835b9a SHA256 737cab248d8870cc15bf2526d49b4e1a92ad53078f466210337075c1c57e138f
diff --git a/dev-java/maven-bin/maven-bin-2.0.10-r1.ebuild b/dev-java/maven-bin/maven-bin-2.0.10-r1.ebuild
new file mode 100644
index 000000000000..60e8f70ba343
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-2.0.10-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.0.10-r1.ebuild,v 1.1 2009/05/12 19:33:02 ali_bush Exp $
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.bz2"
+HOMEPAGE="http://maven.apache.org/"
+LICENSE="Apache-2.0"
+SLOT="2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jdk-1.4
+	app-admin/eselect-maven"
+
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+src_unpack() {
+	unpack ${A}
+
+	rm -v "${S}"/bin/*.bat || die
+}
+
+# TODO we should use jars from packages, instead of what is bundled
+src_install() {
+	dodir "${MAVEN_SHARE}"
+	cp -Rp bin boot conf lib "${D}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE.txt README.txt || die
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+}
diff --git a/dev-java/maven-bin/maven-bin-2.1.0.ebuild b/dev-java/maven-bin/maven-bin-2.1.0.ebuild
new file mode 100644
index 000000000000..bedccd71cdf2
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-2.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.1.0.ebuild,v 1.1 2009/05/12 19:33:02 ali_bush Exp $
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.bz2"
+HOMEPAGE="http://maven.apache.org/"
+LICENSE="Apache-2.0"
+SLOT="2.1"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jdk-1.4
+	app-admin/eselect-maven"
+
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+src_unpack() {
+	unpack ${A}
+
+	rm -v "${S}"/bin/*.bat || die
+}
+
+# TODO we should use jars from packages, instead of what is bundled
+src_install() {
+	dodir "${MAVEN_SHARE}"
+	cp -Rp bin boot conf lib "${D}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE.txt README.txt || die
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+}