summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-12-12 07:32:07 +0000
committerJustin Lecher <jlec@gentoo.org>2013-12-12 07:32:07 +0000
commita651022382b221d9798508c4a322ad6f4aab899c (patch)
tree1439bd8ceb3acdb419e66e887f8e951e12c001a8 /app-editors/gvim
parentMove cairo, glib, gio, gtk2hs-buildtools, pango to slot 0. (diff)
downloadgentoo-2-a651022382b221d9798508c4a322ad6f4aab899c.tar.gz
gentoo-2-a651022382b221d9798508c4a322ad6f4aab899c.tar.bz2
gentoo-2-a651022382b221d9798508c4a322ad6f4aab899c.zip
app-editors/gvim: Drop unnecessary die and use domenu/doicon from eutils.eclass
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'app-editors/gvim')
-rw-r--r--app-editors/gvim/ChangeLog6
-rw-r--r--app-editors/gvim/gvim-7.4.22.ebuild11
-rw-r--r--app-editors/gvim/gvim-7.4.41.ebuild11
-rw-r--r--app-editors/gvim/gvim-7.4.52.ebuild11
-rw-r--r--app-editors/gvim/gvim-9999.ebuild11
-rw-r--r--app-editors/gvim/metadata.xml12
6 files changed, 27 insertions, 35 deletions
diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 56be3e575cbd..7ace98b816a5 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.416 2013/11/19 10:28:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.417 2013/12/12 07:32:07 jlec Exp $
+
+ 12 Dec 2013; Justin Lecher <jlec@gentoo.org> gvim-7.4.22.ebuild,
+ gvim-7.4.41.ebuild, gvim-7.4.52.ebuild, gvim-9999.ebuild, metadata.xml:
+ Drop unnecessary die and use domenu/doicon from eutils.eclass
*gvim-7.4.94 (19 Nov 2013)
diff --git a/app-editors/gvim/gvim-7.4.22.ebuild b/app-editors/gvim/gvim-7.4.22.ebuild
index ce8cd6a243da..b9c09ec9a542 100644
--- a/app-editors/gvim/gvim-7.4.22.ebuild
+++ b/app-editors/gvim/gvim-7.4.22.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.22.ebuild,v 1.2 2013/10/07 05:38:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.22.ebuild,v 1.3 2013/12/12 07:32:07 jlec Exp $
EAPI=5
VIM_VERSION="7.4"
@@ -293,8 +293,7 @@ src_test() {
ln -s "${S}"/src/gvim "${S}"/src/testvim
# Don't try to do the additional GUI test
- emake -j1 VIMPROG=../testvim nongui \
- || die "At least one test failed"
+ emake -j1 VIMPROG=../testvim nongui
}
# Make convenience symlinks, hopefully without stepping on toes. Some
@@ -353,10 +352,8 @@ src_install() {
newins "${FILESDIR}"/gvimrc-r1 gvimrc
eprefixify "${ED}"/etc/vim/gvimrc
- insinto /usr/share/applications
- newins "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
- insinto /usr/share/pixmaps
- doins "${FILESDIR}"/gvim.xpm
+ domenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+ doicon "${FILESDIR}"/gvim.xpm
# bash completion script, bug #79018.
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
diff --git a/app-editors/gvim/gvim-7.4.41.ebuild b/app-editors/gvim/gvim-7.4.41.ebuild
index 1ea602a0026f..3fbaca8b70dc 100644
--- a/app-editors/gvim/gvim-7.4.41.ebuild
+++ b/app-editors/gvim/gvim-7.4.41.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.41.ebuild,v 1.2 2013/10/07 05:38:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.41.ebuild,v 1.3 2013/12/12 07:32:07 jlec Exp $
EAPI=5
VIM_VERSION="7.4"
@@ -293,8 +293,7 @@ src_test() {
ln -s "${S}"/src/gvim "${S}"/src/testvim
# Don't try to do the additional GUI test
- emake -j1 VIMPROG=../testvim nongui \
- || die "At least one test failed"
+ emake -j1 VIMPROG=../testvim nongui
}
# Make convenience symlinks, hopefully without stepping on toes. Some
@@ -353,10 +352,8 @@ src_install() {
newins "${FILESDIR}"/gvimrc-r1 gvimrc
eprefixify "${ED}"/etc/vim/gvimrc
- insinto /usr/share/applications
- newins "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
- insinto /usr/share/pixmaps
- doins "${FILESDIR}"/gvim.xpm
+ domenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+ doicon "${FILESDIR}"/gvim.xpm
# bash completion script, bug #79018.
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
diff --git a/app-editors/gvim/gvim-7.4.52.ebuild b/app-editors/gvim/gvim-7.4.52.ebuild
index 1a1f66bd3657..834fd5626885 100644
--- a/app-editors/gvim/gvim-7.4.52.ebuild
+++ b/app-editors/gvim/gvim-7.4.52.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.52.ebuild,v 1.1 2013/10/15 23:16:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.52.ebuild,v 1.2 2013/12/12 07:32:07 jlec Exp $
EAPI=5
VIM_VERSION="7.4"
@@ -295,8 +295,7 @@ src_test() {
ln -s "${S}"/src/gvim "${S}"/src/testvim
# Don't try to do the additional GUI test
- emake -j1 VIMPROG=../testvim nongui \
- || die "At least one test failed"
+ emake -j1 VIMPROG=../testvim nongui
}
# Make convenience symlinks, hopefully without stepping on toes. Some
@@ -355,10 +354,8 @@ src_install() {
newins "${FILESDIR}"/gvimrc-r1 gvimrc
eprefixify "${ED}"/etc/vim/gvimrc
- insinto /usr/share/applications
- newins "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
- insinto /usr/share/pixmaps
- doins "${FILESDIR}"/gvim.xpm
+ domenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+ doicon "${FILESDIR}"/gvim.xpm
# bash completion script, bug #79018.
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index e35f0b30e670..a15c766108c3 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.10 2013/11/19 10:28:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.11 2013/12/12 07:32:07 jlec Exp $
EAPI=5
VIM_VERSION="7.4"
@@ -283,8 +283,7 @@ src_test() {
ln -s "${S}"/src/gvim "${S}"/src/testvim
# Don't try to do the additional GUI test
- emake -j1 VIMPROG=../testvim nongui \
- || die "At least one test failed"
+ emake -j1 VIMPROG=../testvim nongui
}
# Make convenience symlinks, hopefully without stepping on toes. Some
@@ -343,10 +342,8 @@ src_install() {
newins "${FILESDIR}"/gvimrc-r1 gvimrc
eprefixify "${ED}"/etc/vim/gvimrc
- insinto /usr/share/applications
- newins "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
- insinto /usr/share/pixmaps
- doins "${FILESDIR}"/gvim.xpm
+ domenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+ doicon "${FILESDIR}"/gvim.xpm
# bash completion script, bug #79018.
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml
index fe574ff96b66..3b459b89e35c 100644
--- a/app-editors/gvim/metadata.xml
+++ b/app-editors/gvim/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>vim</herd>
-<use>
- <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
- <flag name="netbeans">Include netbeans external editor integration support</flag>
- <flag name="racket">Enable support for Scheme using <pkg>dev-lang/racket</pkg></flag>
-</use>
+ <herd>vim</herd>
+ <use>
+ <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
+ <flag name="netbeans">Include netbeans external editor integration support</flag>
+ <flag name="racket">Enable support for Scheme using <pkg>dev-lang/racket</pkg></flag>
+ </use>
</pkgmetadata>