| 1 |
graaff 10/05/06 18:11:14 |
| 2 |
|
| 3 |
Modified: ChangeLog sinatra-1.0.ebuild |
| 4 |
Log: |
| 5 |
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. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.6 dev-ruby/sinatra/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/sinatra/ChangeLog?rev=1.6&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/sinatra/ChangeLog?rev=1.6&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/sinatra/ChangeLog?r1=1.5&r2=1.6 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/ChangeLog,v |
| 18 |
retrieving revision 1.5 |
| 19 |
retrieving revision 1.6 |
| 20 |
diff -u -r1.5 -r1.6 |
| 21 |
--- ChangeLog 3 Apr 2010 13:41:58 -0000 1.5 |
| 22 |
+++ ChangeLog 6 May 2010 18:11:14 -0000 1.6 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for dev-ruby/sinatra |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/ChangeLog,v 1.5 2010/04/03 13:41:58 graaff Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/ChangeLog,v 1.6 2010/05/06 18:11:14 graaff Exp $ |
| 28 |
+ |
| 29 |
+ 06 May 2010; Hans de Graaff <graaff@g.o> sinatra-1.0.ebuild: |
| 30 |
+ Change dev-ruby/rack dependency to be in line with the dependency |
| 31 |
+ expressed by dev-ruby/rack-test to fix the conflict in bug 312971. Thanks |
| 32 |
+ to Andreas Schürch for reporting. |
| 33 |
|
| 34 |
*sinatra-1.0 (03 Apr 2010) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 dev-ruby/sinatra/sinatra-1.0.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/sinatra/sinatra-1.0.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/sinatra/sinatra-1.0.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/sinatra/sinatra-1.0.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: sinatra-1.0.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.0.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- sinatra-1.0.ebuild 3 Apr 2010 13:41:58 -0000 1.1 |
| 52 |
+++ sinatra-1.0.ebuild 6 May 2010 18:11:14 -0000 1.2 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.0.ebuild,v 1.1 2010/04/03 13:41:58 graaff Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.0.ebuild,v 1.2 2010/05/06 18:11:14 graaff Exp $ |
| 58 |
|
| 59 |
EAPI=2 |
| 60 |
USE_RUBY="ruby18" |
| 61 |
@@ -20,7 +20,7 @@ |
| 62 |
KEYWORDS="~amd64" |
| 63 |
IUSE="" |
| 64 |
|
| 65 |
-ruby_add_rdepend '>=dev-ruby/rack-1.0' |
| 66 |
+ruby_add_rdepend '=dev-ruby/rack-1.0*' |
| 67 |
ruby_add_bdepend test "dev-ruby/rack-test dev-ruby/haml dev-ruby/erubis" |
| 68 |
|
| 69 |
each_ruby_prepare() { |
Archives