diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2011-01-20 20:39:27 +0000 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2011-01-20 20:39:27 +0000 |
| commit | 14e90a22e5fec8266d9c98010017704d8ebdcdaa (patch) | |
| tree | 7f0c167d5dfe5a287dbaad72416bd67ee4e9e245 | |
| parent | package move: rename kcm_tablet to wacomtablet to reflect upstream name change (diff) | |
| download | gentoo-2-14e90a22e5fec8266d9c98010017704d8ebdcdaa.tar.gz gentoo-2-14e90a22e5fec8266d9c98010017704d8ebdcdaa.tar.bz2 gentoo-2-14e90a22e5fec8266d9c98010017704d8ebdcdaa.zip | |
dev-java/maven-bin: fixed files collision
(Portage version: 2.1.9.34/cvs/Linux x86_64)
| -rw-r--r-- | dev-java/maven-bin/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/maven-bin/maven-bin-1.0.2-r1.ebuild (renamed from dev-java/maven-bin/maven-bin-1.0.2.ebuild) | 4 | ||||
| -rw-r--r-- | dev-java/maven-bin/maven-bin-1.1-r1.ebuild (renamed from dev-java/maven-bin/maven-bin-1.1.ebuild) | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/dev-java/maven-bin/ChangeLog b/dev-java/maven-bin/ChangeLog index 96a318e0aeb7..e405b959aee8 100644 --- a/dev-java/maven-bin/ChangeLog +++ b/dev-java/maven-bin/ChangeLog @@ -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 diff --git a/dev-java/maven-bin/maven-bin-1.0.2.ebuild b/dev-java/maven-bin/maven-bin-1.0.2-r1.ebuild index e7890545a219..7535130aae95 100644 --- a/dev-java/maven-bin/maven-bin-1.0.2.ebuild +++ b/dev-java/maven-bin/maven-bin-1.0.2-r1.ebuild @@ -1,6 +1,6 @@ # 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.ebuild,v 1.8 2011/01/19 02:46:18 fordfrog Exp $ +# $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/_/-} @@ -32,5 +32,5 @@ src_install() { doexe "${FILESDIR}/${MY_PN}" dodir /usr/bin - dosym ${MAVEN_BIN}/${MY_PN} /usr/bin/${MY_PN} || die "dosym failed" + dosym ${MAVEN_BIN}/${MY_PN} /usr/bin/${MY_PN}-${SLOT} || die "dosym failed" } diff --git a/dev-java/maven-bin/maven-bin-1.1.ebuild b/dev-java/maven-bin/maven-bin-1.1-r1.ebuild index e297e059e335..979bea82b1d3 100644 --- a/dev-java/maven-bin/maven-bin-1.1.ebuild +++ b/dev-java/maven-bin/maven-bin-1.1-r1.ebuild @@ -1,6 +1,6 @@ # 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.1.ebuild,v 1.8 2011/01/19 02:27:25 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.1-r1.ebuild,v 1.4 2011/01/20 20:39:27 fordfrog Exp $ MY_PN=${PN/-bin} MY_PV=${PV/_/-} @@ -10,7 +10,7 @@ SRC_URI="mirror://apache/maven/binaries/${MY_P}.tar.gz" HOMEPAGE="http://maven.apache.org/" LICENSE="Apache-2.0" SLOT="1.1" -KEYWORDS="amd64 ppc x86" +KEYWORDS="~amd64 ~ppc ~x86" DEPEND=">=virtual/jdk-1.5" RDEPEND=">=virtual/jdk-1.5" IUSE="" @@ -32,5 +32,5 @@ src_install() { doexe "${FILESDIR}/${MY_PN}" dodir /usr/bin - dosym ${MAVEN_BIN}/${MY_PN} /usr/bin/${MY_PN} || die sym failed + dosym ${MAVEN_BIN}/${MY_PN} /usr/bin/${MY_PN}-${SLOT} || die sym failed } |