diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2013-12-25 09:53:39 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2013-12-25 09:53:39 +0000 |
| commit | b0bf9aeac5266b35ab78aaa7e62ae60b9bd23c42 (patch) | |
| tree | 81baaf154e2425dda28526f157bb97ba7d5a00a4 | |
| parent | Remove unneeded useflag description from metadata.xml (diff) | |
| download | gentoo-2-b0bf9aeac5266b35ab78aaa7e62ae60b9bd23c42.tar.gz gentoo-2-b0bf9aeac5266b35ab78aaa7e62ae60b9bd23c42.tar.bz2 gentoo-2-b0bf9aeac5266b35ab78aaa7e62ae60b9bd23c42.zip | |
Simplify dependencies and add ruby20.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
| -rw-r--r-- | dev-ruby/dalli/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-ruby/dalli/dalli-2.6.4.ebuild | 15 |
2 files changed, 15 insertions, 5 deletions
diff --git a/dev-ruby/dalli/ChangeLog b/dev-ruby/dalli/ChangeLog index d35ee7d9e36d..5c8c5a8673ae 100644 --- a/dev-ruby/dalli/ChangeLog +++ b/dev-ruby/dalli/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-ruby/dalli # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dalli/ChangeLog,v 1.5 2013/11/02 19:59:39 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dalli/ChangeLog,v 1.6 2013/12/25 09:53:39 graaff Exp $ + + 25 Dec 2013; Hans de Graaff <graaff@gentoo.org> dalli-2.6.4.ebuild: + Simplify dependencies and add ruby20. 02 Nov 2013; Manuel Rüger <mrueg@gentoo.org> -dalli-2.1.0.ebuild, -dalli-2.5.0.ebuild: diff --git a/dev-ruby/dalli/dalli-2.6.4.ebuild b/dev-ruby/dalli/dalli-2.6.4.ebuild index d630f4c1e4e5..c5781770e437 100644 --- a/dev-ruby/dalli/dalli-2.6.4.ebuild +++ b/dev-ruby/dalli/dalli-2.6.4.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dalli/dalli-2.6.4.ebuild,v 1.2 2013/10/13 22:05:08 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dalli/dalli-2.6.4.ebuild,v 1.3 2013/12/25 09:53:39 graaff Exp $ EAPI=5 -USE_RUBY="ruby18 ruby19" +USE_RUBY="ruby18 ruby19 ruby20" RUBY_FAKEGEM_TASK_TEST="test" @@ -22,12 +22,19 @@ IUSE="" DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.4.0 )" ruby_add_bdepend "test? ( - dev-ruby/minitest + dev-ruby/minitest:0 >=dev-ruby/mocha-0.13 - =dev-ruby/rails-3* )" + >=dev-ruby/activesupport-3 )" all_ruby_prepare() { chmod 0755 "${HOME}" || die "Failed to fix permissions on home" sed -i -e '/appraisal/ s:^:#:' Rakefile || die + + sed -i -e '1igem "minitest", "~> 4.0"' test/helper.rb || die + + # Drop rails dependency which is only used to display the version + # number, so we only need to depend on activesupport and avoid + # complicated circular dependencies. + sed -i -e '/rails/I s:^:#:' test/helper.rb || die } |