From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S2B2D-0004ah-E9 for garchives@archives.gentoo.org; Tue, 28 Feb 2012 00:35:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2012E090B; Tue, 28 Feb 2012 00:35:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A0133E090B for ; Tue, 28 Feb 2012 00:35:08 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D711D1B4006 for ; Tue, 28 Feb 2012 00:35:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 85C58E5405 for ; Tue, 28 Feb 2012 00:35:06 +0000 (UTC) From: "Alex Legler" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alex Legler" Message-ID: <1330387730.1656e19a67b8f74c8dfce4de74c9eabc28a21156.a3li@gentoo> Subject: [gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/ X-VCS-Repository: proj/ruby-overlay X-VCS-Files: dev-java/jruby/ChangeLog dev-java/jruby/jruby-1.6.7.ebuild X-VCS-Directories: dev-java/jruby/ X-VCS-Committer: a3li X-VCS-Committer-Name: Alex Legler X-VCS-Revision: 1656e19a67b8f74c8dfce4de74c9eabc28a21156 X-VCS-Branch: master Date: Tue, 28 Feb 2012 00:35:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 46724ef8-11ee-4f57-b0aa-1d66600940e1 X-Archives-Hash: 1cfe279e1d183e77b09525b0e62f50f3 commit: 1656e19a67b8f74c8dfce4de74c9eabc28a21156 Author: Diego Elio Petten=C3=B2 flameeyes eu> AuthorDate: Tue Feb 28 00:08:50 2012 +0000 Commit: Alex Legler gentoo org> CommitDate: Tue Feb 28 00:08:50 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/ruby-overlay.= git;a=3Dcommit;h=3D1656e19a Bump jruby version to 1.6.7. (Portage version: 2.2.0_alpha89/git/Linux x86_64, signed Manifest commit = with key 2200D978) --- dev-java/jruby/ChangeLog | 5 + dev-java/jruby/jruby-1.6.7.ebuild | 199 +++++++++++++++++++++++++++++++= ++++++ 2 files changed, 204 insertions(+), 0 deletions(-) diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index ea8346a..de24a3e 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 +*jruby-1.6.7 (28 Feb 2012) + + 28 Feb 2012; Diego E. Petten=C3=B2 +jruby-1.6.7= .ebuild: + Bump jruby version to 1.6.7. + 23 Jan 2012; Hans de Graaff jruby-1.6.5.1.ebuild, files/jruby-bash-launcher.patch: The properties file is no longer used. Add the bindir option to the wr= apper diff --git a/dev-java/jruby/jruby-1.6.7.ebuild b/dev-java/jruby/jruby-1.6= .7.ebuild new file mode 100644 index 0000000..3f85fad --- /dev/null +++ b/dev-java/jruby/jruby-1.6.7.ebuild @@ -0,0 +1,199 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.6.ebuild,v 1= .2 2011/06/14 18:59:32 maekke Exp $ + +EAPI=3D"4" +JAVA_PKG_IUSE=3D"doc source test" +inherit eutils java-pkg-2 java-ant-2 + +MY_PV=3D"${PV/_rc1/RC1}" + +DESCRIPTION=3D"Java-based Ruby interpreter implementation" +HOMEPAGE=3D"http://jruby.codehaus.org/" +SRC_URI=3D"http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-$= {PV}.tar.gz" +LICENSE=3D"|| ( CPL-1.0 GPL-2 LGPL-2.1 )" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"bsf ssl" + +# jffi still needed? Or do we call that jnr-ffi? +# jnr-ffi depends on jffi which depends on libffi +CDEPEND=3D">=3Ddev-java/bytelist-1.0.8:0 + >=3Ddev-java/jline-0.9.94:0 + >=3Ddev-java/joni-1.1.3:0 + >=3Ddev-java/jnr-netdb-1.0:0 + >=3Ddev-java/jvyamlb-0.2.5:0 + >=3Ddev-java/asm-3.2:3 + >=3Ddev-java/jcodings-1.0.5:0 + dev-java/jffi:1.0 + dev-java/jnr-constants:0 + dev-java/jnr-ffi:0.5 + dev-java/jnr-posix:1.1 + dev-java/joda-time:0 + dev-util/jay:0[java] + dev-java/nailgun:0 + dev-java/jgrapht:0 + dev-java/ant-core:0 + dev-java/bsf:2.3 + dev-java/osgi-core-api:0 + >=3Ddev-java/snakeyaml-1.9:0 + dev-java/jzlib:1" + +RDEPEND=3D"${CDEPEND} + >=3Dvirtual/jre-1.6" + +# Is jna-posix still needed? Or has that been renamed to jnr-posix? +# jna-posix is the original project name which was abononed years ago. +# jnr-posix < 1.1.8 are from the original fork +# later jnr-posix are from the jnr umbrella project. +DEPEND=3D"${CDEPEND} + >=3Dvirtual/jdk-1.6 + test? ( + dev-java/ant-junit4:0 + dev-java/ant-trax:0 + dev-java/junit:4 + java-virtuals/jdk-with-com-sun + dev-java/commons-logging:0 + dev-java/xalan:0 + ) + !! ~/= jruby.fix' + echo 'emerge -1C $(< ~/jruby.fix)' + echo "rm ${directory}" + echo 'emerge -1 $(< ~/jruby.fix)' + echo 'rm ~/jruby.fix' + + eerror "For more information, please see http://bugs.gentoo.org/show_= bug.cgi?id=3D302187" + fail=3D"true" + fi + done + + if [[ -n ${fail} ]]; then + die "Please address the above errors, then run emerge --resume" + fi +} + +java_prepare() { + epatch "${FILESDIR}"/${PN}-bash-launcher.patch + epatch "${FILESDIR}/1.5.1/build.xml.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=3D"128m"/maxmemory=3D"192m"/' \ + -e "/RetroWeaverTask/d" \ + -e "/yecht/! { //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 -name "*.jar" ! -name "jsr292-mock.jar" ! -name "yecht.j= ar" ! -name 'coro-mock-1.0-SNAPSHOT.jar' -delete || die +} + +src_compile() { + # Avoid generating the ri cache since that currently fails. + local flags=3D"-Dgenerate-ri-cache.hasrun=3Dtrue" + #local flags=3D"" + use bsf && flags=3D"-Dbsf.present=3Dtrue" + + export RUBYOPT=3D"" + einfo $RUBYOPT + #eant jar $(use_doc apidocs) -Djdk1.5+=3Dtrue ${flags} + eant -Djdk1.5+=3Dtrue ${flags} +} + +src_test() { + if [ ${UID} =3D=3D 0 ] ; then + ewarn 'The tests will fail if run as root so skipping them.' + ewarn 'Enable FEATURES=3D"userpriv" if you want to run them.' + return + fi + # Our jruby.jar is unbundled so we need to add the classpath to this te= st. + sed -i "s:java -jar:java -Xbootclasspath/a\:#{ENV['JRUBY_CP']} -jar:g" = test/test_load_compiled_ruby_class_from_classpath.rb || die + sed -i "s@:refid =3D> 'build.classpath'@:path =3D>\"#{ENV['JRUBY_CP']}:= lib/jruby.jar\"@g" \ + rakelib/commands.rake || die + #sed -i "s@:refid =3D> 'test.class.path'@:path =3D> \"#{ENV['JRUBY_CP']= }@g" \ + # rakelib/commands.rake || die + + #bsf optionally depends on jruby, which means that the previously + #installed jruby will be added to classpath, nasty things will happen. + local cpath=3D`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,},junit-4` + cpath=3D"$(echo ${cpath} | sed -e "s_${ROOT}/usr/share/jruby/lib/jruby.= jar:__g")" + cpath=3D"${cpath}:$(java-pkg_getjars --build-only commons-logging,xalan= )" + EANT_GENTOO_CLASSPATH=3D"" + + local flags=3D"" + use bsf && flags=3D"-Dbsf.present=3Dtrue" + + #Clear RUBYOPT + export RUBYOPT=3D"" + export JRUBY_CP=3D"${cpath}" + ANT_TASKS=3D"ant-junit4 ant-trax" \ + JRUBY_OPTS=3D"" eant test -Djdk1.5+=3Dtrue -Djruby.bindir=3Dbin \ + -Dgentoo.classpath=3D"${cpath}" ${flags} +} + +src_install() { + 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 + +# Use the bash based launcher to preserve whitespace in arguments. +# Ie allow >jruby -e "puts 'hello'"< to work otherwise +# >jruby -e "\"puts 'hello'\""< is needed. +# +# # We run the sed here in install so that we don't get the wrong +# # data during the test phase! +# sed \ +# -e '/++ebuild-cut-here++/, /--ebuild-cut-here--/ d' \ +# -e '/^JRUBY_HOME=3D/s:=3D:=3D/usr/share/jruby:' \ +# bin/jruby.sh > "${T}"/jruby + + newbin bin/jruby.bash jruby + dobin bin/j{irb{,_swing},rubyc} + + insinto "${RUBY_HOME}" + doins -r "${S}"/lib/ruby/{1.8,1.9,site_ruby} + + # Remove all the references to RubyGems as we're just going to + # install it through dev-ruby/rubygems. + find "${D}${RUBY_HOME}" -type f \ + '(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygem= s.rb' -or -name 'datadir.rb' ')' \ + -delete || die +}