Version bump.

Package-Manager: portage-2.1.2.7

4 files changed, 177 insertions, 5 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 58454242c193..b8158124fdf3 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jruby
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.26 2007/06/05 11:55:28 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.27 2007/06/13 12:42:44 nichoj Exp $
+
+*jruby-1.0.0 (13 Jun 2007)
+
+  13 Jun 2007; Joshua Nichols <nichoj@gentoo.org> +jruby-1.0.0.ebuild:
+  Version bump.
 
 *jruby-1.0.0_rc3 (05 Jun 2007)
 
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index c9046a0629d7..80544a68601d 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -24,6 +24,7 @@ DIST jruby-src-0.9.8.tar.gz 4671287 RMD160 b0e7a17462d4b0ac47edb7adc1595336f1bc5
 DIST jruby-src-0.9.9.tar.gz 4164832 RMD160 d19538a7c863e7905ec1bd89042d2f4ac4aef409 SHA1 b3e4aace3ae5d7bec6c6f11feca5762a99646c83 SHA256 e71175f7b4e0323434115f2547e4cac8bb3afcaf084cbe647bed3b8348ca7288
 DIST jruby-src-1.0.0RC2.tar.gz 4194247 RMD160 0962172af13e37ef32d6a39d0a92a8d4708a0689 SHA1 30d22b8beca4924be112573e15bb79565ab1d450 SHA256 65d72a454c25967272496f9f5b84a6e68b95ae16833b9e95f26abc639dcd390f
 DIST jruby-src-1.0.0RC3.tar.gz 4839472 RMD160 528760019842b9b68adef4ff76013e48f4194e44 SHA1 e81177a33f1a35444563ba89219f8240981aa566 SHA256 8d01393b2892589f01b201ce878e75d588b3d0ffe3a50f45b824e0f151a28458
+DIST jruby-src-1.0.tar.gz 4840184 RMD160 3de4dfa558a12a1643fa2357f3e144e34c5a718d SHA1 f4e18c6c112e1741024d76b10528fef7a242a018 SHA256 80088e32cceb929b0cd0d0115ed800577b7b800d42dca3356e840d1123047b03
 EBUILD jruby-0.7.0-r1.ebuild 1403 RMD160 e63a6f27bf9080981f39efcd401dfcf4e8b359c4 SHA1 886a74b6bb3fa6d859fa0807be0a9aa4db712643 SHA256 265204d1f2eca86d32130ad55c2daff216efc37d7cd2301bd4b3e5988bb9a96b
 MD5 0e46bb8509d4cb0c0bfda365ab28a03e jruby-0.7.0-r1.ebuild 1403
 RMD160 e63a6f27bf9080981f39efcd401dfcf4e8b359c4 jruby-0.7.0-r1.ebuild 1403
@@ -44,6 +45,10 @@ EBUILD jruby-0.9.9.ebuild 2603 RMD160 be1fe6bfb79f51498baf2d6d6e9beb277d9d937b S
 MD5 53edfc07a5af4527313afca47c3e550a jruby-0.9.9.ebuild 2603
 RMD160 be1fe6bfb79f51498baf2d6d6e9beb277d9d937b jruby-0.9.9.ebuild 2603
 SHA256 8b41a671f739df275befa4e1acd674617251c4899b8fbd2c7c4968a00d36a3a8 jruby-0.9.9.ebuild 2603
+EBUILD jruby-1.0.0.ebuild 4733 RMD160 89b1ba09e4b2f94b1437a7e67eefc4494a89d9e5 SHA1 7885a3b3244238d167f1a15a4e08b8e316768d48 SHA256 67102f04cb71ca71b71d1f3afa7af36e05ebe42a3ec8f01212c636d003d19b93
+MD5 9d6c0540adb743cb505b21eed7497bde jruby-1.0.0.ebuild 4733
+RMD160 89b1ba09e4b2f94b1437a7e67eefc4494a89d9e5 jruby-1.0.0.ebuild 4733
+SHA256 67102f04cb71ca71b71d1f3afa7af36e05ebe42a3ec8f01212c636d003d19b93 jruby-1.0.0.ebuild 4733
 EBUILD jruby-1.0.0_rc2-r1.ebuild 4391 RMD160 d14ca804367bc050f4785ac1744cbab695506e78 SHA1 e495ddd9e25640d1d8a49c5fefb42083d5bfdefb SHA256 33ccc3366ae15a3c20b95aca3ac060f51cadabc95ed161da2bbdb7652e891525
 MD5 30b6b27218802f322d7105a44bc453df jruby-1.0.0_rc2-r1.ebuild 4391
 RMD160 d14ca804367bc050f4785ac1744cbab695506e78 jruby-1.0.0_rc2-r1.ebuild 4391
@@ -56,10 +61,10 @@ EBUILD jruby-1.0.0_rc3.ebuild 4627 RMD160 c58dcf8c29593986a7384ff817fb035e8032cd
 MD5 77716ad2917366c68f2f6a4d08a03ef9 jruby-1.0.0_rc3.ebuild 4627
 RMD160 c58dcf8c29593986a7384ff817fb035e8032cdda jruby-1.0.0_rc3.ebuild 4627
 SHA256 3b34e84df1c1953e43a00f7b993a188da3fce7596947e934b1a5343b9771dfec jruby-1.0.0_rc3.ebuild 4627
-MISC ChangeLog 4369 RMD160 6ee36e39290f77d1c78960fdd1ee3d3f10ef0ba5 SHA1 8992658e3a5e24b7be3d204ab8cfe76f9c6f9e15 SHA256 8305a5c6a01b4d8d3c87a1f59b3d894af29904aba0ead374af91389def28a43b
-MD5 651f224f3d3899f578b0fdfa4809dc88 ChangeLog 4369
-RMD160 6ee36e39290f77d1c78960fdd1ee3d3f10ef0ba5 ChangeLog 4369
-SHA256 8305a5c6a01b4d8d3c87a1f59b3d894af29904aba0ead374af91389def28a43b ChangeLog 4369
+MISC ChangeLog 4485 RMD160 3898fbbcda272ce8ca74fd0a1e90c3c3a01f7005 SHA1 8aa1b4e568fc03e4f4a8fb0884601e6e599d8a76 SHA256 b179b5cd1fca7292305f6d4a82725239057022c9ec2b6dd05f4ef455d699cae8
+MD5 a1f5b90dfda70c4ea8a2c9a77b632373 ChangeLog 4485
+RMD160 3898fbbcda272ce8ca74fd0a1e90c3c3a01f7005 ChangeLog 4485
+SHA256 b179b5cd1fca7292305f6d4a82725239057022c9ec2b6dd05f4ef455d699cae8 ChangeLog 4485
 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a
 MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252
 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252
@@ -79,6 +84,9 @@ SHA256 bb18e573a2279e0efea98b153bb74269c95cd2c9c4cc7b48fdec90ba9e9fef56 files/di
 MD5 a04f447961f0d8b673148524a969375f files/digest-jruby-0.9.9 250
 RMD160 b68b8a3069a76022115e86af6ac90268dff698e1 files/digest-jruby-0.9.9 250
 SHA256 18f56ac5a70a4f92df4c249c0f5ee7a2f1eccf734fccd7b55eaa7ab872c16bc5 files/digest-jruby-0.9.9 250
+MD5 1de6acdc93f9c7df804b8279d812ad60 files/digest-jruby-1.0.0 244
+RMD160 3a32c832a5d3802d6f6480f8fef95177c29d421b files/digest-jruby-1.0.0 244
+SHA256 f46252b7d091496da106d37e1906d4a84a01fe2f42ed5d24181d7400eea5c441 files/digest-jruby-1.0.0 244
 MD5 fdf5e205ceb40e83e97a8c1fcf21eee0 files/digest-jruby-1.0.0_rc2 259
 RMD160 73289819d5799fec70044c8a0650611a22568289 files/digest-jruby-1.0.0_rc2 259
 SHA256 6bc759795de1c9f6407a1921d23581006893aba2b8a1e99269cebeeb5cacc997 files/digest-jruby-1.0.0_rc2 259
diff --git a/dev-java/jruby/files/digest-jruby-1.0.0 b/dev-java/jruby/files/digest-jruby-1.0.0
new file mode 100644
index 000000000000..42e97c60923b
--- /dev/null
+++ b/dev-java/jruby/files/digest-jruby-1.0.0
@@ -0,0 +1,3 @@
+MD5 516d9351e26a802c72a46bf5d8f557b4 jruby-src-1.0.tar.gz 4840184
+RMD160 3de4dfa558a12a1643fa2357f3e144e34c5a718d jruby-src-1.0.tar.gz 4840184
+SHA256 80088e32cceb929b0cd0d0115ed800577b7b800d42dca3356e840d1123047b03 jruby-src-1.0.tar.gz 4840184
diff --git a/dev-java/jruby/jruby-1.0.0.ebuild b/dev-java/jruby/jruby-1.0.0.ebuild
new file mode 100644
index 000000000000..060c969847bc
--- /dev/null
+++ b/dev-java/jruby/jruby-1.0.0.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.0.0.ebuild,v 1.1 2007/06/13 12:42:44 nichoj Exp $
+
+JAVA_PKG_IUSE="doc source test"
+inherit eutils java-pkg-2 java-ant-2
+
+# 1.0 < 1.0.0_rcX
+# so, we'll pretend 1.0 is actually 1.0.0
+# remove this for next release
+# TODO complain to upstream
+MY_PV="1.0"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Java based ruby interpreter implementation"
+HOMEPAGE="http://jruby.codehaus.org/"
+SRC_URI="http://dist.codehaus.org/${PN}/${PN}-src-${MY_PV}.tar.gz"
+
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bsf"
+
+COMMON_DEPEND=">=dev-java/jline-0.9.91
+	=dev-java/asm-2.2*
+	dev-java/backport-util-concurrent
+	!<dev-java/jruby-1.0.0_rc2-r1"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+# FIXME doesn't quite compile correctly with 1.6
+DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
+	bsf? ( >=dev-java/bsf-2.3 )
+	test? (
+		=dev-java/junit-3*
+		dev-java/ant-junit
+		dev-java/ant-trax
+	)
+	${COMMON_DEPEND}"
+PDEPEND="dev-ruby/rubygems
+	>=dev-ruby/rake-0.7.3
+	>=dev-ruby/rspec-1.0.4"
+
+S="${WORKDIR}/${MY_P}"
+
+RUBY_HOME=/usr/share/${PN}/lib/ruby
+SITE_RUBY=${RUBY_HOME}/site_ruby
+GEMS=${RUBY_HOME}/gems
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	if [[ -d ${SITE_RUBY} && ! -L ${SITE_RUBY} ]]; then
+		ewarn "dev-java/jruby now uses dev-lang/ruby's site_ruby directory by creating symlinks."
+		ewarn "${SITE_RUBY} is a directory right now, which will cause problems when being merged onto the filesystem."
+	fi
+	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
+
+	# only use javac, see http://jira.codehaus.org/browse/JRUBY-675
+	java-pkg_force-compiler javac
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# prevents /root/.jruby being created at build time with
+	# FEATURES="-userpriv"
+	# see http://bugs.gentoo.org/show_bug.cgi?id=170058
+	epatch ${FILESDIR}/${PN}-0.9.8-sandbox.patch
+	# search only lib, kills jdk1.4+ property which we set manually
+	java-ant_ignore-system-classes
+
+	cd ${S}/lib
+	rm -v *.jar || die
+
+	java-pkg_jar-from --build-only ant-core ant.jar
+	java-pkg_jar-from asm-2.2 asm.jar
+	java-pkg_jar-from asm-2.2 asm-commons.jar
+	java-pkg_jar-from jline
+	java-pkg_jar-from backport-util-concurrent
+	use test && java-pkg_jar-from --build-only junit
+
+	# build-only because it's just BSF adapter classes and won't be used
+	# unless invoked from bsf itself, so no need to pollute classpath
+	if use bsf; then
+		java-pkg_jar-from --build-only bsf-2.3
+	else
+		cd ${S}
+		# testcases depending on bsf
+		rm test/org/jruby/test/TestAdoptedThreading.java || die
+		rm test/org/jruby/javasupport/test/TestBSF.java || die
+		sed -i -e '/TestBSF.class/d' \
+			test/org/jruby/javasupport/test/JavaSupportTestSuite.java || die
+		sed -i -e '/TestAdoptedThreading.class/d' \
+			test/org/jruby/test/MainTestSuite.java || die
+	fi
+}
+
+src_compile() {
+	eant jar $(use_doc create-apidocs) -Djruby.home=${T}/.jruby -Djdk1.4+=true
+}
+
+src_test() {
+	# needs bsf's runtime deps to work
+	use bsf && java-pkg_jar-from --into lib --with-dependencies bsf-2.3
+	ANT_TASKS="ant-junit ant-trax" eant test -Djdk1.4+=true
+}
+
+src_install() {
+	java-pkg_dojar lib/${PN}.jar
+
+	dodoc README docs/{*.txt,README.*,BeanScriptingFramework} || die
+	dohtml docs/getting_involved.html || die
+
+	if use doc; then
+		java-pkg_dojavadoc docs/api
+	fi
+	use source && java-pkg_dosrc src/org
+	java-pkg_dolauncher ${PN} \
+		--main 'org.jruby.Main' \
+		--java_args '-Djruby.base=/usr/share/jruby -Djruby.home=/usr/share/jruby -Djruby.lib=/usr/share/jruby/lib -Djruby.script=jruby -Djruby.shell=/bin/sh'
+	dobin ${S}/bin/jirb
+
+	dodir "/usr/share/${PN}/lib"
+	insinto "/usr/share/${PN}/lib"
+	doins -r "${S}/lib/ruby"
+
+	# Share gems with regular ruby
+	rm -r ${D}/usr/share/${PN}/lib/ruby/gems || die
+	dosym /usr/lib/ruby/gems /usr/share/${PN}/lib/ruby/gems || die
+
+	# Share site_ruby with regular ruby
+	rm -r ${D}/usr/share/${PN}/lib/ruby/site_ruby || die
+	dosym /usr/lib/ruby/site_ruby /usr/share/${PN}/lib/ruby/site_ruby || die
+}
+
+pkg_preinst() {
+	local bad_directory=0
+
+	if [[ -d ${SITE_RUBY} && ! -L ${SITE_RUBY} ]]; then
+		eerror "${SITE_RUBY} is a directory. Please move this directory out of the way, and then emerge --resume."
+		bad_directory=1
+	fi
+
+	if [[ -d ${GEMS} && ! -L ${GEMS} ]]; then
+		eerror "${GEMS} is a directory. Please move this directory out of the way, and then emerge --resume."
+		bad_directory=1
+	fi
+
+	if [[ ! ${bad_directory} ]]; then
+		die "Please address the above errors, then emerge --resume."
+	fi
+}
+