summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/vim.eclass5
2 files changed, 7 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 70efa1d677ba..d318e348febb 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.796 2013/04/21 23:23:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.797 2013/04/21 23:24:24 radhermit Exp $
+
+ 21 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Disable python.eclass inherit in vim-core (patch by mgorny, bug #458794).
21 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
Move EAPI check earlier (patch by mgorny, bug #458794).
diff --git a/eclass/vim.eclass b/eclass/vim.eclass
index 6a98b0656909..d5e734855828 100644
--- a/eclass/vim.eclass
+++ b/eclass/vim.eclass
@@ -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/eclass/vim.eclass,v 1.207 2013/04/21 23:23:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.208 2013/04/21 23:24:24 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -44,8 +44,9 @@ if [[ ${MY_PN} != "vim-core" ]] ; then
PYTHON_DEPEND="python? 2"
PYTHON_USE_WITH_OPT="python"
PYTHON_USE_WITH="threads"
+ inherit python
fi
-inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion-r1 prefix python
+inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion-r1 prefix
HOMEPAGE="http://www.vim.org/"
SLOT="0"