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

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 172 insertions, 2 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/Manifest b/dev-ruby/rubygems/Manifest
index cf06e24e1875..6c0e87d299a1 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 10rubygems 21 RMD160 02441be7de6307bbb859fbc2bf5891809fe9ecf8 SHA1 3f98150bfb39a3f3f1dfabcf2d9bf80051960d81 SHA256 8c30de9ba7f327237af47f85d8f7f6701d34c9a8780ff7303244667568ca5833
 AUX auto_gem.rb 159 RMD160 fbf261e5cf0a8450c51c33a7ad4dafbab21bd518 SHA1 8dde3d73f65998f4c5552924ad49e1441e1b211d SHA256 fe1efe24cd0ba36c55449e9623cd0be394980f37d12468624dad7ffdef72f4dc
 AUX auto_gem.rb.ruby19 509 RMD160 f8ffc36e384592956e6508b952ea80110f73efe3 SHA1 498f8963c27cad7e8334b2e797c51f6ac2101b1b SHA256 f0f7f61b110955325be52d278fcc1d3f3ea395cd9523dba33af37a44fd59666d
@@ -8,11 +11,21 @@ AUX rubygems-1.3.3-gentoo.patch 1422 RMD160 e39a2042170399d0e98c772b0572026d6057
 AUX rubygems-1.3.5-setup.patch 942 RMD160 69e8714f72482387019bad7b9254110c6bb8b957 SHA1 ba58de08e29731de4ce820f7d8e4c60de2fcee6e SHA256 d3e7c43ff20a649d1c731e27b0791f110b920201a28607091da0166495709b97
 AUX rubygems-1.3.7-gentoo.patch 3935 RMD160 cb01379f53d78688f700c23adf4fb5bf1244da59 SHA1 cbb9a8f473a4762e1c2d09b8bf109f751383a430 SHA256 fbe2ec29bd9f8f7701819c779d8f18e5124d427d4febae5a2b5b9a92a62e6c57
 AUX rubygems-1.3.7-ruby19.patch 8765 RMD160 2f95a4ad50e2c13b14096fa16f07c6e193caa019 SHA1 78b526d634eddfc119ec7b02c486426dcd2ad5b2 SHA256 fd438576410e0e4d7772d8762994ae04761f9535bcc097dd92bece1d17838f3c
+AUX rubygems-1.8.7-ruby19.patch 608 RMD160 72c09b6ecce1ccce58f9a79337ed9dae56e2e00e SHA1 fd5612ed4c10ea310af5bf04939fa711f76823a7 SHA256 fa51443ab215df9e36f1e509fa35b0971762cd88fc7e52b29e67cbf9862f8665
 DIST rubygems-1.3.7.tgz 290986 RMD160 2ea8e16d1535216045798258603d5f2f9e3dbfea SHA1 68ad2970963db9893b76acc8777be72a77c4bee4 SHA256 388b90ae6273f655507b10c8ba6bee9ea72e7d49c3e610025531cb8c3ba67c9d
 DIST rubygems-1.8.5.tgz 249170 RMD160 ce577db0dab7aa48229e137d027f6aa8117fcfc7 SHA1 eb86fd08f0c1f43773fe97aa48e53ec9fe16d664 SHA256 2c9c256ccb23e28f185912df2ba874e761672d6b4eb30821a14a13b014a6fad0
+DIST rubygems-1.8.7.tgz 248796 RMD160 7e309e9705921d10d5d5ec68ed235d5fd14c9776 SHA1 02ab2356c08fe6a8eeb818dcbbc96e231f1512e5 SHA256 cc3ff80c9250defe173a7c315804828be88b80561251d5a90c554072f8df5c1e
 EBUILD rubygems-1.3.7-r1.ebuild 3004 RMD160 80c41690c1f0c0ed286b30e717d720ace0a9a9d5 SHA1 8d852b067649b3e3e38a793a92c46b530c5f843c SHA256 010dce3a418df065d9f525e878f5152904fa14d71461e8653e7aab7b4ab4a63f
 EBUILD rubygems-1.3.7-r5.ebuild 3747 RMD160 990a3b8c8babbd04865a4cc464dc33ada66b07c0 SHA1 c62b9d262fa101fa12e74028b97c831349550789 SHA256 cf302064dc8c48da252d8e33dc0b8c92009030af7da2e476bfcc63a9b40cdfeb
 EBUILD rubygems-1.3.7.ebuild 2995 RMD160 154085ac99dcb1efa2c581df8cd4c67c2fc43dae SHA1 facdf12e411b45651c40e00f9659cd6828ec85f5 SHA256 8047192b5e43b59eeaa0f9ee07f319b3bda6451c1d205cc3740b4385dca9cb73
 EBUILD rubygems-1.8.5.ebuild 3622 RMD160 cc1aeb54b65dfd29ec4401b40a2a29c159cc6f0a SHA1 c4e3a4fa246e38617b05467eb1de31038547968d SHA256 29764ef0617a3d08a00091f29d805cc1799cd7155d71ee38a03be1ef4a0e8541
-MISC ChangeLog 27588 RMD160 592fc67f282811f12390a45f31a6422d96b6a043 SHA1 1d42441d50514391433fb74c51644dbd77954379 SHA256 356217c44ce97db8060ef87a2848345b86899d2a71b0662f57764e37488e7fef
+EBUILD rubygems-1.8.7.ebuild 3579 RMD160 a932db50ad921a9ffb8b3c945931b7ed007f084d SHA1 0e721ed3ab8621f6a42978b7b701638f454fe6b6 SHA256 ff2dbeff9fcbe1fd1a4224752eeb1fd3444e5ac077292ecafd8dd77486d7bff3
+MISC ChangeLog 27786 RMD160 3fa225954e2d6485d1ba1443d944b719c5520b18 SHA1 679bba0d008b4cf27050a10261ad16f127f5fa36 SHA256 a44e786e355d4e250e4f86a036f569b42f4601059b7de5ab15542fce271f76f0
 MISC metadata.xml 247 RMD160 eb1d10b4366542ce2f232dcaf7317341b6b5608f SHA1 fcb6e2a1d6cda6d45640f9c5a5dfcc0fd4f3ab3b SHA256 633ae9912e8dd27f76b9cf53f5ad0d3222db85d9a19a76da7fd5e26f40b144e3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5VMEYACgkQ3Ca6Xy8+rvRSBgD+Nkhh/BQvxQGfjSH5yq67+1Jf
+fwW0/1c5jDcNU9LY7+sA/ixSfaa6J5iNJjhBug8RYmFk4zQuxWGTBZp40AJsLZIz
+=QiO3
+-----END PGP SIGNATURE-----
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"
+}