* [gentoo-commits] gentoo-x86 commit in dev-java/jruby: ChangeLog jruby-1.3.1-r1.ebuild
@ 2009-12-29 21:55 Alistair Bush (ali_bush)
0 siblings, 0 replies; 3+ messages in thread
From: Alistair Bush (ali_bush) @ 2009-12-29 21:55 UTC (permalink / raw
To: gentoo-commits
ali_bush 09/12/29 21:55:32
Modified: ChangeLog
Added: jruby-1.3.1-r1.ebuild
Log:
Changes made to ensure gems that 1.8 and jruby don't collide. See flameeyes for the why.
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Revision Changes Path
1.43 dev-java/jruby/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?r1=1.42&r2=1.43
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog 25 Oct 2009 21:51:27 -0000 1.42
+++ ChangeLog 29 Dec 2009 21:55:32 -0000 1.43
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/jruby
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.42 2009/10/25 21:51:27 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.43 2009/12/29 21:55:32 ali_bush Exp $
+
+*jruby-1.3.1-r1 (29 Dec 2009)
+
+ 29 Dec 2009; Alistair Bush <ali_bush@gentoo.org> +jruby-1.3.1-r1.ebuild:
+ Changes made to ensure gems that 1.8 and jruby don't collide. See flameeyes
+ for the why.
25 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> jruby-1.2.0-r1.ebuild,
jruby-1.3.1.ebuild:
1.1 dev-java/jruby/jruby-1.3.1-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.3.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.3.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: jruby-1.3.1-r1.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.3.1-r1.ebuild,v 1.1 2009/12/29 21:55:32 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
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"
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"
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
# 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 "invokedynamic.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 create-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}"
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/jruby: ChangeLog jruby-1.3.1-r1.ebuild
@ 2010-01-02 0:01 Diego Petteno (flameeyes)
0 siblings, 0 replies; 3+ messages in thread
From: Diego Petteno (flameeyes) @ 2010-01-02 0:01 UTC (permalink / raw
To: gentoo-commits
flameeyes 10/01/02 00:01:24
Modified: ChangeLog jruby-1.3.1-r1.ebuild
Log:
Fix creation of cache and doc directories.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Revision Changes Path
1.44 dev-java/jruby/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?r1=1.43&r2=1.44
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog 29 Dec 2009 21:55:32 -0000 1.43
+++ ChangeLog 2 Jan 2010 00:01:23 -0000 1.44
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/jruby
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.43 2009/12/29 21:55:32 ali_bush Exp $
+# 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 $
+
+ 02 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ jruby-1.3.1-r1.ebuild:
+ Fix creation of cache and doc directories.
*jruby-1.3.1-r1 (29 Dec 2009)
1.2 dev-java/jruby/jruby-1.3.1-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.3.1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.3.1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.3.1-r1.ebuild?r1=1.1&r2=1.2
Index: jruby-1.3.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.3.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jruby-1.3.1-r1.ebuild 29 Dec 2009 21:55:32 -0000 1.1
+++ jruby-1.3.1-r1.ebuild 2 Jan 2010 00:01:23 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.3.1-r1.ebuild,v 1.1 2009/12/29 21:55:32 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.3.1-r1.ebuild,v 1.2 2010/01/02 00:01:23 flameeyes Exp $
EAPI="2"
JAVA_PKG_IUSE="doc source test"
@@ -176,5 +176,5 @@
doins "${FILESDIR}/gentoo.rb" || die
doenvd "${FILESDIR}/10jruby" || die
- keepdir "${GEMS}/1.8/{cache,doc}"
+ keepdir "${GEMS}"/1.8/{cache,doc}
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/jruby: ChangeLog jruby-1.3.1-r1.ebuild
@ 2010-06-28 19:17 Mark Loeser (halcy0n)
0 siblings, 0 replies; 3+ messages in thread
From: Mark Loeser (halcy0n) @ 2010-06-28 19:17 UTC (permalink / raw
To: gentoo-commits
halcy0n 10/06/28 19:17:09
Modified: ChangeLog
Added: jruby-1.3.1-r1.ebuild
Log:
Add back only ~ppc version
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.63 dev-java/jruby/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/ChangeLog?r1=1.62&r2=1.63
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ChangeLog 26 Jun 2010 12:06:07 -0000 1.62
+++ ChangeLog 28 Jun 2010 19:17:09 -0000 1.63
@@ -1,6 +1,9 @@
# 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.62 2010/06/26 12:06:07 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.63 2010/06/28 19:17:09 halcy0n Exp $
+
+ 28 Jun 2010; Mark Loeser <halcy0n@gentoo.org> +jruby-1.3.1-r1.ebuild:
+ Add back only ~ppc version
*jruby-1.4.1-r1 (26 Jun 2010)
1.5 dev-java/jruby/jruby-1.3.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/jruby-1.3.1-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/jruby-1.3.1-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/jruby-1.3.1-r1.ebuild?r1=1.4&r2=1.5
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-06-28 19:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-28 19:17 [gentoo-commits] gentoo-x86 commit in dev-java/jruby: ChangeLog jruby-1.3.1-r1.ebuild Mark Loeser (halcy0n)
-- strict thread matches above, loose matches on Subject: below --
2010-01-02 0:01 Diego Petteno (flameeyes)
2009-12-29 21:55 Alistair Bush (ali_bush)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox