summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2014-11-16 01:15:11 +0000
committerBen de Groot <yngwin@gentoo.org>2014-11-16 01:15:11 +0000
commit11086cf8892cea6e1256faf06eba017889454641 (patch)
tree1122ab95968855534302f1993bd68068c41689c3 /app-editors
parentamd64/x86 stable, bug #517722 (diff)
downloadgentoo-2-11086cf8892cea6e1256faf06eba017889454641.tar.gz
gentoo-2-11086cf8892cea6e1256faf06eba017889454641.tar.bz2
gentoo-2-11086cf8892cea6e1256faf06eba017889454641.zip
Add system vimrc, drop gpm use (bug #526938)
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x0F9C590B7FF324F6!)
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/vim-qt/ChangeLog5
-rw-r--r--app-editors/vim-qt/vim-qt-20140827-r1.ebuild12
2 files changed, 12 insertions, 5 deletions
diff --git a/app-editors/vim-qt/ChangeLog b/app-editors/vim-qt/ChangeLog
index ba5710fbb87b..607f641f2974 100644
--- a/app-editors/vim-qt/ChangeLog
+++ b/app-editors/vim-qt/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/vim-qt
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/ChangeLog,v 1.8 2014/11/15 12:32:44 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/ChangeLog,v 1.9 2014/11/16 01:15:11 yngwin Exp $
+
+ 16 Nov 2014; Ben de Groot <yngwin@gentoo.org> vim-qt-20140827-r1.ebuild:
+ Add system vimrc, drop gpm use (bug #526938)
*vim-qt-20140827-r1 (15 Nov 2014)
diff --git a/app-editors/vim-qt/vim-qt-20140827-r1.ebuild b/app-editors/vim-qt/vim-qt-20140827-r1.ebuild
index 43043c0b208a..8329354a12dd 100644
--- a/app-editors/vim-qt/vim-qt-20140827-r1.ebuild
+++ b/app-editors/vim-qt/vim-qt-20140827-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20140827-r1.ebuild,v 1.1 2014/11/15 12:32:44 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20140827-r1.ebuild,v 1.2 2014/11/16 01:15:11 yngwin Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3} )
@@ -26,7 +26,7 @@ fi
LICENSE="vim"
SLOT="0"
-IUSE="acl cscope debug gpm lua luajit nls perl python racket ruby"
+IUSE="acl cscope debug lua luajit nls perl python racket ruby"
REQUIRED_USE="luajit? ( lua )
python? ( ${PYTHON_REQUIRED_USE} )"
@@ -38,7 +38,6 @@ RDEPEND="app-admin/eselect-vi
>=dev-qt/qtgui-4.7.0:4
acl? ( kernel_linux? ( sys-apps/acl ) )
cscope? ( dev-util/cscope )
- gpm? ( sys-libs/gpm )
lua? ( luajit? ( dev-lang/luajit )
!luajit? ( dev-lang/lua[deprecated] ) )
nls? ( virtual/libintl )
@@ -53,10 +52,15 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
pkg_setup() {
- export LC_COLLATE="C" # prevent locale brokenness bug #82186
+ export LC_COLLATE="C" # prevent locale brokenness
use python && python-single-r1_pkg_setup
}
+src_prepare() {
+ # Read vimrc from /etc/vim/
+ echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+}
+
src_configure() {
use debug && append-flags "-DDEBUG"