diff options
author | Alistair Bush <ali_bush@gentoo.org> | 2010-01-14 09:01:40 +0000 |
---|---|---|
committer | Alistair Bush <ali_bush@gentoo.org> | 2010-01-14 09:01:40 +0000 |
commit | e085edc26f6d29277d65094fae74755b3fa8b788 (patch) | |
tree | 1cf6aca4c693b955425ffef2740bd5461017ef31 /dev-java | |
parent | Mask jruby-1.4.0 for testing and waiting dep keywording. (diff) | |
download | historical-e085edc26f6d29277d65094fae74755b3fa8b788.tar.gz historical-e085edc26f6d29277d65094fae74755b3fa8b788.tar.bz2 historical-e085edc26f6d29277d65094fae74755b3fa8b788.zip |
Version Bump.
Package-Manager: portage-2.1.7.16/cvs/Linux x86_64
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/jruby/ChangeLog | 7 | ||||
-rw-r--r-- | dev-java/jruby/Manifest | 4 | ||||
-rw-r--r-- | dev-java/jruby/jruby-1.4.0.ebuild | 184 |
3 files changed, 193 insertions, 2 deletions
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index 0ea935ea1fd7..ab1260de2cb5 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/jruby # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.44 2010/01/02 00:01:23 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.45 2010/01/14 09:01:40 ali_bush Exp $ + +*jruby-1.4.0 (14 Jan 2010) + + 14 Jan 2010; Alistair Bush <ali_bush@gentoo.org> +jruby-1.4.0.ebuild: + Version Bump. 02 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> jruby-1.3.1-r1.ebuild: diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest index 40da78240eaf..5b7926085fff 100644 --- a/dev-java/jruby/Manifest +++ b/dev-java/jruby/Manifest @@ -8,10 +8,12 @@ DIST jruby-src-1.0.3.tar.gz 5218289 RMD160 b717863f8455ea5f323dd2b73824c39732dbd DIST jruby-src-1.0.tar.gz 4840184 RMD160 3de4dfa558a12a1643fa2357f3e144e34c5a718d SHA1 f4e18c6c112e1741024d76b10528fef7a242a018 SHA256 80088e32cceb929b0cd0d0115ed800577b7b800d42dca3356e840d1123047b03 DIST jruby-src-1.2.0.tar.gz 10858426 RMD160 a12d9243eb7e5338f1674c0bc9f874bc617c2662 SHA1 69f13b5ec216a7e615f4077730908217a6a9f1fc SHA256 8bd4e007f4d132b15fe968d88f474c97b5058e8cdd1e674820363c2cdc5fb048 DIST jruby-src-1.3.1.tar.gz 12076705 RMD160 ef10395dbdf9490820caa65ff6236dd99e7c62c8 SHA1 e4de71e5c01f71f236b3135e07a5841784767fd8 SHA256 9095b0bec0ee8e6cd96b72c7f2aec8a90fa429b840484d57a48d8fb760aae600 +DIST jruby-src-1.4.0.tar.gz 12731458 RMD160 70b6a34a9e1b174fe1c8f1df8ba8ea7cbfa4da37 SHA1 3d6f634e16b789a5a086327c0f09710dd29d1ec7 SHA256 b9fd84ed097ac136afce4462a13bb0752bab467db203ed3797e228a435e26d23 EBUILD jruby-1.0.0.ebuild 4643 RMD160 6da48b87bdb363864e78d8b5011033899ca03a6f SHA1 67508a52174b5efc940282094e93e9517ca0d306 SHA256 bfbcb8a3a02979527967408102b639bf510eb3eda96972c47c888d50da576cc3 EBUILD jruby-1.0.3.ebuild 4462 RMD160 83c55f4dd8b7d4c2c92843dd26608da2485b004d SHA1 febe0773f61e855d8926ce880104a805a31f81fb SHA256 bb7b90dab07750d0ed11ba62ef73f98ca35db0b682c1f9d35d84fc993f04ad19 EBUILD jruby-1.2.0-r1.ebuild 5023 RMD160 8239a5ba7e717c3a434e98a81eb60875f97e3055 SHA1 e02cefc8138981f6d100bf6e633f04db3327000a SHA256 513ec2c93efaa444220c5ca1c2bfeb46c1244de43b900b38386e8d63f9f94d52 EBUILD jruby-1.3.1-r1.ebuild 5502 RMD160 94388e24d29a24d3b23013125ae38e5a0e3f4846 SHA1 4c66c6df3aab698f950dc28e57208a4c94d523c7 SHA256 b5b064f8bec2f7ab2c045c684dda9171e57d7942dd22dfaec715dbeba3adc620 EBUILD jruby-1.3.1.ebuild 5552 RMD160 fd6520487dd38cc12dbc5204b985117c700d454f SHA1 5208c74e8b4a45d8198ccf93c2283bc9b2fe7d69 SHA256 af93273763993cf81cfc14efe1735eb00d1fbf256c2164c74602eceb4eafd1bd -MISC ChangeLog 7377 RMD160 d9e5ebccca8f16eb27a28180a22451a9bf98cfbf SHA1 0f7708f970b524796a4d8593bb626f447630ca28 SHA256 8a1571ba9eec95912c33e503a04d52d59137c835ad3dd0210f1a68b76ea711f0 +EBUILD jruby-1.4.0.ebuild 5606 RMD160 dbb95ddcc7337baa7a58ada7ecb08da4eccd3898 SHA1 877f0856c7a620285c48805c749c97368af1be7a SHA256 feb6af882ebabc8a4608c8d6d7352382c287a3ccefbe91e54192b9e5f946492b +MISC ChangeLog 7493 RMD160 3e77320410ea841ff3bfa86f681da6608556c446 SHA1 39f3f25ca822f336ac5bdf7ebdb3d9b8af6bd48f SHA256 e613acedd5c896fee689ff00d3fa64e19c5ea3fda949dd4cb692a851b5f688c8 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb diff --git a/dev-java/jruby/jruby-1.4.0.ebuild b/dev-java/jruby/jruby-1.4.0.ebuild new file mode 100644 index 000000000000..64524d62f28c --- /dev/null +++ b/dev-java/jruby/jruby-1.4.0.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.0.ebuild,v 1.1 2010/01/14 09:01:40 ali_bush Exp $ + +EAPI="2" +JAVA_PKG_IUSE="doc source test" +inherit eutils java-pkg-2 java-ant-2 + +MY_PV="${PV/_rc1/RC1}" + +DESCRIPTION="Java-based Ruby interpreter implementation" +HOMEPAGE="http://jruby.codehaus.org/" +SRC_URI="http://dist.codehaus.org/${PN}/${MY_PV}/${PN}-src-${MY_PV}.tar.gz" +LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="bsf java6 ssl" + +CDEPEND=">=dev-java/bytelist-1.0.2:0 + >=dev-java/constantine-0.6:0 + >=dev-java/jline-0.9.94:0 + >=dev-java/joni-1.1.3:0 + >=dev-java/jna-posix-1.0.1:0 + >=dev-java/jvyamlb-0.2.5:0 + >=dev-java/asm-3.2:3 + dev-java/jcodings:0 + dev-java/jffi:0.4 + dev-java/jna:0 + dev-java/joda-time:0 + dev-util/jay:0[java] + !java6? ( dev-java/backport-util-concurrent:0 ) + dev-java/nailgun:0 + dev-java/jaffl:0 + dev-java/jgrapht:0" + +RDEPEND="${CDEPEND} + !java6? ( =virtual/jre-1.5* ) + java6? ( >=virtual/jre-1.6 )" + +# using 1.6 produces 1.6 bytecode, not sure why +DEPEND="${CDEPEND} + !java6? ( =virtual/jdk-1.5* ) + java6? ( >=virtual/jdk-1.6 ) + bsf? ( dev-java/bsf:2.3 ) + test? ( + dev-java/ant-junit + dev-java/ant-trax + )" + +PDEPEND="dev-ruby/rubygems + >=dev-ruby/rake-0.7.3 + >=dev-ruby/rspec-1.0.4 + ssl? ( dev-ruby/jruby-openssl )" + +# Tests work for ali_bush. But fail for flameeyes see #282439. +# Tests work for ali_bush inside the ebuild env +# but fail when using vanilla src tarball. +# Restrict tests so we can stablise this package. +#RESTRICT="test" + +S="${WORKDIR}/${PN}-${MY_PV}" + +RUBY_HOME=/usr/share/${PN}/lib/ruby +SITE_RUBY=${RUBY_HOME}/site_ruby +GEMS=${RUBY_HOME}/gems + +JAVA_ANT_REWRITE_CLASSPATH="true" +JAVA_ANT_IGNORE_SYSTEM_CLASSES="true" +EANT_GENTOO_CLASSPATH="asm-3 bytelist constantine jay jcodings jffi-0.4 jline \ +joda-time joni jna jna-posix jvyamlb nailgun jaffl jgrapht" +EANT_NEEDS_TOOLS="true" + +pkg_setup() { + java-pkg-2_pkg_setup + use java6 || EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} backport-util-concurrent" + + local fail + + if [[ ! -d "${GEMS}" && -L "${GEMS}" ]]; then + eerror "${GEMS} is a symlink. Please remove this symlink." + fail="true" + fi + + # the symlink creates a collision with rubygems, bug #270953 + # cannot be currently solved by removing in pkg_preinst, bug #233278 + if [[ -L "${SITE_RUBY}" ]]; then + eerror "${SITE_RUBY} is a symlink. Please remove this symlink." + fail="true" + fi + + if [[ -n ${fail} ]]; then + eerror "Unmerging the old jruby version should also fix the problem(s)." + die "Please address the above errors, then run emerge --resume" + fi +} + +java_prepare() { + epatch "${FILESDIR}/ftype-test-fixes.patch" + epatch "${FILESDIR}/user-test-fixes.patch" + + # We don't need to use Retroweaver. There is a jarjar and a regular jar + # target but even with jarjarclean, both are a pain. The latter target + # is slightly easier so go with this one. + sed -r -i \ + -e 's/maxmemory="128m"/maxmemory="192m"/' \ + -e "/RetroWeaverTask/d" \ + -e "/<zipfileset .+\/>/d" \ + build.xml || die + + sed -i -e '/Arndt/d' src/org/jruby/RubyBigDecimal.java + + # Delete the bundled JARs but keep invokedynamic.jar. + # No source is available and it's only a dummy anyway. + find build_lib lib -name "*.jar" ! -name "jsr292-mock.jar" -delete || die + + if ! use bsf; then + # Remove BSF test cases. + cd "${S}/test/org/jruby" + rm -f test/TestAdoptedThreading.java || die + rm -f javasupport/test/TestBSF.java || die + sed -i '/TestBSF.class/d' javasupport/test/JavaSupportTestSuite.java || die + sed -i '/TestAdoptedThreading.class/d' test/MainTestSuite.java || die + fi +} + +src_compile() { + eant jar $(use_doc apidocs) -Djdk1.5+=true +} + +src_test() { + if [ ${UID} == 0 ] ; then + ewarn 'The tests will fail if run as root so skipping them.' + ewarn 'Enable FEATURES="userpriv" if you want to run them.' + return + fi + + # ali_bush was getting crashes while attempting to run a test. + # No info about why it crashed seemed to be produced. + # remove it as temp fix. + #sed -i -e '/MRI/d' build.xml || die "Failed to sed build.xml" + + # BSF is a compile-time only dependency because it's just the adapter + # classes and they won't be used unless invoked from BSF itself. + use bsf && java-pkg_jar-from --into build_lib --with-dependencies bsf-2.3 + + # Our jruby.jar is unbundled so we need to add the classpath to this test. + sed -i "s:java -jar:java -Xbootclasspath/a\:#{ENV['JRUBY_CP']} -jar:g" test/test_load_compiled_ruby_class_from_classpath.rb || die + + ANT_TASKS="ant-junit ant-trax" JRUBY_CP=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,}` JRUBY_OPTS="" eant test -Djdk1.5+=true +} + +src_install() { + local bin + + java-pkg_dojar lib/${PN}.jar + dodoc README docs/{*.txt,README.*} || die + + use doc && java-pkg_dojavadoc docs/api + use source && java-pkg_dosrc src/org + + dobin "${FILESDIR}/jruby" || die + exeinto "/usr/share/${PN}/bin" + doexe "${S}/bin/jruby" || die + + # Install some jruby tools. + dobin "${S}"/bin/j{gem,irb{,_swing},rubyc} || die + + # Symlink some common tools so that jruby can launch them internally. + for bin in {j,}gem jirb jrubyc rake rdoc ri spec{,_translator} ; do + dosym "/usr/bin/${bin}" "/usr/share/${PN}/bin/${bin}" || die + done + + insinto "${RUBY_HOME}" + doins -r "${S}/lib/ruby/1.8" || die + doins -r "${S}/lib/ruby/site_ruby" || die + + # Autoload rubygems and append regular site_ruby to $LOAD_PATH. + # Unfortunately the -I option prepends instead. + insinto "${SITE_RUBY}" + doins "${FILESDIR}/gentoo.rb" || die + doenvd "${FILESDIR}/10jruby" || die + + keepdir "${GEMS}/1.8/{cache,doc}" +} |