diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2012-12-18 14:43:22 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2012-12-18 14:43:22 +0000 |
| commit | 2325af44ed7cef14fc5968bc066efdb7bd8831dd (patch) | |
| tree | dc8640760f94e78803dd7d96cc4884ff4a4cabbe /app-admin/chef | |
| parent | Drop -Werror, spotted by ago in bug #447374 (diff) | |
| download | gentoo-2-2325af44ed7cef14fc5968bc066efdb7bd8831dd.tar.gz gentoo-2-2325af44ed7cef14fc5968bc066efdb7bd8831dd.tar.bz2 gentoo-2-2325af44ed7cef14fc5968bc066efdb7bd8831dd.zip | |
fix gem dependency issues
(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-admin/chef')
| -rw-r--r-- | app-admin/chef/ChangeLog | 5 | ||||
| -rw-r--r-- | app-admin/chef/chef-10.16.2.ebuild | 15 |
2 files changed, 17 insertions, 3 deletions
diff --git a/app-admin/chef/ChangeLog b/app-admin/chef/ChangeLog index 8b12f4421803..6c16bf610247 100644 --- a/app-admin/chef/ChangeLog +++ b/app-admin/chef/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/chef # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/ChangeLog,v 1.14 2012/12/17 09:35:03 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/ChangeLog,v 1.15 2012/12/18 14:43:22 hollow Exp $ + + 18 Dec 2012; Benedikt Böhm <hollow@gentoo.org> chef-10.16.2.ebuild: + fix gem dependency issues *chef-10.16.2 (17 Dec 2012) diff --git a/app-admin/chef/chef-10.16.2.ebuild b/app-admin/chef/chef-10.16.2.ebuild index c77cd3aa6947..f079c342bce5 100644 --- a/app-admin/chef/chef-10.16.2.ebuild +++ b/app-admin/chef/chef-10.16.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/chef-10.16.2.ebuild,v 1.1 2012/12/17 09:35:03 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/chef-10.16.2.ebuild,v 1.2 2012/12/18 14:43:22 hollow Exp $ EAPI=4 USE_RUBY="ruby18 ruby19" @@ -10,6 +10,8 @@ RUBY_FAKEGEM_TASK_TEST="spec" RUBY_FAKEGEM_EXTRADOC="README.rdoc" +RUBY_FAKEGEM_GEMSPEC=${RUBY_FAKEGEM_NAME}.gemspec + inherit ruby-fakegem user DESCRIPTION="Chef is a systems integration framework" @@ -28,7 +30,6 @@ ruby_add_rdepend ">=dev-ruby/bunny-0.6.0 dev-ruby/erubis >=dev-ruby/highline-1.6.9 >=dev-ruby/json-1.4.4 - <=dev-ruby/json-1.6.1 >=dev-ruby/mixlib-authentication-1.3.0 >=dev-ruby/mixlib-cli-1.1.0 >=dev-ruby/mixlib-config-1.1.2 @@ -49,6 +50,16 @@ ruby_add_rdepend ">=dev-ruby/bunny-0.6.0 >=dev-ruby/yajl-ruby-1.1 <dev-ruby/yajl-ruby-2" +each_ruby_prepare() { + ruby_fakegem_metadata_gemspec ../metadata ${RUBY_FAKEGEM_GEMSPEC} + + # bunny + sed -i -e 's/"< 0.8.0", //' ${RUBY_FAKEGEM_GEMSPEC} || die "Unable to fix up dependencies." + + # json + sed -i -e 's/"<= 1.6.1", //' ${RUBY_FAKEGEM_GEMSPEC} || die "Unable to fix up dependencies." +} + all_ruby_install() { all_fakegem_install |