Mercurial > hg > portage

changeset 273:f80894b3a960

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync with main portage
author holger
date Wed, 19 Jan 2011 10:51:24 +0100
parents 5eb4742d488d
children 5c4d20467b83
files dev-java/maven-bin/Manifest dev-java/maven-bin/maven-bin-3.0.2.ebuild
diffstat 2 files changed, 11 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/dev-java/maven-bin/Manifest	Wed Jan 19 09:44:52 2011 +0100
+++ b/dev-java/maven-bin/Manifest	Wed Jan 19 10:51:24 2011 +0100
@@ -1,2 +1,2 @@
 DIST apache-maven-3.0.2-bin.tar.gz 2968629 RMD160 26214da3e72cd8b9ea0fea0bb81e740b94ae0463 SHA1 eedd18952c373824c32b2fa891569bdf3776f650 SHA256 c7a70e37cbd564a6025288e381e6ad56e20ae2fa537b2eddf3b9e3bc644b0814
-EBUILD maven-bin-3.0.2.ebuild 1342 RMD160 328c37ff4c7b64997559228c1a7644677ea7d426 SHA1 e984aa0a6ca99623564a321a84b9b62a579da691 SHA256 c62852395db1e30845b0762993b5f47a110ea966e6e5ba4227f29a3087a60ca4
+EBUILD maven-bin-3.0.2.ebuild 1254 RMD160 ad6feea9826ec58c2deca437899caab482cdd580 SHA1 1a3d4f2ecffaf69a830770258397d9cbb37bbfa6 SHA256 c70e594f7bc803fcbfd4256cfe1cfe189e568c42752305e22ff3af0f79d67792
--- a/dev-java/maven-bin/maven-bin-3.0.2.ebuild	Wed Jan 19 09:44:52 2011 +0100
+++ b/dev-java/maven-bin/maven-bin-3.0.2.ebuild	Wed Jan 19 10:51:24 2011 +0100
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.2.ebuild,v 1.1 2011/01/15 12:25:40 fordfrog Exp $
 
 inherit java-pkg-2
-inherit versionator
 
-MY_P="apache-maven-3.0.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.gz"
@@ -28,23 +28,22 @@
 	unpack ${A}
 
 	rm -v "${S}"/bin/*.bat || die
+	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || 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
-	
-	# 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}
+
+	# bug #342901
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
 }
-