Backport fix for bug 199378

Package-Manager: portage-2.1.3.19

5 files changed, 137 insertions, 8 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index bf37c8ade31a..47e07fbf7878 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.71 2007/11/04 07:48:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.72 2007/11/18 13:40:21 graaff Exp $
+
+*rubygems-0.9.4-r2 (18 Nov 2007)
+
+  18 Nov 2007; Hans de Graaff <graaff@gentoo.org>
+  +files/rubygems-0.9.4-shebang-env-fix.patch, +rubygems-0.9.4-r2.ebuild:
+  Backport a patch from rubygems SVN to fix #199378.
 
   04 Nov 2007; Hans de Graaff <graaff@gentoo.org>
   -files/rubygems-0.9.0-build-c-extensions.patch,
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index bb61278c4e15..1c451c515f5a 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -41,6 +41,10 @@ AUX rubygems-0.9.1-no_rdoc_install.patch 327 RMD160 088ebdd6ff4a5df74f1e741eab56
 MD5 903be806d476df9c477c877d2b40e099 files/rubygems-0.9.1-no_rdoc_install.patch 327
 RMD160 088ebdd6ff4a5df74f1e741eab56cea61f90bad8 files/rubygems-0.9.1-no_rdoc_install.patch 327
 SHA256 2bd1d7637843b66148f50a8bb9b2c6ea55c6f19a7d25413bc978f3aac18ebcba files/rubygems-0.9.1-no_rdoc_install.patch 327
+AUX rubygems-0.9.4-shebang-env-fix.patch 1064 RMD160 c9532f60054199cd4c2a2e305e114a28eb929bfa SHA1 d2e4a561a53f667de6ec1f9e66b56dc18b729c63 SHA256 50402d910bf01e59f68d4aba4aedd5218ecd927d13fe2aa84fbd36b893c1c22e
+MD5 4e18e9fad034f189ba521581572fdde6 files/rubygems-0.9.4-shebang-env-fix.patch 1064
+RMD160 c9532f60054199cd4c2a2e305e114a28eb929bfa files/rubygems-0.9.4-shebang-env-fix.patch 1064
+SHA256 50402d910bf01e59f68d4aba4aedd5218ecd927d13fe2aa84fbd36b893c1c22e files/rubygems-0.9.4-shebang-env-fix.patch 1064
 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
 EBUILD rubygems-0.8.11-r6.ebuild 1689 RMD160 62663f7c3f60be3c31bda96c967dd32425bbf6cb SHA1 6f1e9597fd17d1d72a15721d73ca614a667f8cbf SHA256 70f91c1d0abf91897796f0dfcfcb42472b28c6c29e26740be578c2c44b0d4215
@@ -51,14 +55,18 @@ EBUILD rubygems-0.9.4-r1.ebuild 2893 RMD160 8bfb7fe4fa5201838653c360f70fa6bb8752
 MD5 f6d6ec6175014bcf8cebd93f9f881835 rubygems-0.9.4-r1.ebuild 2893
 RMD160 8bfb7fe4fa5201838653c360f70fa6bb8752d932 rubygems-0.9.4-r1.ebuild 2893
 SHA256 780f9a7effc03861a98fc65268c5ea5ebee3cd0a2b8b26a75560b81085433336 rubygems-0.9.4-r1.ebuild 2893
+EBUILD rubygems-0.9.4-r2.ebuild 2938 RMD160 91407bd8f1f705b09ce9e61fb64764f9f542c463 SHA1 c55c5973a9551b2c199926eb5ca358e0e0eaa61b SHA256 7cded87e5ff0c72f50818ff7d2e6f5ee89ceaa36d87f65979cb81abf7fbae3a5
+MD5 d2c8c80581ca424580ac6a7012c21920 rubygems-0.9.4-r2.ebuild 2938
+RMD160 91407bd8f1f705b09ce9e61fb64764f9f542c463 rubygems-0.9.4-r2.ebuild 2938
+SHA256 7cded87e5ff0c72f50818ff7d2e6f5ee89ceaa36d87f65979cb81abf7fbae3a5 rubygems-0.9.4-r2.ebuild 2938
 EBUILD rubygems-0.9.4.ebuild 2753 RMD160 62d3725c309778184b5639bf80d0a3277b7be752 SHA1 4e54d3242dfc30f6112928599acc17cfaae8b185 SHA256 0466e321185e2bef8b796c0de744ef58de27a64cb98f65651b1e0e1cd659df35
 MD5 9fb8a7f4eb4b434f2716b2ea712a7f9b rubygems-0.9.4.ebuild 2753
 RMD160 62d3725c309778184b5639bf80d0a3277b7be752 rubygems-0.9.4.ebuild 2753
 SHA256 0466e321185e2bef8b796c0de744ef58de27a64cb98f65651b1e0e1cd659df35 rubygems-0.9.4.ebuild 2753
-MISC ChangeLog 10593 RMD160 06ad66091d8638a8dde18a6e3bc53d3765216180 SHA1 e719f6e1444b339f74645d3482d9028d7f396af3 SHA256 ab55f7f25a3dc1ab827a292aa2c245b58c38fc677dbabef6c2980c7fbe0ba091
-MD5 8955a7aafbd274ac85aeb230c202c7eb ChangeLog 10593
-RMD160 06ad66091d8638a8dde18a6e3bc53d3765216180 ChangeLog 10593
-SHA256 ab55f7f25a3dc1ab827a292aa2c245b58c38fc677dbabef6c2980c7fbe0ba091 ChangeLog 10593
+MISC ChangeLog 10805 RMD160 9d37ccc3f56244f671af3dc339757767e4776a03 SHA1 64d18912ead380f799f494415b3a3594b5aa8159 SHA256 fc8723103006d41125dc1cfc0b50efcf9bb941383a721ffc337be72c3fb5ad3a
+MD5 4979fa5ddb41bc3f30882962541358c0 ChangeLog 10805
+RMD160 9d37ccc3f56244f671af3dc339757767e4776a03 ChangeLog 10805
+SHA256 fc8723103006d41125dc1cfc0b50efcf9bb941383a721ffc337be72c3fb5ad3a ChangeLog 10805
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -72,10 +80,13 @@ SHA256 01e01f85b72c814b08949caff97674ef45d0560c218c1de3d3814b9310b1d4d1 files/di
 MD5 c7ab1d478ef92824585c153009dff80b files/digest-rubygems-0.9.4-r1 235
 RMD160 3a4038918818bfe86f352858b2ee4656c761c4d2 files/digest-rubygems-0.9.4-r1 235
 SHA256 01e01f85b72c814b08949caff97674ef45d0560c218c1de3d3814b9310b1d4d1 files/digest-rubygems-0.9.4-r1 235
+MD5 c7ab1d478ef92824585c153009dff80b files/digest-rubygems-0.9.4-r2 235
+RMD160 3a4038918818bfe86f352858b2ee4656c761c4d2 files/digest-rubygems-0.9.4-r2 235
+SHA256 01e01f85b72c814b08949caff97674ef45d0560c218c1de3d3814b9310b1d4d1 files/digest-rubygems-0.9.4-r2 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHLXk30BM77Tkv120RArPCAKCdRi/7pEVnLwBwfZ6gQDrJ3GP6HgCg14Bv
-tpMnj3lUxxjZfw+BC8Png/0=
-=XHN1
+iD8DBQFHQEDK0BM77Tkv120RApn2AJsF2k0mc6eVsPCxgintJns8cVzvjACfbgQ8
+TuFeTJ8+QgwDVbgWqGw1HJ0=
+=rxK+
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rubygems/files/digest-rubygems-0.9.4-r2 b/dev-ruby/rubygems/files/digest-rubygems-0.9.4-r2
new file mode 100644
index 000000000000..29a12d32c242
--- /dev/null
+++ b/dev-ruby/rubygems/files/digest-rubygems-0.9.4-r2
@@ -0,0 +1,3 @@
+MD5 b5680acaa019c80ea44fe87cc2e227da rubygems-0.9.4.tgz 204841
+RMD160 6ee02db45173f05e6f8c5b1ecd5af832fb8601f8 rubygems-0.9.4.tgz 204841
+SHA256 b4d47bcfe2f3b08f7c3bb659a2f4e34a3fa9c1135ba98ad3272753753c354e5c rubygems-0.9.4.tgz 204841
diff --git a/dev-ruby/rubygems/files/rubygems-0.9.4-shebang-env-fix.patch b/dev-ruby/rubygems/files/rubygems-0.9.4-shebang-env-fix.patch
new file mode 100644
index 000000000000..944d542e5196
--- /dev/null
+++ b/dev-ruby/rubygems/files/rubygems-0.9.4-shebang-env-fix.patch
@@ -0,0 +1,20 @@
+This patch is taken from r1441 of rubygems's SVN repository to fix
+rewriting of /usr/bin/env shebang patch with additional arguments to
+the ruby interpreter. Without the patch the regexp would not match,
+leaving the /usr/bin/env in place. This causes problems on platforms
+that pass the remainder of the shebang line as a single argument, such
+as Linux. See bug #199378 for all the details.
+
+This patch should no longer be needed with rubygems 0.9.5.
+
+--- lib/rubygems/installer.rb.~1~	2007-05-10 21:01:45.000000000 +0200
++++ lib/rubygems/installer.rb	2007-11-18 14:18:31.000000000 +0100
+@@ -254,7 +254,7 @@
+         path_to_ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+         if first_line =~ /^#!/
+           # Preserve extra words on shebang line, like "-w".  Thanks RPA.
+-          shebang = first_line.sub(/\A\#!\s*\S*ruby\S*/, "#!" + path_to_ruby)
++          shebang = first_line.sub(/\A\#!.*?ruby\S*/, "#!" + path_to_ruby)
+         else
+           # Create a plain shebang line.
+           shebang = "#!" + path_to_ruby
diff --git a/dev-ruby/rubygems/rubygems-0.9.4-r2.ebuild b/dev-ruby/rubygems/rubygems-0.9.4-r2.ebuild
new file mode 100644
index 000000000000..af1b1ff49bb5
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-0.9.4-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-0.9.4-r2.ebuild,v 1.1 2007/11/18 13:40:21 graaff Exp $
+
+inherit ruby
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="http://rubyforge.org/projects/rubygems/"
+LICENSE="Ruby"
+
+# 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/20989/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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
+
+PATCHES="${FILESDIR}/${PN}-0.9.1-no_post_install.patch
+	${FILESDIR}/${P}-shebang-env-fix.patch
+	${FILESDIR}/no-system-rubygems.patch"
+USE_RUBY="ruby18"
+
+src_unpack() {
+	ruby_src_unpack
+	use doc || epatch "${FILESDIR}/${PN}-0.9.1-no_rdoc_install.patch"
+
+	# Delete mis-packaged . files
+	cd "${S}"
+	find -name '.*' -type f -print0|xargs -0 rm
+}
+
+src_compile() {
+	${RUBY} setup.rb config --libruby="/usr/$(get_libdir)/ruby" || die "setup.rb config failed"
+	${RUBY} setup.rb setup || die "setup.rb setup failed"
+}
+
+src_test() {
+	# Currently RESTRICTed because rubygems needs to be installed
+	# When I work out how to get around that I'll remove the RETRICT
+
+	#for i in test/{test,functional}*.rb; do
+	#	ruby -I pkgs/sources/lib/ -I lib ${i} # || die "$i failed"
+	#done
+	ruby setup.rb test || die "test failed"
+}
+
+src_install() {
+	# RUBYOPT=-rauto_gem without rubygems installed will cause ruby to fail, bug #158455
+	export RUBYOPT="${GENTOO_RUBYOPT}"
+
+	# Fix GEM_HOME to install sources.gem
+	ver=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
+	export GEM_HOME="${D}usr/$(get_libdir)/ruby/gems/${ver}"
+
+	${RUBY} setup.rb install --prefix="${D}" || die "setup.rb install failed"
+	erubydoc
+	cp "${FILESDIR}/auto_gem.rb" "${D}"/$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitedir"]')
+	keepdir /usr/$(get_libdir)/ruby/gems/$ver/doc
+	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()
+{
+	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"
+}