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

2 files changed, 16 insertions, 42 deletions

diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
index 4b30ab5319a7..a63e75951327 100644
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -1,20 +1,20 @@
-AUX build.xml-1.0_rc01 5867 RMD160 bea7b7ff30b4f7e9dc9e43c4b2a052043e0c422f SHA1 7cbb241e1602387216e91ee15329005b624892ec SHA256 e7a2ca6baf9c49803b1ee95bf0674e766989a6271ed8f58f51aa5cbcf24ab47d
-MD5 010a9f9882e4b6c3ced8d21d5cbc32e5 files/build.xml-1.0_rc01 5867
-RMD160 bea7b7ff30b4f7e9dc9e43c4b2a052043e0c422f files/build.xml-1.0_rc01 5867
-SHA256 e7a2ca6baf9c49803b1ee95bf0674e766989a6271ed8f58f51aa5cbcf24ab47d files/build.xml-1.0_rc01 5867
-AUX groovy-1.0.06-compiler-exit-code.patch 1391 RMD160 f59efe245caba5be33bd1f98855999bd12b46f9c SHA1 fb86146718d40ffb843a39c4888b2a06b7d33b90 SHA256 af35fea287ef6b13e1f7ea9a44a7e01b09362c7f7eb36ec067e6603d6dd460f5
-MD5 fa11cfef466f02d0fe5b0c264942b41b files/groovy-1.0.06-compiler-exit-code.patch 1391
-RMD160 f59efe245caba5be33bd1f98855999bd12b46f9c files/groovy-1.0.06-compiler-exit-code.patch 1391
-SHA256 af35fea287ef6b13e1f7ea9a44a7e01b09362c7f7eb36ec067e6603d6dd460f5 files/groovy-1.0.06-compiler-exit-code.patch 1391
+AUX build.xml-1.0_rc01 5860 RMD160 ecabd798fc1b4ff10502fa298b3e985b2b22771c SHA1 638dee00a4e5d0466d67fd63c9d06dbbd3a5fb21 SHA256 27b2c31c174f74314d8d75accbe08acfcf5f49ebeae9831e2869ed3d9f54a44d
+MD5 e2611e683bbbbf9bc8988d7cabc54a52 files/build.xml-1.0_rc01 5860
+RMD160 ecabd798fc1b4ff10502fa298b3e985b2b22771c files/build.xml-1.0_rc01 5860
+SHA256 27b2c31c174f74314d8d75accbe08acfcf5f49ebeae9831e2869ed3d9f54a44d files/build.xml-1.0_rc01 5860
+AUX groovy-1.0_rc01-compiler-exit-code.patch 1298 RMD160 b03e55173ea0ff4e1ccece169d172b82d65af727 SHA1 ef45228ad25a704c4a9f08b43f7f4c519551a692 SHA256 1e95765f7b0919314049ab955eeb3e38b0cd17c2e5655f4bc1958f1fda6543d3
+MD5 5f0b3b8d5848efe47815055e507ae196 files/groovy-1.0_rc01-compiler-exit-code.patch 1298
+RMD160 b03e55173ea0ff4e1ccece169d172b82d65af727 files/groovy-1.0_rc01-compiler-exit-code.patch 1298
+SHA256 1e95765f7b0919314049ab955eeb3e38b0cd17c2e5655f4bc1958f1fda6543d3 files/groovy-1.0_rc01-compiler-exit-code.patch 1298
 DIST groovy-1.0-RC-01-src.tar.gz 985880 RMD160 eed0f9259ad9775779c1c58b0128befe88fe90da SHA1 9ecce175ccac2dae784eed26f0eda796f34a78d0 SHA256 b788d1f8e43779cb518a21a92d1b9808f363b491d7d7084cfd177ed71fff84aa
-EBUILD groovy-1.0_rc01.ebuild 3087 RMD160 82441469ecf6b10f6492ddffcc8a8d634b2cc2a3 SHA1 f56b73bed85a7bf31d81f5934948ca33eddc98b3 SHA256 9372daa778a476d5bc5658587ee22035764786d77be1a21e4ff26d7b55c9c0fb
-MD5 1b2e3e9149862d516cc543abd0b8170e groovy-1.0_rc01.ebuild 3087
-RMD160 82441469ecf6b10f6492ddffcc8a8d634b2cc2a3 groovy-1.0_rc01.ebuild 3087
-SHA256 9372daa778a476d5bc5658587ee22035764786d77be1a21e4ff26d7b55c9c0fb groovy-1.0_rc01.ebuild 3087
-MISC ChangeLog 3140 RMD160 8125c4d46ef23579e2cce2c29d91d1200ac810c1 SHA1 7da0c99e7459a75827dca6897dc82814b3e3abe3 SHA256 2cc57cd85a4e2bbe6716454e8dd0cb728f5d6ae23017fe0a632d934e17a07c80
-MD5 b6f1348b167d9d98bcd70bfd63208de2 ChangeLog 3140
-RMD160 8125c4d46ef23579e2cce2c29d91d1200ac810c1 ChangeLog 3140
-SHA256 2cc57cd85a4e2bbe6716454e8dd0cb728f5d6ae23017fe0a632d934e17a07c80 ChangeLog 3140
+EBUILD groovy-1.0_rc01.ebuild 3065 RMD160 8421ade851a442ebffb691150384d68292e26b7a SHA1 47fb4010d5d2239a70b1c1c586a1fd86a16d1710 SHA256 733c0ac8d9298a675bf63cef85e72cb35dd8efffa1b58a9a1fc6390b0718dfc7
+MD5 5a017e712e234c3baf1c169304259188 groovy-1.0_rc01.ebuild 3065
+RMD160 8421ade851a442ebffb691150384d68292e26b7a groovy-1.0_rc01.ebuild 3065
+SHA256 733c0ac8d9298a675bf63cef85e72cb35dd8efffa1b58a9a1fc6390b0718dfc7 groovy-1.0_rc01.ebuild 3065
+MISC ChangeLog 3455 RMD160 6b01d530a094c845cc3b67a32ba20d89a1346368 SHA1 6dc4753e880004845f5df5d8af2b7ba0c505af7f SHA256 37a2199cd61f97b28a19bf35e075379f63d84ad7cf81cd7ef2a55fff1db23376
+MD5 d2df87dc71eff5b9890898b3fac72166 ChangeLog 3455
+RMD160 6b01d530a094c845cc3b67a32ba20d89a1346368 ChangeLog 3455
+SHA256 37a2199cd61f97b28a19bf35e075379f63d84ad7cf81cd7ef2a55fff1db23376 ChangeLog 3455
 MISC metadata.xml 830 RMD160 e44201b843377223db467fe70be144015cab7b59 SHA1 37a0746d1e2a77a17c787679a9999eb51dad7988 SHA256 4b3a3459adb24e4c0b26ce6393047369f82ab7d6075c19c2926cf9cd256794ab
 MD5 fa732ae92a71e90035cc94ba31d28449 metadata.xml 830
 RMD160 e44201b843377223db467fe70be144015cab7b59 metadata.xml 830
diff --git a/dev-java/groovy/files/groovy-1.0.06-compiler-exit-code.patch b/dev-java/groovy/files/groovy-1.0.06-compiler-exit-code.patch
deleted file mode 100644
index c70bf2309fe0..000000000000
--- a/dev-java/groovy/files/groovy-1.0.06-compiler-exit-code.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Only in groovy-1.0-JSR-06: .classpath
-Only in groovy-1.0-JSR-06: .project
-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" ) ;
-Only in groovy-1.0-JSR-06: target