summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-08-14 03:40:22 +0000
committerTim Harder <radhermit@gentoo.org>2013-08-14 03:40:22 +0000
commit2c1f3d837ff56088067967e7915a418dcf1dc4b9 (patch)
tree2ab2699cd263ebd2f37b04da9cf458cfc98800f0 /app-editors
parentre-add prefix support, which was ignored by previous version bumps (diff)
downloadgentoo-2-2c1f3d837ff56088067967e7915a418dcf1dc4b9.tar.gz
gentoo-2-2c1f3d837ff56088067967e7915a418dcf1dc4b9.tar.bz2
gentoo-2-2c1f3d837ff56088067967e7915a418dcf1dc4b9.zip
Fix gvimrc and gvim.desktop file installs (bug #480938).
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/gvim/ChangeLog6
-rw-r--r--app-editors/gvim/gvim-7.4.ebuild6
-rw-r--r--app-editors/gvim/gvim-9999.ebuild6
3 files changed, 11 insertions, 7 deletions
diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 0710170baf41..31f47a1a6ca4 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,10 @@
# 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.405 2013/08/13 22:33:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.406 2013/08/14 03:40:22 radhermit Exp $
+
+ 14 Aug 2013; Tim Harder <radhermit@gentoo.org> gvim-7.4.ebuild,
+ gvim-9999.ebuild:
+ Fix gvimrc and gvim.desktop file installs (bug #480938).
13 Aug 2013; Tim Harder <radhermit@gentoo.org> gvim-7.4.ebuild,
gvim-9999.ebuild:
diff --git a/app-editors/gvim/gvim-7.4.ebuild b/app-editors/gvim/gvim-7.4.ebuild
index 2ecdd9026b7d..2d03376a4180 100644
--- a/app-editors/gvim/gvim-7.4.ebuild
+++ b/app-editors/gvim/gvim-7.4.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-editors/gvim/gvim-7.4.ebuild,v 1.2 2013/08/13 22:33:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.ebuild,v 1.3 2013/08/14 03:40:22 radhermit Exp $
EAPI=5
VIM_VERSION="7.4"
@@ -346,11 +346,11 @@ src_install() {
echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
insinto /etc/vim
- newins "${FILESDIR}"/gvimrc${GVIMRC_FILE_SUFFIX} gvimrc
+ newins "${FILESDIR}"/gvimrc-r1 gvimrc
eprefixify "${ED}"/etc/vim/gvimrc
insinto /usr/share/applications
- newins "${FILESDIR}"/gvim.desktop${GVIM_DESKTOP_SUFFIX} gvim.desktop
+ newins "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
insinto /usr/share/pixmaps
doins "${FILESDIR}"/gvim.xpm
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 5b7d263b78dd..621de4a7918b 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.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-editors/gvim/gvim-9999.ebuild,v 1.4 2013/08/13 22:33:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.5 2013/08/14 03:40:22 radhermit Exp $
EAPI=5
VIM_VERSION="7.4"
@@ -346,11 +346,11 @@ src_install() {
echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
insinto /etc/vim
- newins "${FILESDIR}"/gvimrc${GVIMRC_FILE_SUFFIX} gvimrc
+ newins "${FILESDIR}"/gvimrc-r1 gvimrc
eprefixify "${ED}"/etc/vim/gvimrc
insinto /usr/share/applications
- newins "${FILESDIR}"/gvim.desktop${GVIM_DESKTOP_SUFFIX} gvim.desktop
+ newins "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
insinto /usr/share/pixmaps
doins "${FILESDIR}"/gvim.xpm