1 |
johu 13/11/30 12:56:01 |
2 |
|
3 |
Modified: ChangeLog splice-1.0.1.ebuild |
4 |
Log: |
5 |
x86 stable wrt bug #481852 |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD) |
8 |
|
9 |
Revision Changes Path |
10 |
1.4 app-vim/splice/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-vim/splice/ChangeLog?rev=1.4&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-vim/splice/ChangeLog?rev=1.4&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-vim/splice/ChangeLog?r1=1.3&r2=1.4 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-vim/splice/ChangeLog,v |
19 |
retrieving revision 1.3 |
20 |
retrieving revision 1.4 |
21 |
diff -u -r1.3 -r1.4 |
22 |
--- ChangeLog 5 Nov 2013 13:53:17 -0000 1.3 |
23 |
+++ ChangeLog 30 Nov 2013 12:56:00 -0000 1.4 |
24 |
@@ -1,6 +1,9 @@ |
25 |
# ChangeLog for app-vim/splice |
26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-vim/splice/ChangeLog,v 1.3 2013/11/05 13:53:17 chainsaw Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-vim/splice/ChangeLog,v 1.4 2013/11/30 12:56:00 johu Exp $ |
29 |
+ |
30 |
+ 30 Nov 2013; Johannes Huber <johu@g.o> splice-1.0.1.ebuild: |
31 |
+ x86 stable wrt bug #481852 |
32 |
|
33 |
05 Nov 2013; Tony Vroon <chainsaw@g.o> splice-1.0.1.ebuild: |
34 |
Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El |
35 |
|
36 |
|
37 |
|
38 |
1.4 app-vim/splice/splice-1.0.1.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-vim/splice/splice-1.0.1.ebuild?rev=1.4&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-vim/splice/splice-1.0.1.ebuild?rev=1.4&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-vim/splice/splice-1.0.1.ebuild?r1=1.3&r2=1.4 |
43 |
|
44 |
Index: splice-1.0.1.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/app-vim/splice/splice-1.0.1.ebuild,v |
47 |
retrieving revision 1.3 |
48 |
retrieving revision 1.4 |
49 |
diff -u -r1.3 -r1.4 |
50 |
--- splice-1.0.1.ebuild 5 Nov 2013 13:53:17 -0000 1.3 |
51 |
+++ splice-1.0.1.ebuild 30 Nov 2013 12:56:00 -0000 1.4 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2013 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/app-vim/splice/splice-1.0.1.ebuild,v 1.3 2013/11/05 13:53:17 chainsaw Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/app-vim/splice/splice-1.0.1.ebuild,v 1.4 2013/11/30 12:56:00 johu Exp $ |
57 |
|
58 |
EAPI=5 |
59 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
60 |
@@ -10,7 +10,7 @@ |
61 |
DESCRIPTION="vim plugin: resolve conflicts during three-way merges" |
62 |
HOMEPAGE="http://sjl.bitbucket.org/splice.vim/ http://vim.sourceforge.net/scripts/script.php?script_id=4026" |
63 |
LICENSE="MIT" |
64 |
-KEYWORDS="amd64 ~x86" |
65 |
+KEYWORDS="amd64 x86" |
66 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
67 |
|
68 |
RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )" |