diff options
author | 2013-11-23 16:13:33 +0000 | |
---|---|---|
committer | 2013-11-23 16:13:33 +0000 | |
commit | eb0707d4f200661a8c0e4efad53c88acaae68dd4 (patch) | |
tree | bed4f663a8e8072de20e7896557d75cc6d347972 /dev-ruby | |
parent | amd64/x86 stable wrt bug #491886 (diff) | |
download | gentoo-2-eb0707d4f200661a8c0e4efad53c88acaae68dd4.tar.gz gentoo-2-eb0707d4f200661a8c0e4efad53c88acaae68dd4.tar.bz2 gentoo-2-eb0707d4f200661a8c0e4efad53c88acaae68dd4.zip |
Fix building with LANG=C by using the ruby gemspec, fixing bug 491826.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-ruby')
-rw-r--r-- | dev-ruby/bundler/ChangeLog | 5 | ||||
-rw-r--r-- | dev-ruby/bundler/bundler-1.3.5-r1.ebuild | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/dev-ruby/bundler/ChangeLog b/dev-ruby/bundler/ChangeLog index 6974cb0b1425..e51d346d3135 100644 --- a/dev-ruby/bundler/ChangeLog +++ b/dev-ruby/bundler/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-ruby/bundler # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.58 2013/10/16 06:07:34 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.59 2013/11/23 16:13:33 graaff Exp $ + + 23 Nov 2013; Hans de Graaff <graaff@gentoo.org> bundler-1.3.5-r1.ebuild: + Fix building with LANG=C by using the ruby gemspec, fixing bug 491826. *bundler-1.3.5-r1 (16 Oct 2013) diff --git a/dev-ruby/bundler/bundler-1.3.5-r1.ebuild b/dev-ruby/bundler/bundler-1.3.5-r1.ebuild index 4cf54157981d..5bc2abcae78b 100644 --- a/dev-ruby/bundler/bundler-1.3.5-r1.ebuild +++ b/dev-ruby/bundler/bundler-1.3.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.3.5-r1.ebuild,v 1.1 2013/10/16 06:07:34 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.3.5-r1.ebuild,v 1.2 2013/11/23 16:13:33 graaff Exp $ EAPI=5 @@ -13,6 +13,8 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md ISSUES.md UPGRADING.md" +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + inherit ruby-fakegem DESCRIPTION="An easy way to vendor gem dependencies" @@ -40,4 +42,8 @@ all_ruby_prepare() { # failing spec, so patch out this spec for now since it is not a # regression. sed -i -e '/works when you bundle exec bundle/,/^ end/ s:^:#:' spec/install/deploy_spec.rb || die + + # Remove unneeded git dependency from gemspec, which we need to use + # for bug 491826 + sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die } |