From 25e9f6d3abfb5ed3b559ca8313b7b8dcf955638a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 21 Dec 2011 10:38:28 +0000 Subject: [PATCH] Bump EAPI and fix gem specification to accept more than just 2.3.5 versions of Rails gems (in the 2.3 slot). Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- dev-ruby/actionwebservice/ChangeLog | 11 +++++++++-- ....ebuild => actionwebservice-2.3.5-r1.ebuild} | 17 ++++++++++------- 2 files changed, 19 insertions(+), 9 deletions(-) rename dev-ruby/actionwebservice/{actionwebservice-2.3.5.ebuild => actionwebservice-2.3.5-r1.ebuild} (67%) diff --git a/dev-ruby/actionwebservice/ChangeLog b/dev-ruby/actionwebservice/ChangeLog index 79263003940b..1486c489eaed 100644 --- a/dev-ruby/actionwebservice/ChangeLog +++ b/dev-ruby/actionwebservice/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-ruby/actionwebservice -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionwebservice/ChangeLog,v 1.78 2010/06/12 19:06:56 graaff Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionwebservice/ChangeLog,v 1.79 2011/12/21 10:38:28 flameeyes Exp $ + +*actionwebservice-2.3.5-r1 (21 Dec 2011) + + 21 Dec 2011; Diego E. Pettenò + +actionwebservice-2.3.5-r1.ebuild, -actionwebservice-2.3.5.ebuild: + Bump EAPI and fix gem specification to accept more than just 2.3.5 versions of + Rails gems (in the 2.3 slot). 12 Jun 2010; Hans de Graaff -actionwebservice-2.3.2.ebuild, -actionwebservice-2.3.3.ebuild, diff --git a/dev-ruby/actionwebservice/actionwebservice-2.3.5.ebuild b/dev-ruby/actionwebservice/actionwebservice-2.3.5-r1.ebuild similarity index 67% rename from dev-ruby/actionwebservice/actionwebservice-2.3.5.ebuild rename to dev-ruby/actionwebservice/actionwebservice-2.3.5-r1.ebuild index 5e8312aafa89..a57e1cec5006 100644 --- a/dev-ruby/actionwebservice/actionwebservice-2.3.5.ebuild +++ b/dev-ruby/actionwebservice/actionwebservice-2.3.5-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionwebservice/actionwebservice-2.3.5.ebuild,v 1.2 2010/06/12 19:05:41 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionwebservice/actionwebservice-2.3.5-r1.ebuild,v 1.1 2011/12/21 10:38:28 flameeyes Exp $ -EAPI=2 +EAPI=4 USE_RUBY="ruby18" MY_OWNER="panztel" @@ -24,16 +24,19 @@ SLOT="2.3" KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="" -ruby_add_rdepend "=dev-ruby/actionpack-2.3* - =dev-ruby/activerecord-2.3*" +ruby_add_rdepend ">=dev-ruby/actionpack-2.3.5:2.3 + >=dev-ruby/activerecord-2.3.5:2.3" # it uses activerecord when running tests, but they don't work so # ignore them for now. #ruby_add_bdepend test 'dev-ruby/sqlite3-ruby' RESTRICT=test -each_ruby_install() { - each_fakegem_install +all_ruby_prepare() { + # fix dependencies so that instead of requiring _exactly_ versions + # 2.3.5 of Rails gems, it requires the 2.3 slot as we do above. + sed -i -e 's:"=":"~>":' \ + ../metadata || die } all_ruby_install() { -- 2.26.2