* [gentoo-commits] gentoo-x86 commit in dev-ruby/rubygems: rubygems-1.3.5-r2.ebuild ChangeLog
@ 2010-01-31 23:11 Diego Petteno (flameeyes)
0 siblings, 0 replies; 2+ messages in thread
From: Diego Petteno (flameeyes) @ 2010-01-31 23:11 UTC (permalink / raw
To: gentoo-commits
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@gentoo.org>
+ rubygems-1.3.5-r2.ebuild:
+ Avoid double-versioning.
*rubygems-1.3.5-r2 (31 Jan 2010)
^ permalink raw reply [flat|nested] 2+ messages in thread* [gentoo-commits] gentoo-x86 commit in dev-ruby/rubygems: rubygems-1.3.5-r2.ebuild ChangeLog
@ 2010-01-31 17:20 Diego Petteno (flameeyes)
0 siblings, 0 replies; 2+ messages in thread
From: Diego Petteno (flameeyes) @ 2010-01-31 17:20 UTC (permalink / raw
To: gentoo-commits
flameeyes 10/01/31 17:20:15
Modified: ChangeLog
Added: rubygems-1.3.5-r2.ebuild
Log:
Add JRuby support here, rather than keep it bundled in JRuby.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Revision Changes Path
1.132 dev-ruby/rubygems/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/ChangeLog?rev=1.132&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/ChangeLog?rev=1.132&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/ChangeLog?r1=1.131&r2=1.132
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- ChangeLog 28 Jan 2010 00:49:41 -0000 1.131
+++ ChangeLog 31 Jan 2010 17:20:15 -0000 1.132
@@ -1,6 +1,12 @@
# 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.131 2010/01/28 00:49:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.132 2010/01/31 17:20:15 flameeyes Exp $
+
+*rubygems-1.3.5-r2 (31 Jan 2010)
+
+ 31 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ +rubygems-1.3.5-r2.ebuild:
+ Add JRuby support here, rather than keep it bundled in JRuby.
*rubygems-1.3.5-r1 (28 Jan 2010)
1.1 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.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.5-r2.ebuild?rev=1.1&content-type=text/plain
Index: rubygems-1.3.5-r2.ebuild
===================================================================
# 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 $
EAPI="2"
USE_RUBY="ruby18 jruby"
inherit ruby-ng
DESCRIPTION="Centralized Ruby extension management system"
HOMEPAGE="http://rubyforge.org/projects/rubygems/"
LICENSE="|| ( Ruby GPL-2 )"
# Needs to be installed first
RESTRICT="test"
SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
SLOT="0"
IUSE="doc server"
# previous versions had rubygems bundled, so it would collide badly
RDEPEND="ruby_targets_jruby? ( >=dev-java/jruby-1.4.0-r5 )"
# index_gem_repository.rb
PDEPEND="server? ( dev-ruby/builder[ruby_targets_ruby18] )"
all_ruby_prepare() {
epatch "${FILESDIR}/${PN}-1.3.5-setup.patch"
# Fixes a new "feature" that would prevent us from recognizing installed
# gems inside the sandbox
epatch "${FILESDIR}/${PN}-1.3.3-gentoo.patch"
}
each_ruby_install() {
# RUBYOPT=-rauto_gem without rubygems installed will cause ruby to fail, bug #158455
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_PATH="${GEM_HOME}/"
keepdir ${gemsitedir}/$ver/{doc,gems,cache,specifications}
myconf=""
if ! use doc; then
myconf="${myconf} --no-ri"
myconf="${myconf} --no-rdoc"
fi
${RUBY} setup.rb $myconf --destdir="${D}" || die "setup.rb install failed"
doruby "${FILESDIR}/auto_gem.rb"
}
all_ruby_install() {
dodoc README || die "dodoc README failed"
doenvd "${FILESDIR}/10rubygems" || die "doenvd 10rubygems failed"
if use server; then
newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
fi
}
pkg_postinst() {
SOURCE_CACHE="/usr/$(get_libdir)/ruby/gems/$ver/source_cache"
if [[ -e "${SOURCE_CACHE}" ]]; then
rm "${SOURCE_CACHE}"
fi
if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
eselect ruby set ruby18
fi
ewarn
ewarn "This ebuild is compatible to eselect-ruby"
ewarn "To switch between available Ruby profiles, execute as root:"
ewarn "\teselect ruby set ruby(18|19|...)"
ewarn
}
pkg_postrm() {
ewarn "If you have uninstalled dev-ruby/rubygems, Ruby applications are unlikely"
ewarn "to run in current shells because of missing auto_gem."
ewarn "Please run \"unset RUBYOPT\" in your shells before using ruby"
ewarn "or start new shells"
ewarn
ewarn "If you have not uninstalled dev-ruby/rubygems, please do not unset "
ewarn "RUBYOPT"
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-31 23:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-31 23:11 [gentoo-commits] gentoo-x86 commit in dev-ruby/rubygems: rubygems-1.3.5-r2.ebuild ChangeLog Diego Petteno (flameeyes)
-- strict thread matches above, loose matches on Subject: below --
2010-01-31 17:20 Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox