# HG changeset patch
# User holger
# Date 1286957034 -7200
# Node ID 919d2e672e53e3f7d18e87d4f13897cc6e632504
# Parent  33bbcb7e6d8b966b872f8822a14c8301a44cc8ff
update to m3 final

diff -r 33bbcb7e6d8b -r 919d2e672e53 dev-java/maven-bin/Manifest
--- a/dev-java/maven-bin/Manifest	Wed Oct 13 10:02:29 2010 +0200
+++ b/dev-java/maven-bin/Manifest	Wed Oct 13 10:03:54 2010 +0200
@@ -1,2 +1,2 @@
-DIST apache-maven-3.0-beta-2-bin.tar.gz 2664069 RMD160 4240c480e6cd96df4ac114054d74ee400e34fe46 SHA1 0b39a8586b8979808e582faf332abf71456e9ad1 SHA256 6ee65e96244a05e8f43a840590c5e3e72822410dc9a68d282f168c8d8136ad15
-EBUILD maven-bin-3.0.0_beta2.ebuild 1066 RMD160 18a6b1c6f6d3f77b6d45fe103033f76281b5ddb1 SHA1 131f4e088498298376192203ddf9bb1ecfb97f55 SHA256 84d0191aa8d980cb21d7258b2d1dcba80403181f3986f13faa816442c23a5246
+DIST apache-maven-3.0-bin.tar.gz 2899256 RMD160 eacd100b1ac8291d0ae32a5e10914596d1d9de77 SHA1 996f29b5a19e8145cb00926c68a0200dac554205 SHA256 046a0c7661ca85ac6cef6ac6c7cc2175b77bc5ee915e30897afba6c38fdb27a2
+EBUILD maven-bin-3.0.0.ebuild 1340 RMD160 f506a30a86a2b0904291082cd08725b02ecc3562 SHA1 b237c07267bb6dfc6fff37d194698b4e8651d285 SHA256 b39d5132091ae9730a20785515a496e15e85005db6a43cd8fc634379f3115cc5
diff -r 33bbcb7e6d8b -r 919d2e672e53 dev-java/maven-bin/maven-bin-3.0.0.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/maven-bin/maven-bin-3.0.0.ebuild	Wed Oct 13 10:03:54 2010 +0200
@@ -0,0 +1,50 @@
+# Copyright 1999-2010 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.2.1.ebuild,v 1.3 2010/04/26 11:05:56 phajdan.jr Exp $
+
+inherit java-pkg-2
+inherit versionator
+
+MY_P="apache-maven-3.0"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=virtual/jdk-1.5
+	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
+}
+
+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
+	
+	# the Maven distro comes with really weird permissions in the tarball 
+	# which will cause the ebuild to preserve these weird permissions, leaving
+	# users with a broken maven installationy
+	chown root: "${D}/${MAVEN_SHARE}"/lib/*.jar "${D}/${MAVEN_SHARE}"/boot/*.jar
+	chmod 644  "${D}/${MAVEN_SHARE}"/lib/*.jar "${D}/${MAVEN_SHARE}"/boot/*.jar
+
+	dodoc NOTICE.txt README.txt || die
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+}
+
diff -r 33bbcb7e6d8b -r 919d2e672e53 dev-java/maven-bin/maven-bin-3.0.0_beta2.ebuild
--- a/dev-java/maven-bin/maven-bin-3.0.0_beta2.ebuild	Wed Oct 13 10:02:29 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 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.2.1.ebuild,v 1.3 2010/04/26 11:05:56 phajdan.jr Exp $
-
-inherit java-pkg-2
-inherit versionator
-
-MY_P="apache-maven-3.0-beta-2"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=virtual/jdk-1.5
-	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}
-}