From: Vlastimil Babka <caster@gentoo.org>
Date: Sat, 30 Dec 2006 20:46:42 +0000 (+0000)
Subject: Fix libdir property in build.xml wrt bug #159457 by Sean <sean.gollschewsky@gmail... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=15f89e8d6ae2350305e8fc10c33d8beb5b68ace8;p=gentoo.git

Fix libdir property in build.xml wrt bug #159457 by Sean <sean.gollschewsky@gmail.com>. Remove -Dnoget=true from eant call, because it's now default in the eclass. Fix and apply the exit-code patch again.
Package-Manager: portage-2.1.2_rc4-r3
---

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index 93368df48e6c..0ee371929ecf 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/groovy
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.17 2006/12/29 17:37:16 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.18 2006/12/30 20:46:42 caster Exp $
+
+  30 Dec 2006; Vlastimil Babka <caster@gentoo.org> files/build.xml-1.0_rc01,
+  groovy-1.0_rc01.ebuild:
+  Fix libdir property in build.xml wrt bug #159457 by Sean
+  <sean.gollschewsky@gmail.com>. Remove -Dnoget=true from eant call, because
+  it's now default in the eclass. Fix and apply the exit-code patch again.
 
 *groovy-1.0_rc01 (29 Dec 2006)
 
diff --git a/dev-java/groovy/files/build.xml-1.0_rc01 b/dev-java/groovy/files/build.xml-1.0_rc01
index 92caf0b518cf..2382c339d35a 100644
--- a/dev-java/groovy/files/build.xml-1.0_rc01
+++ b/dev-java/groovy/files/build.xml-1.0_rc01
@@ -8,7 +8,7 @@
   <property file="${user.home}/build.properties"></property>
   <!--Build properties-->
   <property name="defaulttargetdir" value="${basedir}/target"></property>
-  <property name="libdir" value="${user.home}/.maven/repository"></property>
+  <property name="libdir" value="${defaulttargetdir}/lib"></property>
   <property name="classesdir" value="${basedir}/target/classes"></property>
   <property name="testclassesdir" value="${basedir}/target/test-classes"></property>
   <property name="testreportdir" value="${basedir}/target/test-reports"></property>
diff --git a/dev-java/groovy/files/groovy-1.0_rc01-compiler-exit-code.patch b/dev-java/groovy/files/groovy-1.0_rc01-compiler-exit-code.patch
new file mode 100644
index 000000000000..29c7ce83d967
--- /dev/null
+++ b/dev-java/groovy/files/groovy-1.0_rc01-compiler-exit-code.patch
@@ -0,0 +1,23 @@
+diff -ru groovy-1.0-JSR-06-orig/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java groovy-1.0-JSR-06/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
+--- groovy-1.0-JSR-06-orig/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java	2006-06-28 10:42:01.000000000 -0400
++++ groovy-1.0-JSR-06/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java	2006-09-23 00:13:34.000000000 -0400
+@@ -223,6 +223,7 @@
+         catch( Throwable e ) 
+         {
+             new ErrorReporter( e, displayStackTraceOnError ).write( System.err );
++            System.exit(1);
+         }
+     }
+     
+diff -ru groovy-1.0-JSR-06-orig/src/test/UberTestCase.java groovy-1.0-JSR-06/src/test/UberTestCase.java
+--- groovy-1.0-JSR-06-orig/src/test/UberTestCase.java	2006-06-28 10:42:01.000000000 -0400
++++ groovy-1.0-JSR-06/src/test/UberTestCase.java	2006-09-23 00:12:36.000000000 -0400
+@@ -17,7 +17,7 @@
+ 
+         String osName = System.getProperty ( "os.name" ) ;
+         if ( osName.equals ( "Linux" ) || osName.equals ( "SunOS" ) ) {
+-          suite.addTestSuite ( ExecuteTest_LinuxSolaris.class ) ;
++//          suite.addTestSuite ( ExecuteTest_LinuxSolaris.class ) ;
+         }
+         else {
+           System.err.println ( "XXXXXX  No execute testsfor this OS.  XXXXXX" ) ;
diff --git a/dev-java/groovy/groovy-1.0_rc01.ebuild b/dev-java/groovy/groovy-1.0_rc01.ebuild
index 74e676e0ad11..3270fbe68953 100644
--- a/dev-java/groovy/groovy-1.0_rc01.ebuild
+++ b/dev-java/groovy/groovy-1.0_rc01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_rc01.ebuild,v 1.1 2006/12/29 17:37:16 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_rc01.ebuild,v 1.2 2006/12/30 20:46:42 caster Exp $
 
 inherit versionator java-pkg-2 java-ant-2
 
@@ -40,7 +40,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-#	epatch ${FILESDIR}/${PN}-1.0.06-compiler-exit-code.patch
+	epatch ${FILESDIR}/${P}-compiler-exit-code.patch
 
 	mkdir -p ${S}/target/lib
 
@@ -76,7 +76,7 @@ src_unpack() {
 }
 
 src_compile() {
-	eant -Dnoget=true jar
+	eant jar
 
 	# need to compile .groovy files to .class files
 	cd src/main