Version bump (p.masked). Incuding a try to fix bug 336863.

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

3 files changed, 158 insertions, 1 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index f57d87d49f7f..a7d8631fa3b7 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.172 2011/06/25 14:15:20 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.173 2011/08/24 17:09:18 a3li Exp $
+
+*rubygems-1.8.7 (24 Aug 2011)
+
+  24 Aug 2011; Alex Legler <a3li@gentoo.org> +rubygems-1.8.7.ebuild,
+  +files/rubygems-1.8.7-ruby19.patch:
+  Version bump (p.masked). Incuding a try to fix bug 336863.
 
 *rubygems-1.8.5 (25 Jun 2011)
 
diff --git a/dev-ruby/rubygems/files/rubygems-1.8.7-ruby19.patch b/dev-ruby/rubygems/files/rubygems-1.8.7-ruby19.patch
new file mode 100644
index 000000000000..542bdf69bf59
--- /dev/null
+++ b/dev-ruby/rubygems/files/rubygems-1.8.7-ruby19.patch
@@ -0,0 +1,25 @@
+Forcibly load our operating_system.rb
+This circumvents the GEM_PRELUDE_SUCKAGE by upstream.
+Gentoo bug 336863
+
+Upstream: no
+
+diff -Naur 1.9.1-orig/rubygems.rb 1.9.1/rubygems.rb
+--- 1.9.1-orig/rubygems.rb	2011-08-24 18:37:34.000000000 +0200
++++ lib/rubygems.rb	2011-08-24 19:01:14.550357134 +0200
+@@ -1245,6 +1245,15 @@
+   end
+ end
+ 
++begin
++  ##
++  # Force re-loading of operating_system to get Gentoo defaults applied
++
++  load 'rubygems/defaults/operating_system.rb'
++rescue LoadError => e
++  alert_error "Cannot apply Gentoo settings: #{e.message}" 
++end
++
+ ##
+ # Enables the require hook for RubyGems.
+ 
diff --git a/dev-ruby/rubygems/rubygems-1.8.7.ebuild b/dev-ruby/rubygems/rubygems-1.8.7.ebuild
new file mode 100644
index 000000000000..95a96403a6e0
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-1.8.7.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.8.7.ebuild,v 1.1 2011/08/24 17:09:18 a3li Exp $
+
+EAPI="4"
+
+# jruby's own RUBY_ENGINE defaults are no longer compatible.
+USE_RUBY="ruby18 ree18 ruby19"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="http://rubyforge.org/projects/rubygems/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 )"
+
+# index_gem_repository.rb
+PDEPEND="server? ( dev-ruby/builder[ruby_targets_ruby18] )"
+
+# Tests fail when YARD is installed.. but just the rdoc-related stuff,
+# so it's not a mistake.
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest
+		virtual/ruby-rdoc
+		!!dev-ruby/yard
+	)"
+
+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 default values:
+	sed -i -e '/^  def test_self_bindir_default_dir/, /^  end/ s:^:#:' \
+		-e '/^  def test_self_default_dir/, /^  end/ s:^:#:' \
+		test/rubygems/test_gem.rb || die
+
+	# Remove tests that want to write to /usr/local/bin
+	rm test/rubygems/test_gem_uninstaller.rb test/rubygems/test_gem_install_update_options.rb || die
+}
+
+each_ruby_prepare() {
+	case "${RUBY}" in
+		*ruby19)
+			epatch "${FILESDIR}/${P}-ruby19.patch" || die
+			;;
+	esac
+}
+
+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} -Ilib:test \
+	-e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || 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)
+			local sld=$(ruby_rbconfig_value 'sitelibdir')
+			insinto "${sld#${EPREFIX}}"  # bug #320813
+			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 History.txt README.rdoc
+
+	doenvd "${FILESDIR}/10rubygems"
+
+	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"
+}