* [gentoo-commits] gentoo-x86 commit in dev-ruby/rubygems: rubygems-1.3.7.ebuild ChangeLog rubygems-1.3.6-r2.ebuild rubygems-1.3.7-r2.ebuild rubygems-1.3.6.ebuild rubygems-1.3.7-r1.ebuild rubygems-1.3.5-r3.ebuild
@ 2010-08-03 16:07 Diego Petteno (flameeyes)
0 siblings, 0 replies; only message in thread
From: Diego Petteno (flameeyes) @ 2010-08-03 16:07 UTC (permalink / raw
To: gentoo-commits
flameeyes 10/08/03 16:07:36
Modified: rubygems-1.3.7.ebuild ChangeLog
rubygems-1.3.6-r2.ebuild
Added: rubygems-1.3.7-r2.ebuild
Removed: rubygems-1.3.6.ebuild rubygems-1.3.7-r1.ebuild
rubygems-1.3.5-r3.ebuild
Log:
Un-hack rubygems. With the new version, we're patching only tests and one customisation, all clear for upstream, while we install our own defaults in a separate file exactly as upstream intended.
This new version installs in /usr/local rather than /usr, so that whatever the user installs, it's not going to collide or mess with Portage-installed gems. Also, we no longer do any per-implementation patching, and we only special-case Ruby 1.9 for what concern the auto_gem file (instead of keeping four copies of the same identical file in files/).
Documentation is not currently building right, but tests are executed (they fail for JRuby, that is known.
Note that the -r1 version has been dropped, so for ~alpha and ~arm (which will have to re-keyword -r2) this causes a faux-downgrade to 1.3.7, but the changes in -r1 only related to Ruby 1.9 anyway.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-ruby/rubygems/rubygems-1.3.7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7.ebuild?r1=1.1&r2=1.2
Index: rubygems-1.3.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rubygems-1.3.7.ebuild 14 May 2010 19:04:17 -0000 1.1
+++ rubygems-1.3.7.ebuild 3 Aug 2010 16:07:36 -0000 1.2
@@ -1,10 +1,10 @@
# 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.7.ebuild,v 1.1 2010/05/14 19:04:17 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7.ebuild,v 1.2 2010/08/03 16:07:36 flameeyes Exp $
EAPI="2"
-USE_RUBY="ruby18 ruby19 ree18 jruby"
+USE_RUBY="ruby18 jruby"
inherit ruby-ng
@@ -22,10 +22,7 @@
IUSE="doc server"
# previous versions had rubygems bundled, so it would collide badly
-RDEPEND="
- ruby_targets_jruby? ( >=dev-java/jruby-1.4.0-r5 )
- ruby_targets_ruby19? ( >=dev-lang/ruby-1.9.1_p376 )
-"
+RDEPEND="ruby_targets_jruby? ( >=dev-java/jruby-1.4.0-r5 )"
# index_gem_repository.rb
PDEPEND="server? ( dev-ruby/builder[ruby_targets_ruby18] )"
@@ -37,16 +34,6 @@
epatch "${FILESDIR}/${PN}-1.3.3-gentoo.patch"
}
-each_ruby_prepare() {
- case ${RUBY} in
- *rubyee18)
- epatch "${FILESDIR}/${P}-rubyee.patch" || die "ree patch failed"
- ;;
- *)
- ;;
- esac
-}
-
each_ruby_install() {
# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
unset RUBYOPT
@@ -67,8 +54,7 @@
${RUBY} setup.rb $myconf --destdir="${D}" || die "setup.rb install failed"
- insinto $(ruby_rbconfig_value 'sitelibdir')
- newins "${FILESDIR}/auto_gem.rb.$(basename ${RUBY})" auto_gem.rb || die "newins auto_gem failed"
+ doruby "${FILESDIR}/auto_gem.rb"
}
all_ruby_install() {
1.148 dev-ruby/rubygems/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rubygems/ChangeLog?rev=1.148&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rubygems/ChangeLog?rev=1.148&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rubygems/ChangeLog?r1=1.147&r2=1.148
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- ChangeLog 23 Jul 2010 13:08:09 -0000 1.147
+++ ChangeLog 3 Aug 2010 16:07:36 -0000 1.148
@@ -1,6 +1,32 @@
# 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.147 2010/07/23 13:08:09 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.148 2010/08/03 16:07:36 flameeyes Exp $
+
+*rubygems-1.3.7-r2 (03 Aug 2010)
+
+ 03 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ -rubygems-1.3.5-r3.ebuild, -rubygems-1.3.6.ebuild,
+ rubygems-1.3.6-r2.ebuild, rubygems-1.3.7.ebuild,
+ -rubygems-1.3.7-r1.ebuild, +rubygems-1.3.7-r2.ebuild,
+ +files/rubygems-1.3.7-gentoo.patch, -files/rubygems-1.3.7-ruby19.patch,
+ -files/rubygems-1.3.7-rubyee.patch, -files/auto_gem.rb.jruby,
+ -files/auto_gem.rb.ruby18, -files/auto_gem.rb.rubyee18,
+ +files/gentoo-defaults.rb, -files/init.d-gem_server,
+ -files/rubygems-rubyee.patch:
+ Un-hack rubygems. With the new version, we're patching only tests and one
+ customisation, all clear for upstream, while we install our own defaults
+ in a separate file exactly as upstream intended.
+ This new version installs in /usr/local rather than /usr, so that whatever
+ the user installs, it's not going to collide or mess with
+ Portage-installed gems. Also, we no longer do any per-implementation
+ patching, and we only special-case Ruby 1.9 for what concern the auto_gem
+ file (instead of keeping four copies of the same identical file in
+ files/).
+ Documentation is not currently building right, but tests are executed
+ (they fail for JRuby, that is known.
+ Note that the -r1 version has been dropped, so for ~alpha and ~arm (which
+ will have to re-keyword -r2) this causes a faux-downgrade to 1.3.7, but
+ the changes in -r1 only related to Ruby 1.9 anyway.
23 Jul 2010; Tobias Klausmann <klausman@gentoo.org>
rubygems-1.3.6-r2.ebuild:
1.9 dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild?r1=1.8&r2=1.9
Index: rubygems-1.3.6-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rubygems-1.3.6-r2.ebuild 23 Jul 2010 13:08:09 -0000 1.8
+++ rubygems-1.3.6-r2.ebuild 3 Aug 2010 16:07:36 -0000 1.9
@@ -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.6-r2.ebuild,v 1.8 2010/07/23 13:08:09 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild,v 1.9 2010/08/03 16:07:36 flameeyes Exp $
EAPI="2"
@@ -36,16 +36,6 @@
epatch "${FILESDIR}/${PN}-1.3.3-gentoo.patch"
}
-each_ruby_prepare() {
- case ${RUBY} in
- *rubyee18)
- epatch "${FILESDIR}/${PN}-rubyee.patch" || die "ree patch failed"
- ;;
- *)
- ;;
- esac
-}
-
each_ruby_install() {
# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
unset RUBYOPT
@@ -66,8 +56,7 @@
${RUBY} setup.rb $myconf --destdir="${D}" || die "setup.rb install failed"
- insinto $(ruby_rbconfig_value 'sitelibdir')
- newins "${FILESDIR}/auto_gem.rb.$(basename ${RUBY})" auto_gem.rb || die "newins auto_gem failed"
+ doruby "${FILESDIR}/auto_gem.rb"
}
all_ruby_install() {
1.1 dev-ruby/rubygems/rubygems-1.3.7-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7-r2.ebuild?rev=1.1&content-type=text/plain
Index: rubygems-1.3.7-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.7-r2.ebuild,v 1.1 2010/08/03 16:07:36 flameeyes Exp $
EAPI="3"
USE_RUBY="ruby18 ruby19 ree18 jruby"
inherit ruby-ng prefix
DESCRIPTION="Centralized Ruby extension management system"
HOMEPAGE="http://rubyforge.org/projects/rubygems/"
LICENSE="|| ( Ruby GPL-2 )"
SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
SLOT="0"
IUSE="server test"
RDEPEND="
ruby_targets_jruby? ( >=dev-java/jruby-1.4.0-r5 )
ruby_targets_ruby19? ( >=dev-lang/ruby-1.9.2_rc2 )"
# index_gem_repository.rb
PDEPEND="server? ( dev-ruby/builder[ruby_targets_ruby18] )"
# Tests fail _badly_ when YARD is installed.. but just the
# rdoc-related stuff, so it's not a mistake.
ruby_add_bdepend "
test? (
dev-ruby/rake
dev-ruby/hoe
virtual/ruby-minitest
dev-ruby/builder
!dev-ruby/yard
!dev-ruby/test-unit:2
)"
# Until all the JRuby tests' failures are sorted out
RESTRICT="ruby_targets_jruby? ( test )"
RUBY_PATCHES=(
"${FILESDIR}/${P}-gentoo.patch"
)
all_ruby_prepare() {
mkdir -p lib/rubygems/defaults || die
cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
eprefixify lib/rubygems/defaults/operating_system.rb
# Disable broken tests when changing defaults:
sed -i -e '/^ def test_self_bindir_default_dir/, /^ end/ s:^:#:' \
test/test_gem.rb || die
}
each_ruby_compile() {
# Not really a build but...
sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
}
each_ruby_test() {
# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
unset RUBYOPT
RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -S rake test || die "tests failed"
}
each_ruby_install() {
# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
unset RUBYOPT
pushd lib &>/dev/null
doruby -r *
popd &>/dev/null
case "${RUBY}" in
*ruby19)
insinto $(ruby_rbconfig_value 'sitelibdir')
newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
;;
*)
doruby "${FILESDIR}/auto_gem.rb" || die
;;
esac
newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
}
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() {
if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
fi
ewarn
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] only message in thread
only message in thread, other threads:[~2010-08-03 17:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-03 16:07 [gentoo-commits] gentoo-x86 commit in dev-ruby/rubygems: rubygems-1.3.7.ebuild ChangeLog rubygems-1.3.6-r2.ebuild rubygems-1.3.7-r2.ebuild rubygems-1.3.6.ebuild rubygems-1.3.7-r1.ebuild rubygems-1.3.5-r3.ebuild 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