dev-java/maven-bin: fixed files collision

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

4 files changed, 15 insertions, 9 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/Manifest b/dev-java/maven-bin/Manifest
index 0144a73d00a8..90613e359052 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -7,13 +7,13 @@ DIST apache-maven-3.0-bin.tar.gz 2899256 RMD160 eacd100b1ac8291d0ae32a5e10914596
 DIST apache-maven-3.0.2-bin.tar.gz 2968629 RMD160 26214da3e72cd8b9ea0fea0bb81e740b94ae0463 SHA1 eedd18952c373824c32b2fa891569bdf3776f650 SHA256 c7a70e37cbd564a6025288e381e6ad56e20ae2fa537b2eddf3b9e3bc644b0814
 DIST maven-1.0.2.tar.gz 6060686 RMD160 3d94fad30086f462eb3dd238803d274346ef9e2f SHA1 2978ffff5526dad371b560acb052cc78b6a2cb6b SHA256 8895c3bc0cce94e03aede40322e7485c8c458ad88f377d8170986c18e8f34c83
 DIST maven-1.1.tar.gz 7625074 RMD160 82ef869218ac42d9132fc74316f0e8a5edcf9431 SHA1 d9174675f0e846a225278949869fa2d979fa7f3b SHA256 6913083d2db1d32ee5e18db7280be0f8ce36224aba3595690e85054f2ad5e731
-EBUILD maven-bin-1.0.2.ebuild 945 RMD160 b827fa715f52f5cc96f4f47bfdc6268f955ebdb7 SHA1 62b9f46c77d7c86f12108cdeef7858f12c974931 SHA256 1a3cfce6d2cdae4ab7f1f382405ac9739d39d3c6b1dea9e12dd693523c19a5fc
-EBUILD maven-bin-1.1.ebuild 936 RMD160 bbe6f7a056e1ea449be5bb545237b105615bcac7 SHA1 06a67f83f7a294dea7b18ecba023b475a497df7d SHA256 3b8b12b955ac68f6d4f62880c5cead8e1ce5322c310a4cde3867da08ca92c88b
+EBUILD maven-bin-1.0.2-r1.ebuild 956 RMD160 691c249771f5bf65013913c72bd872a8af3b349f SHA1 3c97250580dc5811d4cb40b7653ee2e39ed08bf8 SHA256 0e0ad0e189bf76036516911c4f92043573d84c50b0b0af65889d61203e4cf2d2
+EBUILD maven-bin-1.1-r1.ebuild 950 RMD160 39eee20c9c9f05b3d9c1880e6973d86492f37574 SHA1 e1c298933f35690ee270dc7cd2e8b7fa35b5953b SHA256 688a05b6fb5f50606469dbe77f8ebbb5275aee9e550e909e188caa716c43d500
 EBUILD maven-bin-2.0.10.ebuild 1024 RMD160 7b8518567ccbfdaf02aef7b7584c53ccb6978932 SHA1 5a9a2d53d4f079dac99ed32479b2de86ff87cdef SHA256 f098e7e9d89172982fa19d299231d148e1686a32830ad25c178de9fae7e4292f
 EBUILD maven-bin-2.0.11.ebuild 1172 RMD160 50877e555188f1628b73636c22b9ee2b88cd60bc SHA1 4eb01ab352b95b50de6c2e7ee6fa6b74b8dd5760 SHA256 fabef1df63a2cd6f6acf54869f200828f22a838a08dce28bfca8c246b3cc8fc6
 EBUILD maven-bin-2.1.0.ebuild 1173 RMD160 fca35a6d7fafc9eae8b9188465431af2804c4bfe SHA1 b49e18d8e30cb3968de634990f274c8040166ea4 SHA256 00c62bfde23094bbb7772a4510c5152d28e8c55880dc2f715344ced57a799569
 EBUILD maven-bin-2.2.1.ebuild 1173 RMD160 dc2ed400ff796730a4600bf515fcbfee583afcc3 SHA1 b77258af091158b7c856e32335abfd949be66fe8 SHA256 b5a3c83a3da46d4474cf6063d1473a7c1494cf2d63726d777b7dd422615e66be
 EBUILD maven-bin-3.0.2.ebuild 1254 RMD160 ad6feea9826ec58c2deca437899caab482cdd580 SHA1 1a3d4f2ecffaf69a830770258397d9cbb37bbfa6 SHA256 c70e594f7bc803fcbfd4256cfe1cfe189e568c42752305e22ff3af0f79d67792
 EBUILD maven-bin-3.0.ebuild 1250 RMD160 3e12e3e5c4a438abc4fcb0890fe86393d973c36e SHA1 b12f37583cf094cf69a9755ea85bc22a2840da4b SHA256 b592154a1908fd1c85c9f3b034cb32b28cb987352eb3df215018d9eba204656d
-MISC ChangeLog 12090 RMD160 6211eaacb830a16d6c3789f3a5b6de972f61199b SHA1 594b3f0b5c69a0fecc3ef706e457d4bd9e7ce30d SHA256 13af0a774a0a4b91068be04a788e426b91a13f4242edd68ffac9852b631b2205
+MISC ChangeLog 12351 RMD160 fa81389ebf1ed2757a675a0374db5728e1dda1dc SHA1 d19303b7bd1cc485be97267108317667b564d5f8 SHA256 18d914d8602446403072fb5af7ca369fe7145243d2c7fb71dd10875d9697689e
 MISC metadata.xml 532 RMD160 23fa79fc26d775ecf394078ea2b437c13fcb1c1c SHA1 9788d76408e6137cfac15b1cbe453f1f29835b9a SHA256 737cab248d8870cc15bf2526d49b4e1a92ad53078f466210337075c1c57e138f
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
 }