Version bump: #229327

Package-Manager: portage-2.1.4.4

4 files changed, 170 insertions, 2 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index ac59fed1d503..c008c7f858ec 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.90 2008/04/11 07:00:30 rbrown Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.91 2008/06/28 07:21:44 graaff Exp $
+
+*rubygems-1.2.0 (28 Jun 2008)
+
+  28 Jun 2008; Hans de Graaff <graaff@gentoo.org>
+  +files/rubygems-1.2.0-setup.patch, +rubygems-1.2.0.ebuild:
+  Version bump. Thanks to Greg Fitzgerald for providing an updated patch in
+  #229327.
 
   11 Apr 2008; Richard Brown <rbrown@gentoo.org> rubygems-1.1.0.ebuild:
   Revert erroneous commit to rubygems-1.1.0.ebuild
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 62e798eb8714..dbe932c29f47 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.8.11-install.rb.extract_files.patch 1416 RMD160 1af89ae0536a8139a849e66a71e27c205b1a5a0a SHA1 f7feb72e775ddaf48b455f66a719575306e4e09b SHA256 801106efb151be063fca60dd3eed4a981424e4a7ce65f60eb97606453ebffde2
 AUX 10rubygems 21 RMD160 02441be7de6307bbb859fbc2bf5891809fe9ecf8 SHA1 3f98150bfb39a3f3f1dfabcf2d9bf80051960d81 SHA256 8c30de9ba7f327237af47f85d8f7f6701d34c9a8780ff7303244667568ca5833
 AUX auto_gem.rb 159 RMD160 fbf261e5cf0a8450c51c33a7ad4dafbab21bd518 SHA1 8dde3d73f65998f4c5552924ad49e1441e1b211d SHA256 fe1efe24cd0ba36c55449e9623cd0be394980f37d12468624dad7ffdef72f4dc
@@ -13,11 +16,13 @@ AUX rubygems-0.9.5-setup.patch 1794 RMD160 3b417ae647a187dbfa27aeca41c045a5e5934
 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
 AUX rubygems-1.1.1-setup.patch 1555 RMD160 f36324fb0b4092d7af330a55db19c2de70b8a66b SHA1 07f6c0d5f32640fdd3762c56caf184004c687d47 SHA256 9f8006fdf6d43a97773029ce695ed384ae0bd6ea3e5ad18c64c8e8ea8babc86d
+AUX rubygems-1.2.0-setup.patch 1534 RMD160 e253b5bf4b21a79e67bd4809cb0decad87240a77 SHA1 15dcec952759233a257dfb825df4ad05fac24e26 SHA256 a95b44921346f82384a5799cc92e2a4a8abde8e6073693349eb3c28d928c09c5
 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
 DIST rubygems-1.1.1.tgz 423308 RMD160 264b6c2667fd74c111b6886da13b324bc391eaa8 SHA1 e1ead11fa2928fb4b7871c17fd1186198c97c11a SHA256 2b1ce82c8629e4583c8feb1248cfdd12207206f174a4aac2ac30b6d06b6664e1
+DIST rubygems-1.2.0.tgz 246920 RMD160 c66444cc3f372f7170ba1d8ef3c456052acb2bde SHA1 89f8e35f03e1e8057cc8e237f2df025642653dde SHA256 28af450a85fd74ae8bd315023cbeeff98a132720978fa009199f6c95f4bb372d
 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
@@ -25,5 +30,13 @@ EBUILD rubygems-0.9.4.ebuild 2753 RMD160 62d3725c309778184b5639bf80d0a3277b7be75
 EBUILD rubygems-1.0.1.ebuild 2938 RMD160 a9727f8d2fcd045a0d8db21e77a0db4019afae6a SHA1 9a7a242a908d35e7d4d22e80098e7e85e67cf0ab SHA256 1f323edf7b9445de95743402349888726c56928d699a2c3b1d28145ef196e984
 EBUILD rubygems-1.1.0.ebuild 3089 RMD160 9962ab3df4a4235b5623cae61e558cec710f1e7d SHA1 fbee6aa36457b26244e9bf517c2e21a45d9d369d SHA256 a5d772396d50458da77b65d7e77786e6f7226c4d9c975cc83c13e1df09aecb9d
 EBUILD rubygems-1.1.1.ebuild 2893 RMD160 e53deb76dba192882af8c292e5dc7ac4dc3935ef SHA1 7a9dd780754e416ff1c17a6a51ca62c938d8f229 SHA256 f5a535b30dc52bb92cd17beb015ff66eb8be76ab7a72a5c86ed95ede6836f8fb
-MISC ChangeLog 13557 RMD160 ca53c0cc3297997ffa04802117020e4a71f261e1 SHA1 4bda40b93013f8afe9e84dff7560750b5a2e0d06 SHA256 7dcbd04a2df80ba436d62d3b6366628a23d5f1dd1e992cb8431beab6648aba18
+EBUILD rubygems-1.2.0.ebuild 2893 RMD160 5ae4dbe10a01f6853e0b6dee5165af2a24a4ac56 SHA1 c8cf1ae409498694e08f85a86514965952a5e26b SHA256 d95b51a3b251220b501f0bf1b8c4f94414cd9b9f4169de8d4c5751e5bc8cb251
+MISC ChangeLog 13787 RMD160 f9724c19a6e2ff26531b3cb195bd0d9d1dbf70e2 SHA1 f4ba20f37f73328f0e91625a837aa901ad44ee86 SHA256 562b941db8a24c90e7095fc62efa91810442d146416e38f4d349588876daeb32
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhl5pYACgkQCzgcb6sPj4/uqACfXb2Qhg6rLo9LDpbqQfSH689b
+5owAn30JIj2qDtneLbpWWvEGSjB2T2w2
+=Yf0C
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/rubygems/files/rubygems-1.2.0-setup.patch b/dev-ruby/rubygems/files/rubygems-1.2.0-setup.patch
new file mode 100644
index 000000000000..3b76ad3f9990
--- /dev/null
+++ b/dev-ruby/rubygems/files/rubygems-1.2.0-setup.patch
@@ -0,0 +1,53 @@
+--- setup.rb.~1~	2008-06-22 01:51:11.000000000 +0200
++++ setup.rb	2008-06-28 09:05:54.923666929 +0200
+@@ -128,8 +128,8 @@
+     lib_dir = Gem::ConfigMap[site_or_vendor]
+     bin_dir = Gem::ConfigMap[:bindir]
+   else
+-    lib_dir = File.join prefix, 'lib'
+-    bin_dir = File.join prefix, 'bin'
++    lib_dir = File.join prefix, Gem::ConfigMap[site_or_vendor]
++    bin_dir = File.join prefix, Gem::ConfigMap[:bindir]
+   end
+ end
+ 
+@@ -240,19 +240,6 @@
+   end
+ end
+ 
+-# Remove source caches
+-if install_destdir.empty?
+-  require 'rubygems/source_info_cache'
+-
+-  user_cache_file = File.join(install_destdir,
+-                              Gem::SourceInfoCache.user_cache_file)
+-  system_cache_file = File.join(install_destdir,
+-                                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)
+-end
+-
+ # install RDoc
+ 
+ gem_doc_dir = File.join Gem.dir, 'doc'
+@@ -262,10 +249,6 @@
+ if File.writable? gem_doc_dir and
+    (not File.exist? rubygems_doc_dir or
+     File.writable? rubygems_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)
+     begin
+@@ -277,7 +260,7 @@
+ 
+     args << '--quiet'
+     args << '--main' << 'README'
+-    args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt'
++    args << '.' << 'README'
+ 
+     r = RDoc::RDoc.new
+     r.document args
diff --git a/dev-ruby/rubygems/rubygems-1.2.0.ebuild b/dev-ruby/rubygems/rubygems-1.2.0.ebuild
new file mode 100644
index 000000000000..d4e813cd0d5c
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-1.2.0.ebuild
@@ -0,0 +1,95 @@
+# 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.2.0.ebuild,v 1.1 2008/06/28 07:21:44 graaff 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="mirror://rubyforge/${PN}/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE="doc server"
+DEPEND=">=dev-lang/ruby-1.8"
+PDEPEND="server? ( dev-ruby/builder )" # index_gem_repository.rb
+
+USE_RUBY="ruby18"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-setup.patch"
+
+	# Delete mis-packaged . files
+	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 gem18 /usr/bin/gem || die "dosym gem failed"
+
+	dodoc README || die "dodoc README failed"
+
+	cp "${FILESDIR}/auto_gem.rb" "${D}"/$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitedir"]') || die "cp auto_gem.rb failed"
+	doenvd "${FILESDIR}/10rubygems" || die "doenvd 10rubygems failed"
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server" 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
+
+	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"
+}