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 | a31de702e5be4a146dee48583e04cc73e96888f8 (patch) | |
| tree | 5476d7d454deda8375c077e697442b8ce215216f /dev-ruby | |
| parent | Punt useless mask, gnu-smalltalk was saved. yay. (diff) | |
| download | historical-a31de702e5be4a146dee48583e04cc73e96888f8.tar.gz historical-a31de702e5be4a146dee48583e04cc73e96888f8.tar.bz2 historical-a31de702e5be4a146dee48583e04cc73e96888f8.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.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby')
| -rw-r--r-- | dev-ruby/sinatra/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-ruby/sinatra/Manifest | 10 | ||||
| -rw-r--r-- | dev-ruby/sinatra/sinatra-1.0.ebuild | 4 |
3 files changed, 13 insertions, 8 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/Manifest b/dev-ruby/sinatra/Manifest index 17d7500b579b..d7c798d621c6 100644 --- a/dev-ruby/sinatra/Manifest +++ b/dev-ruby/sinatra/Manifest @@ -5,13 +5,13 @@ DIST sinatra-0.9.4.gem 119808 RMD160 c3396ffcc9004b213dccde6bb7b9e1635f0f392b SH DIST sinatra-1.0.gem 121856 RMD160 90b5c985f494574141c0cf33144d2cf206f0eaed SHA1 0f79a20ae46eedd387d5b93a823ecc1f9c4133bb SHA256 8a79ad3209baf34a4dfef6079a5461c381c755750f8a1234c36144a838f67a8a EBUILD sinatra-0.9.4-r1.ebuild 704 RMD160 a4814cf23be624e66fc68374cf7abdd28cafaffb SHA1 615fa19f579152496eb0ca1012758e16b9a7ceb2 SHA256 d26f11cf9eea8c0bb5ae6e023ae78ea93880647a31aa85ef1f613595883e99e1 EBUILD sinatra-0.9.4.ebuild 520 RMD160 5d8d940affc956db41f0f79058de503958836124 SHA1 91114afe26e8c549f9b3805e36f8ebb3d1f576c2 SHA256 7aa0a2a5bd8230231080e1720a50720a118b884f6181a045b5fefa49eba9b53e -EBUILD sinatra-1.0.ebuild 846 RMD160 3dd9db2fb6ee9fbbf7cff69b71810f1994781425 SHA1 e1f1eb1282aad8823b1e19bf3e4ec5e3ef982ac5 SHA256 5417c95757cdb95ec04564c6425604899809675330f8753b8f832b9062d4c69c -MISC ChangeLog 1091 RMD160 fcf3c091ce281c9d52b568aea649af74e1394641 SHA1 fa4def0f5b594aef961ee9d862ae69bf368d482e SHA256 7d772c158dfdd60fecff202a003bc2335200a70e3d2c15f48ad877195999fdd6 +EBUILD sinatra-1.0.ebuild 846 RMD160 781ec61839e2952fe02e49adbc5f43e6ba27ced3 SHA1 5946e084152c28388a5047859286b804a25fdc30 SHA256 1729d00b6aee0ccd04b1508dbe54bda0ee103edaee0eb62f257006cf0681e5fa +MISC ChangeLog 1343 RMD160 513f369fe433138fd0acad7c281322bd9fbc2278 SHA1 7a5f487ece60c0c64b73cd2a24eb5b0b62669799 SHA256 147e41a332a736bd521d4254d8cf4f5f4acc072b8303d7631efff659f601b002 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAku3RbEACgkQeM7EJeUH71PS1wCdGupprIWvVBTEJT53BJ94H2GW -S2wAnjtBS+6+h66UL38ROSlPzIRCF/hR -=gT34 +iEYEARECAAYFAkvjBkcACgkQeM7EJeUH71PCFACdFmcWRPsH8vP7vS6RoPpXFubn +Z70An29m9BbbniLlY5NUKz8ip2l2/i6s +=SLzh -----END PGP SIGNATURE----- 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() { |