Added in help text and moved the einfo things around, bug #63318.

3 files changed, 40 insertions, 21 deletions

diff --git a/app-vim/cream/ChangeLog b/app-vim/cream/ChangeLog
index 64e3d8dda51a..b660947b3ac6 100644
--- a/app-vim/cream/ChangeLog
+++ b/app-vim/cream/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-vim/cream
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/ChangeLog,v 1.16 2004/09/06 22:47:28 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/ChangeLog,v 1.17 2004/09/11 00:20:16 ciaranm Exp $
+
+  11 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> cream-0.30-r2.ebuild:
+  Added in help text and moved the einfo things around, bug #63318.
 
   06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> cream-0.30-r2.ebuild:
   Stable on x86, sparc, mips
diff --git a/app-vim/cream/Manifest b/app-vim/cream/Manifest
index ab886f66d084..cf00f7494b7a 100644
--- a/app-vim/cream/Manifest
+++ b/app-vim/cream/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5bc4b841f09feb3e97091cb1767a36b2 cream-0.30-r1.ebuild 2120
 MD5 b5480467d60a7baef45eaf6e1e89f6e2 cream-0.29-r1.ebuild 2048
 MD5 5c7f55045fcc0472b8931606ebeebbb1 ChangeLog 2719
 MD5 0f44d41b4361ca8e1412c3d395cc3923 metadata.xml 434
 MD5 ed33e142107e0ad62a7ee9dbb65faf99 cream-0.28.ebuild 838
-MD5 2308a9cca5cee89ec8df9a114212d1a7 cream-0.30-r2.ebuild 2211
+MD5 7c51433b5a195d76ed1e3fe79376ea4c cream-0.30-r2.ebuild 3156
 MD5 72e0247891a704fa4cbe72a221b62a56 files/cream-0.29-ctags.patch 825
 MD5 305830ed8a287efa536fb2a951a75c7f files/digest-cream-0.30-r2 347
 MD5 305830ed8a287efa536fb2a951a75c7f files/digest-cream-0.30-r1 347
@@ -16,10 +13,3 @@ MD5 11a37b610fef3f6de7fca7058b1432e2 files/cream-0.29-paths.patch 1801
 MD5 a4b3168e3d6553e216fece5e86da946d files/cream.sh 128
 MD5 b805bdc2fd56028f6182d4fe44cfb033 files/digest-cream-0.28 62
 MD5 130945b9ad1e1413be8ede26054e2a91 files/cream-0.29-desktop.patch 313
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBPOhcLLFUmVNQ7rkRAqfnAKCh2/fyhM67zH41Rrz/uaIWD3g7HACbBl5U
-hTA02NezjC8xWjwpH5u7ZX0=
-=4ozK
------END PGP SIGNATURE-----
diff --git a/app-vim/cream/cream-0.30-r2.ebuild b/app-vim/cream/cream-0.30-r2.ebuild
index 07ca32ba08dc..8ccd7474ec6a 100644
--- a/app-vim/cream/cream-0.30-r2.ebuild
+++ b/app-vim/cream/cream-0.30-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/cream-0.30-r2.ebuild,v 1.2 2004/09/06 22:47:28 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/cream-0.30-r2.ebuild,v 1.3 2004/09/11 00:20:16 ciaranm Exp $
 
 inherit vim-plugin eutils
 
@@ -21,6 +21,23 @@ DEPEND=""
 RDEPEND=">=app-editors/gvim-6.2
 	dev-util/ctags"
 
+VIM_PLUGIN_HELPTEXT=\
+"Cream is completly independent from the rest of your Vim/GVim setup.
+To launch GVim in Cream mode, use this wrapper script:
+\    % cream [filename...]
+
+Cream's documentation has been installed in ${ROOT}usr/share/doc/${PF}
+In particular, you may want to read:
+
+\ - the Cream features list:
+file://${ROOT}usr/share/doc/${PF}/html/features.html
+
+\ - the Cream shortcuts list:
+file://${ROOT}usr/share/doc/${PF}/html/keyboardshortcuts.html
+
+\ - the Cream FAQ:
+file://${ROOT}usr/share/doc/${PF}/html/faq.html"
+
 src_unpack() {
 	mkdir -p ${S}/spelldicts
 
@@ -71,15 +88,24 @@ src_install() {
 	dohtml docs-html/*
 }
 
-pkg_postinst() {
+pkg_setup() {
+	einfo "Cream comes with several dictionaries for spell checking. In"
+	einfo "all cases, at least a small English dictionary will be installed."
 	einfo " "
-	einfo "To specify which dictionaries are installed with this ebuild,"
-	einfo "set the LINGUAS variable in /etc/make.conf. For example, to"
-	einfo "install full English and French dictionaries, use:"
+	einfo "To specify which optional dictionaries are installed, set the"
+	einfo "LINGUAS variable in /etc/make.conf. For example, to install full"
+	einfo "English and French dictionaries, use:"
 	einfo "    LINGUAS=\"en fr\""
 	einfo " "
-	if [ -z "${LINGUAS}" ] ; then
-		einfo "By default, a small English dictionary was installed."
-		einfo " "
-	fi
+	einfo "Available dictionaries are:"
+	for dict in "English en" "French fr" "German de" "Spanish es" ; do
+		# portage bug: shouldn't get a QA notice for linguas stuff...
+		einfo "    ${dict% *} \t(${dict#* }) $( ( \
+			use linguas_${dict#* } &>/dev/null && \
+			echo '(Will be installed)' ) || echo '(Will not be installed)' )"
+	done
+	einfo " "
+	# give the user time to cancel if necessary
+	epause
 }
+