fix 55870

(Portage version: 2.0.53_rc5)

5 files changed, 36 insertions, 99 deletions

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index 6b8f2dd79d1c..fe2e8eccdcf4 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/groovy
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.11 2005/05/06 09:53:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.12 2005/10/18 08:28:01 axxo Exp $
+
+  18 Oct 2005; Thomas Matthijs <axxo@gentoo.org> files/basescript-1.0_beta4,
+  groovy-1.0_beta4-r1.ebuild:
+  Actualy build without previous groovy install, and fixes #55870. Thanks too
+  Eivind Tagseth <eivindt-gentoo@multinet.no>
 
   06 May 2005; Sven Wegener <swegener@gentoo.org>
   groovy-1.0_beta4-r1.ebuild:
diff --git a/dev-java/groovy/files/basescript-1.0_beta4 b/dev-java/groovy/files/basescript-1.0_beta4
index d4d20132be80..3d4f402d8b46 100644
--- a/dev-java/groovy/files/basescript-1.0_beta4
+++ b/dev-java/groovy/files/basescript-1.0_beta4
@@ -6,7 +6,7 @@
 ##############################################################################
 
 ##
-## $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/files/basescript-1.0_beta4,v 1.2 2004/07/18 02:51:44 dragonheart Exp $
+## $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/files/basescript-1.0_beta4,v 1.3 2005/10/18 08:28:01 axxo Exp $
 ##
 ## Modified for Gentoo by Karl Trygve Kalleberg <karltk@gentoo.org>
 ##
@@ -25,8 +25,9 @@ commons_cli_classpath="@commons_cli_classpath@"
 mockobjects_classpath="@mockobjects_classpath@"
 xerces_classpath="@xerces_classpath@"
 xmojo_classpath="@xmojo_classpath@"
+extra_classpath="@extra_classpath@"
 
-final_classpath="${asm_classpath}:${bsf_classpath}:${classworlds_classpath}:${commons_cli_classpath}:${mockobjects_classpath}:${xerces_classpath}:${xmojo_classpath}"
+final_classpath="${asm_classpath}:${bsf_classpath}:${classworlds_classpath}:${commons_cli_classpath}:${mockobjects_classpath}:${xerces_classpath}:${xmojo_classpath}${extra_classpath}"
 
 GROOVY_HOME="@groovy-home@"
 
diff --git a/dev-java/groovy/files/digest-groovy-1.0_beta4 b/dev-java/groovy/files/digest-groovy-1.0_beta4
deleted file mode 100644
index ae973ed4b46c..000000000000
--- a/dev-java/groovy/files/digest-groovy-1.0_beta4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9aac05cd0bfca996e34f079a90f4147c groovy-1.0-beta-4-src.tar.gz 349710
diff --git a/dev-java/groovy/groovy-1.0_beta4-r1.ebuild b/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
index 19fa4d704c6a..db2267089181 100644
--- a/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
+++ b/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4-r1.ebuild,v 1.8 2005/05/06 09:53:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4-r1.ebuild,v 1.9 2005/10/18 08:28:01 axxo Exp $
 
 inherit java-pkg
 
@@ -15,7 +15,7 @@ DEPEND="=dev-java/xerces-2.6* \
 	>=dev-java/commons-cli-1.0-r3
 	>=dev-java/ant-1.5
 	=dev-java/junit-3.8*
-	=dev-java/asm-1.4*
+	=dev-java/asm-1.4.1*
 	>=dev-java/classworlds-1.0-r2
 	=dev-java/mockobjects-0.0*
 	=dev-java/bsf-2.3*
@@ -34,15 +34,15 @@ src_unpack() {
 	mkdir -p ${S}/target/lib
 
 	cd ${S}/target/lib
-	java-pkg_jar-from xerces-2 || die "Missing xerces"
-	java-pkg_jar-from junit || die "Missing junit"
-	java-pkg_jar-from asm-1.4 || die "Missing asm"
-	java-pkg_jar-from commons-cli-1 || die "Missing commons-cli"
-	java-pkg_jar-from classworlds-1 || die "Missing classworlds"
-	java-pkg_jar-from bsf-2.3 || die "Missing bsf"
-	java-pkg_jar-from mockobjects || die "Missing mockobjects"
-	java-pkg_jar-from xmojo-bin-5.0 || die "Missing xmojo-bin"
-	java-pkg_jar-from servletapi-2.4 servlet-api.jar || die "Missing servletapi"
+	java-pkg_jar-from xerces-2
+	java-pkg_jar-from junit
+	java-pkg_jar-from asm-1.4.1
+	java-pkg_jar-from commons-cli-1
+	java-pkg_jar-from classworlds-1
+	java-pkg_jar-from bsf-2.3
+	java-pkg_jar-from mockobjects
+	java-pkg_jar-from xmojo-bin-5.0
+	java-pkg_jar-from servletapi-2.4 servlet-api.jar
 
 	cd ${S}
 
@@ -65,21 +65,20 @@ src_compile() {
 
 	# Generate command-line scripts
 	for x in grok groovy groovyc groovysh groovyConsole ; do
-		generate_script $x
+		generate_script "$x" "${S}/src" ":${S}/target/classes"
 	done
 
+	mkdir src/lib
 	cd src/main
-	sh groovyc \
-		--classpath ../../target/classes/ \
-		groovy/ui/Console.groovy || die "Failed to invoke groovyc"
+	sh ${S}/groovyc groovy/ui/Console.groovy || die "Failed to invoke groovyc"
 
 	jar uf ../../target/groovy-1.0-beta-4.jar groovy/ui/Console*.class || die "Failed to backpatch Console*.class"
 }
 
 generate_script() {
-	scriptname=$1
+	scriptname="${1}"
 	classworlds_classpath="$(java-config -p classworlds-1)"
-	asm_classpath="$(java-config -p asm-1)"
+	asm_classpath="$(java-config -p asm-1.4.1)"
 	bsf_classpath="$(java-config -p bsf-2.3)"
 	classworlds_classpath="$(java-config -p classworlds-1)"
 	commons_cli_classpath="$(java-config -p commons-cli-1)"
@@ -87,8 +86,13 @@ generate_script() {
 	xerces_classpath="$(java-config -p xerces-2)"
 	xmojo_classpath="$(java-config -p xmojo-bin-5.0)"
 
+	if [[ -n ${2} ]]; then
+		local groovy_home="${2}"
+	else
+		local groovy_home="/usr/share/groovy-${SLOT}"
+	fi
 	sed -e "s;@scriptname@;${scriptname};" \
-		-e "s;@groovy-home@;/usr/share/groovy-${SLOT};" \
+		-e "s;@groovy-home@;${groovy_home};" \
 		-e "s;@classworlds_classpath@;${classworlds_classpath};" \
 		-e "s;@asm_classpath@;${asm_classpath};" \
 		-e "s;@bsf_classpath@;${bsf_classpath};" \
@@ -96,22 +100,15 @@ generate_script() {
 		-e "s;@mockobjects_classpath@;${mockobjects_classpath};" \
 		-e "s;@xerces_classpath@;${xerces_classpath};" \
 		-e "s;@xmojo_classpath@;${xmojo_classpath};" \
+		-e "s;@extra_classpath@;${3};" \
 		< ${FILESDIR}/basescript-${PV} \
 		> ${scriptname} || die "Failed to generate ${scriptname}"
 }
 
 src_install() {
-
-	# Install misc. documentation
-	dodoc LICENSE.txt
-
-	# Install jar files
 	java-pkg_dojar target/groovy-1.0-beta-4.jar
 
-	# Install API documentation
-	if use doc ; then
-		java-pkg_dohtml -r dist/docs/api
-	fi
+	use doc && java-pkg_dohtml -r dist/docs/api
 
 	# Install configuration files
 	confdir=/usr/share/groovy-${SLOT}/conf
@@ -121,7 +118,10 @@ src_install() {
 
 	# Install command-line scripts
 	exeinto /usr/bin
+
 	for x in grok groovy groovyc groovysh groovyConsole ; do
+		rm -f $x
+		generate_script $x
 		doexe $x || die "Failed to install ${x}"
 	done
 }
diff --git a/dev-java/groovy/groovy-1.0_beta4.ebuild b/dev-java/groovy/groovy-1.0_beta4.ebuild
deleted file mode 100644
index 0849020f45f3..000000000000
--- a/dev-java/groovy/groovy-1.0_beta4.ebuild
+++ /dev/null
@@ -1,68 +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/groovy/groovy-1.0_beta4.ebuild,v 1.5 2005/01/05 22:16:31 luckyduck Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
-HOMEPAGE="http://groovy.codehaus.org/"
-SRC_URI="http://dist.codehaus.org/groovy/distributions/${PN}-1.0-beta-4-src.tar.gz"
-LICENSE="codehaus-groovy"
-SLOT="1"
-KEYWORDS="~x86"
-IUSE="doc"
-DEPEND="=dev-java/xerces-2.6*
-	=dev-java/commons-cli-1.0*
-	=dev-java/ant-1.5*
-	=dev-java/junit-3.8*
-	=dev-java/asm-1.4*
-	=dev-java/classworlds-1.0*
-	=dev-java/mockobjects-0.0*
-	=dev-java/bsf-2.3*
-	=www-servers/tomcat-5*
-	=dev-java/xmojo-bin-5.0*"
-# karltk:
-# xmojo-bin is a JMX provider, we should add a list of alternatives
-
-
-S=${WORKDIR}/${PN}-1.0-beta-4
-
-src_unpack() {
-	unpack ${A}
-	cp ${FILESDIR}/build-${PV}.xml ${S}/build.xml || die
-	mkdir -p ${S}/target/lib
-	(
-		cd ${S}/target/lib
-		java-pkg_jar-from xerces || die
-		java-pkg_jar-from asm-1.4 || die
-		java-pkg_jar-from commons-cli || die
-		java-pkg_jar-from junit || die
-		java-pkg_jar-from classworlds || die
-		java-pkg_jar-from bsf-2.3 || die
-		java-pkg_jar-from mockobjects || die
-		java-pkg_jar-from xmojo-bin-5.0 || die
-		ln -s /opt/tomcat/common/lib/servlet-api.jar .
-	)
-
-	# The original build.xml will only build on a MacOSX machine when you're
-	# logged in as jstrachan. I don't reckon many Gentoo users are...
-	cp ${FILESDIR}/build.xml-${PV} ${S}/build.xml || die "Failed to update build.xml"
-
-	# This won't compile without an incestuous relationship with radeox.
-	rm -rf ${S}/src/main/org/codehaus/groovy/wiki
-}
-
-src_compile() {
-	ant jar || die
-	if use doc ; then
-		ant javadoc || die
-	fi
-}
-
-src_install() {
-	dodoc LICENSE.txt
-	java-pkg_dojar target/groovy-1.0-beta-2.jar
-	if use doc ; then
-		java-pkg_dohtml -r dist/docs/api
-	fi
-}