From 04a7e567e045ef08f33a43458ef76953d420db72 Mon Sep 17 00:00:00 2001 From: Joshua Nichols Date: Fri, 29 Dec 2006 17:37:25 +0000 Subject: [PATCH] Version bump. 1.0 JSR 06 was versioned as 1.0.06, which was wrong, so 1.0_rc01 is actually newer. Pruned 1.0.06. Package-Manager: portage-2.1.2_rc4-r1 --- dev-java/groovy/Manifest | 40 ++-- dev-java/groovy/files/build.xml-1.0.06 | 250 --------------------- dev-java/groovy/files/digest-groovy-1.0.06 | 3 - dev-java/groovy/groovy-1.0.06.ebuild | 91 -------- 4 files changed, 20 insertions(+), 364 deletions(-) delete mode 100644 dev-java/groovy/files/build.xml-1.0.06 delete mode 100644 dev-java/groovy/files/digest-groovy-1.0.06 delete mode 100644 dev-java/groovy/groovy-1.0.06.ebuild diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest index 3df29f40d3fd..4b30ab5319a7 100644 --- a/dev-java/groovy/Manifest +++ b/dev-java/groovy/Manifest @@ -1,24 +1,24 @@ -AUX build.xml-1.0.06 11631 RMD160 08c909da44f03fa95ec79f0aa3f7b0cf78e5aa61 SHA1 d587d5eace573ff49f6177bb0b3f68de299aa9d3 SHA256 178d0fcf6a05db90c5c28baa1df09a7901e30acb32d12c22727f5f64e7bbeaa6 -MD5 aa692c2c93648100bdcbad2e9213525b files/build.xml-1.0.06 11631 -RMD160 08c909da44f03fa95ec79f0aa3f7b0cf78e5aa61 files/build.xml-1.0.06 11631 -SHA256 178d0fcf6a05db90c5c28baa1df09a7901e30acb32d12c22727f5f64e7bbeaa6 files/build.xml-1.0.06 11631 +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 -DIST groovy-1.0-jsr-06-src.tar.gz 915850 RMD160 ff355f9abd85b051e444a914f30712fd9dd610c5 SHA1 4e2b7577af9e573d845e2fc5af651dec257a8a61 SHA256 b64ef8f6c3c2f8e628a0ecc4a4983d3422b0241900eae2bc93deb0a467d64e51 -EBUILD groovy-1.0.06.ebuild 2700 RMD160 d250ac9d6daf92ac4c5290d57a87803dfd9a1762 SHA1 e61a5103a3eda7812a19f9211f6ed662e1137d27 SHA256 7563185ba1ea9067b108c06955542339793b48070fdc7a752e4062b767c45b61 -MD5 7ca829ccb598f88aa8eaa7fc50707f89 groovy-1.0.06.ebuild 2700 -RMD160 d250ac9d6daf92ac4c5290d57a87803dfd9a1762 groovy-1.0.06.ebuild 2700 -SHA256 7563185ba1ea9067b108c06955542339793b48070fdc7a752e4062b767c45b61 groovy-1.0.06.ebuild 2700 -MISC ChangeLog 2838 RMD160 b180d2eaf7e2963b8579199f295075e4af4fed10 SHA1 a90c5140ac3696fb8ce105791c99c33c4ce1a1b6 SHA256 0383e5a67ed5b50f378b19bc99d4c64e6eb3e862c02596d897ab4f3e84e9f686 -MD5 6e25fc378405aaaeb30a5b3a455919bc ChangeLog 2838 -RMD160 b180d2eaf7e2963b8579199f295075e4af4fed10 ChangeLog 2838 -SHA256 0383e5a67ed5b50f378b19bc99d4c64e6eb3e862c02596d897ab4f3e84e9f686 ChangeLog 2838 -MISC metadata.xml 831 RMD160 9f135737c19a6ec3f5a22cc6f05f4244f3f1dea4 SHA1 349f041d840aa74e16833a0ac37850f570cec27a SHA256 2f53542578ff9fd27149090937adf62898535640ab889582ada8e49eb4748018 -MD5 d24f57f20f31e6a9a7181d82f4cfc9b9 metadata.xml 831 -RMD160 9f135737c19a6ec3f5a22cc6f05f4244f3f1dea4 metadata.xml 831 -SHA256 2f53542578ff9fd27149090937adf62898535640ab889582ada8e49eb4748018 metadata.xml 831 -MD5 d4c45682ca6e69259f7902fd596476d1 files/digest-groovy-1.0.06 265 -RMD160 6b476984307ce0f512d8cd17b30b8673274def7f files/digest-groovy-1.0.06 265 -SHA256 b7b882b275d94fddf90deeb579859863f04a24f61cc9314f72d0b439b91da663 files/digest-groovy-1.0.06 265 +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 +MISC metadata.xml 830 RMD160 e44201b843377223db467fe70be144015cab7b59 SHA1 37a0746d1e2a77a17c787679a9999eb51dad7988 SHA256 4b3a3459adb24e4c0b26ce6393047369f82ab7d6075c19c2926cf9cd256794ab +MD5 fa732ae92a71e90035cc94ba31d28449 metadata.xml 830 +RMD160 e44201b843377223db467fe70be144015cab7b59 metadata.xml 830 +SHA256 4b3a3459adb24e4c0b26ce6393047369f82ab7d6075c19c2926cf9cd256794ab metadata.xml 830 +MD5 afaff3addd3c6831ceddc75a5bf063a3 files/digest-groovy-1.0_rc01 262 +RMD160 b134a8ee07418d937e851a7cf7e9a2625fc71e99 files/digest-groovy-1.0_rc01 262 +SHA256 8cc01f453647a7f0be77bcaebf8366fdb24384d330a2b0e790545fd6ad112b86 files/digest-groovy-1.0_rc01 262 diff --git a/dev-java/groovy/files/build.xml-1.0.06 b/dev-java/groovy/files/build.xml-1.0.06 deleted file mode 100644 index 118444bb2707..000000000000 --- a/dev-java/groovy/files/build.xml-1.0.06 +++ /dev/null @@ -1,250 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dev-java/groovy/files/digest-groovy-1.0.06 b/dev-java/groovy/files/digest-groovy-1.0.06 deleted file mode 100644 index be608adf710e..000000000000 --- a/dev-java/groovy/files/digest-groovy-1.0.06 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 28f185cab09027ea88a7aa1240bf30be groovy-1.0-jsr-06-src.tar.gz 915850 -RMD160 ff355f9abd85b051e444a914f30712fd9dd610c5 groovy-1.0-jsr-06-src.tar.gz 915850 -SHA256 b64ef8f6c3c2f8e628a0ecc4a4983d3422b0241900eae2bc93deb0a467d64e51 groovy-1.0-jsr-06-src.tar.gz 915850 diff --git a/dev-java/groovy/groovy-1.0.06.ebuild b/dev-java/groovy/groovy-1.0.06.ebuild deleted file mode 100644 index b4a08ca891e8..000000000000 --- a/dev-java/groovy/groovy-1.0.06.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# 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.06.ebuild,v 1.2 2006/11/30 15:40:35 caster Exp $ - -inherit versionator java-pkg-2 java-ant-2 - -MY_PV="$(get_version_component_range 1-2)-JSR-$(get_version_component_range 3)" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Groovy is a high-level dynamic language for the JVM" -HOMEPAGE="http://groovy.codehaus.org/" -SRC_URI="http://dist.codehaus.org/groovy/distributions/${MY_P/JSR/jsr}-src.tar.gz" -LICENSE="codehaus-groovy" -SLOT="1" -KEYWORDS="~amd64 ~x86" -IUSE="source" - -COMMON_DEPS=" - =dev-java/asm-2.2* - >=dev-java/antlr-2.7.5 - >=dev-java/xerces-2.7 - >=dev-java/ant-core-1.6.5 - >=dev-java/xstream-1.1.1 - >=dev-java/junit-3.8.1 - dev-java/qdox - >=dev-java/commons-cli-1.0 - >=dev-java/bsf-2.3.0_rc1 - >=dev-java/mockobjects-0.09 - ~dev-java/servletapi-2.4 - dev-java/sun-jmx" -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEPS}" -# FIXME doesn't compile with 1.6 due to JDBC api change -DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) - ${COMMON_DEPS}" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - - cd ${S} - epatch ${FILESDIR}/${P}-compiler-exit-code.patch - - mkdir -p ${S}/target/lib - - cd ${S}/target/lib - java-pkg_jar-from commons-cli-1 - java-pkg_jar-from xerces-2 - java-pkg_jar-from ant-core ant.jar - java-pkg_jar-from antlr - java-pkg_jar-from asm-2.2 - java-pkg_jar-from qdox-1.6 - java-pkg_jar-from xstream - java-pkg_jar-from mockobjects - java-pkg_jar-from junit - java-pkg_jar-from servletapi-2.4 - java-pkg_jar-from bsf-2.3 - java-pkg_jar-from sun-jmx - - cd ${S} - - # We use ant NOT maven - cp ${FILESDIR}/build.xml-${PV} ${S}/build.xml || die "Failed to update build.xml" - - cd src/main - # This won't compile without an incestuous relationship with radeox. - rm -rf org/codehaus/groovy/wiki -} - -src_compile() { - eant -Dnoget=true jar - - # need to compile .groovy files to .class files - cd src/main - java -classpath ../../target/${MY_P}.jar:$(java-pkg_getjars commons-cli-1,asm-2.2,antlr,junit,qdox-1.6) \ - org.codehaus.groovy.tools.FileSystemCompiler \ - $(find -name *.groovy) || die "Failed to invoke groovyc" - - # add the now compiled .class files to our jar - jar uf ../../target/${MY_P}.jar $(find -name *.class) || die "Failed to backpatch Console*.class" -} - -src_install() { - java-pkg_newjar target/${MY_P}.jar - java-pkg_dolauncher "grok" --main org.codehaus.groovy.tools.Grok - java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler - java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain - java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell - java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console -} -- 2.26.2