summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-vim/splice')
-rw-r--r--app-vim/splice/ChangeLog6
-rw-r--r--app-vim/splice/splice-1.0.1.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/app-vim/splice/ChangeLog b/app-vim/splice/ChangeLog
index 83e775d8c747..e6adc9c165f5 100644
--- a/app-vim/splice/ChangeLog
+++ b/app-vim/splice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-vim/splice
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/splice/ChangeLog,v 1.2 2013/05/30 07:18:50 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/splice/ChangeLog,v 1.3 2013/11/05 13:53:17 chainsaw Exp $
+
+ 05 Nov 2013; Tony Vroon <chainsaw@gentoo.org> splice-1.0.1.ebuild:
+ Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El
+ Lazkani in bug #481852.
30 May 2013; Tim Harder <radhermit@gentoo.org> splice-1.0.1.ebuild:
Add PYTHON_REQUIRED_USE for python-single-r1.
diff --git a/app-vim/splice/splice-1.0.1.ebuild b/app-vim/splice/splice-1.0.1.ebuild
index cfed1b71c9dd..492527cad4f6 100644
--- a/app-vim/splice/splice-1.0.1.ebuild
+++ b/app-vim/splice/splice-1.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/splice/splice-1.0.1.ebuild,v 1.2 2013/05/30 07:18:50 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/splice/splice-1.0.1.ebuild,v 1.3 2013/11/05 13:53:17 chainsaw Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -10,7 +10,7 @@ inherit vim-plugin python-single-r1
DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
HOMEPAGE="http://sjl.bitbucket.org/splice.vim/ http://vim.sourceforge.net/scripts/script.php?script_id=4026"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )"