[gentoo-commits] gentoo-x86 commit in dev-java/maven-bin: ChangeLog maven-bin-1.1-r1.ebuild maven-bin-1.0.2-r1.ebuild maven-bin-1.1.ebuild maven-bin-1.0.2.ebuild

[gentoo-commits] gentoo-x86 commit in dev-java/maven-bin: ChangeLog maven-bin-1.1-r1.ebuild maven-bin-1.0.2-r1.ebuild maven-bin-1.1.ebuild maven-bin-1.0.2.ebuild

[Miroslav Sulc (fordfrog)]

fordfrog    11/01/20 20:39:27

  Modified:             ChangeLog
  Added:                maven-bin-1.1-r1.ebuild maven-bin-1.0.2-r1.ebuild
  Removed:              maven-bin-1.1.ebuild maven-bin-1.0.2.ebuild
  Log:
  dev-java/maven-bin: fixed files collision
  
  (Portage version: 2.1.9.34/cvs/Linux x86_64)

Revision  Changes    Path
1.71                 dev-java/maven-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/ChangeLog?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/ChangeLog?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/ChangeLog?r1=1.70&r2=1.71

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ChangeLog	19 Jan 2011 02:46:18 -0000	1.70
+++ ChangeLog	20 Jan 2011 20:39:27 -0000	1.71
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/maven-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.70 2011/01/19 02:46:18 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.71 2011/01/20 20:39:27 fordfrog Exp $
+
+*maven-bin-1.0.2-r1 (20 Jan 2011)
+
+  20 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> -maven-bin-1.0.2.ebuild,
+  +maven-bin-1.0.2-r1.ebuild, -maven-bin-1.1.ebuild, +maven-bin-1.1-r1.ebuild:
+  Fixed slotting issue I caused with adding maven 1.0.2, bug #352211
 
   19 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> maven-bin-1.0.2.ebuild:
   Removed not needed post install message



1.4                  dev-java/maven-bin/maven-bin-1.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/maven-bin-1.1-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/maven-bin-1.1-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/maven-bin-1.1-r1.ebuild?r1=1.3&r2=1.4




1.1                  dev-java/maven-bin/maven-bin-1.0.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/maven-bin-1.0.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/maven-bin-1.0.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: maven-bin-1.0.2-r1.ebuild
===================================================================
# 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-1.0.2-r1.ebuild,v 1.1 2011/01/20 20:39:27 fordfrog Exp $

MY_PN=${PN/-bin}
MY_PV=${PV/_/-}
MY_P=${MY_PN}-${MY_PV}
DESCRIPTION="Project Management and Comprehension Tool for Java"
SRC_URI="mirror://apache/maven/binaries/${MY_P}.tar.gz"
HOMEPAGE="http://maven.apache.org/"
LICENSE="Apache-2.0"
SLOT="1.0"
KEYWORDS="~amd64 ~ppc ~x86"
DEPEND=">=virtual/jdk-1.5"
RDEPEND=">=virtual/jdk-1.5"
IUSE=""

S="${WORKDIR}/${MY_P}"
MAVEN=${PN}-${SLOT}
MAVEN_HOME="/usr/share/${MAVEN}"
MAVEN_BIN="${MAVEN_HOME}/bin"

src_compile() { :; }

src_install() {
	dodir ${MAVEN_HOME}
	insinto ${MAVEN_HOME}
	doins -r bin lib *.xsd plugins

	dodir ${MAVEN_BIN}
	exeinto ${MAVEN_BIN}
	doexe "${FILESDIR}/${MY_PN}"

	dodir /usr/bin
	dosym ${MAVEN_BIN}/${MY_PN} /usr/bin/${MY_PN}-${SLOT} || die "dosym failed"
}