diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-07-28 22:32:35 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-07-28 22:32:35 +0000 |
| commit | 4dec32f9e63f49294ca86e1d9ec6fd8f78b12e79 (patch) | |
| tree | 97960f7e49057c4117450c52c2f70b494bb02e27 /dev-ruby/nokogiri | |
| parent | Version bump, remove old (diff) | |
| download | gentoo-2-4dec32f9e63f49294ca86e1d9ec6fd8f78b12e79.tar.gz gentoo-2-4dec32f9e63f49294ca86e1d9ec6fd8f78b12e79.tar.bz2 gentoo-2-4dec32f9e63f49294ca86e1d9ec6fd8f78b12e79.zip | |
Fix building with Ruby 1.9.2 (bug #330275).
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/nokogiri')
| -rw-r--r-- | dev-ruby/nokogiri/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ruby/nokogiri/files/nokogiri-1.4.2+ruby-1.9.2.patch | 28 | ||||
| -rw-r--r-- | dev-ruby/nokogiri/nokogiri-1.4.2.ebuild | 4 |
3 files changed, 36 insertions, 2 deletions
diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog index 995965e8fdb6..a7da9b86c7b8 100644 --- a/dev-ruby/nokogiri/ChangeLog +++ b/dev-ruby/nokogiri/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/nokogiri # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.30 2010/06/19 10:32:56 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.31 2010/07/28 22:32:35 flameeyes Exp $ + + 28 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org> + nokogiri-1.4.2.ebuild, +files/nokogiri-1.4.2+ruby-1.9.2.patch: + Fix building with Ruby 1.9.2 (bug #330275). *nokogiri-1.4.2 (19 Jun 2010) diff --git a/dev-ruby/nokogiri/files/nokogiri-1.4.2+ruby-1.9.2.patch b/dev-ruby/nokogiri/files/nokogiri-1.4.2+ruby-1.9.2.patch new file mode 100644 index 000000000000..261fbb4b5617 --- /dev/null +++ b/dev-ruby/nokogiri/files/nokogiri-1.4.2+ruby-1.9.2.patch @@ -0,0 +1,28 @@ +From 47fa53a3c34ae5aa5eccf3bc92922b15b09a423f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com> +Date: Thu, 29 Jul 2010 00:17:02 +0200 +Subject: [PATCH] Make sure that the required paths are absolute. + +Ruby 1.9.2 no longer adds the CWD to the list of searched paths. +--- + Rakefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Rakefile b/Rakefile +index 29ef0e2..c4e9887 100644 +--- a/Rakefile ++++ b/Rakefile +@@ -128,8 +128,8 @@ file GENERATED_TOKENIZER => "lib/nokogiri/css/tokenizer.rex" do |t| + end + end + +-require 'tasks/test' +-require 'tasks/cross_compile' ++require File.dirname(__FILE__) + '/tasks/test' ++require File.dirname(__FILE__) + '/tasks/cross_compile' + + desc "set environment variables to build and/or test with debug options" + task :debug do +-- +1.7.2 + diff --git a/dev-ruby/nokogiri/nokogiri-1.4.2.ebuild b/dev-ruby/nokogiri/nokogiri-1.4.2.ebuild index 69f52ba0dc0d..c08f177e5ef3 100644 --- a/dev-ruby/nokogiri/nokogiri-1.4.2.ebuild +++ b/dev-ruby/nokogiri/nokogiri-1.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.4.2.ebuild,v 1.1 2010/06/19 10:32:56 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.4.2.ebuild,v 1.2 2010/07/28 22:32:35 flameeyes Exp $ EAPI=2 @@ -42,6 +42,8 @@ ruby_add_rdepend "ffi? ( virtual/ruby-ffi )" # ruby_add_bdepend "test? ( dev-ruby/weakling )" all_ruby_prepare() { + epatch "${FILESDIR}"/${P}+ruby-1.9.2.patch + sed -i \ -e '/tasks\/cross_compile/s:^:#:' \ -e '/:test.*prerequisites/s:^:#:' \ |