Revision bumps; fixed up snakeyaml dependency to use SLOT 1.9, fixed up documentation because install phase was failing due to missing index.html.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

5 files changed, 229 insertions, 19 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 6991af10e520..c3885ece5768 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/jruby
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.90 2013/07/16 09:01:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.91 2013/10/24 19:32:40 tomwij Exp $
+
+*jruby-1.6.7.2-r1 (24 Oct 2013)
+*jruby-1.6.8-r1 (24 Oct 2013)
+*jruby-1.6.5.1-r1 (24 Oct 2013)
+
+  24 Oct 2013; Tom Wijsman <TomWij@gentoo.org> +jruby-1.6.5.1-r1.ebuild,
+  +jruby-1.6.7.2-r1.ebuild, +jruby-1.6.8-r1.ebuild, -jruby-1.6.7.2.ebuild,
+  -jruby-1.6.8.ebuild:
+  Revision bumps; fixed up snakeyaml dependency to use SLOT 1.9, fixed up
+  documentation because install phase was failing due to missing index.html.
 
   16 Jul 2013; Hans de Graaff <graaff@gentoo.org> jruby-1.6.8.ebuild:
   Add back accidentally dropped jvyamlb dependency, fixing bug 474488.
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index 351042d1dbb0..5569ea7a21ef 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -21,15 +21,20 @@ DIST jruby-src-1.6.7.2.tar.gz 14701511 SHA256 d3308652136a20883184860ea7b3373e84
 DIST jruby-src-1.6.8.tar.gz 14709528 SHA256 7832053682bf791de7a5b062b5c8a3521ad5d6468141238551a9959649df973a SHA512 924114149bd7ce81b15c71e80cf53f4b50eb8d5220098e5ead2b447b96a6a405d93a219fb19fb7a0b9e4dc6798fd99b547b2352aabe4f84b5a694fe6760fd24d WHIRLPOOL 1f21b0899ac6c37b1e3e94aa7ef0927a720092f3a8687ba476cc70d8cd58228dbfdf1e2ea3e29414c14c329f1b6f61178ae34dd40bdf8a4c39cae5251849ac6c
 EBUILD jruby-1.4.1.ebuild 5990 SHA256 0b01dc2cf3469546154ca205a38ee6bb442b184bd9dd01393a76f57345938c21 SHA512 c81c2ef23fad54db0520fbf387cc6927f4ccccb874135d29ee3566143100115b9d38b81db286128e9a59aad4af928da58c66aa69e70267f8f89c412b1f8dcf7a WHIRLPOOL 83760efffa89bd77b4ed02e0446ff6dc9a4abf63bf141af85be06e6beea7ddf9708509d1cb85b4651b60cecd30398e3415eecea63aadedcb922e27a6d5fabb1a
 EBUILD jruby-1.5.6.ebuild 6175 SHA256 740bccc78a4130e3824678e06c46e8f8c665e41ee1cc077f01e70da3ce354613 SHA512 e08541a08b81499ea1eaa76d4d82bf92a0596949270ee4686b787988209598025650117eb959945b6f18b89e1ef9f5d537e53ae2e786f8bc865783e39c62565a WHIRLPOOL 884881bfaae055ad6a6d001d9786bed3ae2dc7ce91c293befdc4061f2ebfba38d4cf8b78b037c60479adbdcc33f4bc31c25c40938035743368a30485bc927e04
+EBUILD jruby-1.6.5.1-r1.ebuild 6140 SHA256 3ecc2376ad1431992453852bc35be0c3a7f598181ca15495b1bb899d6281f081 SHA512 8f4a14e78eae7c96ffbf01256547b3cf35750db38bfec5b75366324d682b5c14785df227f14a2ac16b0dc0a0d4493e333f1a8ee8455a0aa077b5b8e8c47ab3b2 WHIRLPOOL 134c504be51f0405a641ffb5f9585a80702b9fd8a5418ac2115abfe3d740508fd484f62951a3ec141cb399e84a942c3d656766c990cf3371dbbaac5d9ff7a267
 EBUILD jruby-1.6.5.1.ebuild 6169 SHA256 a18f03300b26e65673ede85d281f82101af8b433ae1a85f8661465a086d5ea8b SHA512 f95371cb4d47698f8bd7bd5c9fde2f81adf23b4a3a6f915b43b2de6716da58d06dfee0e7d333535594be73bbe966e27b11182545f047a80bb9bbb2fa41e0b964 WHIRLPOOL 82206f9712a2e7fb207b708e539cc0bf3d33be3871047b7c5178fa1fc514a270eab90c34737af853bb7aeef33aa57c3a48027c8d41a0dc40f8e3b25663ed95bc
-EBUILD jruby-1.6.7.2.ebuild 6270 SHA256 db1c3b6a5a9fcfb34cdb7d3984e74455b5ade2dfdb1c8907ef71c096553a1b40 SHA512 2277324d0655bc2f354553b856ef01d352d0d6ed63e978ea442ba6310a07218f0dbaaec2b430bf042bff48b8d812d4b0aa139ee76a6c7d868e2056f5bcc4c757 WHIRLPOOL 258ef3a6d9a186f788472671b014bec054403a1c12f3668575d6bc82760e7e7b2ac719c1807b0c5af0d74ac5ca069ee80eb0f9b4186a1c0421ee5e2f6e84fd71
-EBUILD jruby-1.6.8.ebuild 6272 SHA256 214dfb3433a2781d69a14bc593a60dbeea37f642509872abaa2a3bc738d0be41 SHA512 3c3fc73acbd427e6dbfab55f01de63d6e97bf1060235ab1a3d89de1da444d8c6846beb58bcf7e985e5faecd2a7e4856aac18dd6bda383e09233402f9736e805e WHIRLPOOL bc82d1b3ad16380628d065c50f6c669fadd92e4b1c3d4371cc9bd05d7255cddfcbdd6a1eee2a7c940b191cb2ee67522d7ba3b778f1faba9041d30947207df0f9
-MISC ChangeLog 16240 SHA256 c2b4dbe65256fa6567f61fccf3a7fb30a4c38cd7ae70a7efda0e2f1eb643ac9d SHA512 1af11ccbb4e1ef1b124cf51855e613d25f1319bc145a2373c2e1ee26db393c2995e35f7324041fdab3c2074975a581b4f0b0df391df5b862d4453cb6053a6739 WHIRLPOOL 9983ba99050d3c75c6007d5f1409753b2df8670aa4cd9c584a90c42439555df5029cdedfb3c75ade341332c255bec9c51cfa337a9b5ccf141e758e031048b5f5
+EBUILD jruby-1.6.7.2-r1.ebuild 6242 SHA256 aa962863395d04f4b8595c81776ce39ee51a19ed33c9af31eaee8b0f30825d1b SHA512 f7181f255d1984e964e0eda782848f276f200e630cf78d6c6c6dfd9fef3a53ccf8ddf3e21c9a3730f456cc1eaf504f0a034236ab30404aaff5d862819a9c6421 WHIRLPOOL a06dae25206c63acd6cc37ecbc896075ffecf9a7ca1f5452aead2be12a13879772dc31defff809d500547e44e02b79cfb44725a2bcb9dd2601ddced6ffd0cccc
+EBUILD jruby-1.6.8-r1.ebuild 6244 SHA256 c0fe23e256b23be79f481f797309a2513506aa39133cf5356e7914e7bd89023c SHA512 59e0286a828ad443e4a5f2061f21355b45a888335ca29793d18aa59f6ead07bb900f9ae7e9a808d975430e9b54ebf3e2f37e4257d1b32f948660d80cc5990a0a WHIRLPOOL 565c10c9ba0d10c69cee17439ac18237bd8e0aa1f9a4b1edc4505b48aa4adc0a58d948b4b72ce4c0a0ba2bc97e46bfed938e8f3abf144a954b48a405de4cc21b
+MISC ChangeLog 16658 SHA256 8bb02eaa0067f3407e38a7fb84e51e78f5d88d418a7cc87422ffb539ce0685d1 SHA512 472818c99053243dd14d8f6bda7bbf0ca1dcb001d5f29d5735fea4b5792cf5dbd2f7273394930a205a4386be4c25a2528e4a9d0255597ca38e6d3fbcf03ae593 WHIRLPOOL 6065010c7e5ce89195f386de86a172c820a01c63d649d324ee4d5054fcb1e670f645ce4b57c3a2b09d975952d9af38932873ab59e7696a9b0176b825643040f8
 MISC metadata.xml 179 SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b SHA512 d6f0a7b7511f9d016fa3464817f8921b958ba50a25eb834c453a9ab937d0f12f7ca418fb70c3c847568da1e48aecb10f7e0fa2898bb956e9cd9b60886033725c WHIRLPOOL d6f2832d5f7db39b2ca75bacd4c3b1b9d854c3404d1ad405f9befe8e34c86a155cb6dda3eb1b93b30d8d35b83accf4567079f4d13c1a1a06e19078afe2e81ea5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlHlC+kACgkQiIP6VqMIqNdpFgD/RN092AuYyw9woUsG7detNS6x
-iBzwHVw0NtiTBBeAeaIA/2HeXiWdgANjjC72ILDLyhiVza3ITNgChgrXhkXUWlfi
-=DIOm
+iQEcBAEBCAAGBQJSaXXLAAoJEJWyH81tNOV9l88H/0xyPw28MclOt+S7kQbGgMaR
+cOyXLBqYcHyiYGbA4wGQ6DZuSzcve4QHf+FsWl5o2ETUGNgKzsQw82A62gJyL+6E
+epdWpN/200GQzburZS/dnoeGxl7rsrIAiWUsdrh7yXOkKoTbnkNKdD4Du1y3b7RH
+g7Yp0s0SSh6JbO6Qam7uJw6JkSrIkbc3S20Jt7bZ9wkByjcBblY0gkcKWrT55lqf
+KfxRGvI1ygSF4W2o8YX7socsx2+l6ElD4NjzdV90xSoKH7q7SaATzxnADOjCpbQh
+dX1FFz9Nfc0PkHjUdV+SFc+7aBGO3hWj814TAAdz/i/LR5qPQNNjoisAEQjFy2E=
+=yNI3
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jruby/jruby-1.6.5.1-r1.ebuild b/dev-java/jruby/jruby-1.6.5.1-r1.ebuild
new file mode 100644
index 000000000000..505fc034f4ef
--- /dev/null
+++ b/dev-java/jruby/jruby-1.6.5.1-r1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.5.1-r1.ebuild,v 1.1 2013/10/24 19:32:40 tomwij Exp $
+
+EAPI="4"
+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://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${PV}.tar.gz"
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bsf ssl"
+
+# jffi still needed? Or do we call that jnr-ffi?
+#  jnr-ffi depends on jffi which depends on libffi
+CDEPEND=">=dev-java/bytelist-1.0.8:0
+	>=dev-java/jline-0.9.94:0
+	>=dev-java/joni-1.1.3:0
+	>=dev-java/jnr-netdb-1.0:0
+	>=dev-java/jvyamlb-0.2.5:0
+	>=dev-java/asm-3.2:3
+	>=dev-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
+	dev-java/snakeyaml:1.9"
+
+RDEPEND="${CDEPEND}
+	>=virtual/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="${CDEPEND}
+	>=virtual/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
+	)
+	!!<dev-ruby/jruby-1.3.1-r1"
+
+PDEPEND="ssl? ( dev-ruby/jruby-openssl )"
+
+# Tests fail.
+# Need to stop injecting jar's into classpath.
+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="ant-core asm-3 bsf-2.3 bytelist jnr-constants jay \
+jcodings jffi-1.0 jline \
+joda-time joni jnr-ffi-0.5 jnr-posix-1.1 jnr-netdb jvyamlb nailgun jgrapht osgi-core-api \
+snakeyaml-1.9"
+EANT_NEEDS_TOOLS="true"
+
+pkg_setup() {
+	unset RUBYOPT
+	java-pkg-2_pkg_setup
+
+	local fail
+
+	for directory in "${GEMS}" "${SITE_RUBY}"; do
+		if [[ -L ${directory} ]]; then
+			eerror "${directory} is a symlink. Please do the following to resolve the situation:"
+			echo 'emerge -an app-portage/gentoolkit'
+			echo 'equery -qC b '"${directory}"' | sort | uniq | sed s/^/=/ > ~/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=302187"
+			fail="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="128m"/maxmemory="192m"/' \
+		-e "/RetroWeaverTask/d" \
+		-e "/yecht/! { /<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 -name "*.jar" ! -name "jsr292-mock.jar" ! -name "yecht.jar" -delete || die
+}
+
+src_compile() {
+	# Avoid generating the ri cache since that currently fails.
+	local flags="-Dgenerate-ri-cache.hasrun=true"
+	#local flags=""
+	use bsf && flags+=" -Dbsf.present=true"
+
+	export RUBYOPT=""
+	einfo $RUBYOPT
+	eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
+}
+
+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
+	# 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
+	sed -i "s@:refid => 'build.classpath'@:path =>\"#{ENV['JRUBY_CP']}:lib/jruby.jar\"@g" \
+		rakelib/commands.rake || die
+	#sed -i "s@:refid => 'test.class.path'@:path => \"#{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=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,},junit-4`
+	cpath="$(echo ${cpath} | sed -e "s_${ROOT}/usr/share/jruby/lib/jruby.jar:__g")"
+	cpath="${cpath}:$(java-pkg_getjars --build-only commons-logging,xalan)"
+	EANT_GENTOO_CLASSPATH=""
+
+	local flags=""
+	use bsf && flags="-Dbsf.present=true"
+
+	#Clear RUBYOPT
+	export RUBYOPT=""
+	export JRUBY_CP="${cpath}"
+	ANT_TASKS="ant-junit4 ant-trax" \
+		JRUBY_OPTS="" eant test -Djdk1.5+=true -Djruby.bindir=bin \
+		-Dgentoo.classpath="${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=/s:=:=/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 'ubygems.rb' -or -name 'datadir.rb' ')' \
+		-delete || die
+}
diff --git a/dev-java/jruby/jruby-1.6.7.2.ebuild b/dev-java/jruby/jruby-1.6.7.2-r1.ebuild
index beb4b68da2fa..82ff477b24f4 100644
--- a/dev-java/jruby/jruby-1.6.7.2.ebuild
+++ b/dev-java/jruby/jruby-1.6.7.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.7.2.ebuild,v 1.2 2012/08/20 02:32:48 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.7.2-r1.ebuild,v 1.1 2013/10/24 19:32:40 tomwij Exp $
 
 EAPI="4"
 JAVA_PKG_IUSE="doc source test"
@@ -36,7 +36,7 @@ CDEPEND=">=dev-java/bytelist-1.0.8:0
 	dev-java/ant-core:0
 	dev-java/bsf:2.3
 	dev-java/osgi-core-api:0
-	>=dev-java/snakeyaml-1.9:0
+	dev-java/snakeyaml:1.9
 	dev-java/jzlib:1.1"
 
 RDEPEND="${CDEPEND}
@@ -75,7 +75,7 @@ JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
 EANT_GENTOO_CLASSPATH="ant-core asm-3 bsf-2.3 bytelist jnr-constants jay \
 jcodings jffi-1.0 jline \
 joda-time joni jnr-ffi-0.5 jnr-posix-1.1 jnr-netdb jvyamlb nailgun jgrapht osgi-core-api \
-snakeyaml jzlib-1.1"
+snakeyaml-1.9 jzlib-1.1"
 EANT_NEEDS_TOOLS="true"
 
 pkg_setup() {
@@ -132,8 +132,7 @@ src_compile() {
 
 	export RUBYOPT=""
 	einfo $RUBYOPT
-	#eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
-	eant -Djdk1.5+=true ${flags}
+	eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
 }
 
 src_test() {
diff --git a/dev-java/jruby/jruby-1.6.8.ebuild b/dev-java/jruby/jruby-1.6.8-r1.ebuild
index b905b35a022e..2ff185fbb0eb 100644
--- a/dev-java/jruby/jruby-1.6.8.ebuild
+++ b/dev-java/jruby/jruby-1.6.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.8.ebuild,v 1.2 2013/07/16 09:01:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.8-r1.ebuild,v 1.1 2013/10/24 19:32:40 tomwij Exp $
 
 EAPI="4"
 JAVA_PKG_IUSE="doc source test"
@@ -36,7 +36,7 @@ CDEPEND=">=dev-java/bytelist-1.0.8:0
 	dev-java/ant-core:0
 	dev-java/bsf:2.3
 	dev-java/osgi-core-api:0
-	>=dev-java/snakeyaml-1.9:0
+	dev-java/snakeyaml:1.9
 	dev-java/jzlib:1.1"
 
 RDEPEND="${CDEPEND}
@@ -75,7 +75,7 @@ JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
 EANT_GENTOO_CLASSPATH="ant-core asm-3 bsf-2.3 bytelist jnr-constants jay \
 jcodings jffi-1.0 jline \
 joda-time joni jnr-ffi-0.5 jnr-posix-1.1 jnr-netdb jvyamlb nailgun jgrapht osgi-core-api \
-snakeyaml jzlib-1.1"
+snakeyaml-1.9 jzlib-1.1"
 EANT_NEEDS_TOOLS="true"
 
 pkg_setup() {
@@ -132,8 +132,7 @@ src_compile() {
 
 	export RUBYOPT=""
 	einfo $RUBYOPT
-	#eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
-	eant -Djdk1.5+=true ${flags}
+	eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
 }
 
 src_test() {