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

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 25 insertions, 21 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/Manifest b/app-emacs/emacs-jabber/Manifest
index 6b35d15728a8..7abee80493f2 100644
--- a/app-emacs/emacs-jabber/Manifest
+++ b/app-emacs/emacs-jabber/Manifest
@@ -5,13 +5,13 @@ AUX 70emacs-jabber-gentoo.el 249 RMD160 099c3e0b5887226cf2765cfac9cc913596b1bf4a
 DIST emacs-jabber-0.7.1.tar.gz 205903 RMD160 b94a6ab7581080846e0871f53e448c63277dab25 SHA1 0cf4524135678a8a504f06c2e5219a9359bdb370 SHA256 e0f4595efc0a3fa03f6eb3222d868a6c65affbbeffce554030454d1aba7e6295
 DIST emacs-jabber-0.8.0.tar.gz 358265 RMD160 ea1cd4fdbf87253c2e5bdade5c6cb09d2a96dbe0 SHA1 f15479bc804a8036ed8ae4c548cc577e75b0b2e4 SHA256 9f498c6165ddde921e8b080c6e026eaabebae6844d4741f573a975c72c2d8fa6
 EBUILD emacs-jabber-0.7.1.ebuild 1122 RMD160 726c7444c7aa1e06515d1a55d75797ae1402c779 SHA1 dac2a4ea299fad925a85cf26468174055b4257b9 SHA256 6e1a422d493121a4b2d239cc254927e23f60e6cdb7dc6265192eba8d4908649a
-EBUILD emacs-jabber-0.8.0.ebuild 984 RMD160 4fd9c5fcd0602e0dde8d75f42c91ac6c88b7441f SHA1 202ae13ab6744aab445cebe07a2edeedb41bdef2 SHA256 ee99655db75f618fee3baa44cbe3e07d1a3e4bfce357f6af6adf5f70639bc512
-MISC ChangeLog 3096 RMD160 06f12c49b8cd25a43cce3773cd80817b3c8f1a89 SHA1 bce50871d0e68365882cf7f38a9f3579121999b4 SHA256 0aec6a23367b9805c74090d276d3a1d3fa8bce72aa30ef681d073c7ec8f92f66
+EBUILD emacs-jabber-0.8.0.ebuild 905 RMD160 18c08d6cac953755f8645abd68419ea2e5e55b01 SHA1 9827218dd51b4b65c455ff4ce0ce1f60b0ac120f SHA256 94e7362fabc82e310777d21d32ba4f04c8da611c0e13a9a5d4b4cf4060e6e9ce
+MISC ChangeLog 3348 RMD160 21e57d535a46c6dde39336ba037e98c51c0326ae SHA1 ae18780a5a52b2ed834a931080e59ad3f3cc66d2 SHA256 a540744d4566ac65e01566147daa2449ee97ac5608bbc5f89b46619fffceeae7
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkqtDg0ACgkQNQqtfCuFneOjRACdEzS4taCrJ5g/ShhbZom7vDTp
-xxgAnAsArzvD2U4T0UMpQfXRcSx3eJln
-=JE3k
+iEYEARECAAYFAkqtLlcACgkQOeoy/oIi7ux3sACdF9/Mcm8qywYw17h8uD+B0QcQ
+lbgAoNJ2wtDYHyu1M5XLP1ZGotkKg03n
+=1Qkk
 -----END PGP SIGNATURE-----
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."
 }