[gentoo-commits] gentoo-x86 commit in dev-java/jruby: jruby-1.2.0-r1.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in dev-java/jruby: jruby-1.2.0-r1.ebuild ChangeLog

[Vlastimil Babka (caster)]

caster      09/05/23 08:03:46

  Modified:             ChangeLog
  Added:                jruby-1.2.0-r1.ebuild
  Log:
  Version bump, bug #217388. Fixes also #184375 and #213391. Many thanks to James Le Cuirot <chewi@aura-online.co.uk> and ali_bush. The ppc keyword dropped due to new deps.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.35                 dev-java/jruby/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?r1=1.34&r2=1.35

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog	20 Mar 2009 12:50:02 -0000	1.34
+++ ChangeLog	23 May 2009 08:03:46 -0000	1.35
@@ -1,6 +1,15 @@
 # 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.34 2009/03/20 12:50:02 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.35 2009/05/23 08:03:46 caster Exp $
+
+*jruby-1.2.0-r1 (23 May 2009)
+
+  23 May 2009; Vlastimil Babka <caster@gentoo.org> +files/10jruby,
+  +jruby-1.2.0-r1.ebuild, +files/ftype-test-fixes.patch, +files/gentoo.rb,
+  +files/jruby, +files/user-test-fixes.patch:
+  Version bump, bug #217388. Fixes also #184375 and #213391. Many thanks to
+  James Le Cuirot <chewi@aura-online.co.uk> and ali_bush. The ppc keyword
+  dropped due to new deps.
 
   20 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:



1.1                  dev-java/jruby/jruby-1.2.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.2.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.2.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: jruby-1.2.0-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.2.0-r1.ebuild,v 1.1 2009/05/23 08:03:46 caster Exp $

EAPI="2"
JAVA_PKG_IUSE="doc source test"
inherit eutils java-pkg-2 java-ant-2

DESCRIPTION="Java-based Ruby interpreter implementation"
HOMEPAGE="http://jruby.codehaus.org/"
SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="bsf java6 ssl"

CDEPEND=">=dev-java/bytelist-1.0.2:0
	>=dev-java/constantine-0.5:0
	>=dev-java/jline-0.9.94:0
	>=dev-java/joni-1.1.3:0
	>=dev-java/jna-posix-1.0:0
	>=dev-java/jvyamlb-0.2.5:0
	dev-java/asm:3
	dev-java/jcodings:0
	dev-java/jffi:0
	dev-java/jna:0
	dev-java/joda-time:0
	dev-util/jay:0[java]
	!java6? ( dev-java/backport-util-concurrent )"

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 )"

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 jline joda-time joni jna jna-posix jvyamlb"
EANT_NEEDS_TOOLS="true"

pkg_setup() {
	java-pkg-2_pkg_setup
	use java6 || EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} backport-util-concurrent"

	if [[ -d "${GEMS}" && ! -L "${GEMS}" ]]; then
		ewarn "dev-java/jruby now uses dev-lang/ruby's gems directory by creating symlinks."
		ewarn "${GEMS} is a directory right now, which will cause problems when being merged onto the filesystem."
	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

	# 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

	# Share gems with regular Ruby.
	dosym /usr/$(get_libdir)/ruby/gems "${GEMS}" || 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
}

pkg_preinst() {
	if [[ -d "${GEMS}" && ! -L "${GEMS}" ]]; then
		eerror "${GEMS} is a directory. Please move this directory out of the way, and then emerge --resume."
		die "Please address the above errors, then emerge --resume."
	fi

	# Delete site_ruby if it is a symlink.
	[[ -L "${SITE_RUBY}" ]] && rm -f "${SITE_RUBY}"
}

[gentoo-commits] gentoo-x86 commit in dev-java/jruby: jruby-1.2.0-r1.ebuild ChangeLog

[Vlastimil Babka (caster)]

caster      09/05/23 23:02:21

  Modified:             jruby-1.2.0-r1.ebuild ChangeLog
  Log:
  Add pkg_setup checks to workaround bug #270953.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-java/jruby/jruby-1.2.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.2.0-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.2.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.2.0-r1.ebuild?r1=1.1&r2=1.2

Index: jruby-1.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.2.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jruby-1.2.0-r1.ebuild	23 May 2009 08:03:46 -0000	1.1
+++ jruby-1.2.0-r1.ebuild	23 May 2009 23:02:21 -0000	1.2
@@ -1,6 +1,6 @@
 # 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.2.0-r1.ebuild,v 1.1 2009/05/23 08:03:46 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.2.0-r1.ebuild,v 1.2 2009/05/23 23:02:21 caster Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source test"
@@ -60,9 +60,23 @@
 	java-pkg-2_pkg_setup
 	use java6 || EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} backport-util-concurrent"
 
+	local fail
+
 	if [[ -d "${GEMS}" && ! -L "${GEMS}" ]]; then
-		ewarn "dev-java/jruby now uses dev-lang/ruby's gems directory by creating symlinks."
-		ewarn "${GEMS} is a directory right now, which will cause problems when being merged onto the filesystem."
+		eerror "${GEMS} is a directory. Please remove this directory."
+		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
 }
 
@@ -149,12 +163,3 @@
 	doenvd "${FILESDIR}/10jruby" || die
 }
 
-pkg_preinst() {
-	if [[ -d "${GEMS}" && ! -L "${GEMS}" ]]; then
-		eerror "${GEMS} is a directory. Please move this directory out of the way, and then emerge --resume."
-		die "Please address the above errors, then emerge --resume."
-	fi
-
-	# Delete site_ruby if it is a symlink.
-	[[ -L "${SITE_RUBY}" ]] && rm -f "${SITE_RUBY}"
-}



1.36                 dev-java/jruby/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?r1=1.35&r2=1.36

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog	23 May 2009 08:03:46 -0000	1.35
+++ ChangeLog	23 May 2009 23:02:21 -0000	1.36
@@ -1,6 +1,9 @@
 # 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.35 2009/05/23 08:03:46 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.36 2009/05/23 23:02:21 caster Exp $
+
+  23 May 2009; Vlastimil Babka <caster@gentoo.org> jruby-1.2.0-r1.ebuild:
+  Add pkg_setup checks to workaround bug #270953.
 
 *jruby-1.2.0-r1 (23 May 2009)