1 |
graaff 13/12/25 09:53:39 |
2 |
|
3 |
Modified: ChangeLog dalli-2.6.4.ebuild |
4 |
Log: |
5 |
Simplify dependencies and add ruby20. |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.6 dev-ruby/dalli/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/dalli/ChangeLog?rev=1.6&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/dalli/ChangeLog?rev=1.6&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/dalli/ChangeLog?r1=1.5&r2=1.6 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/dalli/ChangeLog,v |
19 |
retrieving revision 1.5 |
20 |
retrieving revision 1.6 |
21 |
diff -u -r1.5 -r1.6 |
22 |
--- ChangeLog 2 Nov 2013 19:59:39 -0000 1.5 |
23 |
+++ ChangeLog 25 Dec 2013 09:53:39 -0000 1.6 |
24 |
@@ -1,6 +1,9 @@ |
25 |
# ChangeLog for dev-ruby/dalli |
26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dalli/ChangeLog,v 1.5 2013/11/02 19:59:39 mrueg Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dalli/ChangeLog,v 1.6 2013/12/25 09:53:39 graaff Exp $ |
29 |
+ |
30 |
+ 25 Dec 2013; Hans de Graaff <graaff@g.o> dalli-2.6.4.ebuild: |
31 |
+ Simplify dependencies and add ruby20. |
32 |
|
33 |
02 Nov 2013; Manuel RĂ¼ger <mrueg@g.o> -dalli-2.1.0.ebuild, |
34 |
-dalli-2.5.0.ebuild: |
35 |
|
36 |
|
37 |
|
38 |
1.3 dev-ruby/dalli/dalli-2.6.4.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/dalli/dalli-2.6.4.ebuild?rev=1.3&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/dalli/dalli-2.6.4.ebuild?rev=1.3&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/dalli/dalli-2.6.4.ebuild?r1=1.2&r2=1.3 |
43 |
|
44 |
Index: dalli-2.6.4.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/dalli/dalli-2.6.4.ebuild,v |
47 |
retrieving revision 1.2 |
48 |
retrieving revision 1.3 |
49 |
diff -u -r1.2 -r1.3 |
50 |
--- dalli-2.6.4.ebuild 13 Oct 2013 22:05:08 -0000 1.2 |
51 |
+++ dalli-2.6.4.ebuild 25 Dec 2013 09:53:39 -0000 1.3 |
52 |
@@ -1,9 +1,9 @@ |
53 |
# Copyright 1999-2013 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dalli/dalli-2.6.4.ebuild,v 1.2 2013/10/13 22:05:08 maekke Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dalli/dalli-2.6.4.ebuild,v 1.3 2013/12/25 09:53:39 graaff Exp $ |
57 |
|
58 |
EAPI=5 |
59 |
-USE_RUBY="ruby18 ruby19" |
60 |
+USE_RUBY="ruby18 ruby19 ruby20" |
61 |
|
62 |
RUBY_FAKEGEM_TASK_TEST="test" |
63 |
|
64 |
@@ -22,12 +22,19 @@ |
65 |
DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.4.0 )" |
66 |
|
67 |
ruby_add_bdepend "test? ( |
68 |
- dev-ruby/minitest |
69 |
+ dev-ruby/minitest:0 |
70 |
>=dev-ruby/mocha-0.13 |
71 |
- =dev-ruby/rails-3* )" |
72 |
+ >=dev-ruby/activesupport-3 )" |
73 |
|
74 |
all_ruby_prepare() { |
75 |
chmod 0755 "${HOME}" || die "Failed to fix permissions on home" |
76 |
|
77 |
sed -i -e '/appraisal/ s:^:#:' Rakefile || die |
78 |
+ |
79 |
+ sed -i -e '1igem "minitest", "~> 4.0"' test/helper.rb || die |
80 |
+ |
81 |
+ # Drop rails dependency which is only used to display the version |
82 |
+ # number, so we only need to depend on activesupport and avoid |
83 |
+ # complicated circular dependencies. |
84 |
+ sed -i -e '/rails/I s:^:#:' test/helper.rb || die |
85 |
} |