summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-06-17 00:58:44 +0000
committerTim Harder <radhermit@gentoo.org>2013-06-17 00:58:44 +0000
commitaf5539a91cb46a6191e43452d3bcb47bd85654f0 (patch)
tree2871b3c14bbc7a5ba113f7f04a5e8e89c10d7a3c /app-editors/gvim
parentVersion bump. (diff)
downloadgentoo-2-af5539a91cb46a6191e43452d3bcb47bd85654f0.tar.gz
gentoo-2-af5539a91cb46a6191e43452d3bcb47bd85654f0.tar.bz2
gentoo-2-af5539a91cb46a6191e43452d3bcb47bd85654f0.zip
Version bump.
(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'app-editors/gvim')
-rw-r--r--app-editors/gvim/ChangeLog8
-rw-r--r--app-editors/gvim/files/gvim-7.3.1214-python3.patch15
-rw-r--r--app-editors/gvim/gvim-7.3.1214.ebuild33
3 files changed, 55 insertions, 1 deletions
diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 7c68c0c85f9e..a9e3bb157239 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-editors/gvim
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.400 2013/06/11 09:34:11 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.401 2013/06/17 00:58:44 radhermit Exp $
+
+*gvim-7.3.1214 (17 Jun 2013)
+
+ 17 Jun 2013; Tim Harder <radhermit@gentoo.org> +gvim-7.3.1214.ebuild,
+ +files/gvim-7.3.1214-python3.patch:
+ Version bump.
*gvim-7.3.1163 (11 Jun 2013)
diff --git a/app-editors/gvim/files/gvim-7.3.1214-python3.patch b/app-editors/gvim/files/gvim-7.3.1214-python3.patch
new file mode 100644
index 000000000000..80dc073f5267
--- /dev/null
+++ b/app-editors/gvim/files/gvim-7.3.1214-python3.patch
@@ -0,0 +1,15 @@
+diff -r 6e9667d3f166 src/configure.in
+--- a/src/configure.in Sun Jun 16 22:49:14 2013 +0200
++++ b/src/configure.in Sun Jun 16 17:47:30 2013 -0700
+@@ -1107,9 +1107,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
+ d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
+ if test -d "$d" && test -f "$d/config.c"; then
diff --git a/app-editors/gvim/gvim-7.3.1214.ebuild b/app-editors/gvim/gvim-7.3.1214.ebuild
new file mode 100644
index 000000000000..f643473fd615
--- /dev/null
+++ b/app-editors/gvim/gvim-7.3.1214.ebuild
@@ -0,0 +1,33 @@
+# 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.1214.ebuild,v 1.1 2013/06/17 00:58:44 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/~radhermit/vim/${VIM_ORG_PATCHES}"
+
+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"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+
+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}"/${P}-python3.patch
+}