[gentoo-commits] gentoo-x86 commit in dev-ruby/rubygems: rubygems-1.3.5-r2.ebuild ChangeLog

[Diego Petteno (flameeyes)]

flameeyes    10/01/31 23:11:51

  Modified:             rubygems-1.3.5-r2.ebuild ChangeLog
  Log:
  Avoid double-versioning.
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-ruby/rubygems/rubygems-1.3.5-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.5-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.5-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.5-r2.ebuild?r1=1.1&r2=1.2

Index: rubygems-1.3.5-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.5-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rubygems-1.3.5-r2.ebuild	31 Jan 2010 17:20:15 -0000	1.1
+++ rubygems-1.3.5-r2.ebuild	31 Jan 2010 23:11:51 -0000	1.2
@@ -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-ruby/rubygems/rubygems-1.3.5-r2.ebuild,v 1.1 2010/01/31 17:20:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.5-r2.ebuild,v 1.2 2010/01/31 23:11:51 flameeyes Exp $
 
 EAPI="2"
 
@@ -39,15 +39,14 @@
 	export RUBYOPT="${GENTOO_RUBYOPT}"
 	ewarn "RUBYOPT=${RUBYOPT}"
 
-	local ver=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
 	local gemsitedir=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitelibdir"]' | sed -e 's:site_ruby:gems:')
 
 	# rubygems tries to create GEM_HOME if it doesn't exist, upsetting sandbox,
 	# bug #202109. Since 1.2.0 we also need to set GEM_PATH
 	# for this reason, bug #230163.
-	export GEM_HOME="${D}${gemsitedir}/${ver}"
+	export GEM_HOME="${D}${gemsitedir}"
 	export GEM_PATH="${GEM_HOME}/"
-	keepdir ${gemsitedir}/$ver/{doc,gems,cache,specifications}
+	keepdir ${gemsitedir}/{doc,gems,cache,specifications}
 
 	myconf=""
 	if ! use doc; then
@@ -72,7 +71,8 @@
 }
 
 pkg_postinst() {
-	SOURCE_CACHE="/usr/$(get_libdir)/ruby/gems/$ver/source_cache"
+	local gemsitedir=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitelibdir"]' | sed -e 's:site_ruby:gems:')
+	SOURCE_CACHE="${gemsitedir}/source_cache"
 	if [[ -e "${SOURCE_CACHE}" ]]; then
 		rm "${SOURCE_CACHE}"
 	fi



1.133                dev-ruby/rubygems/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/ChangeLog?rev=1.133&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/ChangeLog?rev=1.133&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/ChangeLog?r1=1.132&r2=1.133

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- ChangeLog	31 Jan 2010 17:20:15 -0000	1.132
+++ ChangeLog	31 Jan 2010 23:11:51 -0000	1.133
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.132 2010/01/31 17:20:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.133 2010/01/31 23:11:51 flameeyes Exp $
+
+  31 Jan 2010; Diego E. Pettenò <flameeyes@g.o>
+  rubygems-1.3.5-r2.ebuild:
+  Avoid double-versioning.
 
 *rubygems-1.3.5-r2 (31 Jan 2010)