Cleanup.

Package-Manager: portage-2.1.2-r9

7 files changed, 6 insertions, 158 deletions

diff --git a/dev-java/maven-bin/ChangeLog b/dev-java/maven-bin/ChangeLog
index eed4514a357b..a3bb14971fca 100644
--- a/dev-java/maven-bin/ChangeLog
+++ b/dev-java/maven-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/maven-bin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.23 2007/02/10 19:13:02 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.24 2007/02/11 12:27:30 caster Exp $
+
+  11 Feb 2007; Vlastimil Babka <caster@gentoo.org> -files/25maven,
+  -files/maven-bin-1.0-script.patch, -maven-bin-1.0_rc3.ebuild,
+  -maven-bin-2.0.2.ebuild:
+  Cleanup.
 
   10 Feb 2007; nixnut <nixnut@gentoo.org> maven-bin-1.0.2.ebuild:
   Stable on ppc wrt bug 163984
diff --git a/dev-java/maven-bin/files/25maven b/dev-java/maven-bin/files/25maven
deleted file mode 100644
index 38d4c229a7a7..000000000000
--- a/dev-java/maven-bin/files/25maven
+++ /dev/null
@@ -1,2 +0,0 @@
-MAVEN_HOME=/usr/share/maven
-#MAVEN_LOCAL_REPO=/usr/lib/java/
diff --git a/dev-java/maven-bin/files/digest-maven-bin-1.0_rc3 b/dev-java/maven-bin/files/digest-maven-bin-1.0_rc3
deleted file mode 100644
index aff0648db2df..000000000000
--- a/dev-java/maven-bin/files/digest-maven-bin-1.0_rc3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 754ffe20fcfa19f249ca2f1c9e2fcad8 maven-1.0-rc3.tar.gz 5675348
-RMD160 69b3430a4db6f7124c7d6ec8fb476295118eef65 maven-1.0-rc3.tar.gz 5675348
-SHA256 6103f0e79d4a512e2263079aa96f96957da681c650f52f5f36bfd650720d70e0 maven-1.0-rc3.tar.gz 5675348
diff --git a/dev-java/maven-bin/files/digest-maven-bin-2.0.2 b/dev-java/maven-bin/files/digest-maven-bin-2.0.2
deleted file mode 100644
index eb0acf2b8460..000000000000
--- a/dev-java/maven-bin/files/digest-maven-bin-2.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e0d730b4f1056e2f9cbac3c9fe3a3c0d maven-2.0.2-bin.tar.bz2 1528938
-RMD160 088e6ec0dd0551949f0f9c9c63342d3cb2fd584a maven-2.0.2-bin.tar.bz2 1528938
-SHA256 1d33e4e6f9bb8538dcaa8d5b330eb790a2435ce2dd9709d1749d335d71dde5bf maven-2.0.2-bin.tar.bz2 1528938
diff --git a/dev-java/maven-bin/files/maven-bin-1.0-script.patch b/dev-java/maven-bin/files/maven-bin-1.0-script.patch
deleted file mode 100644
index e41f3166c2ec..000000000000
--- a/dev-java/maven-bin/files/maven-bin-1.0-script.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ru maven-1.0/bin/maven maven-1.0-patched/bin/maven
---- maven-1.0/bin/maven	2004-07-13 09:20:50.000000000 -0400
-+++ maven-1.0-patched/bin/maven	2005-11-21 19:14:56.000000000 -0500
-@@ -45,41 +45,51 @@
-            ;;
- esac
- 
--if [ -z "$MAVEN_HOME" ] ; then
--  # try to find MAVEN
--  if [ -d /opt/maven ] ; then
-+  # try a couple ways to find MAVEN_HOME
-+
-+  if [ -z ${MAVEN_HOME} ] && [ -d /opt/maven ] ; then
-     MAVEN_HOME=/opt/maven
-   fi
- 
--  if [ -d "$HOME/maven" ] ; then
-+  if [ -z ${MAVEN_HOME} ] && [ -d "$HOME/maven" ] ; then
-     MAVEN_HOME="$HOME/maven"
-   fi
- 
--  ## resolve links - $0 may be a link to maven's home
--  PRG=$0
--  progname=`basename $0`
--  saveddir=`pwd`
--
--  # need this for relative symlinks
--  cd `dirname $PRG`
--
--  while [ -h "$PRG" ] ; do
--    ls=`ls -ld "$PRG"`
--    link=`expr "$ls" : '.*-> \(.*\)$'`
--    if expr "$link" : '.*/.*' > /dev/null; then
--  PRG="$link"
--    else
--  PRG="`dirname $PRG`/$link"
--    fi
--  done
-+  # try to load from env.d file
-+  if [ -z ${MAVEN_HOME} ] && [ -f /etc/env.d/25maven ]; then
-+  	MAVEN_HOME=$(source /etc/env.d/25maven; echo ${MAVEN_HOME})
-+  fi
- 
--  MAVEN_HOME=`dirname "$PRG"`/..
-+ # try to figure it out from how this script was invoked
-+  if [ -z ${MAVEN_HOME} ]; then
-+    ## resolve links - $0 may be a link to maven's home
-+    PRG=$0
-+    progname=`basename $0`
-+    saveddir=`pwd`
-+
-+    # need this for relative symlinks
-+    cd `dirname $PRG`
-+
-+    while [ -h "$PRG" ] ; do
-+      ls=`ls -ld "$PRG"`
-+      link=`expr "$ls" : '.*-> \(.*\)$'`
-+      if expr "$link" : '.*/.*' > /dev/null; then
-+        PRG="$link"
-+      else
-+        PRG="`dirname $PRG`/$link"
-+      fi
-+    done
-+
-+    MAVEN_HOME=`dirname "$PRG"`/..
-+
-+    # make it fully qualified
-+    MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
-+    echo "MAVEN_HOME=${MAVEN_HOME}" 1>&2
- 
--  # make it fully qualified
--  MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
-+    cd $saveddir
-+  fi
- 
--  cd $saveddir
--fi
-+[ -z "${MAVEN_HOME}" ] && exit "Was unable to determine MAVEN_HOME"
- 
- # For Cygwin, ensure paths are in UNIX format before anything is touched
- if $cygwin ; then
diff --git a/dev-java/maven-bin/maven-bin-1.0_rc3.ebuild b/dev-java/maven-bin/maven-bin-1.0_rc3.ebuild
deleted file mode 100644
index e59b2d27ce51..000000000000
--- a/dev-java/maven-bin/maven-bin-1.0_rc3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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-1.0_rc3.ebuild,v 1.6 2006/04/07 21:50:07 wormo Exp $
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/binaries/${PN/-bin}-${PV/_/-}.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="x86 ppc amd64"
-DEPEND=">=virtual/jdk-1.3"
-RDEPEND=">=virtual/jdk-1.3"
-IUSE=""
-
-S="${WORKDIR}/${PN/-bin}-${PV/_/-}"
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/maven
-	dodir /usr/lib/java
-	exeinto /usr/bin
-	doexe ${S}/bin/maven
-	insinto /etc/env.d
-	doins ${FILESDIR}/25maven
-	cp -Rp * ${D}/usr/share/maven
-}
diff --git a/dev-java/maven-bin/maven-bin-2.0.2.ebuild b/dev-java/maven-bin/maven-bin-2.0.2.ebuild
deleted file mode 100644
index b9738aae1f65..000000000000
--- a/dev-java/maven-bin/maven-bin-2.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.2.ebuild,v 1.5 2006/05/29 17:22:48 blubb 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 ppc 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
-
-	dodir /usr/bin
-	dosym ${MAVEN_SHARE}/bin/mvn /usr/bin/mvn
-}