Index: vim-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v
retrieving revision 1.21
diff -u -r1.21 vim-plugin.eclass
--- vim-plugin.eclass	7 May 2007 19:06:14 -0000	1.21
+++ vim-plugin.eclass	6 Apr 2008 11:20:33 -0000
@@ -10,14 +10,20 @@
 inherit vim-doc
 EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm
 
-VIM_PLUGIN_VIM_VERSION="${VIM_PLUGIN_VIM_VERSION:-6.4}"
+if [ "${CATEGORY}" = "app-vim" ]; then
+	IUSE=""
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	SLOT="0"
+fi
 
-IUSE=""
-DEPEND="|| ( >=app-editors/vim-${VIM_PLUGIN_VIM_VERSION}
+if [ -n "${VIM_PLUGIN_VERSION}" ]; then
+	DEPEND="|| ( >=app-editors/vim-${VIM_PLUGIN_VIM_VERSION}
 	>=app-editors/gvim-${VIM_PLUGIN_VIM_VERSION} )"
+elif [ "${CATEGORY}" = "app-vim" ]; then
+	# Default fallback for packages under app-vim/
+	DEPEND="|| ( app-editors/vim app-editors/gvim )"
+fi
 RDEPEND="${DEPEND}"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-SLOT="0"
 
 vim-plugin_src_install() {
 	local f