gvim or vim for RDEPEND - bug #155154

Package-Manager: portage-2.1.2_rc1-r4

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 145b90b665a2bb17d6352039e041cd2044ecd3b7..35d1bd7edfa39100177dbea1c919ca2dac99a4ba 100644 (file)
--- 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/Manifest b/app-admin/conky/Manifest
index 5a2e81e07050b2f70153ad137ba272b13112c857..989ef4476501a54fce8f4673c988700c03d7c0bf 100644 (file)
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -20,14 +20,14 @@ EBUILD conky-1.4.2.ebuild 2505 RMD160 796fae04f9a64e56abc4c54b157f1a46e8eeaca9 S
 MD5 086e0032db3a0aff61833eb65e000b34 conky-1.4.2.ebuild 2505
 RMD160 796fae04f9a64e56abc4c54b157f1a46e8eeaca9 conky-1.4.2.ebuild 2505
 SHA256 4b81ab8e58e80b08302b19f390f073773e2f944e50490039981dd4046fde8002 conky-1.4.2.ebuild 2505
-EBUILD conky-1.4.4.ebuild 2840 RMD160 6b95612a3f4125152c95f98105f536c57ddbeab3 SHA1 4c999782dc16376ea6e79497317a24c0630154b8 SHA256 457755b2e1cea094e9e36d3c40444b57a57cb20fc2f45c0a59f7a8b7cd112515
-MD5 8755da8273d0b32b6ea45d78af8909b6 conky-1.4.4.ebuild 2840
-RMD160 6b95612a3f4125152c95f98105f536c57ddbeab3 conky-1.4.4.ebuild 2840
-SHA256 457755b2e1cea094e9e36d3c40444b57a57cb20fc2f45c0a59f7a8b7cd112515 conky-1.4.4.ebuild 2840
-MISC ChangeLog 6506 RMD160 e740b043021800862711e3e53206ac64d38f12fb SHA1 4bb74f38deaa09308ba68263c536611f4269345d SHA256 07ea5fb961e31ff8f21f04b969fc487b31c16450870be8dc3656204d0818f8a6
-MD5 2e3b9d24f45707863317f8f1ab51db94 ChangeLog 6506
-RMD160 e740b043021800862711e3e53206ac64d38f12fb ChangeLog 6506
-SHA256 07ea5fb961e31ff8f21f04b969fc487b31c16450870be8dc3656204d0818f8a6 ChangeLog 6506
+EBUILD conky-1.4.4.ebuild 2865 RMD160 bbdf0c7f59fa3d3700740d2e4082eba147c39a41 SHA1 8d64259849fe8e1769c881fc4b79ce86b3c7d7b1 SHA256 33f1162e0a6fa67a7387ed656ab9dcfd4855e0247d16b867aa7ace0788de3047
+MD5 8f48321afb59cc2171046c57a7f5494f conky-1.4.4.ebuild 2865
+RMD160 bbdf0c7f59fa3d3700740d2e4082eba147c39a41 conky-1.4.4.ebuild 2865
+SHA256 33f1162e0a6fa67a7387ed656ab9dcfd4855e0247d16b867aa7ace0788de3047 conky-1.4.4.ebuild 2865
+MISC ChangeLog 6640 RMD160 40cfd7d761cb55ed0b1fd461d23d77fc08bf3fb0 SHA1 e73624fe134729f97f4d62f59543be24bedbc34b SHA256 d417a6123e53a2c683571e5ccca325da871d35544d429053ac8c151143091e1b
+MD5 1e7d02a815028cf2d0188fb298cfb55c ChangeLog 6640
+RMD160 40cfd7d761cb55ed0b1fd461d23d77fc08bf3fb0 ChangeLog 6640
+SHA256 d417a6123e53a2c683571e5ccca325da871d35544d429053ac8c151143091e1b ChangeLog 6640
 MISC metadata.xml 569 RMD160 b366c022728c365d2c27ddd7d558e4d7815bd512 SHA1 55b29887fc494ea60ff7e6100c3a85857eabf3a7 SHA256 1cfb216faf8f26ef4032857408246f0addf6fd09e50f0d4f1cb67789b506832b
 MD5 03a9b5b9e3a071e3a4f6450a3559735b metadata.xml 569
 RMD160 b366c022728c365d2c27ddd7d558e4d7815bd512 metadata.xml 569
@@ -44,7 +44,7 @@ SHA256 d2e0d992bebabc0de316ad4ace6c8896387107d6529379b79e7ac2fbc874f11d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFWaUkmdTrptrqvGERAsr5AJ0ZOj2ntSj4BcdmjLBI/iQcmG3ADACeIAO1
-GkAkZ/Zsk+Jj8BjNiID/Dfk=
-=7wNp
+iD8DBQFFWrt4mdTrptrqvGERAoKuAKCFFb8EcwyW9GGIhqfDXprvcgZM0QCfWEH4
+IZEYqaYF9l41Y9rtkn2lUSA=
+=o8TZ
 -----END PGP SIGNATURE-----

diff --git a/app-admin/conky/conky-1.4.4.ebuild b/app-admin/conky/conky-1.4.4.ebuild
index d9b16adca4a0bc33c08d863a9f647f9c2bce30de..29373bbac9763f3492990818aabdb7d35b8ace5b 100644 (file)
--- 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
 }