[gentoo-commits] gentoo-x86 commit in eclass: ruby-fakegem.eclass

[Diego Petteno (flameeyes)]

flameeyes    10/02/19 11:58:37

  Modified:             ruby-fakegem.eclass
  Log:
  Don't create generic wrappers when installing for a single implementation.
  
  Since we have a few packages that can only be installed for JRuby, and
  that thus wouldn't work with any of the selected implementations, and
  a few that installs only for Ruby 1.8 (and thus would break if 1.9 was
  selected), try to reduce their impact by only producing generic
  wrappers when installing for multiple implementations.
  
  This should produce a totally working system after updating from 1.9,
  among other things.
  
  To make sure that the wrappers generated by different revisions of
  ruby-fakegem.eclass are properly identified, also add the CVS ID of
  the eclass in the comments of the generated wrapper.
  
  At the same time add the same specification about generation to the
  gemspec files, so that we can identify “older” specifications quickly.

Revision  Changes    Path
1.16                 eclass/ruby-fakegem.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ruby-fakegem.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ruby-fakegem.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ruby-fakegem.eclass?r1=1.15&r2=1.16

Index: ruby-fakegem.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ruby-fakegem.eclass	19 Feb 2010 08:47:36 -0000	1.15
+++ ruby-fakegem.eclass	19 Feb 2010 11:58:36 -0000	1.16
@@ -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/eclass/ruby-fakegem.eclass,v 1.15 2010/02/19 08:47:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.16 2010/02/19 11:58:36 flameeyes Exp $
 #
 # @ECLASS: ruby-fakegem.eclass
 # @MAINTAINER:
@@ -148,6 +148,7 @@
 		# so better taking this into consideration.
 		local quoted_description=${DESCRIPTION//\"/\\\"}
 		cat - > "${T}"/${RUBY_FAKEGEM_NAME}-${_ruby_implementation} <<EOF
+# generated by ruby-fakegem.eclass $Id: ruby-fakegem.eclass,v 1.16 2010/02/19 11:58:36 flameeyes Exp $
 Gem::Specification.new do |s|
   s.name = "${RUBY_FAKEGEM_NAME}"
   s.version = "${RUBY_FAKEGEM_VERSION}"
@@ -175,11 +176,33 @@
 		local binpath=$(dirname $newbinary)
 		[[ ${binpath} = . ]] && binpath=/usr/bin
 
+		# Try to find out whether the package is going to install for
+		# one or multiple implementations; if we're installing for a
+		# *single* implementation, no need to use “/usr/bin/env ruby”
+		# in the shebang, and we can actually avoid errors when
+		# calling the script by default (see for instance the
+		# JRuby-specific commands).
+		local rubycmd=
+		for implementation in ${USE_RUBY}; do
+			# ignore non-enabled implementations
+			use ruby_targets_${implementation} || continue
+			if [ -z $rubycmd ]; then
+				# if no other implementation was set before, set it.
+				rubycmd="/usr/bin/${implementation}"
+			else
+				# if another implementation already arrived, then make
+				# it generic and break out of the loop. This ensures
+				# that we do at most two iterations.
+				rubycmd="/usr/bin/env ruby"
+				break
+			fi
+		done
+
 		cat - > "${T}"/gembin-wrapper-${gembinary} <<EOF
-#!/usr/bin/env ruby
+#!${rubycmd}
 # This is a simplified version of the RubyGems wrapper
 #
-# Generated by ruby-fakegem.eclass
+# Generated by ruby-fakegem.eclass $Id: ruby-fakegem.eclass,v 1.16 2010/02/19 11:58:36 flameeyes Exp $
 
 require 'rubygems'