Fix SRC_URI, remove older broken 1.4.0 release.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 12 insertions, 193 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 2fb6c4c63d9d..82830c7335cc 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,10 @@
 # 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.46 2010/01/14 14:43:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.47 2010/01/16 20:45:36 flameeyes Exp $
+
+  16 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> -jruby-1.4.0.ebuild,
+  jruby-1.4.0-r1.ebuild:
+  Fix SRC_URI, remove older broken 1.4.0 release.
 
 *jruby-1.4.0-r1 (14 Jan 2010)
 
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index 34bbe075ad0a..32d053a3fd7f 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -18,14 +18,13 @@ EBUILD jruby-1.0.3.ebuild 4462 RMD160 83c55f4dd8b7d4c2c92843dd26608da2485b004d S
 EBUILD jruby-1.2.0-r1.ebuild 5023 RMD160 8239a5ba7e717c3a434e98a81eb60875f97e3055 SHA1 e02cefc8138981f6d100bf6e633f04db3327000a SHA256 513ec2c93efaa444220c5ca1c2bfeb46c1244de43b900b38386e8d63f9f94d52
 EBUILD jruby-1.3.1-r1.ebuild 5502 RMD160 94388e24d29a24d3b23013125ae38e5a0e3f4846 SHA1 4c66c6df3aab698f950dc28e57208a4c94d523c7 SHA256 b5b064f8bec2f7ab2c045c684dda9171e57d7942dd22dfaec715dbeba3adc620
 EBUILD jruby-1.3.1.ebuild 5552 RMD160 fd6520487dd38cc12dbc5204b985117c700d454f SHA1 5208c74e8b4a45d8198ccf93c2283bc9b2fe7d69 SHA256 af93273763993cf81cfc14efe1735eb00d1fbf256c2164c74602eceb4eafd1bd
-EBUILD jruby-1.4.0-r1.ebuild 5541 RMD160 9aa4f33ddd99afa3d321e49d4459a7fcaf2c2973 SHA1 6ec854343879a79cf351237a6daefbc6fae20de5 SHA256 223f069ef91a047ceb072c5cd468b29e1c8559f2392d60fb1d2c14d53a7afbf6
-EBUILD jruby-1.4.0.ebuild 5606 RMD160 dbb95ddcc7337baa7a58ada7ecb08da4eccd3898 SHA1 877f0856c7a620285c48805c749c97368af1be7a SHA256 feb6af882ebabc8a4608c8d6d7352382c287a3ccefbe91e54192b9e5f946492b
-MISC ChangeLog 8067 RMD160 5c8e9699f88fae88168b53b0a46430d56b860030 SHA1 f42543242d98e0918149e297fdd5e9456ce30545 SHA256 5e0e93b391ca4d2dd34b0eae8822466a16a5f80c7300189a36e8082036e2da21
+EBUILD jruby-1.4.0-r1.ebuild 5540 RMD160 e86c5c22e2ccef2150ce810c056bb89b14b1fad7 SHA1 4891d4d54bcddacf624896044cf332bd3350bc49 SHA256 5d5d339d4a4ea284986ec53d638d4d5a8006cb51b93369b2416a24d7b3c77701
+MISC ChangeLog 8220 RMD160 61bcfd7784a706d71c25dd3b675a14c177828289 SHA1 9832bec5fdc62fa79e6a6684869f6500822b2ea1 SHA256 aac0f05c8baf9e441cd5ef3ea660a7243af4f4d8e6446e963a4a6dd7cac7dd61
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktPLZkACgkQAiZjviIA2XhSjQCfdNHai9OtpVkub/Qxfvfsm///
-bEUAoOOunWoact7egNPD8FLvuwP2INKw
-=2oPK
+iEYEARECAAYFAktSJU4ACgkQAiZjviIA2XiBUQCgpN9h90zUMUUa1xeOPBrIfo+1
+BMcAoPNa4yjbL9mTIiTkqQVNzsWS7f3/
+=A09G
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jruby/jruby-1.4.0-r1.ebuild b/dev-java/jruby/jruby-1.4.0-r1.ebuild
index 71f1e256e684..ede9198d7130 100644
--- a/dev-java/jruby/jruby-1.4.0-r1.ebuild
+++ b/dev-java/jruby/jruby-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.0-r1.ebuild,v 1.1 2010/01/14 14:43:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.0-r1.ebuild,v 1.2 2010/01/16 20:45:36 flameeyes Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source test"
@@ -10,7 +10,7 @@ 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"
+SRC_URI="http://jruby.kenai.com/downloads/${PV}/${PN}-src-${MY_PV}.tar.gz"
 LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/dev-java/jruby/jruby-1.4.0.ebuild b/dev-java/jruby/jruby-1.4.0.ebuild
deleted file mode 100644
index 64524d62f28c..000000000000
--- a/dev-java/jruby/jruby-1.4.0.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# 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.4.0.ebuild,v 1.1 2010/01/14 09:01:40 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.2: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
-	dev-java/jaffl:0
-	dev-java/jgrapht: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 jaffl jgrapht"
-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
-
-	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 lib -name "*.jar" ! -name "jsr292-mock.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 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}"
-}