Version bump, update to EAPI 5 and support python3.

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 57 insertions, 2 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 6eeb5ce70c3b..d2781d6c7235 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gvim
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.385 2012/12/27 21:29:35 lack Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.386 2013/04/21 23:34:49 radhermit Exp $
+
+*gvim-7.3.905 (21 Apr 2013)
+
+  21 Apr 2013; Tim Harder <radhermit@gentoo.org> +files/gvim-python3.patch,
+  +gvim-7.3.905.ebuild:
+  Version bump, update to EAPI 5 and support python3.
 
 *gvim-7.3.762 (27 Dec 2012)
 
diff --git a/app-editors/gvim/files/gvim-python3.patch b/app-editors/gvim/files/gvim-python3.patch
new file mode 100644
index 000000000000..f3c05ebb9ead
--- /dev/null
+++ b/app-editors/gvim/files/gvim-python3.patch
@@ -0,0 +1,15 @@
+diff -r ef341d8811b2 src/configure.in
+--- a/src/configure.in	Mon Apr 15 22:22:58 2013 +0200
++++ b/src/configure.in	Sun Apr 21 15:53:35 2013 -0700
+@@ -1093,9 +1093,9 @@
+     AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf,
+     [
+      vi_cv_path_python3_conf=
+-     config_dir="config"
++     config_dir="config-${vi_cv_var_python3_version}"
+      if test "${vi_cv_var_python3_abiflags}" != ""; then
+-       config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
++       config_dir="${config_dir}${vi_cv_var_python3_abiflags}"
+      fi
+      for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do
+        for subdir in lib64 lib share; do
diff --git a/app-editors/gvim/gvim-7.3.905.ebuild b/app-editors/gvim/gvim-7.3.905.ebuild
new file mode 100644
index 000000000000..1f4cd9030ae4
--- /dev/null
+++ b/app-editors/gvim/gvim-7.3.905.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.3.905.ebuild,v 1.1 2013/04/21 23:34:49 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.3"
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+inherit vim
+
+VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
+GVIMRC_FILE_SUFFIX="-r1"
+GVIM_DESKTOP_SUFFIX="-r2"
+
+SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+	http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}
+	http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
+
+S="${WORKDIR}/vim${VIM_VERSION/.}"
+DESCRIPTION="GUI version of the Vim text editor"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+src_prepare() {
+	vim_src_prepare
+
+	epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch
+	if [[ ${CHOST} == *-interix* ]]; then
+		epatch "${FILESDIR}"/${PN}-7.1-interix-link.patch
+		epatch "${FILESDIR}"/${PN}-7.1.319-interix-cflags.patch
+	fi
+
+	# fix python3 support
+	epatch "${FILESDIR}"/${PN}-python3.patch
+}