version bump, with a few dep changes. See bug #190124

Package-Manager: portage-2.1.3.16

5 files changed, 175 insertions, 14 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index afdcb091a3a4..73cc8011ba1e 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,12 @@
 # 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.31 2007/10/24 05:29:46 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.32 2007/12/17 13:58:17 caleb Exp $
+
+*jruby-1.0.3 (17 Dec 2007)
+
+  17 Dec 2007; Caleb Tennis <caleb@gentoo.org> jruby-1.0.0.ebuild,
+  +jruby-1.0.3.ebuild:
+  version bump, with some dep changes.  See bug #190124
 
   24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   -jruby-0.7.0-r1.ebuild, jruby-1.0.0.ebuild:
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index eb28b43d9e17..7280744150a8 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -2,15 +2,20 @@ AUX jruby-0.9.8-sandbox.patch 522 RMD160 f9aebe3469edb3d2d22d641e616691ff14def7d
 MD5 898463cbef30f1c337df6dca781ba83d files/jruby-0.9.8-sandbox.patch 522
 RMD160 f9aebe3469edb3d2d22d641e616691ff14def7db files/jruby-0.9.8-sandbox.patch 522
 SHA256 1c2701881674a978c9ddc32e2e126cf25690e86011c6301e7f825407fb5810a2 files/jruby-0.9.8-sandbox.patch 522
+DIST jruby-src-1.0.3.tar.gz 5218289 RMD160 b717863f8455ea5f323dd2b73824c39732dbd7df SHA1 38c091dbd28102013b61b10d1d24c6c237f44937 SHA256 3d10f92d8fd0815529a2ddefc291af288b8f2f51749c347c29006b84a30a2c0a
 DIST jruby-src-1.0.tar.gz 4840184 RMD160 3de4dfa558a12a1643fa2357f3e144e34c5a718d SHA1 f4e18c6c112e1741024d76b10528fef7a242a018 SHA256 80088e32cceb929b0cd0d0115ed800577b7b800d42dca3356e840d1123047b03
-EBUILD jruby-1.0.0.ebuild 4747 RMD160 4682785a3527fc30129d5a3c6658598069f88920 SHA1 b7b268cc6b0e07e6244756e924345f577e9ea1c0 SHA256 881c728d0a17f3fc38358f4c3bf0abd616160d283b3777ccafec8cacf20fea61
-MD5 dcca1ec3fbee44ed4a51c08462ab4a67 jruby-1.0.0.ebuild 4747
-RMD160 4682785a3527fc30129d5a3c6658598069f88920 jruby-1.0.0.ebuild 4747
-SHA256 881c728d0a17f3fc38358f4c3bf0abd616160d283b3777ccafec8cacf20fea61 jruby-1.0.0.ebuild 4747
-MISC ChangeLog 5231 RMD160 e606050cfdd8364b811f12955455eced0806d35d SHA1 943141d7eb320acbce0d4cafcd3ab3ece7d09ae7 SHA256 8a31b38d9aaa9cadbcd6216ab1d7031057574607a8af5e991724114d53d7da9f
-MD5 d3c06c30910e3109ba2b7a11880849d4 ChangeLog 5231
-RMD160 e606050cfdd8364b811f12955455eced0806d35d ChangeLog 5231
-SHA256 8a31b38d9aaa9cadbcd6216ab1d7031057574607a8af5e991724114d53d7da9f ChangeLog 5231
+EBUILD jruby-1.0.0.ebuild 4643 RMD160 6da48b87bdb363864e78d8b5011033899ca03a6f SHA1 67508a52174b5efc940282094e93e9517ca0d306 SHA256 bfbcb8a3a02979527967408102b639bf510eb3eda96972c47c888d50da576cc3
+MD5 3141f3dd844db7397914b11e008a7471 jruby-1.0.0.ebuild 4643
+RMD160 6da48b87bdb363864e78d8b5011033899ca03a6f jruby-1.0.0.ebuild 4643
+SHA256 bfbcb8a3a02979527967408102b639bf510eb3eda96972c47c888d50da576cc3 jruby-1.0.0.ebuild 4643
+EBUILD jruby-1.0.3.ebuild 4462 RMD160 83c55f4dd8b7d4c2c92843dd26608da2485b004d SHA1 febe0773f61e855d8926ce880104a805a31f81fb SHA256 bb7b90dab07750d0ed11ba62ef73f98ca35db0b682c1f9d35d84fc993f04ad19
+MD5 2df6a22788b6ca72ca4798b38e8b57ae jruby-1.0.3.ebuild 4462
+RMD160 83c55f4dd8b7d4c2c92843dd26608da2485b004d jruby-1.0.3.ebuild 4462
+SHA256 bb7b90dab07750d0ed11ba62ef73f98ca35db0b682c1f9d35d84fc993f04ad19 jruby-1.0.3.ebuild 4462
+MISC ChangeLog 5406 RMD160 955d664016c069dabae62de6cf17af1aac4ec246 SHA1 0408bbd69e40466e186e0db2269e939d9a0522d6 SHA256 3756e55504da0a78a9cbaf3d50b7e6339ac28f6811b441947c98832f894379af
+MD5 068554d825abfbcbaf20e34cb066af52 ChangeLog 5406
+RMD160 955d664016c069dabae62de6cf17af1aac4ec246 ChangeLog 5406
+SHA256 3756e55504da0a78a9cbaf3d50b7e6339ac28f6811b441947c98832f894379af ChangeLog 5406
 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a
 MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252
 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252
@@ -18,3 +23,6 @@ SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a metadata
 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 d6e134e1f16924461deaf354583dcddd files/digest-jruby-1.0.3 250
+RMD160 9755ff206015153eb0d4964807e83b82714ef9be files/digest-jruby-1.0.3 250
+SHA256 8615706f2db5c77f9cac2c8419c639dd6e425014a8b9497fc661add3366ea5c8 files/digest-jruby-1.0.3 250
diff --git a/dev-java/jruby/files/digest-jruby-1.0.3 b/dev-java/jruby/files/digest-jruby-1.0.3
new file mode 100644
index 000000000000..8675ef11b0ca
--- /dev/null
+++ b/dev-java/jruby/files/digest-jruby-1.0.3
@@ -0,0 +1,3 @@
+MD5 def7168f6c8061da753f875acb250f66 jruby-src-1.0.3.tar.gz 5218289
+RMD160 b717863f8455ea5f323dd2b73824c39732dbd7df jruby-src-1.0.3.tar.gz 5218289
+SHA256 3d10f92d8fd0815529a2ddefc291af288b8f2f51749c347c29006b84a30a2c0a jruby-src-1.0.3.tar.gz 5218289
diff --git a/dev-java/jruby/jruby-1.0.0.ebuild b/dev-java/jruby/jruby-1.0.0.ebuild
index 75fc287a6980..faf7d4ec7e57 100644
--- a/dev-java/jruby/jruby-1.0.0.ebuild
+++ b/dev-java/jruby/jruby-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2007/10/24 05:29:46 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.0.0.ebuild,v 1.4 2007/12/17 13:58:17 caleb Exp $
 
 JAVA_PKG_IUSE="doc source test"
 inherit eutils java-pkg-2 java-ant-2
@@ -23,12 +23,11 @@ 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"
+	dev-java/backport-util-concurrent"
 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* )
+
+DEPEND=">=virtual/jdk-1.4
 	bsf? ( >=dev-java/bsf-2.3 )
 	test? (
 		=dev-java/junit-3*
diff --git a/dev-java/jruby/jruby-1.0.3.ebuild b/dev-java/jruby/jruby-1.0.3.ebuild
new file mode 100644
index 000000000000..ce20a2aa7676
--- /dev/null
+++ b/dev-java/jruby/jruby-1.0.3.ebuild
@@ -0,0 +1,145 @@
+# 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.3.ebuild,v 1.1 2007/12/17 13:58:17 caleb Exp $
+
+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}/${PN}-src-${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"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+
+DEPEND=">=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"
+
+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
+}