diff options
author | Vlastimil Babka <caster@gentoo.org> | 2006-10-22 22:48:36 +0000 |
---|---|---|
committer | Vlastimil Babka <caster@gentoo.org> | 2006-10-22 22:48:36 +0000 |
commit | 515d268018c7212b5634305dd4663ba54ef1478d (patch) | |
tree | ad64826703786366994da2ca985b46bfd5f0d8d8 /dev-java | |
parent | 0.14.3-r1 have to be ~all for now (diff) | |
download | historical-515d268018c7212b5634305dd4663ba54ef1478d.tar.gz historical-515d268018c7212b5634305dd4663ba54ef1478d.tar.bz2 historical-515d268018c7212b5634305dd4663ba54ef1478d.zip |
Version bump, reported by M. Edward Borasky <znmeb@cesmail.net> in bug #152309.
Package-Manager: portage-2.1.2_pre3-r5
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/jruby/ChangeLog | 9 | ||||
-rw-r--r-- | dev-java/jruby/Manifest | 38 | ||||
-rw-r--r-- | dev-java/jruby/files/digest-jruby-0.9.1 | 3 | ||||
-rw-r--r-- | dev-java/jruby/files/jruby-0.9.1-build.xml.patch | 21 | ||||
-rw-r--r-- | dev-java/jruby/jruby-0.9.0.ebuild | 5 | ||||
-rw-r--r-- | dev-java/jruby/jruby-0.9.1.ebuild | 85 |
6 files changed, 139 insertions, 22 deletions
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index 309479ef6ef3..0d50293e5df1 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/jruby # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.9 2006/10/22 08:17:08 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.10 2006/10/22 22:48:36 caster Exp $ + +*jruby-0.9.1 (22 Oct 2006) + + 22 Oct 2006; Vlastimil Babka <caster@gentoo.org> + +files/jruby-0.9.1-build.xml.patch, jruby-0.9.0.ebuild, + +jruby-0.9.1.ebuild: + Version bump, reported by M. Edward Borasky <znmeb@cesmail.net> in bug #152309. 22 Oct 2006; Petteri Räty <betelgeuse@gentoo.org> metadata.xml: Fixed metadata.xml by changing the herd from jruby to java. diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest index 917ff003b312..ee11787e9c02 100644 --- a/dev-java/jruby/Manifest +++ b/dev-java/jruby/Manifest @@ -1,20 +1,26 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX jruby-0.9.1-build.xml.patch 1077 RMD160 f900cc14b62f612851e3f8bc318be78af76a275e SHA1 70a6d9b46ad404068b1b74b9a51b8d0185704d62 SHA256 84be93ae37090a2d7f9fcf969804a9748103420a62695eca79939e224fb7ed5d +MD5 8e75e6f804e6ea96e4bf8ddbc07b514a files/jruby-0.9.1-build.xml.patch 1077 +RMD160 f900cc14b62f612851e3f8bc318be78af76a275e files/jruby-0.9.1-build.xml.patch 1077 +SHA256 84be93ae37090a2d7f9fcf969804a9748103420a62695eca79939e224fb7ed5d files/jruby-0.9.1-build.xml.patch 1077 DIST jruby-src-0.7.0.tar.gz 1872867 RMD160 6fcff75d74c3a93e18c3a424761afc00674070cb SHA1 a874cd90e1937ea757d6bd7d5ec85feee8f0db2a SHA256 4e200a32b0582021e9fbc93faaa16f25198cf496c44d4df635e9282dde647dce DIST jruby-src-0.9.0.tar.gz 2399908 RMD160 0da3836c61722cc1188fbf57fc1db68acd544478 SHA1 3c34b9ac79f5462a75a510888194f704ab6bb50d SHA256 bf700f2762f5a61235d727b5595e378b6867af68614fe2616496dc952fa93209 +DIST jruby-src-0.9.1.tar.gz 2898463 RMD160 edfebe6c2a539e03aed2863d44d225f1f103f77f SHA1 9aa89f63bf1ef95cd7f51f5b0b52fc574bc9cc45 SHA256 5c5904caf3421063b03498263528e303ab71f49105f90b8358c7a2989191edc9 EBUILD jruby-0.7.0-r1.ebuild 1402 RMD160 9459f6dff3ed01cfd38628b84acd3c9f840b37c9 SHA1 a7bf4edd08dafe2b13ca73bd7eef5acd56637dd6 SHA256 d476b5c3bf6f6af593647a31e8b10e6e78553086a9a0105f59e75bebef4cf5db MD5 14bd7f98d0a9fe324445918a8924f55e jruby-0.7.0-r1.ebuild 1402 RMD160 9459f6dff3ed01cfd38628b84acd3c9f840b37c9 jruby-0.7.0-r1.ebuild 1402 SHA256 d476b5c3bf6f6af593647a31e8b10e6e78553086a9a0105f59e75bebef4cf5db jruby-0.7.0-r1.ebuild 1402 -EBUILD jruby-0.9.0.ebuild 1860 RMD160 306a3d8616005959f65e2ffc1910426ae26bc44f SHA1 8e3b39ae72386770276c70bfbf40282fe71fe5f4 SHA256 f2c84a997198e614dcae16402c8454879eacfbfe942874057873933866bda21a -MD5 bed593efec6ab11cf45dcf8993969b93 jruby-0.9.0.ebuild 1860 -RMD160 306a3d8616005959f65e2ffc1910426ae26bc44f jruby-0.9.0.ebuild 1860 -SHA256 f2c84a997198e614dcae16402c8454879eacfbfe942874057873933866bda21a jruby-0.9.0.ebuild 1860 -MISC ChangeLog 1380 RMD160 a3c94671fee3982155d1f0e8b5889b70bc942aa1 SHA1 5627ce35ea560204e8f88f7855a6d9ef43648dfe SHA256 756236f8f09dcaf2349547a3eb8d976524f9bd9c460c61253b81b2dbeec9e208 -MD5 2bec61c0409d06da3ae0f0fbca3a7f09 ChangeLog 1380 -RMD160 a3c94671fee3982155d1f0e8b5889b70bc942aa1 ChangeLog 1380 -SHA256 756236f8f09dcaf2349547a3eb8d976524f9bd9c460c61253b81b2dbeec9e208 ChangeLog 1380 +EBUILD jruby-0.9.0.ebuild 1841 RMD160 aeaf81be243365ad16406218c4ceb0b66cd9721d SHA1 ea4e81a727f000d2742c909cdb2f2102a1536804 SHA256 1d6d2df3bc6c39dabc87be65036da0853c4753160e84d680b1398ea86a5ca908 +MD5 d7c1f08b9fd61cd02e486c744bbd6c42 jruby-0.9.0.ebuild 1841 +RMD160 aeaf81be243365ad16406218c4ceb0b66cd9721d jruby-0.9.0.ebuild 1841 +SHA256 1d6d2df3bc6c39dabc87be65036da0853c4753160e84d680b1398ea86a5ca908 jruby-0.9.0.ebuild 1841 +EBUILD jruby-0.9.1.ebuild 2259 RMD160 828ead8bd61037c7e7f5877255ceae5c7e469f50 SHA1 d813b38ba9fbf82cc213a88b2372bb69ba8b5c8b SHA256 eb3c5ea31c83ef6ba9b4fe654a9547c640569a419d35d212d2ca06dbd1b07895 +MD5 eded16fef9b5e4ffbf4793ff031716ed jruby-0.9.1.ebuild 2259 +RMD160 828ead8bd61037c7e7f5877255ceae5c7e469f50 jruby-0.9.1.ebuild 2259 +SHA256 eb3c5ea31c83ef6ba9b4fe654a9547c640569a419d35d212d2ca06dbd1b07895 jruby-0.9.1.ebuild 2259 +MISC ChangeLog 1620 RMD160 0be41607ebc8d885b2286a5a8e798e2c921bc0ac SHA1 c4828b7fa06a6d4f7e5a3621f7892842e4414930 SHA256 4be13f4056eca3c13ec14ed18bd0204902a51338a24b9bf7c6c943daae745c55 +MD5 07b492a3e47628edd4d372a472932528 ChangeLog 1620 +RMD160 0be41607ebc8d885b2286a5a8e798e2c921bc0ac ChangeLog 1620 +SHA256 4be13f4056eca3c13ec14ed18bd0204902a51338a24b9bf7c6c943daae745c55 ChangeLog 1620 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -25,10 +31,6 @@ SHA256 9409bf31ef149eab6910f5a13e40b4710bd06c3812c21ffb7c60850c2ccbce63 files/di MD5 dff38649df94f10f0a8e88b9a9f1e36e files/digest-jruby-0.9.0 250 RMD160 6c371bacb34ea882501988e1599b3784f96ce450 files/digest-jruby-0.9.0 250 SHA256 5ad8510a5e43fddc04ba96b0ea27c9b7b44b7b8be63d2f37f58bc8849c858e76 files/digest-jruby-0.9.0 250 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFOykScxLzpIGCsLQRAmYYAJ9u2wLFBH38sPt7DyLV49kUGBFgoACfe9qP -AS+wE6rITr1Jv5IRF5VxlGU= -=iTNm ------END PGP SIGNATURE----- +MD5 1ebc1bd66326d38a72be42168a746e7a files/digest-jruby-0.9.1 250 +RMD160 7b71bfc620caf5b1fa570f9db9dd69253e73bfd6 files/digest-jruby-0.9.1 250 +SHA256 4613181ff33f03367847718e253ee0edfdce47e003dfb715a95bd73abefbb1d2 files/digest-jruby-0.9.1 250 diff --git a/dev-java/jruby/files/digest-jruby-0.9.1 b/dev-java/jruby/files/digest-jruby-0.9.1 new file mode 100644 index 000000000000..2055cd62dbe5 --- /dev/null +++ b/dev-java/jruby/files/digest-jruby-0.9.1 @@ -0,0 +1,3 @@ +MD5 579d2885623d4ec730d829d2b268bb6e jruby-src-0.9.1.tar.gz 2898463 +RMD160 edfebe6c2a539e03aed2863d44d225f1f103f77f jruby-src-0.9.1.tar.gz 2898463 +SHA256 5c5904caf3421063b03498263528e303ab71f49105f90b8358c7a2989191edc9 jruby-src-0.9.1.tar.gz 2898463 diff --git a/dev-java/jruby/files/jruby-0.9.1-build.xml.patch b/dev-java/jruby/files/jruby-0.9.1-build.xml.patch new file mode 100644 index 000000000000..c95b83f1a186 --- /dev/null +++ b/dev-java/jruby/files/jruby-0.9.1-build.xml.patch @@ -0,0 +1,21 @@ +--- build.xml 2006-10-23 00:24:34.000000000 +0200 ++++ build.xml 2006-10-23 00:25:19.000000000 +0200 +@@ -188,7 +188,7 @@ + + <target name="test" depends="copy-test-files,instrument,run-junit,coverage-report"/> + <target name="run-junit" description="runs junit tests"> +- <junit fork="yes" haltonfailure="false" dir="${basedir}" maxmemory="256M"> ++ <junit fork="yes" haltonfailure="true" dir="${basedir}" maxmemory="256M"> + <classpath> + <pathelement location="${jruby.instrumented.classes.dir}" /> + <path refid="build.classpath"/> +@@ -218,8 +218,7 @@ + description="Creates the Java API docs"> + <javadoc destdir="${api.docs.dir}" author="true" version="true" use="true" + windowtitle="JRuby API" source="${javac.version}"> +- <fileset dir="${src.dir}"/> +- <fileset dir="${test.dir}"/> ++ <fileset dir="${src.dir}" includes="**/*.java"/> + <doctitle><![CDATA[<h1>JRuby</h1>]]></doctitle> + <bottom><![CDATA[<i>Copyright © 2002-2006 JRuby Team. All Rights Reserved.</i>]]></bottom> + </javadoc> diff --git a/dev-java/jruby/jruby-0.9.0.ebuild b/dev-java/jruby/jruby-0.9.0.ebuild index ce42b7fd12c7..f7339cbaff7e 100644 --- a/dev-java/jruby/jruby-0.9.0.ebuild +++ b/dev-java/jruby/jruby-0.9.0.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/jruby/jruby-0.9.0.ebuild,v 1.1 2006/09/30 02:25:15 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-0.9.0.ebuild,v 1.2 2006/10/22 22:48:36 caster Exp $ inherit java-pkg-2 java-ant-2 @@ -47,7 +47,7 @@ src_install() { if use doc; then java-pkg_dohtml -r docs/api/* docinto docs - dodoc *.* + dodoc docs/* fi use source && java-pkg_dosrc src/org java-pkg_dolauncher jruby \ @@ -64,7 +64,6 @@ src_install() { dobin ${S}/bin/jirb dodir /usr/share/${PN}/lib - cp -a ${S}/lib/*.jar insinto /usr/share/${PN}/lib doins -r ${S}/lib/ruby diff --git a/dev-java/jruby/jruby-0.9.1.ebuild b/dev-java/jruby/jruby-0.9.1.ebuild new file mode 100644 index 000000000000..73d0ba654fef --- /dev/null +++ b/dev-java/jruby/jruby-0.9.1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-0.9.1.ebuild,v 1.1 2006/10/22 22:48:36 caster Exp $ + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="Java based ruby interpreter implementation" +HOMEPAGE="http://${PN}.codehaus.org/" +SRC_URI="http://dist.codehaus.org/${PN}/${PN}-src-${PV}.tar.gz" + +LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc source test" + +COMMON_DEPEND="dev-java/jvyaml + =dev-java/asm-2.2* + =dev-java/bsf-2.3*" +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEPEND}" +DEPEND=">=virtual/jdk-1.4 + !test? ( dev-java/ant-core ) + test? ( + dev-java/junit + dev-java/ant + ) + source? ( app-arch/zip ) + ${COMMON_DEPEND}" + +src_unpack() { + unpack ${A} + cd "${S}" + + # fix javadoc, make tests halt on failure + epatch "${FILESDIR}/${P}-build.xml.patch" + + cd lib + # created by jruby dev, but no source available, so use bundled + mv plaincharset.jar "${T}" + rm -rf *.jar + mv "${T}/plaincharset.jar" . + + java-pkg_jar-from --build-only ant-core ant.jar + java-pkg_jar-from asm-2.2 asm.jar + java-pkg_jar-from bsf-2.3 + java-pkg_jar-from jvyaml + use test && java-pkg_jar-from --build-only junit +} +src_compile() { + eant jar $(use_doc create-apidocs) +} + +src_test() { + eant test +} + +src_install() { + java-pkg_dojar "lib/${PN}.jar" + java-pkg_dojar "lib/plaincharset.jar" + + dodoc README COPYING COPYING.CPL COPYING.GPL COPYING.LGPL + + if use doc; then + java-pkg_dojavadoc docs/api + docinto docs + dodoc docs/* + fi + use source && java-pkg_dosrc src/org + java-pkg_dolauncher jruby \ + --main 'org.jruby.Main' \ + --java_args '-Djruby.base=/usr/share/jruby -Djruby.home=/usr/share/jruby -Djruby.lib=/usr/share/jruby/lib -Djruby.script=jruby -Djruby.shell=/bin/sh' + newbin ${S}/bin/gem jgem + newbin ${S}/bin/gem_server jgem_server + newbin ${S}/bin/gemlock jgem_lock + newbin ${S}/bin/gemri jgemri + newbin ${S}/bin/gemwhich jgemwhich + newbin ${S}/bin/update_rubygems jupdate_rubygems + newbin ${S}/bin/generate_yaml_index.rb jgenerate_yaml_index.rb + newbin ${S}/bin/index_gem_repository.rb jindex_gem_repository.rb + dobin ${S}/bin/jirb + + dodir "/usr/share/${PN}/lib" + insinto "/usr/share/${PN}/lib" + doins -r "${S}/lib/ruby" +} |