diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2010-05-06 18:11:14 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2010-05-06 18:11:14 +0000 |
| commit | 8cb79880c8f439d42eaf50aaee1f59bf2b7b2fdb (patch) | |
| tree | 54fa2e371dbc273e126af1e209597b85abddc983 /dev-ruby/sinatra | |
| parent | Punt useless mask, gnu-smalltalk was saved. yay. (diff) | |
| download | gentoo-2-8cb79880c8f439d42eaf50aaee1f59bf2b7b2fdb.tar.gz gentoo-2-8cb79880c8f439d42eaf50aaee1f59bf2b7b2fdb.tar.bz2 gentoo-2-8cb79880c8f439d42eaf50aaee1f59bf2b7b2fdb.zip | |
Change dev-ruby/rack dependency to be in line with the dependency expressed by dev-ruby/rack-test to fix the conflict in bug 312971. Thanks to Andreas Schürch for reporting.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/sinatra')
| -rw-r--r-- | dev-ruby/sinatra/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-ruby/sinatra/sinatra-1.0.ebuild | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/dev-ruby/sinatra/ChangeLog b/dev-ruby/sinatra/ChangeLog index 17b34113746b..20b6687d8b0e 100644 --- a/dev-ruby/sinatra/ChangeLog +++ b/dev-ruby/sinatra/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-ruby/sinatra # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/ChangeLog,v 1.5 2010/04/03 13:41:58 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/ChangeLog,v 1.6 2010/05/06 18:11:14 graaff Exp $ + + 06 May 2010; Hans de Graaff <graaff@gentoo.org> sinatra-1.0.ebuild: + Change dev-ruby/rack dependency to be in line with the dependency + expressed by dev-ruby/rack-test to fix the conflict in bug 312971. Thanks + to Andreas Schürch for reporting. *sinatra-1.0 (03 Apr 2010) diff --git a/dev-ruby/sinatra/sinatra-1.0.ebuild b/dev-ruby/sinatra/sinatra-1.0.ebuild index 1b04b14c8b25..d4c63ee4537a 100644 --- a/dev-ruby/sinatra/sinatra-1.0.ebuild +++ b/dev-ruby/sinatra/sinatra-1.0.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/sinatra/sinatra-1.0.ebuild,v 1.1 2010/04/03 13:41:58 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.0.ebuild,v 1.2 2010/05/06 18:11:14 graaff Exp $ EAPI=2 USE_RUBY="ruby18" @@ -20,7 +20,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -ruby_add_rdepend '>=dev-ruby/rack-1.0' +ruby_add_rdepend '=dev-ruby/rack-1.0*' ruby_add_bdepend test "dev-ruby/rack-test dev-ruby/haml dev-ruby/erubis" each_ruby_prepare() { |