Version bump to fix bug #117902. Removed old ebuilds with same keywords.

(Portage version: 2.1_pre1)

6 files changed, 13 insertions, 57 deletions

diff --git a/dev-java/maven-bin/ChangeLog b/dev-java/maven-bin/ChangeLog
index b9d6a2b06ee3..181ccf557190 100644
--- a/dev-java/maven-bin/ChangeLog
+++ b/dev-java/maven-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/maven-bin
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.10 2005/12/16 04:50:48 nichoj Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.11 2006/01/06 02:34:02 nichoj Exp $
+
+*maven-bin-2.0.1-r1 (06 Jan 2006)
+
+  06 Jan 2006; Joshua Nichols <nichoj@gentoo.org> -maven-bin-2.0.ebuild,
+  -maven-bin-2.0.1.ebuild, +maven-bin-2.0.1-r1.ebuild:
+  Version bump to fix bug #117902. Removed old ebuilds with same keywords.
 
 *maven-bin-2.0.1 (16 Dec 2005)
 
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 8b03eb984d40..a26d12a55308 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 717014d773075a65204096eaefed74e6 ChangeLog 3747
 MD5 b62aef084315e664ba8ce901882c4087 files/25maven 61
 MD5 03cf0059efc0fa7a81f91bf9f74ada41 files/digest-maven-bin-1.0 62
@@ -8,17 +5,10 @@ MD5 fc48ae8abd9687043ff4f42b956fec9c files/digest-maven-bin-1.0_rc3 66
 MD5 73a1ddbeab35cfa7b9cdf22069268280 files/digest-maven-bin-1.0_rc4 66
 MD5 481ca5fa4bcf5a76f9a1bb70223b0d3b files/digest-maven-bin-2.0 67
 MD5 e1bfab71e11346fc00790a6ad2d21e75 files/digest-maven-bin-2.0.1 69
+MD5 e1bfab71e11346fc00790a6ad2d21e75 files/digest-maven-bin-2.0.1-r1 69
 MD5 74a13098bf9c5a96e423bb88a8c7927c files/maven-bin-1.0-script.patch 2110
 MD5 6abad25d688c61908f861a552d81ca44 maven-bin-1.0.ebuild 840
 MD5 0fd9270c9e7a5650cb4d16daef5d6ef4 maven-bin-1.0_rc3.ebuild 760
 MD5 85dc27c1a0baf62ae39262f3c55b0e3c maven-bin-1.0_rc4.ebuild 763
-MD5 cb7bb75943f4857eafd4c36d3682d036 maven-bin-2.0.1.ebuild 900
-MD5 8b25287073b8fc45a38e9b053ba3e43d maven-bin-2.0.ebuild 898
+MD5 6174b2bdf7bc72c97660fcf292b41f06 maven-bin-2.0.1-r1.ebuild 916
 MD5 8eec08a2cf3441c55736840e21a71c5a metadata.xml 534
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDokfIndWRXhKOboURApJHAJ9RbE8EKCyZfaViHU3hipjSsQcn7ACeMfe8
-ZdvdFC3fCRcWGOwcE+euWpY=
-=4oUG
------END PGP SIGNATURE-----
diff --git a/dev-java/maven-bin/files/digest-maven-bin-2.0 b/dev-java/maven-bin/files/digest-maven-bin-2.0
deleted file mode 100644
index f5458a788c79..000000000000
--- a/dev-java/maven-bin/files/digest-maven-bin-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc66bd538203eace0d6724be97133729 maven-2.0-bin.tar.bz2 1164156
diff --git a/dev-java/maven-bin/files/digest-maven-bin-2.0.1 b/dev-java/maven-bin/files/digest-maven-bin-2.0.1-r1
index bfaa404b9d30..bfaa404b9d30 100644
--- a/dev-java/maven-bin/files/digest-maven-bin-2.0.1
+++ b/dev-java/maven-bin/files/digest-maven-bin-2.0.1-r1
diff --git a/dev-java/maven-bin/maven-bin-2.0.1.ebuild b/dev-java/maven-bin/maven-bin-2.0.1-r1.ebuild
index 6a4d1e4a7886..b313fef1beb6 100644
--- a/dev-java/maven-bin/maven-bin-2.0.1.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.0.1.ebuild,v 1.1 2005/12/16 04:50:48 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.0.1-r1.ebuild,v 1.1 2006/01/06 02:34:02 nichoj Exp $
 
 inherit java-pkg
 
@@ -36,5 +36,6 @@ src_install() {
 
 	dodoc NOTICE.txt README.txt
 
+	dodir /usr/bin
 	dosym ${MAVEN_SHARE}/bin/mvn /usr/bin/mvn
 }
diff --git a/dev-java/maven-bin/maven-bin-2.0.ebuild b/dev-java/maven-bin/maven-bin-2.0.ebuild
deleted file mode 100644
index 3e4e5c795a98..000000000000
--- a/dev-java/maven-bin/maven-bin-2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 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.0.ebuild,v 1.1 2005/12/04 22:44:32 nichoj Exp $
-
-inherit java-pkg
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/${MY_PN}/binaries/${MY_P}-bin.tar.bz2"
-HOMEPAGE="http://maven.apache.org/"
-LICENSE="Apache-2.0"
-SLOT="2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.3"
-
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-src_unpack() {
-	unpack ${A}
-
-	rm ${S}/bin/*.bat
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir ${MAVEN_SHARE}
-	cp -Rp bin conf core lib ${D}/${MAVEN_SHARE}
-
-	dodoc NOTICE.txt README.txt
-
-	dosym ${MAVEN_SHARE}/bin/mvn /usr/bin/mvn
-}