Version bump.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 144 insertions, 12 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index c94e63c12436..f92ec8b4214a 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.123 2009/07/05 18:27:15 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.124 2009/07/30 07:42:48 gengor Exp $
+
+*rubygems-1.3.5 (30 Jul 2009)
+
+  30 Jul 2009; Gordon Malm <gengor@gentoo.org> +rubygems-1.3.5.ebuild,
+  +files/rubygems-1.3.5-setup.patch:
+  Version bump.
 
 *rubygems-1.3.4 (05 Jul 2009)
 
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index cbda88cde5e6..d5604f7ca2f5 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 10rubygems 21 RMD160 02441be7de6307bbb859fbc2bf5891809fe9ecf8 SHA1 3f98150bfb39a3f3f1dfabcf2d9bf80051960d81 SHA256 8c30de9ba7f327237af47f85d8f7f6701d34c9a8780ff7303244667568ca5833
 AUX auto_gem.rb 159 RMD160 fbf261e5cf0a8450c51c33a7ad4dafbab21bd518 SHA1 8dde3d73f65998f4c5552924ad49e1441e1b211d SHA256 fe1efe24cd0ba36c55449e9623cd0be394980f37d12468624dad7ffdef72f4dc
 AUX conf.d-gem_server 81 RMD160 8c5c57e989e009b87fcb345185f3f1e3acaf517d SHA1 4d43d760253a478adbce597148ff1c4e414e8eea SHA256 aa850780bebe0e31da9732d8707a748567ca72716fd91e294dc712e71f82db2f
@@ -11,18 +8,14 @@ AUX rubygems-1.3.1-proxy.patch 480 RMD160 4a782791fa29525473a6ec9de91885606c0c85
 AUX rubygems-1.3.1-setup.patch 1534 RMD160 e253b5bf4b21a79e67bd4809cb0decad87240a77 SHA1 15dcec952759233a257dfb825df4ad05fac24e26 SHA256 a95b44921346f82384a5799cc92e2a4a8abde8e6073693349eb3c28d928c09c5
 AUX rubygems-1.3.3-gentoo.patch 1422 RMD160 e39a2042170399d0e98c772b0572026d6057353d SHA1 11cb4656b77185c78df809d3180061e5fe41139b SHA256 95e6c7ea38177b0798562be5abaf040e72db4a27f851502d91c4453890e630b0
 AUX rubygems-1.3.3-setup.patch 886 RMD160 fa4610c20574a42f2703748359dd0bf50b83892e SHA1 54fcc6dc9dd4435a1d043fdf8f10e1d0756722fe SHA256 5220a63f1c8a231a0f8d7dfa938ef4351764a76aa82cf941fdd9dd6b83c7b6bf
+AUX rubygems-1.3.5-setup.patch 942 RMD160 69e8714f72482387019bad7b9254110c6bb8b957 SHA1 ba58de08e29731de4ce820f7d8e4c60de2fcee6e SHA256 d3e7c43ff20a649d1c731e27b0791f110b920201a28607091da0166495709b97
 DIST rubygems-1.3.1.tgz 263748 RMD160 898f33bf49ac6d29d8980cb4feaf30ade0125248 SHA1 a21ae466146bffb28ece05cddbdced0b908ca74f SHA256 361f02e9e3bf1b6625f0e2146553b12c3003d36336cacba51410740f544a8d3b
 DIST rubygems-1.3.3.tgz 292766 RMD160 a9dffb8b93e1ef5cc0679a1555d0899859d770a3 SHA1 395de32c37518041f0bea242fa343f521b8dc100 SHA256 22744ae3994939a198707b9d573d19432c34960220afd2d196ed718bfebee6d7
 DIST rubygems-1.3.4.tgz 293275 RMD160 451797299921cac9997fc93a85601d6f28f17cf5 SHA1 b973b4748c0bc08f9a62b3312bde935dda2eac6f SHA256 1eb4b0a24ed589c40c2b2c3583bd39c52e841afedd55958cc191b3e31adfbbfc
+DIST rubygems-1.3.5.tgz 278469 RMD160 2d17f0de2d387bd2a034916cb79531110f3be196 SHA1 8545f25d00c757a310b879a2580e56d6012fc981 SHA256 c0928cc1ae54dedfb5f57ad3829882c1f90e42bc17bf50491aa6f93a937546ac
 EBUILD rubygems-1.3.1.ebuild 2692 RMD160 939c06d8f9012240bd5b6ea3064cb8f61542b232 SHA1 427ce6a6afe5f5cacc93cc2f1cd3508e2ebd16e9 SHA256 09aef68efa11323e0c61fad32d50878d1e27af3fc19f6c4eaa9829690af44e47
 EBUILD rubygems-1.3.3.ebuild 3192 RMD160 73a18f41a57573fbd40837953b5d738642222473 SHA1 497e45de4315ca49105d925452e6699b6bce5b56 SHA256 65f8c1a130cbdfe8ee9e756e9a3388402d3b8f22cd881cabb722d74745c4e046
 EBUILD rubygems-1.3.4.ebuild 3189 RMD160 cac5fbc72bb5e9041b3e434b11b390653c9097b4 SHA1 13077c588ec3b6c304d15e74529c0df686a3bd57 SHA256 f7f74943d27b82112af0be50fddd5aed7113592af50862a41d3c4a65133147a1
-MISC ChangeLog 18644 RMD160 d13a8381d354cd00905c3afac1b608f10d16f754 SHA1 f17e49ff92797fdb2a54f09458c291856fcf812d SHA256 0cf26c2735b56f6f65ed908d5b057e5111cc46f43e10f3c34418920989c4b3a4
+EBUILD rubygems-1.3.5.ebuild 3177 RMD160 901bf8086a0efcfdebdf14e651665a7d7bbcf739 SHA1 0e655249299e5c37bd5204cb10c62eb3c0c81108 SHA256 8d1e896f5eccd5375781d9e374ce8f9f244edf3ed7d304b2cc5e4f683ccc6e73
+MISC ChangeLog 18802 RMD160 349c0d25cd8606efee1f7f0cb519c1f4cfed9a20 SHA1 185355a900dde2d74499b3306901c2dafbc47cc7 SHA256 9c0679f6961bff5943f0bab9023f3feabba9f58f25b0f7163f2b24195a11b71d
 MISC metadata.xml 247 RMD160 eb1d10b4366542ce2f232dcaf7317341b6b5608f SHA1 fcb6e2a1d6cda6d45640f9c5a5dfcc0fd4f3ab3b SHA256 633ae9912e8dd27f76b9cf53f5ad0d3222db85d9a19a76da7fd5e26f40b144e3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpQ8JAACgkQaGsKqSU7eCSwkwCfS8U/M9LF0B2dKF/AIE6otzzt
-sWMAniGK2RuaXqordSIXqk0jIWDWiEey
-=UAhy
------END PGP SIGNATURE-----
diff --git a/dev-ruby/rubygems/files/rubygems-1.3.5-setup.patch b/dev-ruby/rubygems/files/rubygems-1.3.5-setup.patch
new file mode 100644
index 000000000000..ad6c1d0ec742
--- /dev/null
+++ b/dev-ruby/rubygems/files/rubygems-1.3.5-setup.patch
@@ -0,0 +1,31 @@
+--- a/lib/rubygems/commands/setup_command.rb
++++ b/lib/rubygems/commands/setup_command.rb
+@@ -113,8 +113,6 @@ By default, this RubyGems will install g
+ 
+     remove_old_bin_files bin_dir
+ 
+-    remove_source_caches install_destdir
+-
+     say "RubyGems #{Gem::VERSION} installed"
+ 
+     install_rdoc
+@@ -236,10 +234,6 @@ TEXT
+     if File.writable? gem_doc_dir and
+        (not File.exist? rubygems_doc_dir or
+         File.writable? rubygems_doc_dir) then
+-      say "Removing old RubyGems RDoc and ri" if @verbose
+-      Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir|
+-        rm_rf dir
+-      end
+ 
+       if options[:ri] then
+         ri_dir = File.join rubygems_doc_dir, 'ri'
+@@ -353,7 +347,7 @@ abort "#{deprecation_message}"
+ 
+     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.3.5.ebuild b/dev-ruby/rubygems/rubygems-1.3.5.ebuild
new file mode 100644
index 000000000000..0d3ee9485761
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-1.3.5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.5.ebuild,v 1.1 2009/07/30 07:42:48 gengor Exp $
+
+EAPI="2"
+
+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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE="doc server"
+DEPEND="=dev-lang/ruby-1.8*"
+RDEPEND="${DEPEND}"
+PDEPEND="server? ( dev-ruby/builder )" # index_gem_repository.rb
+
+USE_RUBY="ruby18"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.3.5-setup.patch"
+	# Fixes a new "feature" that would prevent us from recognizing installed
+	# gems inside the sandbox
+	epatch "${FILESDIR}/${PN}-1.3.3-gentoo.patch"
+}
+
+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}"
+	ewarn "RUBYOPT=${RUBYOPT}"
+
+	# Force ebuild to use Ruby 1.8
+	export RUBY="/usr/bin/ruby18"
+
+	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. Since 1.2.0 we also need to set GEM_PATH
+	# for this reason, bug #230163.
+	export GEM_HOME="${D}/usr/$(get_libdir)/ruby/gems/${ver}"
+	export GEM_PATH="${GEM_HOME}/"
+	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 --destdir="${D}" || die "setup.rb install 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_server2" 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
+
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
+		eselect ruby set ruby18
+	fi
+
+	ewarn
+	ewarn "This ebuild is compatible to eselect-ruby"
+	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"
+}