[gentoo-commits] repo/gentoo:master commit in: app-editors/gvim/

["Tim Harder" <radhermit@gentoo.org>]

commit:     4a81673cb7282f1184c2e7de5e0ef26f4d5e96c4
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 15:28:15 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 15:30:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a81673c

app-editors/gvim: version bump to 8.0.0005

 app-editors/gvim/Manifest                           |  1 +
 .../gvim/{gvim-9999.ebuild => gvim-8.0.0005.ebuild} | 21 +++++++++++++--------
 app-editors/gvim/gvim-9999.ebuild                   | 21 +++++++++++++--------
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index f4588e3..32ce2da 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -6,3 +6,4 @@ DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a4
 DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c
 DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
 DIST vim-8.0.0004.tar.gz 12909073 SHA256 3ba0aeaf86c9f89ea55d6144b82f36f82d3ad5b7efcd393d0689e6ec2ca970ef SHA512 d52a30df952e6b3a5b3ee6c3dd2a5ee48573286fab9ae6955ac79c67087f22748a910a35cfed1badff99614daf28eecefd3b16eb2e0da0fae184eee32e09dfd6 WHIRLPOOL 7053e543ff2437a3f46e47e7af02cdec74f2f25a9a519872c0dfe207c828b51279af62dbc4a06977bac782e91a4d59c51d96ec16d3c22c7373f6a3a87f320e2d
+DIST vim-8.0.0005.tar.gz 12909267 SHA256 4ad6b4e8fad6412724a665d974e1be3138a9562a5f4f4aab17debf709c1d3ad3 SHA512 3d62557c6929e554c50f8043658665b907b235f180d8917288fc1434237856df7fa098ecb1823e6edea9e5735564cb55869e535350e52fd8c22423480a49438d WHIRLPOOL a80eec04afb2a797837874ec4b035268a20be7cefa487e44e8e441fb518d46cd7e16a263a6256f49e23e60e737b14dc6a7d93d7c3e579d3da13ccee48536b41b

diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-8.0.0005.ebuild
similarity index 95%
copy from app-editors/gvim/gvim-9999.ebuild
copy to app-editors/gvim/gvim-8.0.0005.ebuild
index 19d0717..8dd474d 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-8.0.0005.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 VIM_VERSION="8.0"
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-r1
+inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator bash-completion-r1 prefix python-r1
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -359,6 +359,8 @@ src_install() {
 	dosym gvim /usr/bin/rgvim
 	dosym gvim /usr/bin/rgview
 
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
 	dodir /usr/share/man/man1
 	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
 	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
@@ -368,16 +370,13 @@ src_install() {
 	newins "${FILESDIR}"/gvimrc-r1 gvimrc
 	eprefixify "${ED}"/etc/vim/gvimrc
 
-	newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
-	doicon "${FILESDIR}"/gvim.xpm
 	doicon -s scalable "${FILESDIR}"/gvim.svg
 
 	# bash completion script, bug #79018.
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
 
-	# We shouldn't be installing the ex or view man page symlinks, as they
-	# are managed by eselect-vi
-	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+	# don't install vim desktop file
+	rm "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
 }
 
 pkg_postinst() {
@@ -385,7 +384,10 @@ pkg_postinst() {
 	update_vim_helptags
 
 	# Update fdo mime stuff, bug #78394
-	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
 
 	# Make convenience symlinks
 	update_vim_symlinks
@@ -396,7 +398,10 @@ pkg_postrm() {
 	update_vim_helptags
 
 	# Update fdo mime stuff, bug #78394
-	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
 
 	# Make convenience symlinks
 	update_vim_symlinks

diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 19d0717..8dd474d 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 VIM_VERSION="8.0"
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-r1
+inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator bash-completion-r1 prefix python-r1
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -359,6 +359,8 @@ src_install() {
 	dosym gvim /usr/bin/rgvim
 	dosym gvim /usr/bin/rgview
 
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
 	dodir /usr/share/man/man1
 	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
 	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
@@ -368,16 +370,13 @@ src_install() {
 	newins "${FILESDIR}"/gvimrc-r1 gvimrc
 	eprefixify "${ED}"/etc/vim/gvimrc
 
-	newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
-	doicon "${FILESDIR}"/gvim.xpm
 	doicon -s scalable "${FILESDIR}"/gvim.svg
 
 	# bash completion script, bug #79018.
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
 
-	# We shouldn't be installing the ex or view man page symlinks, as they
-	# are managed by eselect-vi
-	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+	# don't install vim desktop file
+	rm "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
 }
 
 pkg_postinst() {
@@ -385,7 +384,10 @@ pkg_postinst() {
 	update_vim_helptags
 
 	# Update fdo mime stuff, bug #78394
-	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
 
 	# Make convenience symlinks
 	update_vim_symlinks
@@ -396,7 +398,10 @@ pkg_postrm() {
 	update_vim_helptags
 
 	# Update fdo mime stuff, bug #78394
-	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
 
 	# Make convenience symlinks
 	update_vim_symlinks