Add pkg_setup checks to workaround bug #270953.

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

3 files changed, 23 insertions, 15 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 07edc6aef80a..377679ada971 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -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)
 
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index dc77871f059c..1e11d5fb34e4 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -9,6 +9,6 @@ DIST jruby-src-1.0.tar.gz 4840184 RMD160 3de4dfa558a12a1643fa2357f3e144e34c5a718
 DIST jruby-src-1.2.0.tar.gz 10858426 RMD160 a12d9243eb7e5338f1674c0bc9f874bc617c2662 SHA1 69f13b5ec216a7e615f4077730908217a6a9f1fc SHA256 8bd4e007f4d132b15fe968d88f474c97b5058e8cdd1e674820363c2cdc5fb048
 EBUILD jruby-1.0.0.ebuild 4643 RMD160 6da48b87bdb363864e78d8b5011033899ca03a6f SHA1 67508a52174b5efc940282094e93e9517ca0d306 SHA256 bfbcb8a3a02979527967408102b639bf510eb3eda96972c47c888d50da576cc3
 EBUILD jruby-1.0.3.ebuild 4462 RMD160 83c55f4dd8b7d4c2c92843dd26608da2485b004d SHA1 febe0773f61e855d8926ce880104a805a31f81fb SHA256 bb7b90dab07750d0ed11ba62ef73f98ca35db0b682c1f9d35d84fc993f04ad19
-EBUILD jruby-1.2.0-r1.ebuild 5024 RMD160 748eec836899d817efbe92c1b0997254c8999592 SHA1 1b387a61dceab84273a225dd5aecd12819e977ec SHA256 bb90ac618a7834b095a3945e3d96c9ebe9b23bde91e298a2d5ad39ad99b86ed5
-MISC ChangeLog 6036 RMD160 2c2fb9df36abab3ae98442db210f7e5a6a83309f SHA1 b6827b4e602ed679594d8a32df31aef76627c4bf SHA256 e2ff6dca25083b3340a469deeee300a4d28839a9558fbe9c87c65032125044d8
+EBUILD jruby-1.2.0-r1.ebuild 5018 RMD160 014a07b7b3f6ff2e70916cde0af88c95de05577f SHA1 b38281908fa8579c11c84a37b80275dcaa8c1a95 SHA256 97fb64710ef8420cec9a46f8b4764287f4820b92369ba996624d5c82a303e024
+MISC ChangeLog 6161 RMD160 5be0ffee4995b0d4627db6dab0d35d63a33935c7 SHA1 d7c82f71093ec115cda20f688d6dd44c320b0ea1 SHA256 03f973ecd58d3e0a193570726099443b28914e64b08f7d828226541457e532c8
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/jruby/jruby-1.2.0-r1.ebuild b/dev-java/jruby/jruby-1.2.0-r1.ebuild
index d6ee5ec34145..d30fdf71a43a 100644
--- a/dev-java/jruby/jruby-1.2.0-r1.ebuild
+++ b/dev-java/jruby/jruby-1.2.0-r1.ebuild
@@ -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 @@ 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
-		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 @@ src_install() {
 	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}"
-}