fix 55870

Package-Manager: portage-2.0.53_rc5

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index 6b8f2dd79d1c0c488c547069415108e0293af1bc..fe2e8eccdcf48f0bbbf3ac7cc44e0dbc621683de 100644 (file)
--- 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/Manifest b/dev-java/groovy/Manifest
index 83d7c320879d272bfe094cb02b023e1432439f6a..104e7704f46e808264c65d7ad47f1b1572a797f6 100644 (file)
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 225752b5b343e1bfca005d635177ec03 groovy-1.0_beta4-r1.ebuild 4003
-MD5 c8ab3eb02130e8a8245b26408bf2975a ChangeLog 1705
-MD5 588ad8dfb2fec53915194f50ee7276fe groovy-1.0_beta4.ebuild 1896
-MD5 d24f57f20f31e6a9a7181d82f4cfc9b9 metadata.xml 831
-MD5 81ed508672aae26b21b7aadfab3f3c9d files/digest-groovy-1.0_beta4 73
-MD5 6e8019506e306b3b30bde2ac6dcb9d53 files/basescript-1.0_beta4 3179
+MD5 d130a3a24e8484ec68777a1278b26aec ChangeLog 1933
+MD5 a96c05c052b1b1fdf35e81d3f499afc0 files/basescript-1.0_beta4 3226
 MD5 7481ca6b947624d4f94dcddc9d04e25b files/build.xml-1.0_beta4 5427
 MD5 81ed508672aae26b21b7aadfab3f3c9d files/digest-groovy-1.0_beta4-r1 73
+MD5 0dc5c3074b41da4df16f382becdc8964 groovy-1.0_beta4-r1.ebuild 3845
+MD5 d24f57f20f31e6a9a7181d82f4cfc9b9 metadata.xml 831
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCez6iI1lqEGTUzyQRAo6IAJ0eQg0ws8/y4Tjw8oPUS/of/B/KeACg3V5O
-W7bUbysdc5ze5IMRtJv9Tf0=
-=2RGe
+iD8DBQFDVLI8/rLF9B432nYRAk5sAJ0WvY1FdcXc0+mEtoApwbEX279+tQCeK8MN
+/ud0+BLtxxkkPPfyYg9P4Jg=
+=o3cD
 -----END PGP SIGNATURE-----

diff --git a/dev-java/groovy/files/basescript-1.0_beta4 b/dev-java/groovy/files/basescript-1.0_beta4
index d4d20132be80b7e41b1d291dd0f89409b09091cc..3d4f402d8b46865c34a9bd31ebdd8727a2928c76 100644 (file)
--- 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 (file)
index ae973ed..0000000
--- 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 19fa4d704c6a5cd2b905b65d36149f8d1c23fb5e..db226708918191110ae51080177f50764b5b00aa 100644 (file)
--- 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 (file)
index 0849020..0000000
--- 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
-}