Drop dependency on flim. Add an elog message to pkg_postinst.

(Portage version: 2.2_rc40/cvs/Linux i686)

2 files changed, 19 insertions, 15 deletions

diff --git a/app-emacs/emacs-jabber/ChangeLog b/app-emacs/emacs-jabber/ChangeLog
index f3d3e189d02c..fdebbfeb4fa5 100644
--- a/app-emacs/emacs-jabber/ChangeLog
+++ b/app-emacs/emacs-jabber/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/emacs-jabber
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/ChangeLog,v 1.19 2009/09/13 15:21:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/ChangeLog,v 1.20 2009/09/13 17:37:25 ulm Exp $
+
+  13 Sep 2009; Ulrich Mueller <ulm@gentoo.org> emacs-jabber-0.8.0.ebuild:
+  Drop dependency on virtual/flim, as it is not needed at build time and
+  optional at run time. Use elisp_src_{compile,install} functions. Add an elog
+  message to pkg_postinst.
 
 *emacs-jabber-0.8.0 (13 Sep 2009)
 
diff --git a/app-emacs/emacs-jabber/emacs-jabber-0.8.0.ebuild b/app-emacs/emacs-jabber/emacs-jabber-0.8.0.ebuild
index 7cc44e52cd49..66b48ac552c9 100644
--- a/app-emacs/emacs-jabber/emacs-jabber-0.8.0.ebuild
+++ b/app-emacs/emacs-jabber/emacs-jabber-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/emacs-jabber-0.8.0.ebuild,v 1.1 2009/09/13 15:21:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/emacs-jabber-0.8.0.ebuild,v 1.2 2009/09/13 17:37:25 ulm Exp $
 
 inherit elisp
 
@@ -14,25 +14,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-# emacs-jabber depends on >= gnus-5.10 which is available in
-# app-emacs/gnus or bundled with app-editors/emacs-cvs.	 emacs 21.4a
-# includes gnus-5.9
-
-DEPEND=">=virtual/gnus-5.10
-	virtual/flim"
+DEPEND=">=virtual/gnus-5.10"
 RDEPEND="${DEPEND}"
 
-SITEFILE=70${PN}-gentoo.el
+DOCS="AUTHORS NEWS README"
+SITEFILE="70${PN}-gentoo.el"
 
 src_compile() {
-	elisp-compile *.el || die
+	elisp_src_compile
 	makeinfo jabber.texi || die
 }
 
 src_install() {
-	elisp-install ${PN} *.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	doinfo jabber.info
-	dohtml html/*
-	dodoc AUTHORS NEWS README || die
+	elisp_src_install
+	doinfo jabber.info || die
+}
+
+pkg_postinst() {
+	elisp_pkg_postinst
+	elog "If you want to use SASL authentication, you need either Emacs 23,"
+	elog "or install one of virtual/flim or app-emacs/ngnus."
 }