From a9320c51a5f007975e0c8dba5b85ba260f49ed87 Mon Sep 17 00:00:00 2001
From: Joshua Nichols <nichoj@gentoo.org>
Date: Tue, 22 Nov 2005 01:04:23 +0000
Subject: Added a patch to fix 1.0's script (bug #96729). (Portage version:
2.0.51.22-r3)
---
dev-java/maven-bin/Manifest | 21 ++----
.../maven-bin/files/maven-bin-1.0-script.patch | 81 ++++++++++++++++++++++
dev-java/maven-bin/maven-bin-1.0.ebuild | 12 +++-
3 files changed, 96 insertions(+), 18 deletions(-)
create mode 100644 dev-java/maven-bin/files/maven-bin-1.0-script.patch
(limited to 'dev-java/maven-bin')
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index d0b39e32f225..b25cbe43c0ce 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0fd9270c9e7a5650cb4d16daef5d6ef4 maven-bin-1.0_rc3.ebuild 760
MD5 85dc27c1a0baf62ae39262f3c55b0e3c maven-bin-1.0_rc4.ebuild 763
-MD5 8eec08a2cf3441c55736840e21a71c5a metadata.xml 534
-MD5 c216019c03378ac846174b4806cf645d maven-bin-1.0.ebuild 759
+MD5 0fd9270c9e7a5650cb4d16daef5d6ef4 maven-bin-1.0_rc3.ebuild 760
+MD5 dff548135683f9d9308884527f332b49 maven-bin-1.0.ebuild 843
MD5 4a82b6beaf4c43efd3e7a54cc990eab5 ChangeLog 3316
-MD5 03cf0059efc0fa7a81f91bf9f74ada41 files/digest-maven-bin-1.0 62
+MD5 8eec08a2cf3441c55736840e21a71c5a metadata.xml 534
+MD5 74a13098bf9c5a96e423bb88a8c7927c files/maven-bin-1.0-script.patch 2110
+MD5 b62aef084315e664ba8ce901882c4087 files/25maven 61
MD5 fc48ae8abd9687043ff4f42b956fec9c files/digest-maven-bin-1.0_rc3 66
MD5 73a1ddbeab35cfa7b9cdf22069268280 files/digest-maven-bin-1.0_rc4 66
-MD5 b62aef084315e664ba8ce901882c4087 files/25maven 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDKz5LLLFUmVNQ7rkRAvH5AKDUxWeTDTVhuTPt4Imi5ipQVXhBBQCeL3zJ
-YuJTpZfR/siFvRClqCagEHk=
-=LtaY
------END PGP SIGNATURE-----
+MD5 03cf0059efc0fa7a81f91bf9f74ada41 files/digest-maven-bin-1.0 62
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
new file mode 100644
index 000000000000..e41f3166c2ec
--- /dev/null
+++ b/dev-java/maven-bin/files/maven-bin-1.0-script.patch
@@ -0,0 +1,81 @@
+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.ebuild b/dev-java/maven-bin/maven-bin-1.0.ebuild
index c5804f843884..51058045a58c 100644
--- a/dev-java/maven-bin/maven-bin-1.0.ebuild
+++ b/dev-java/maven-bin/maven-bin-1.0.ebuild
@@ -1,9 +1,14 @@
# 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-1.0.ebuild,v 1.3 2005/09/02 12:25:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.0.ebuild,v 1.4 2005/11/22 01:04:23 nichoj Exp $
+inherit base
+
+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/${PN/-bin}-${PV/_/-}.tar.gz"
+SRC_URI="mirror://apache/maven/binaries/${MY_P}.tar.gz"
HOMEPAGE="http://maven.apache.org/"
LICENSE="Apache-2.0"
SLOT="1.0"
@@ -12,8 +17,9 @@ DEPEND=">=virtual/jdk-1.3"
RDEPEND=">=virtual/jdk-1.3"
IUSE=""
-S="${WORKDIR}/${PN/-bin}-${PV/_/-}"
+S="${WORKDIR}/${MY_P}"
+PATCHES="${FILESDIR}/${P}-script.patch"
src_compile() { :; }
src_install() {
--
cgit v1.2.3-65-gdbad