Version bump. Fixes bug #215293

Package-Manager: portage-2.1.4.4

5 files changed, 191 insertions, 2 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index bd335fae5a8a..821dc81be0de 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.85 2008/03/26 03:29:59 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.86 2008/03/29 15:16:20 rbrown Exp $
+
+*rubygems-1.1.0-r0 (29 Mar 2008)
+
+  29 Mar 2008; Richard Brown <rbrown@gentoo.org>
+  +files/rubygems-1.1.0-dependency-installer-install-dir-fix.patch,
+  +files/rubygems-1.1.0-setup.patch, +rubygems-1.1.0-r0.ebuild:
+  Version bump. Fixes bug #215293
 
   25 Mar 2008; <ricmm@gentoo.org> rubygems-0.8.11-r6.ebuild:
   Drop to ~mips due to unstable deps
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 1b54eac2535d..11f164d55629 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -10,13 +10,17 @@ AUX rubygems-0.9.1-no_post_install.patch 317 RMD160 5fc0efc85cacfca6a6f4f59e0d6c
 AUX rubygems-0.9.1-no_rdoc_install.patch 327 RMD160 088ebdd6ff4a5df74f1e741eab56cea61f90bad8 SHA1 c000e3575accede2220acec7e312821841f66d3b SHA256 2bd1d7637843b66148f50a8bb9b2c6ea55c6f19a7d25413bc978f3aac18ebcba
 AUX rubygems-0.9.4-shebang-env-fix.patch 1064 RMD160 c9532f60054199cd4c2a2e305e114a28eb929bfa SHA1 d2e4a561a53f667de6ec1f9e66b56dc18b729c63 SHA256 50402d910bf01e59f68d4aba4aedd5218ecd927d13fe2aa84fbd36b893c1c22e
 AUX rubygems-0.9.5-setup.patch 1794 RMD160 3b417ae647a187dbfa27aeca41c045a5e593400c SHA1 e3216b98fa73790c5294e429814a4afa6479d202 SHA256 1c516056489c760de1aa2bdd826c763cfb72193f9b038023499f7b08bec7579a
+AUX rubygems-1.1.0-dependency-installer-install-dir-fix.patch 664 RMD160 e065cdfb53d9ee441f2f99bec0277eceb8b1ef4c SHA1 5042cfa95c50cf882f1d6e54371763e49ef557c6 SHA256 0a3a4800cc61e6afa47f1abe9e580f90f4b8e3134e51f24cb8cf526951336744
+AUX rubygems-1.1.0-setup.patch 1522 RMD160 f29438e5caa31660f7c0059b0c91713cda492c14 SHA1 687014af8a563462e497ab386fb8f81894f3458d SHA256 ed36f08538ef915d97015d51294cdb7327ee8f0eec8b581bcd09da11ba147849
 DIST rubygems-0.8.11.tgz 160265 RMD160 381ef7f088b3b439f28797d6d7a3257b3e28d6e4 SHA1 6a7d047349a073f24621e589f50a6a6548f943be SHA256 6ad2b857248aef0e9a5297f708f9988fbade78e16d670109937a73e56fdbae6d
 DIST rubygems-0.9.4.tgz 204841 RMD160 6ee02db45173f05e6f8c5b1ecd5af832fb8601f8 SHA1 904080d36e34d7a6969c3cef228380eb82688d2a SHA256 b4d47bcfe2f3b08f7c3bb659a2f4e34a3fa9c1135ba98ad3272753753c354e5c
 DIST rubygems-1.0.1.tgz 246165 RMD160 b75fdf2aa252f84972495502b4b91f9e6d4c7e7c SHA1 232750fa59917ea9baf03797fdb10a22d29ebad9 SHA256 f4fb55b0b3631c079c10f6b26ba5c2bf9bc9ec07d19e215c6a47824df6df6e8f
+DIST rubygems-1.1.0.tgz 426191 RMD160 934b6ee3dfcd68b4ac93616ce40c4921d3f2e766 SHA1 2379e510267ed1c979987a618c9f139e58266d28 SHA256 07e734475dbf26b6e50b11b815554db9567e2b6db78cf7a46ea36518c9ebb210
 EBUILD rubygems-0.8.11-r6.ebuild 1690 RMD160 6c75175454049979d4f79e5e958539ca50a306cf SHA1 569d0a76ba51e5e77b549483595a83f0a83b0bba SHA256 ecd2a8adac5fad0cf3fd9366276ab575aebaa3dd69e3efebb94df914dcf97325
 EBUILD rubygems-0.9.4-r1.ebuild 2892 RMD160 a4c73af24616ac94e955106d04c702674e469e32 SHA1 e9b1f4e3f53ebbe4d05ad5b56fedc83c9252b314 SHA256 e13aeac957ce9f72b1365215942a055b7408f9a65dee5c25422c353f0c271585
 EBUILD rubygems-0.9.4-r2.ebuild 2932 RMD160 ebad6a0585460b1c6c4344e17131ea7d11bd5af5 SHA1 ba12ece04ae871d85d5808cb33e8cee458cd13c6 SHA256 62279bc4b345a57e618c46cfe46089be067d0ff74301eedc64620073f2acb5ec
 EBUILD rubygems-0.9.4.ebuild 2753 RMD160 62d3725c309778184b5639bf80d0a3277b7be752 SHA1 4e54d3242dfc30f6112928599acc17cfaae8b185 SHA256 0466e321185e2bef8b796c0de744ef58de27a64cb98f65651b1e0e1cd659df35
 EBUILD rubygems-1.0.1.ebuild 2938 RMD160 a9727f8d2fcd045a0d8db21e77a0db4019afae6a SHA1 9a7a242a908d35e7d4d22e80098e7e85e67cf0ab SHA256 1f323edf7b9445de95743402349888726c56928d699a2c3b1d28145ef196e984
-MISC ChangeLog 12531 RMD160 e267162a4f21db08ac103fda7d7274074aad165e SHA1 9f86484403507c67c56adbe15c8cc80f22e2f057 SHA256 e87254c82a4f9fdea33db82b87717e3470207259c79e12788b26c7ea87ac92eb
+EBUILD rubygems-1.1.0-r0.ebuild 3085 RMD160 580df02ac65e0254b534141d56a7e2bae2de15a4 SHA1 da5ea6f673501fdd991aeac0bbc9ba293ce5b656 SHA256 cc7ff44a95b3f3cecbb7d44a5decee74e925acfc25b4cf3afc8667f43f35c71e
+MISC ChangeLog 12782 RMD160 ddf83940e1d033dc429704c63739419254c618e3 SHA1 d1cd9703b23cc4847782d94a8f66366bea4e2f68 SHA256 0d1abcbd6769ed2377c99495ebcba13edd22ea0382345f85971ce74942ec44d6
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
diff --git a/dev-ruby/rubygems/files/rubygems-1.1.0-dependency-installer-install-dir-fix.patch b/dev-ruby/rubygems/files/rubygems-1.1.0-dependency-installer-install-dir-fix.patch
new file mode 100644
index 000000000000..145882cda178
--- /dev/null
+++ b/dev-ruby/rubygems/files/rubygems-1.1.0-dependency-installer-install-dir-fix.patch
@@ -0,0 +1,13 @@
+Index: lib/rubygems/dependency_installer.rb
+===================================================================
+--- lib/rubygems/dependency_installer.rb	(revision 1678)
++++ lib/rubygems/dependency_installer.rb	(working copy)
+@@ -189,7 +189,7 @@
+       say "Installing gem #{spec.full_name}" if Gem.configuration.really_verbose
+ 
+       _, source_uri = @specs_and_sources.assoc spec
+-      local_gem_path = Gem::RemoteFetcher.fetcher.download spec, source_uri
++      local_gem_path = Gem::RemoteFetcher.fetcher.download spec, source_uri, @install_dir
+ 
+       inst = Gem::Installer.new local_gem_path,
+                                 :env_shebang => @env_shebang,
diff --git a/dev-ruby/rubygems/files/rubygems-1.1.0-setup.patch b/dev-ruby/rubygems/files/rubygems-1.1.0-setup.patch
new file mode 100644
index 000000000000..08fc331bfcc8
--- /dev/null
+++ b/dev-ruby/rubygems/files/rubygems-1.1.0-setup.patch
@@ -0,0 +1,61 @@
+Source: Richard Brown
+Upstream: no
+Reason: respect --prefix properly, stop stamping on live filesystem.
+--- setup.rb.orig	2008-03-27 23:09:24.000000000 +0000
++++ setup.rb	2008-03-29 09:12:32.000000000 +0000
+@@ -81,8 +81,8 @@
+ 
+   raise "invalid --prefix #{prefix.inspect}" if prefix.nil?
+ 
+-  lib_dir = File.join prefix, 'lib'
+-  bin_dir = File.join prefix, 'bin'
++  lib_dir = File.join prefix, Config::CONFIG['sitelibdir']
++  bin_dir = File.join prefix, Config::CONFIG['bindir']
+ 
+   mkdir_p lib_dir
+   mkdir_p bin_dir
+@@ -187,30 +187,15 @@
+   end
+ end
+ 
+-# Remove source caches
+-
+-require 'rubygems/source_info_cache'
+-
+-user_cache_file = Gem::SourceInfoCache.user_cache_file
+-system_cache_file = Gem::SourceInfoCache.system_cache_file
+-
+-rm_f user_cache_file if File.writable? File.dirname(user_cache_file)
+-rm_f system_cache_file if File.writable? File.dirname(system_cache_file)
+-
+ # install RDoc
+ 
+ gem_doc_dir = File.join Gem.dir, 'doc'
+ 
+ if File.writable? gem_doc_dir then
+-  puts "Removing old RubyGems RDoc and ri"
+-  Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir|
+-    rm_rf dir
+-  end
+-
+   def run_rdoc(*args)
+     args << '--quiet'
+     args << '--main' << 'README'
+-    args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt'
++    args << '.' << 'README'
+ 
+     r = RDoc::RDoc.new
+     r.document args
+@@ -237,6 +222,7 @@
+ end
+ 
+ # Remove stubs
++if false # Don't want this
+ 
+ def stub?(path)
+   return unless File.readable? path
+@@ -305,3 +291,4 @@
+ puts "to remove it by hand."
+ puts
+ 
++end
diff --git a/dev-ruby/rubygems/rubygems-1.1.0-r0.ebuild b/dev-ruby/rubygems/rubygems-1.1.0-r0.ebuild
new file mode 100644
index 000000000000..6ba7a39e07a4
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-1.1.0-r0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.1.0-r0.ebuild,v 1.1 2008/03/29 15:16:20 rbrown Exp $
+
+inherit ruby
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="http://rubyforge.org/projects/rubygems/"
+LICENSE="|| ( Ruby GPL-2 )"
+
+# Needs to be installed first
+RESTRICT="test"
+
+# The URL depends implicitly on the version, unfortunately. Even if you
+# change the filename on the end, it still downloads the same file.
+SRC_URI="http://rubyforge.org/frs/download.php/34638/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE="doc server examples"
+DEPEND=">=dev-lang/ruby-1.8"
+PDEPEND="server? ( dev-ruby/builder )" # index_gem_repository.rb
+
+USE_RUBY="ruby18"
+
+PATCHES="${FILESDIR}/${P}-setup.patch
+	${FILESDIR}/${P}-dependency-installer-install-dir-fix.patch
+	"
+
+src_unpack() {
+	ruby_src_unpack
+
+	# Delete mis-packaged . files
+	cd "${S}"
+	find -name '.*' -type f -print0|xargs -0 rm
+
+}
+
+src_compile() {
+	# Allowing ruby_src_compile would be bad with the new setup.rb
+	:
+}
+
+src_install() {
+	# RUBYOPT=-rauto_gem without rubygems installed will cause ruby to fail, bug #158455
+	export RUBYOPT="${GENTOO_RUBYOPT}"
+
+	ver=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
+
+	# rubygems tries to create GEM_HOME if it doesn't exist, upsetting sandbox,
+	# bug #202109
+	export GEM_HOME="${D}/usr/$(get_libdir)/ruby/gems/${ver}"
+	keepdir /usr/$(get_libdir)/ruby/gems/$ver/{doc,gems,cache,specifications}
+
+	myconf=""
+	if ! use doc; then
+		myconf="${myconf} --no-ri"
+		myconf="${myconf} --no-rdoc"
+	fi
+
+	${RUBY} setup.rb $myconf --prefix="${D}" || die "setup.rb install failed"
+
+	dosym /usr/bin/gem18 /usr/bin/gem || die "dosym gem failed"
+
+	#This is used to update rubygems, do not want.
+	rm "${D}/usr/bin/update_rubygems18"
+
+	dodoc README
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}"
+	fi
+
+	cp "${FILESDIR}/auto_gem.rb" "${D}"/$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitedir"]')
+	doenvd "${FILESDIR}/10rubygems"
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst()
+{
+	ver=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
+	SOURCE_CACHE="/usr/$(get_libdir)/ruby/gems/$ver/source_cache"
+	if [[ -e "${SOURCE_CACHE}" ]]; then
+		rm "${SOURCE_CACHE}"
+	fi
+
+	ewarn "If you have previously switched to using ruby18_with_gems using ruby-config, this"
+	ewarn "package has removed that file and makes it unnecessary anymore."
+	ewarn "Please use ruby-config to revert back to ruby18."
+}
+
+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"
+}