summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyen Thai Ngoc Duy <pclouds@gentoo.org>2007-01-28 10:13:23 +0000
committerNguyen Thai Ngoc Duy <pclouds@gentoo.org>2007-01-28 10:13:23 +0000
commit0571b15b8a875f9d2a474999a022a2f10ff5507c (patch)
treeb5daf96b62b4220d8fbe79618ae176c6130ad47d /dev-ruby
parentFixed package source thanks to Diego Pettenò, see bug #163200. (diff)
downloadgentoo-2-0571b15b8a875f9d2a474999a022a2f10ff5507c.tar.gz
gentoo-2-0571b15b8a875f9d2a474999a022a2f10ff5507c.tar.bz2
gentoo-2-0571b15b8a875f9d2a474999a022a2f10ff5507c.zip
Skip system rubygems in favor of new rubygems source
(Portage version: 2.1.2_rc4-r5)
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/rubygems/ChangeLog7
-rw-r--r--dev-ruby/rubygems/files/no-system-rubygems.patch12
-rw-r--r--dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild3
-rw-r--r--dev-ruby/rubygems/rubygems-0.9.1.ebuild5
4 files changed, 23 insertions, 4 deletions
diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index 7a41b5cc7e8e..4f72e1faade3 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,11 @@
# 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.44 2007/01/27 15:38:37 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.45 2007/01/28 10:13:23 pclouds Exp $
+
+ 28 Jan 2007; Nguyễn Thái Ngọc Duy <pclouds@gentoo.org>
+ +files/no-system-rubygems.patch, rubygems-0.9.0-r2.ebuild,
+ rubygems-0.9.1.ebuild:
+ Skip system rubygems in favor of new rubygems source
27 Jan 2007; Nguyễn Thái Ngọc Duy <pclouds@gentoo.org>
files/0.8.11-install.rb.extract_files.patch:
diff --git a/dev-ruby/rubygems/files/no-system-rubygems.patch b/dev-ruby/rubygems/files/no-system-rubygems.patch
new file mode 100644
index 000000000000..96855466ae87
--- /dev/null
+++ b/dev-ruby/rubygems/files/no-system-rubygems.patch
@@ -0,0 +1,12 @@
+diff -ur rubygems-0.9.0/post-install.rb rubygems-0.9.0.new/post-install.rb
+--- rubygems-0.9.0/post-install.rb 2006-06-07 10:39:53.000000000 +0700
++++ rubygems-0.9.0.new/post-install.rb 2007-01-28 16:53:13.000000000 +0700
+@@ -65,7 +65,7 @@
+ end
+
+ def install_sources
+- $: << "lib"
++ $:.unshift "lib"
+ require 'rubygems'
+ Gem::manage_gems
+ Dir.chdir("pkgs/sources") do
diff --git a/dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild b/dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild
index 811e9ad23b6a..12068b103f4e 100644
--- a/dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild
+++ b/dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild
@@ -1,6 +1,6 @@
# 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.0-r2.ebuild,v 1.4 2007/01/26 15:59:37 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild,v 1.5 2007/01/28 10:13:23 pclouds Exp $
inherit ruby
@@ -18,6 +18,7 @@ IUSE=""
DEPEND=">=dev-lang/ruby-1.8"
PATCHES="${FILESDIR}/no_post_install.patch
+ ${FILESDIR}/no-system-rubygems.patch
${FILESDIR}/${P}-build-c-extensions.patch
${FILESDIR}/${P}-build-from-yaml.patch"
USE_RUBY="ruby18"
diff --git a/dev-ruby/rubygems/rubygems-0.9.1.ebuild b/dev-ruby/rubygems/rubygems-0.9.1.ebuild
index d3f92f336530..1c4f9d7cf35d 100644
--- a/dev-ruby/rubygems/rubygems-0.9.1.ebuild
+++ b/dev-ruby/rubygems/rubygems-0.9.1.ebuild
@@ -1,6 +1,6 @@
# 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.1.ebuild,v 1.3 2007/01/26 15:59:37 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-0.9.1.ebuild,v 1.4 2007/01/28 10:13:23 pclouds Exp $
RUBY_BUG_145222=yes
inherit ruby
@@ -19,7 +19,8 @@ IUSE="doc server examples"
DEPEND=">=dev-lang/ruby-1.8"
PDEPEND="server? ( dev-ruby/builder )" # index_gem_repository.rb
-PATCHES="${FILESDIR}/${P}-no_post_install.patch"
+PATCHES="${FILESDIR}/${P}-no_post_install.patch
+ ${FILESDIR}/no-system-rubygems.patch"
USE_RUBY="ruby18"
src_unpack() {