1 |
ssuominen 09/04/30 08:51:55 |
2 |
|
3 |
Modified: amrita-1.8.2-r1.ebuild ChangeLog |
4 |
Log: |
5 |
File collision /usr/bin/ams wrt #247812 |
6 |
(Portage version: 2.1.6.11/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.21 dev-ruby/amrita/amrita-1.8.2-r1.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/amrita/amrita-1.8.2-r1.ebuild?rev=1.21&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/amrita/amrita-1.8.2-r1.ebuild?rev=1.21&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/amrita/amrita-1.8.2-r1.ebuild?r1=1.20&r2=1.21 |
14 |
|
15 |
Index: amrita-1.8.2-r1.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/amrita/amrita-1.8.2-r1.ebuild,v |
18 |
retrieving revision 1.20 |
19 |
retrieving revision 1.21 |
20 |
diff -u -r1.20 -r1.21 |
21 |
--- amrita-1.8.2-r1.ebuild 26 Mar 2008 03:34:01 -0000 1.20 |
22 |
+++ amrita-1.8.2-r1.ebuild 30 Apr 2009 08:51:55 -0000 1.21 |
23 |
@@ -1,6 +1,6 @@ |
24 |
-# Copyright 1999-2008 Gentoo Foundation |
25 |
+# Copyright 1999-2009 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amrita/amrita-1.8.2-r1.ebuild,v 1.20 2008/03/26 03:34:01 ricmm Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amrita/amrita-1.8.2-r1.ebuild,v 1.21 2009/04/30 08:51:55 ssuominen Exp $ |
29 |
|
30 |
inherit ruby |
31 |
|
32 |
@@ -13,4 +13,6 @@ |
33 |
SLOT="0" |
34 |
USE_RUBY="ruby18 ruby19" |
35 |
KEYWORDS="alpha hppa ia64 ~mips ppc ppc64 sparc x86" |
36 |
-DEPEND=">=dev-lang/ruby-1.8.0" |
37 |
+# File collision /usr/bin/ams wrt #247812 |
38 |
+DEPEND=">=dev-lang/ruby-1.8.0 |
39 |
+ !media-sound/ams" |
40 |
|
41 |
|
42 |
|
43 |
1.26 dev-ruby/amrita/ChangeLog |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/amrita/ChangeLog?rev=1.26&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/amrita/ChangeLog?rev=1.26&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/amrita/ChangeLog?r1=1.25&r2=1.26 |
48 |
|
49 |
Index: ChangeLog |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/amrita/ChangeLog,v |
52 |
retrieving revision 1.25 |
53 |
retrieving revision 1.26 |
54 |
diff -u -r1.25 -r1.26 |
55 |
--- ChangeLog 26 Mar 2008 03:34:01 -0000 1.25 |
56 |
+++ ChangeLog 30 Apr 2009 08:51:55 -0000 1.26 |
57 |
@@ -1,6 +1,10 @@ |
58 |
# ChangeLog for dev-ruby/amrita |
59 |
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
60 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amrita/ChangeLog,v 1.25 2008/03/26 03:34:01 ricmm Exp $ |
61 |
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 |
62 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amrita/ChangeLog,v 1.26 2009/04/30 08:51:55 ssuominen Exp $ |
63 |
+ |
64 |
+ 30 Apr 2009; Samuli Suominen <ssuominen@g.o> |
65 |
+ amrita-1.8.2-r1.ebuild: |
66 |
+ File collision /usr/bin/ams wrt #247812 |
67 |
|
68 |
25 Mar 2008; <ricmm@g.o> amrita-1.8.2-r1.ebuild: |
69 |
Drop to ~mips due to unstable deps |