summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <dragonheart@gentoo.org>2006-11-15 06:54:54 +0000
committerDaniel Black <dragonheart@gentoo.org>2006-11-15 06:54:54 +0000
commit0406011e69fd15c2100475ece43123ade5e2867a (patch)
treeca0eb71b415cf028bbb9e91c261b6621a6f7c066 /app-admin
parentamd64 stable, bug 145549 (diff)
downloadgentoo-2-0406011e69fd15c2100475ece43123ade5e2867a.tar.gz
gentoo-2-0406011e69fd15c2100475ece43123ade5e2867a.tar.bz2
gentoo-2-0406011e69fd15c2100475ece43123ade5e2867a.zip
gvim or vim for RDEPEND - bug #155154
(Portage version: 2.1.2_rc1-r4)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/conky/ChangeLog5
-rw-r--r--app-admin/conky/conky-1.4.4.ebuild7
2 files changed, 8 insertions, 4 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 145b90b665a2..35d1bd7edfa3 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/conky
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.37 2006/11/14 11:11:40 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.38 2006/11/15 06:54:54 dragonheart Exp $
+
+ 15 Nov 2006; Daniel Black <dragonheart@gentoo.org> conky-1.4.4.ebuild:
+ gvim or vim for RDEPEND - bug #155154 thanks to Zack Elan
*conky-1.4.4 (14 Nov 2006)
diff --git a/app-admin/conky/conky-1.4.4.ebuild b/app-admin/conky/conky-1.4.4.ebuild
index d9b16adca4a0..29373bbac976 100644
--- a/app-admin/conky/conky-1.4.4.ebuild
+++ b/app-admin/conky/conky-1.4.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.4.ebuild,v 1.1 2006/11/14 11:11:40 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.4.ebuild,v 1.2 2006/11/15 06:54:54 dragonheart Exp $
inherit eutils
# used for epause
@@ -37,7 +37,8 @@ DEPEND_COMMON="
RDEPEND="${DEPEND_COMMON}
hddtemp? ( app-admin/hddtemp )
mpd? ( media-sound/mpd )
- vim-syntax? ( app-editors/vim )"
+ vim-syntax? ( || ( app-editors/vim
+ app-editors/gvim ) )"
DEPEND="
${DEPEND_COMMON}
@@ -84,7 +85,7 @@ src_install() {
doins "${S}"/extras/vim/ftdetect/conkyrc.vim
insinto /usr/share/vim/vimfiles/syntax
- doins "${S}"/extras/vim/syntax/conkyrc.vim
+ doins "${S}"/extras/vim/syntax/conkyrc.vim
fi
}